Merge remote branch 'fsorig/master'

libs/freetdm/src/ftdm_call_utils.c

@@ -30,6 +30,12 @@
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Contributors: 
+ *
+ * Moises Silva <moy@sangoma.com>
+ * Ricardo Barroetaveña <rbarroetavena@anura.com.ar>
+ *
  */
 
 #include "private/ftdm_core.h"
@@ -144,3 +150,20 @@ FT_DECLARE(ftdm_status_t) ftdm_is_number(const char *number)
 	return FTDM_SUCCESS;
 }
 
+
+FT_DECLARE(ftdm_status_t) ftdm_set_calling_party_category(const char *string, uint8_t *target)
+{
+	uint8_t val;
+	ftdm_status_t status = FTDM_SUCCESS;
+
+	val = ftdm_str2ftdm_calling_party_category(string);
+	if (val == FTDM_CPC_INVALID) {
+		ftdm_log(FTDM_LOG_WARNING, "Invalid category string (%s)\n", string);
+		val = FTDM_CPC_ORDINARY;
+		status = FTDM_FAIL;
+	}
+
+	*target = val;
+	return status;
+}
+

libs/freetdm/src/ftdm_io.c

@@ -301,6 +301,9 @@ FTDM_STR2ENUM(ftdm_str2ftdm_bearer_cap, ftdm_bearer_cap2str, ftdm_bearer_cap_t,
 FTDM_ENUM_NAMES(USER_LAYER1_PROT_NAMES, USER_LAYER1_PROT_STRINGS)
 FTDM_STR2ENUM(ftdm_str2ftdm_usr_layer1_prot, ftdm_user_layer1_prot2str, ftdm_user_layer1_prot_t, USER_LAYER1_PROT_NAMES, FTDM_USER_LAYER1_PROT_INVALID)
 
+FTDM_ENUM_NAMES(CALLING_PARTY_CATEGORY_NAMES, CALLING_PARTY_CATEGORY_STRINGS)
+FTDM_STR2ENUM(ftdm_str2ftdm_calling_party_category, ftdm_calling_party_category2str, ftdm_calling_party_category_t, CALLING_PARTY_CATEGORY_NAMES, FTDM_CPC_INVALID)
+
 static ftdm_status_t ftdm_group_add_channels(ftdm_span_t* span, int currindex, const char* name);
 
 static const char *cut_path(const char *in)
@@ -1703,6 +1706,21 @@ static ftdm_status_t __inline__ get_best_rated(ftdm_channel_t **fchan, ftdm_chan
 	return FTDM_SUCCESS;
 }
 
+static uint32_t __inline__ rr_next(uint32_t last, uint32_t min, uint32_t max, ftdm_direction_t direction)
+{
+	uint32_t next = min;
+
+	ftdm_log(FTDM_LOG_DEBUG, "last = %d, min = %d, max = %d\n", last, min, max);
+
+	if (direction == FTDM_RR_DOWN) {
+		next = (last >= max) ? min : ++last;
+	} else {
+		next = (last <= min) ? max : --last;
+	}
+	return next;
+}
+
+
 FT_DECLARE(int) ftdm_channel_get_availability(ftdm_channel_t *ftdmchan)
 {
 	int availability = -1;
@@ -1745,6 +1763,8 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_open_by_group(uint32_t group_id, ftdm_dir
 	
 	if (direction == FTDM_TOP_DOWN) {
 		i = 0;
+	} else if (direction == FTDM_RR_DOWN || direction == FTDM_RR_UP) {
+		i = rr_next(group->last_used_index, 0, group->chan_count - 1, direction);
 	} else {
 		i = group->chan_count-1;
 	}
@@ -1759,16 +1779,24 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_open_by_group(uint32_t group_id, ftdm_dir
 
 		if (request_voice_channel(check, ftdmchan, caller_data, direction)) {
 			status = FTDM_SUCCESS;
+			if (direction == FTDM_RR_UP || direction == FTDM_RR_DOWN) {
+				group->last_used_index = i;
+			}
 			break;
 		}
 
 		calculate_best_rate(check, &best_rated, &best_rate);
 
 		if (direction == FTDM_TOP_DOWN) {
-			if (i >= group->chan_count) {
+			if (i >= (group->chan_count - 1)) {
 				break;
 			}
 			i++;
+		} else if (direction == FTDM_RR_DOWN || direction == FTDM_RR_UP) {
+			if (check == best_rated) {
+				group->last_used_index = i;
+			}
+			i = rr_next(i, 0, group->chan_count - 1, direction);
 		} else {
 			if (i == 0) {
 				break;
@@ -1847,6 +1875,8 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_open_by_span(uint32_t span_id, ftdm_direc
 	
 	if (direction == FTDM_TOP_DOWN) {
 		i = 1;
+	} else if (direction == FTDM_RR_DOWN || direction == FTDM_RR_UP) {
+		i = rr_next(span->last_used_index, 1, span->chan_count, direction);
 	} else {
 		i = span->chan_count;
 	}	
@@ -1857,6 +1887,10 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_open_by_span(uint32_t span_id, ftdm_direc
 			if (i > span->chan_count) {
 				break;
 			}
+		} else if (direction == FTDM_RR_DOWN || direction == FTDM_RR_UP) {
+			if (i == span->last_used_index) {
+				break;
+			}
 		} else {
 			if (i == 0) {
 				break;
@@ -1870,6 +1904,9 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_open_by_span(uint32_t span_id, ftdm_direc
 
 		if (request_voice_channel(check, ftdmchan, caller_data, direction)) {
 			status = FTDM_SUCCESS;
+			if (direction == FTDM_RR_UP || direction == FTDM_RR_DOWN) {
+				span->last_used_index = i;
+			}
 			break;
 		}
 			
@@ -1877,6 +1914,11 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_open_by_span(uint32_t span_id, ftdm_direc
 
 		if (direction == FTDM_TOP_DOWN) {
 			i++;
+		} else if (direction == FTDM_RR_DOWN || direction == FTDM_RR_UP) {
+			if (check == best_rated) {
+				span->last_used_index = i;
+			}
+			i = rr_next(i, 1, span->chan_count, direction);
 		} else {
 			i--;
 		}

libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c

@@ -515,23 +515,17 @@ static __inline__ void state_advance(ftdm_channel_t *chan)
 	switch (ftdm_channel_get_state(chan)) {
 	case FTDM_CHANNEL_STATE_DOWN:
 		{
+			ftdm_channel_t *chtmp = chan;
 			chan->call_data = NULL;
-			ftdm_channel_done(chan);
 
-			/*
-			 * Close channel completely, BRI PTMP will thank us
-			 */
-			if (ftdm_test_flag(chan, FTDM_CHANNEL_OPEN)) {
-				ftdm_channel_t *chtmp = chan;
-				if (ftdm_channel_close(&chtmp) != FTDM_SUCCESS) {
-					ftdm_log(FTDM_LOG_WARNING, "-- Failed to close channel %d:%d\n",
-						ftdm_channel_get_span_id(chan),
-						ftdm_channel_get_id(chan));
-				} else {
-					ftdm_log(FTDM_LOG_DEBUG, "-- Closed channel %d:%d\n",
-						ftdm_channel_get_span_id(chan),
-						ftdm_channel_get_id(chan));
-				}
+			if (ftdm_channel_close(&chtmp) != FTDM_SUCCESS) {
+				ftdm_log(FTDM_LOG_WARNING, "-- Failed to close channel %d:%d\n",
+					ftdm_channel_get_span_id(chan),
+					ftdm_channel_get_id(chan));
+			} else {
+				ftdm_log(FTDM_LOG_DEBUG, "-- Closed channel %d:%d\n",
+					ftdm_channel_get_span_id(chan),
+					ftdm_channel_get_id(chan));
 			}
 		}
 		break;

libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c

@@ -33,6 +33,7 @@
  * Contributors: 
  *
  * Arnaldo Pereira <arnaldo@sangoma.com>
+ * Ricardo Barroetaveña <rbarroetavena@anura.com.ar>
  *
  */
 
@@ -380,11 +381,72 @@ static void ft_r2_answer_call(ftdm_channel_t *ftdmchan)
 	R2CALL(ftdmchan)->answer_pending = 0;
 }
 
+static __inline__ ftdm_calling_party_category_t ftdm_openr2_cpc_to_r2_ftdm_cpc(openr2_calling_party_category_t cpc)
+{
+	switch (cpc) {
+	case OR2_CALLING_PARTY_CATEGORY_UNKNOWN:
+		return FTDM_CPC_UNKNOWN;
+
+	case OR2_CALLING_PARTY_CATEGORY_NATIONAL_SUBSCRIBER:
+		return FTDM_CPC_ORDINARY;
+
+	case OR2_CALLING_PARTY_CATEGORY_NATIONAL_PRIORITY_SUBSCRIBER:
+		return FTDM_CPC_PRIORITY;
+
+	case OR2_CALLING_PARTY_CATEGORY_INTERNATIONAL_SUBSCRIBER:
+		return FTDM_CPC_UNKNOWN;
+
+	case OR2_CALLING_PARTY_CATEGORY_INTERNATIONAL_PRIORITY_SUBSCRIBER:
+		return FTDM_CPC_UNKNOWN;
+
+	case OR2_CALLING_PARTY_CATEGORY_TEST_EQUIPMENT:
+		return FTDM_CPC_TEST;
+
+	case OR2_CALLING_PARTY_CATEGORY_PAY_PHONE:
+		return FTDM_CPC_PAYPHONE;
+
+	case OR2_CALLING_PARTY_CATEGORY_COLLECT_CALL:
+		return FTDM_CPC_OPERATOR;
+	}
+	return FTDM_CPC_INVALID;
+}
+
+static __inline openr2_calling_party_category_t ftdm_r2_ftdm_cpc_to_openr2_cpc(ftdm_calling_party_category_t cpc)
+{
+	switch (cpc) {
+	case FTDM_CPC_UNKNOWN:
+		return OR2_CALLING_PARTY_CATEGORY_UNKNOWN;
+
+	case FTDM_CPC_OPERATOR:
+		return OR2_CALLING_PARTY_CATEGORY_COLLECT_CALL;
+
+	case FTDM_CPC_ORDINARY:
+		return OR2_CALLING_PARTY_CATEGORY_NATIONAL_SUBSCRIBER;
+
+	case FTDM_CPC_PRIORITY:
+		return OR2_CALLING_PARTY_CATEGORY_NATIONAL_PRIORITY_SUBSCRIBER;
+
+	case FTDM_CPC_DATA:
+		return OR2_CALLING_PARTY_CATEGORY_UNKNOWN;
+
+	case FTDM_CPC_TEST:
+		return OR2_CALLING_PARTY_CATEGORY_TEST_EQUIPMENT;
+
+	case FTDM_CPC_PAYPHONE:
+		return OR2_CALLING_PARTY_CATEGORY_PAY_PHONE;
+
+	case FTDM_CPC_INVALID:
+		return OR2_CALLING_PARTY_CATEGORY_UNKNOWN;
+	}
+	return OR2_CALLING_PARTY_CATEGORY_UNKNOWN;
+}
+
 /* this function must be called with the chan mutex held! */
 static FIO_CHANNEL_OUTGOING_CALL_FUNCTION(r2_outgoing_call)
 {
 	openr2_call_status_t callstatus;
 	ftdm_r2_data_t *r2data;
+	openr2_calling_party_category_t category = OR2_CALLING_PARTY_CATEGORY_NATIONAL_SUBSCRIBER;
 
 	r2data = ftdmchan->span->signal_data;
 
@@ -397,6 +459,12 @@ static FIO_CHANNEL_OUTGOING_CALL_FUNCTION(r2_outgoing_call)
 
 	ft_r2_clean_call(ftdmchan->call_data);
 
+	if (ftdmchan->caller_data.cpc == FTDM_CPC_INVALID || ftdmchan->caller_data.cpc == FTDM_CPC_UNKNOWN) {
+		category = r2data->category;
+	} else {
+		category = ftdm_r2_ftdm_cpc_to_openr2_cpc(ftdmchan->caller_data.cpc);
+	}
+
 	/* start io dump */
 	if (r2data->mf_dump_size) {
 		ftdm_channel_command(ftdmchan, FTDM_COMMAND_ENABLE_INPUT_DUMP, &r2data->mf_dump_size);
@@ -404,9 +472,9 @@ static FIO_CHANNEL_OUTGOING_CALL_FUNCTION(r2_outgoing_call)
 	}
 
 	callstatus = openr2_chan_make_call(R2CALL(ftdmchan)->r2chan, 
-			ftdmchan->caller_data.cid_num.digits, 
+			ftdmchan->caller_data.pres == FTDM_PRES_ALLOWED ? ftdmchan->caller_data.cid_num.digits : NULL,
 			ftdmchan->caller_data.dnis.digits, 
-			r2data->category);
+			category);
 
 	if (callstatus) {
 		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_CRIT, "Failed to make call in R2 channel, openr2_chan_make_call failed\n");
@@ -622,6 +690,7 @@ static void ftdm_r2_on_call_offered(openr2_chan_t *r2chan, const char *ani, cons
 	} else {
 		ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_RING);
 	}
+	ftdmchan->caller_data.cpc = ftdm_openr2_cpc_to_r2_ftdm_cpc(category);
 }
 
 /*

libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c

@@ -31,7 +31,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-
 #include "private/ftdm_core.h"
 #include "ftmod_zt.h"
 

libs/freetdm/src/include/freetdm.h

@@ -144,7 +144,9 @@ typedef enum {
 /*! \brief Hunting direction (when hunting for free channels) */
 typedef enum {
 	FTDM_TOP_DOWN,
-	FTDM_BOTTOM_UP
+	FTDM_BOTTOM_UP,
+	FTDM_RR_DOWN,
+	FTDM_RR_UP,
 } ftdm_direction_t;
 
 /*! \brief I/O channel type */
@@ -265,6 +267,21 @@ typedef enum {
 #define USER_LAYER1_PROT_STRINGS "V.110", "u-law", "a-law", "Invalid"
 FTDM_STR2ENUM_P(ftdm_str2ftdm_usr_layer1_prot, ftdm_user_layer1_prot2str, ftdm_user_layer1_prot_t)
 
+/*! Calling Party Category */
+typedef enum {
+	FTDM_CPC_UNKNOWN,
+	FTDM_CPC_OPERATOR,
+	FTDM_CPC_ORDINARY,
+	FTDM_CPC_PRIORITY,
+	FTDM_CPC_DATA,
+	FTDM_CPC_TEST,
+	FTDM_CPC_PAYPHONE,
+	FTDM_CPC_INVALID
+} ftdm_calling_party_category_t;
+#define CALLING_PARTY_CATEGORY_STRINGS "unknown", "operator", "ordinary", "priority", "data-call", "test-call", "payphone", "invalid"
+FTDM_STR2ENUM_P(ftdm_str2ftdm_calling_party_category, ftdm_calling_party_category2str, ftdm_calling_party_category_t)
+
+
 /*! \brief Number abstraction */
 typedef struct {
 	char digits[25];
@@ -294,7 +311,8 @@ typedef struct ftdm_caller_data {
 	ftdm_bearer_cap_t bearer_capability;
 	/* user information layer 1 protocol */
 	ftdm_user_layer1_prot_t bearer_layer1;
-	ftdm_variable_container_t variables; /*!<variables attached to this call */
+	ftdm_calling_party_category_t cpc; /*!< Calling party category */
+	ftdm_variable_container_t variables; /*!< Variables attached to this call */
 	/* We need call_id inside caller_data for the user to be able to retrieve 
 	 * the call_id when ftdm_channel_call_place is called. This is the only time
 	 * that the user can use caller_data.call_id to obtain the call_id. The user

libs/freetdm/src/include/ftdm_call_utils.h

@@ -30,6 +30,12 @@
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Contributors: 
+ *
+ * Moises Silva <moy@sangoma.com>
+ * Ricardo Barroetaveña <rbarroetavena@anura.com.ar>
+ *
  */
 
 #ifndef __FTDM_CALL_UTILS_H__
@@ -114,5 +120,16 @@ FT_DECLARE(ftdm_status_t) ftdm_set_presentation_ind(const char *string, uint8_t
  */
 FT_DECLARE(ftdm_status_t) ftdm_is_number(const char *number);
 
+/*! 
+ * \brief Set the Calling Party Category from an enum
+ *
+ * \param cpc_string string value
+ * \param target the target to set value to
+ *
+ * \retval FTDM_SUCCESS success
+ * \retval FTDM_FAIL failure
+ */
+FT_DECLARE(ftdm_status_t) ftdm_set_calling_party_category(const char *string, uint8_t *target);
+
 #endif /* __FTDM_CALL_UTILS_H__ */
 

libs/freetdm/src/include/ftdm_os.h

@@ -39,9 +39,12 @@
 extern "C" {
 #endif
 
+#if defined(__linux__) && !defined(__USE_BSD)
+#define __USE_BSD
+#endif
+
 #include "ftdm_declare.h"
 #include "ftdm_threadmutex.h"
-
 #include <string.h>
 
 #ifndef __WINDOWS__

libs/freetdm/src/include/private/ftdm_core.h

@@ -493,6 +493,7 @@ struct ftdm_span {
 	ftdm_trunk_type_t trunk_type;
 	ftdm_analog_start_type_t start_type;
 	ftdm_signal_type_t signal_type;
+	uint32_t last_used_index;
 	/* Private signaling data. Do not touch unless you are a signaling module */
 	void *signal_data;
 	fio_signal_cb_t signal_cb;

libs/freetdm/src/testsangomaboost.c

@@ -48,12 +48,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#if defined(__linux__) && !defined(__USE_BSD)
-#define __USE_BSD
-#endif
-#ifndef WIN32
-#include <unistd.h>
-#endif
+
 #include "freetdm.h"