Merge branch 'netborder' of git.sangoma.com:smg_freeswitch into netborder

libs/freetdm/mod_freetdm/mod_freetdm.c

@@ -2434,7 +2434,7 @@ static void parse_bri_pri_spans(switch_xml_t cfg, switch_xml_t spans)
 			char *var = (char *) switch_xml_attr_soft(param, "name");
 			char *val = (char *) switch_xml_attr_soft(param, "value");
 
-			if (ftdm_array_len(spanparameters) == paramindex) {
+			if (ftdm_array_len(spanparameters) - 1 == paramindex) {
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Too many parameters for ss7 span, ignoring any parameter after %s\n", var);
 				break;
 			}
@@ -2594,7 +2594,7 @@ static switch_status_t load_config(void)
 				char *var = (char *) switch_xml_attr_soft(param, "name");
 				char *val = (char *) switch_xml_attr_soft(param, "value");
 
-				if (sizeof(spanparameters)/sizeof(spanparameters[0]) == paramindex) {
+				if (ftdm_array_len(spanparameters) - 1 == paramindex) {
 					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Too many parameters for ss7 span, ignoring any parameter after %s\n", var);
 					break;
 				}
@@ -2923,102 +2923,56 @@ static switch_status_t load_config(void)
 
 	if ((spans = switch_xml_child(cfg, "pri_spans"))) {
 		for (myspan = switch_xml_child(spans, "span"); myspan; myspan = myspan->next) {
-			char *id = (char *) switch_xml_attr(myspan, "id");
 			char *name = (char *) switch_xml_attr(myspan, "name");
+			ftdm_conf_parameter_t spanparameters[10];
 			ftdm_status_t zstatus = FTDM_FAIL;
 			const char *context = "default";
 			const char *dialplan = "XML";
-			//Q921NetUser_t mode = Q931_TE;
-			//Q931Dialect_t dialect = Q931_Dialect_National;
-			char *mode = NULL;
-			char *dialect = NULL;
-			uint32_t span_id = 0;
+			unsigned paramindex = 0;
 			ftdm_span_t *span = NULL;
-			const char *tonegroup = NULL;
-			char *digit_timeout = NULL;
-			const char *opts = "none";
-			uint32_t to = 0;
-			int q921loglevel = -1;
-			int q931loglevel = -1;
-			
-			// quick debug
-			//switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ID: '%s', Name:'%s'\n",id,name);
+			uint32_t span_id = 0;
+
+			if (!name) {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "span missing required attribute 'name'\n");
+				continue;
+			}
+
+			memset(spanparameters, 0, sizeof(spanparameters));
 
 			for (param = switch_xml_child(myspan, "param"); param; param = param->next) {
 				char *var = (char *) switch_xml_attr_soft(param, "name");
 				char *val = (char *) switch_xml_attr_soft(param, "value");
 
-				if (!strcasecmp(var, "tonegroup")) {
-					tonegroup = val;
-				} else if (!strcasecmp(var, "mode")) {
-					mode = val;
-				} else if (!strcasecmp(var, "dialect")) {
-					dialect = val;
-				} else if (!strcasecmp(var, "q921loglevel")) {
-                    if ((q921loglevel = switch_log_str2level(val)) == SWITCH_LOG_INVALID) {
-                        q921loglevel = -1;
-                    }
-				} else if (!strcasecmp(var, "q931loglevel")) {
-                    if ((q931loglevel = switch_log_str2level(val)) == SWITCH_LOG_INVALID) {
-                        q931loglevel = -1;
-                    }
-				} else if (!strcasecmp(var, "context")) {
+				if (ftdm_array_len(spanparameters) - 1 == paramindex) {
+					ftdm_log(FTDM_LOG_ERROR, "Too many parameters for pri span '%s', ignoring everything after '%s'\n", name, var);
+					break;
+				}
+
+				if (ftdm_strlen_zero(var) || ftdm_strlen_zero(val)) {
+					ftdm_log(FTDM_LOG_WARNING, "Skipping parameter with empty name or value\n");
+					continue;
+				}
+
+				if (!strcasecmp(var, "context")) {
 					context = val;
-				} else if (!strcasecmp(var, "opts")) {
-					opts = val;
 				} else if (!strcasecmp(var, "dialplan")) {
 					dialplan = val;
-				} else if (!strcasecmp(var, "digit_timeout") || !strcasecmp(var, "digit-timeout")) {
-					digit_timeout = val;
-				}
-			}
-	
-			if (!id && !name) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "span missing required param 'id'\n");
-				continue;
-			}
-			
-			if (name) {
-				zstatus = ftdm_span_find_by_name(name, &span);
-			} else {
-				if (switch_is_number(id)) {
-					span_id = atoi(id);
-					zstatus = ftdm_span_find(span_id, &span);
-				}
-
-				if (zstatus != FTDM_SUCCESS) {
-					zstatus = ftdm_span_find_by_name(id, &span);
+				} else {
+					spanparameters[paramindex].var = var;
+					spanparameters[paramindex].val = val;
+					paramindex++;
 				}
 			}
 
-			if (digit_timeout) {
-				to = atoi(digit_timeout);
-			}
-			
+			zstatus = ftdm_span_find_by_name(name, &span);
 			if (zstatus != FTDM_SUCCESS) {
-				ftdm_log(FTDM_LOG_ERROR, "Error finding FreeTDM span id:%s name:%s\n", switch_str_nil(id), switch_str_nil(name));
+				ftdm_log(FTDM_LOG_ERROR, "Error finding FreeTDM span %s\n", name);
 				continue;
 			}
 
-			if (!span_id) {
-				span_id = ftdm_span_get_id(span);
-			}
-
-			if (!tonegroup) {
-				tonegroup = "us";
-			}
-			
-			if (ftdm_configure_span(span, "isdn", on_clear_channel_signal, 
-								   "mode", mode,
-								   "dialect", dialect,
-								   "digit_timeout", &to,
-								   "opts", opts,
-								   "tonemap", tonegroup,
-								   "q921loglevel", q921loglevel,
-								   "q931loglevel", q931loglevel,
-								   FTDM_TAG_END) != FTDM_SUCCESS) {
-				ftdm_log(FTDM_LOG_ERROR, "Error starting FreeTDM span %d mode: %s dialect: %s error: %s\n", span_id, 
-						mode, dialect, ftdm_span_get_last_error(span));
+			span_id = ftdm_span_get_id(span);
+			if (ftdm_configure_span_signaling(span, "isdn", on_clear_channel_signal, spanparameters) != FTDM_SUCCESS) {
+				ftdm_log(FTDM_LOG_ERROR, "Error configuring FreeTDM span %s\n", name);
 				continue;
 			}
 
@@ -3048,11 +3002,18 @@ static switch_status_t load_config(void)
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "span missing required attribute 'name'\n");
 				continue;
 			}
-			
+
+			memset(spanparameters, 0, sizeof(spanparameters));
+
 			for (param = switch_xml_child(myspan, "param"); param; param = param->next) {
 				char *var = (char *) switch_xml_attr_soft(param, "name");
 				char *val = (char *) switch_xml_attr_soft(param, "value");
 
+				if (ftdm_array_len(spanparameters) - 1 == paramindex) {
+					ftdm_log(FTDM_LOG_ERROR, "Too many parameters for pritap span '%s', ignoring everything after '%s'\n", name, var);
+					break;
+				}
+
 				if (!strcasecmp(var, "context")) {
 					context = val;
 				} else if (!strcasecmp(var, "dialplan")) {
@@ -3102,10 +3063,22 @@ static switch_status_t load_config(void)
 				continue;
 			}
 
-			for (param = switch_xml_child(myspan, "param"); param && paramindex < 10; param = param->next) {
+			memset(spanparameters, 0, sizeof(spanparameters));
+
+			for (param = switch_xml_child(myspan, "param"); param; param = param->next) {
 				char *var = (char *) switch_xml_attr_soft(param, "name");
 				char *val = (char *) switch_xml_attr_soft(param, "value");
 
+				if (ftdm_array_len(spanparameters) - 1 == paramindex) {
+					ftdm_log(FTDM_LOG_ERROR, "Too many parameters for libpri span, ignoring everything after '%s'\n", var);
+					break;
+				}
+
+				if (ftdm_strlen_zero(var) || ftdm_strlen_zero(val)) {
+					ftdm_log(FTDM_LOG_WARNING, "Skipping parameter with empty name or value\n");
+					continue;
+				}
+
 				if (!strcasecmp(var, "context")) {
 					context = val;
 				} else if (!strcasecmp(var, "dialplan")) {
@@ -3165,7 +3138,8 @@ static switch_status_t load_config(void)
 			for (param = switch_xml_child(myspan, "param"); param; param = param->next) {
 				char *var = (char *) switch_xml_attr_soft(param, "name");
 				char *val = (char *) switch_xml_attr_soft(param, "value");
-				if (sizeof(spanparameters)/sizeof(spanparameters[0]) == paramindex) {
+
+				if (ftdm_array_len(spanparameters) - 1 == paramindex) {
 					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Too many parameters for boost span, ignoring any parameter after %s\n", var);
 					break;
 				}

libs/freetdm/patches/oz.diff

@@ -1,134 +0,0 @@
-Index: src/ozmod/ozmod_wanpipe/ozmod_wanpipe.c
-===================================================================
---- src/ozmod/ozmod_wanpipe/ozmod_wanpipe.c	(revision 745)
-+++ src/ozmod/ozmod_wanpipe/ozmod_wanpipe.c	(working copy)
-@@ -98,19 +98,21 @@
-  * so we can have one analong handler thread that will deal with all the idle analog channels for events
-  * the alternative would be for the driver to provide one socket for all of the oob events for all analog channels
-  */
--static __inline__ int tdmv_api_wait_socket(sng_fd_t fd, int timeout, int *flags)
-+static __inline__ int tdmv_api_wait_socket(zap_channel_t *zchan, int timeout, int *flags)
- {
- 	
- #ifdef LIBSANGOMA_VERSION
- 	int err;
--	sangoma_wait_obj_t sangoma_wait_obj;
-+	sangoma_wait_obj_t *sangoma_wait_obj = zchan->mod_data;
- 
-- 	sangoma_init_wait_obj(&sangoma_wait_obj, fd, 1, 1, *flags, SANGOMA_WAIT_OBJ);
-+	sangoma_init_wait_obj(sangoma_wait_obj, zchan->sockfd, 1, 1, 0, SANGOMA_WAIT_OBJ);
- 
--	err=sangoma_socket_waitfor_many(&sangoma_wait_obj,1 , timeout);
-+	err = sangoma_socket_waitfor_many(&sangoma_wait_obj, 1, timeout);
-+
- 	if (err > 0) {
--		*flags=sangoma_wait_obj.flags_out;
-+		*flags = sangoma_wait_obj.flags_out;
- 	}
-+
- 	return err;
- 
- #else
-@@ -118,7 +120,7 @@
-     int res;
- 
-     memset(&pfds[0], 0, sizeof(pfds[0]));
--    pfds[0].fd = fd;
-+    pfds[0].fd = zchan->sockfd;
-     pfds[0].events = *flags;
-     res = poll(pfds, 1, timeout);
- 	*flags = 0;
-@@ -200,6 +202,15 @@
- 		
- 		if (sockfd != WP_INVALID_SOCKET && zap_span_add_channel(span, sockfd, type, &chan) == ZAP_SUCCESS) {
- 			wanpipe_tdm_api_t tdm_api;
-+#ifdef LIBSANGOMA_VERSION
-+			sangoma_wait_obj_t *sangoma_wait_obj;
-+
-+			sangoma_wait_obj = malloc(sizeof(*sangoma_wait_obj));
-+			memset(sangoma_wait_obj, 0, sizeof(*sangoma_wait_obj));
-+			sangoma_init_wait_obj(sangoma_wait_obj, sockfd, 1, 1, 0, SANGOMA_WAIT_OBJ);
-+			chan->mod_data = sangoma_wait_obj;
-+#endif
-+
- 			memset(&tdm_api,0,sizeof(tdm_api));
- 			
- 			chan->physical_span_id = spanno;
-@@ -211,7 +222,7 @@
- 				
- 				dtmf = "software";
- 
--				/* FIXME: Handle Error Conditino Check for return code */
-+				/* FIXME: Handle Error Condition Check for return code */
- 				err= sangoma_tdm_get_hw_coding(chan->sockfd, &tdm_api);
- 
- 				if (tdm_api.wp_tdm_cmd.hw_tdm_coding) {
-@@ -606,7 +617,7 @@
- 		inflags |= POLLPRI;
- 	}
- 
--	result = tdmv_api_wait_socket(zchan->sockfd, to, &inflags);
-+	result = tdmv_api_wait_socket(zchan, to, &inflags);
- 
- 	*flags = ZAP_NO_FLAGS;
- 
-@@ -643,26 +654,30 @@
- ZIO_SPAN_POLL_EVENT_FUNCTION(wanpipe_poll_event)
- {
- #ifdef LIBSANGOMA_VERSION
--	sangoma_wait_obj_t pfds[ZAP_MAX_CHANNELS_SPAN];
-+	sangoma_wait_obj_t *pfds[ZAP_MAX_CHANNELS_SPAN] = { 0 };
- #else
- 	struct pollfd pfds[ZAP_MAX_CHANNELS_SPAN];
- #endif
- 
- 	uint32_t i, j = 0, k = 0, l = 0;
--	int objects=0;
- 	int r;
- 	
- 	for(i = 1; i <= span->chan_count; i++) {
- 		zap_channel_t *zchan = span->channels[i];
- 
-+
- #ifdef LIBSANGOMA_VERSION
-- 		sangoma_init_wait_obj(&pfds[j], zchan->sockfd , 1, 1, POLLPRI, SANGOMA_WAIT_OBJ);
-+		if (!zchan->mod_data) {
-+			continue;
-+		}
-+		pfds[j] = zchan->mod_data;
-+
- #else
- 		memset(&pfds[j], 0, sizeof(pfds[j]));
- 		pfds[j].fd = span->channels[i]->sockfd;
- 		pfds[j].events = POLLPRI;
- #endif
--		objects++;
-+
- 		/* The driver probably should be able to do this wink/flash/ringing by itself this is sort of a hack to make it work! */
- 
- 		if (zap_test_flag(zchan, ZAP_CHANNEL_WINK) || zap_test_flag(zchan, ZAP_CHANNEL_FLASH)) {
-@@ -703,7 +718,7 @@
- 		ms = l;
- 	}
- #ifdef LIBSANGOMA_VERSION
--	r = sangoma_socket_waitfor_many(pfds,objects,ms);
-+	r = sangoma_socket_waitfor_many(pfds, j, ms);
- #else
- 	r = poll(pfds, j, ms);
- #endif
-@@ -935,6 +950,15 @@
-  */
- static ZIO_CHANNEL_DESTROY_FUNCTION(wanpipe_channel_destroy)
- {
-+	sangoma_wait_obj_t *sangoma_wait_obj;
-+
-+	if (zchan->mod_data) {
-+		sangoma_wait_obj = zchan->mod_data;
-+		zchan->mod_data = NULL;
-+		sangoma_release_wait_obj(sangoma_wait_obj);
-+		free(sangoma_wait_obj);
-+	}
-+
- 	if (zchan->sockfd > -1) {
- 		close(zchan->sockfd);
- 		zchan->sockfd = WP_INVALID_SOCKET;

libs/freetdm/src/ftdm_io.c

@@ -1918,6 +1918,11 @@ FT_DECLARE(ftdm_trunk_type_t) ftdm_span_get_trunk_type(const ftdm_span_t *span)
 	return span->trunk_type;
 }
 
+FT_DECLARE(const char *) ftdm_span_get_trunk_type_str(const ftdm_span_t *span)
+{
+	return ftdm_trunk_type2str(span->trunk_type);
+}
+
 FT_DECLARE(uint32_t) ftdm_span_get_id(const ftdm_span_t *span)
 {
 	return span->span_id;
@@ -2117,6 +2122,15 @@ FT_DECLARE(ftdm_caller_data_t *) ftdm_channel_get_caller_data(ftdm_channel_t *ft
 	return &ftdmchan->caller_data;
 }
 
+FT_DECLARE(int) ftdm_channel_get_state(const ftdm_channel_t *ftdmchan)
+{
+	int state;
+	ftdm_channel_lock(ftdmchan);
+	state = ftdmchan->state;
+	ftdm_channel_unlock(ftdmchan);
+	return state;
+}
+
 FT_DECLARE(const char *) ftdm_channel_get_state_str(const ftdm_channel_t *ftdmchan)
 {
 	const char *state;
@@ -2126,6 +2140,15 @@ FT_DECLARE(const char *) ftdm_channel_get_state_str(const ftdm_channel_t *ftdmch
 	return state;
 }
 
+FT_DECLARE(int) ftdm_channel_get_last_state(const ftdm_channel_t *ftdmchan)
+{
+	int last_state;
+	ftdm_channel_lock(ftdmchan);
+	last_state = ftdmchan->last_state;
+	ftdm_channel_unlock(ftdmchan);
+	return last_state;
+}
+
 FT_DECLARE(const char *) ftdm_channel_get_last_state_str(const ftdm_channel_t *ftdmchan)
 {
 	const char *state;

libs/freetdm/src/ftdm_m3ua.c

@@ -484,7 +484,7 @@ static FIO_SPAN_NEXT_EVENT_FUNCTION(m3ua_next_event)
 
 static FIO_SPAN_DESTROY_FUNCTION(m3ua_span_destroy)
 {
-	m3ua_span_data_t *span_data = (m3ua_span_data_t *) span->mod_data;
+	m3ua_span_data_t *span_data = (m3ua_span_data_t *) span->io_data;
 	
 	if (span_data) {
 		ftdm_safe_free(span_data);
@@ -494,8 +494,8 @@ static FIO_SPAN_DESTROY_FUNCTION(m3ua_span_destroy)
 }
 static FIO_CHANNEL_DESTROY_FUNCTION(m3ua_channel_destroy)
 {
-	m3ua_chan_data_t *chan_data = (m3ua_chan_data_t *) ftdmchan->mod_data;
-	m3ua_span_data_t *span_data = (m3ua_span_data_t *) ftdmchan->span->mod_data;
+	m3ua_chan_data_t *chan_data = (m3ua_chan_data_t *) ftdmchan->io_data;
+	m3ua_span_data_t *span_data = (m3ua_span_data_t *) ftdmchan->span->io_data;
 	
 	if (!chan_data) {
 		return FTDM_FAIL;

libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.h

@@ -54,35 +54,20 @@ typedef enum {
 
 struct ftdm_libpri_data {
 	ftdm_channel_t *dchan;
-	ftdm_channel_t *dchans[2];
-	struct ftdm_sigmsg sigmsg;
-	uint32_t flags;
-	int32_t mode;
 	ftdm_isdn_opts_t opts;
+	uint32_t flags;
+	uint32_t debug_mask;
 
-	int node;
-	int pswitch;
-	char *dialplan;
-	unsigned int l1;
-	unsigned int dp;
-
-	int debug;
+	int mode;
+	int dialect;
+	unsigned int layer1;
+	unsigned int ton;
 
 	lpwrap_pri_t spri;
 };
 
 typedef struct ftdm_libpri_data ftdm_libpri_data_t;
 
-
-/* b-channel private data */
-struct ftdm_isdn_bchan_data
-{
-	int32_t digit_timeout;
-};
-
-typedef struct ftdm_isdn_bchan_data ftdm_isdn_bchan_data_t;
-
-
 #endif
 
 /* For Emacs:

libs/freetdm/src/ftmod/ftmod_pika/ftmod_pika.c

@@ -266,7 +266,7 @@ PK_VOID PK_CALLBACK media_out_callback(PKH_TPikaEvent *event)
 {
 	PK_STATUS pk_status;
 	ftdm_channel_t *ftdmchan = event->userData;
-	pika_chan_data_t *chan_data = (pika_chan_data_t *) ftdmchan->mod_data;
+	pika_chan_data_t *chan_data = (pika_chan_data_t *) ftdmchan->io_data;
 
 	//PK_CHAR event_text[PKH_EVENT_MAX_NAME_LENGTH];
 	//PKH_EVENT_GetText(event->id, event_text, sizeof(event_text));
@@ -345,8 +345,8 @@ static unsigned pika_open_range(ftdm_span_t *span, unsigned boardno, unsigned sp
 		
 	}
 
-	if (span->mod_data) {
-		span_data = span->mod_data;
+	if (span->io_data) {
+		span_data = span->io_data;
 	} else {
 		span_data = ftdm_malloc(sizeof(*span_data));
 		assert(span_data != NULL);
@@ -364,7 +364,7 @@ static unsigned pika_open_range(ftdm_span_t *span, unsigned boardno, unsigned sp
 
 		//PKH_QUEUE_Attach(span_data->event_queue, globals.open_boards[boardno], NULL);
 
-		span->mod_data = span_data;
+		span->io_data = span_data;
 	}
 
 	if (type == FTDM_CHAN_TYPE_FXS || type == FTDM_CHAN_TYPE_FXO) {
@@ -380,7 +380,7 @@ static unsigned pika_open_range(ftdm_span_t *span, unsigned boardno, unsigned sp
 		assert(chan_data);
 		memset(chan_data, 0, sizeof(*chan_data));
 		ftdm_span_add_channel(span, 0, type, &chan);
-		chan->mod_data = chan_data;
+		chan->io_data = chan_data;
 
 		if ((type == FTDM_CHAN_TYPE_B || type == FTDM_CHAN_TYPE_DQ921) && !span_data->handle) {
 			PKH_TBoardConfig boardConfig;
@@ -680,7 +680,7 @@ static FIO_CONFIGURE_SPAN_FUNCTION(pika_configure_span)
  */
 static FIO_OPEN_FUNCTION(pika_open) 
 {
-	pika_chan_data_t *chan_data = (pika_chan_data_t *) ftdmchan->mod_data;
+	pika_chan_data_t *chan_data = (pika_chan_data_t *) ftdmchan->io_data;
 
 	if (!chan_data && !ftdm_test_flag(chan_data, PK_FLAG_READY)) {
 		return FTDM_FAIL;
@@ -715,7 +715,7 @@ static FIO_CLOSE_FUNCTION(pika_close)
  */
 static FIO_WAIT_FUNCTION(pika_wait)
 {
-	pika_chan_data_t *chan_data = (pika_chan_data_t *) ftdmchan->mod_data;
+	pika_chan_data_t *chan_data = (pika_chan_data_t *) ftdmchan->io_data;
 	PK_STATUS status;
 	ftdm_wait_flag_t myflags = *flags;
 	PK_CHAR event_text[PKH_EVENT_MAX_NAME_LENGTH];
@@ -754,7 +754,7 @@ static FIO_WAIT_FUNCTION(pika_wait)
  */
 static FIO_READ_FUNCTION(pika_read)
 {
-	pika_chan_data_t *chan_data = (pika_chan_data_t *) ftdmchan->mod_data;
+	pika_chan_data_t *chan_data = (pika_chan_data_t *) ftdmchan->io_data;
 	PK_STATUS status;
 	PK_CHAR event_text[PKH_EVENT_MAX_NAME_LENGTH];
 	uint32_t len;
@@ -795,7 +795,7 @@ static FIO_READ_FUNCTION(pika_read)
  */
 static FIO_WRITE_FUNCTION(pika_write)
 {
-	pika_chan_data_t *chan_data = (pika_chan_data_t *) ftdmchan->mod_data;
+	pika_chan_data_t *chan_data = (pika_chan_data_t *) ftdmchan->io_data;
 	PK_STATUS status;
 
 	if (ftdmchan->type == FTDM_CHAN_TYPE_DQ921) {
@@ -821,8 +821,8 @@ static FIO_WRITE_FUNCTION(pika_write)
  */
 static FIO_COMMAND_FUNCTION(pika_command)
 {
-	pika_chan_data_t *chan_data = (pika_chan_data_t *) ftdmchan->mod_data;
-	//pika_span_data_t *span_data = (pika_span_data_t *) ftdmchan->span->mod_data;
+	pika_chan_data_t *chan_data = (pika_chan_data_t *) ftdmchan->io_data;
+	//pika_span_data_t *span_data = (pika_span_data_t *) ftdmchan->span->io_data;
 	PK_STATUS pk_status;
 	ftdm_status_t status = FTDM_SUCCESS;
 
@@ -956,7 +956,7 @@ static FIO_COMMAND_FUNCTION(pika_command)
  */
 static FIO_SPAN_POLL_EVENT_FUNCTION(pika_poll_event)
 {
-	pika_span_data_t *span_data = (pika_span_data_t *) span->mod_data;
+	pika_span_data_t *span_data = (pika_span_data_t *) span->io_data;
 	PK_STATUS status;
 	PK_CHAR event_text[PKH_EVENT_MAX_NAME_LENGTH];
 
@@ -1025,7 +1025,7 @@ static FIO_SPAN_POLL_EVENT_FUNCTION(pika_poll_event)
 				for(x = 1; x <= span->chan_count; x++) {
 					ftdmchan = span->channels[x];
 					assert(ftdmchan != NULL);
-					chan_data = (pika_chan_data_t *) ftdmchan->mod_data;
+					chan_data = (pika_chan_data_t *) ftdmchan->io_data;
 					assert(chan_data != NULL);
 					
 
@@ -1042,7 +1042,7 @@ static FIO_SPAN_POLL_EVENT_FUNCTION(pika_poll_event)
 		//ftdm_log(FTDM_LOG_DEBUG, "Event: %s\n", event_text);
 		
 		if (ftdmchan) {
-			pika_chan_data_t *chan_data = (pika_chan_data_t *) ftdmchan->mod_data;
+			pika_chan_data_t *chan_data = (pika_chan_data_t *) ftdmchan->io_data;
 
 			assert(chan_data != NULL);
 			ftdm_set_flag(ftdmchan, FTDM_CHANNEL_EVENT);
@@ -1068,7 +1068,7 @@ static FIO_SPAN_NEXT_EVENT_FUNCTION(pika_next_event)
 	
 	for(i = 1; i <= span->chan_count; i++) {
 		if (ftdm_test_flag(span->channels[i], FTDM_CHANNEL_EVENT)) {
-			pika_chan_data_t *chan_data = (pika_chan_data_t *) span->channels[i]->mod_data;
+			pika_chan_data_t *chan_data = (pika_chan_data_t *) span->channels[i]->io_data;
 			PK_CHAR event_text[PKH_EVENT_MAX_NAME_LENGTH];
 			
 			ftdm_clear_flag(span->channels[i], FTDM_CHANNEL_EVENT);
@@ -1207,7 +1207,7 @@ static FIO_SPAN_NEXT_EVENT_FUNCTION(pika_next_event)
  */
 static FIO_SPAN_DESTROY_FUNCTION(pika_span_destroy)
 {
-	pika_span_data_t *span_data = (pika_span_data_t *) span->mod_data;
+	pika_span_data_t *span_data = (pika_span_data_t *) span->io_data;
 	
 	if (span_data) {
 		PKH_QUEUE_Destroy(span_data->event_queue);
@@ -1224,8 +1224,8 @@ static FIO_SPAN_DESTROY_FUNCTION(pika_span_destroy)
  */
 static FIO_CHANNEL_DESTROY_FUNCTION(pika_channel_destroy)
 {
-	pika_chan_data_t *chan_data = (pika_chan_data_t *) ftdmchan->mod_data;
-	pika_span_data_t *span_data = (pika_span_data_t *) ftdmchan->span->mod_data;
+	pika_chan_data_t *chan_data = (pika_chan_data_t *) ftdmchan->io_data;
+	pika_span_data_t *span_data = (pika_span_data_t *) ftdmchan->span->io_data;
 	
 	if (!chan_data) {
 		return FTDM_FAIL;

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

@@ -31,11 +31,15 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
 #ifdef __linux__
+#ifndef _BSD_SOURCE
+#define _BSD_SOURCE /* for strsep() */
+#endif
 #include <syscall.h>
 #include <poll.h>
+#include <string.h>
 #endif
+#include <stdio.h>
 #include <openr2.h>
 #include "freetdm.h"
 #include "private/ftdm_core.h"
@@ -879,7 +883,7 @@ static FIO_SIG_CONFIGURE_FUNCTION(ftdm_r2_configure_span)
 	ftdm_r2_call_t *r2call = NULL;
 	openr2_chan_t *r2chan = NULL;
 	openr2_log_level_t tmplevel;
-	char *clevel;
+	char *clevel = NULL;
 	char *logval = NULL;
 
 	ft_r2_conf_t r2conf = 
@@ -887,20 +891,21 @@ static FIO_SIG_CONFIGURE_FUNCTION(ftdm_r2_configure_span)
 		/* .variant */ OR2_VAR_ITU,
 		/* .category */ OR2_CALLING_PARTY_CATEGORY_NATIONAL_SUBSCRIBER,
 		/* .loglevel */ OR2_LOG_ERROR | OR2_LOG_WARNING,
+		/* .logdir */ NULL,
+		/* .advanced_protocol_file */ NULL,
 		/* .max_ani */ 10,
 		/* .max_dnis */ 4,
 		/* .mfback_timeout */ -1,
 		/* .metering_pulse_timeout */ -1,
-		/* .allow_collect_calls */ -1,
 		/* .immediate_accept */ -1,
 		/* .skip_category */ -1,
-		/* .forced_release */ -1,
-		/* .charge_calls */ -1,
 		/* .get_ani_first */ -1,
 		/* .call_files */ 0,
 		/* .mf_files */ 0,
-		/* .logdir */ NULL,
-		/* .advanced_protocol_file */ NULL
+		/* .double_answer */ 0,
+		/* .charge_calls */ -1,
+		/* .forced_release */ -1,
+		/* .allow_collect_calls */ -1
 	};
 
 	assert(sig_cb != NULL);
@@ -982,15 +987,6 @@ static FIO_SIG_CONFIGURE_FUNCTION(ftdm_r2_configure_span)
 			}
 			if (ftdm_strlen_zero_buf(val)) {
 				ftdm_log(FTDM_LOG_NOTICE, "Ignoring empty R2 advanced_protocol_file parameter\n");
-				/* 
-				 * TODO: investigate this
-				 *
-				 * despite the fact advanced_protocol_file was initialized as NULL, it's now a bad
-				 * pointer - hence, this workaround.
-				 * this seems to happen only on windows.
-				 *
-				 */
-				r2conf.advanced_protocol_file = NULL;
 				continue;
 			}
 			r2conf.advanced_protocol_file = val;
@@ -1615,22 +1611,13 @@ static FIO_API_FUNCTION(ftdm_r2_api)
 						r2data->loops,
 						r2data->monitor_thread_id);
 				stream->write_function(stream, "\n");
-				stream->write_function(stream, "%4s %-12.12s %-12.12s %6s %6s %6s %6s\n", "Channel", "Tx CAS", "Rx CAS", 
-						"Rx Avg", "Tx Avg", "Rx", "Tx");
+				stream->write_function(stream, "%4s %-12.12s %-12.12s\n", "Channel", "Tx CAS", "Rx CAS");
 				for (i = 1; i <= span->chan_count; i++) {
-					char rx_str[25];
-					char tx_str[25];
-					char rxavg_str[25];
-					char txavg_str[25];
 					r2chan = R2CALL(span->channels[i])->r2chan;
-					stream->write_function(stream, "%4d    %-12.12s %-12.12s %6s %6s %6s %6s\n", 
+					stream->write_function(stream, "%4d    %-12.12s %-12.12s\n", 
 							span->channels[i]->chan_id,
 							openr2_chan_get_tx_cas_string(r2chan),
-							openr2_chan_get_rx_cas_string(r2chan),
-							rxavg_str,
-							txavg_str,
-							rx_str,
-							tx_str);
+							openr2_chan_get_rx_cas_string(r2chan));
 				}
 				stream->write_function(stream, "\n");
 				stream->write_function(stream, "+OK.\n");

libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c

@@ -59,9 +59,6 @@ static sng_isdn_event_interface_t	g_sngisdn_event_interface;
 
 ftdm_sngisdn_data_t 			g_sngisdn_data;
 
-extern ftdm_status_t sngisdn_activate_trace(ftdm_span_t *span, sngisdn_tracetype_t trace_opt);
-extern ftdm_status_t sngisdn_check_free_ids(void);
-
 ftdm_state_map_t sangoma_isdn_state_map = {
 	{
 	{

libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h

@@ -270,16 +270,13 @@ extern ftdm_sngisdn_data_t	g_sngisdn_data;
 ftdm_status_t ftmod_isdn_parse_cfg(ftdm_conf_parameter_t *ftdm_parameters, ftdm_span_t *span);
 
 /* Support functions */
-FT_DECLARE_INLINE(uint32_t) get_unique_suInstId(int16_t cc_id);
-FT_DECLARE_INLINE(void) clear_call_data(sngisdn_chan_data_t *sngisdn_info);
-FT_DECLARE_INLINE(void) clear_call_glare_data(sngisdn_chan_data_t *sngisdn_info);
+FT_DECLARE(uint32_t) get_unique_suInstId(int16_t cc_id);
+FT_DECLARE(void) clear_call_data(sngisdn_chan_data_t *sngisdn_info);
+FT_DECLARE(void) clear_call_glare_data(sngisdn_chan_data_t *sngisdn_info);
 
 
 void stack_hdr_init(Header *hdr);
 void stack_pst_init(Pst *pst);
-FT_DECLARE_INLINE(ftdm_status_t) get_ftdmchan_by_spInstId(int16_t cc_id, uint32_t spInstId, sngisdn_chan_data_t **sngisdn_data);
-FT_DECLARE_INLINE(ftdm_status_t) get_ftdmchan_by_suInstId(int16_t cc_id, uint32_t suInstId, sngisdn_chan_data_t **sngisdn_data);
-FT_DECLARE_INLINE(ftdm_status_t) sngisdn_set_avail_rate(ftdm_span_t *ftdmspan, sngisdn_avail_t avail);
 
 /* Outbound Call Control functions */
 void sngisdn_snd_setup(ftdm_channel_t *ftdmchan);
@@ -340,6 +337,14 @@ void sngisdn_process_rst_ind (sngisdn_event_data_t *sngisdn_event);
 
 void sngisdn_rcv_phy_ind(SuId suId, Reason reason);
 void sngisdn_rcv_q921_ind(BdMngmt *status);
+
+void sngisdn_trace_q921(char* str, uint8_t* data, uint32_t data_len);
+void sngisdn_trace_q931(char* str, uint8_t* data, uint32_t data_len);
+void get_memory_info(void);
+
+ftdm_status_t sng_isdn_activate_trace(ftdm_span_t *span, sngisdn_tracetype_t trace_opt);
+ftdm_status_t sngisdn_check_free_ids(void);
+
 void sngisdn_rcv_q921_trace(BdMngmt *trc, Buffer *mBuf);
 void sngisdn_rcv_q931_ind(InMngmt *status);
 void sngisdn_rcv_q931_trace(InMngmt *trc, Buffer *mBuf);

libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c

@@ -34,11 +34,6 @@
 
 #include "ftmod_sangoma_isdn.h"
 
-extern ftdm_status_t cpy_calling_num_from_stack(ftdm_caller_data_t *ftdm, CgPtyNmb *cgPtyNmb);
-extern ftdm_status_t cpy_called_num_from_stack(ftdm_caller_data_t *ftdm, CdPtyNmb *cdPtyNmb);
-extern ftdm_status_t cpy_redir_num_from_stack(ftdm_caller_data_t *ftdm, RedirNmb *redirNmb);
-extern ftdm_status_t cpy_calling_name_from_stack(ftdm_caller_data_t *ftdm, Display *display);
-
 /* Remote side transmit a SETUP */
 void sngisdn_process_con_ind (sngisdn_event_data_t *sngisdn_event)
 {

libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_out.c

@@ -34,12 +34,6 @@
 
 #include "ftmod_sangoma_isdn.h"
 
-extern ftdm_status_t cpy_calling_num_from_user(CgPtyNmb *cgPtyNmb, ftdm_caller_data_t *ftdm);
-extern ftdm_status_t cpy_called_num_from_user(CdPtyNmb *cdPtyNmb, ftdm_caller_data_t *ftdm);
-extern ftdm_status_t cpy_calling_name_from_user(ConEvnt *conEvnt, ftdm_channel_t *ftdmchan);
-extern ftdm_status_t cpy_redir_num_from_user(RedirNmb *redirNmb, ftdm_caller_data_t *ftdm);
-
-
 void sngisdn_snd_setup(ftdm_channel_t *ftdmchan)
 {
 	ConEvnt conEvnt;

libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_rcv.c

@@ -34,10 +34,6 @@
 
 #include "ftmod_sangoma_isdn.h"
 
-extern void sngisdn_trace_q921(char* str, uint8_t* data, uint32_t data_len);
-extern void sngisdn_trace_q931(char* str, uint8_t* data, uint32_t data_len);
-extern void get_memory_info(void);
-
 #define MAX_DECODE_STR_LEN 2000
 
 

libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c

@@ -34,22 +34,12 @@
 
 #include "ftmod_sangoma_isdn.h"
 
-ftdm_status_t cpy_calling_num_from_stack(ftdm_caller_data_t *ftdm, CgPtyNmb *cgPtyNmb);
-ftdm_status_t cpy_called_num_from_stack(ftdm_caller_data_t *ftdm, CdPtyNmb *cdPtyNmb);
-ftdm_status_t cpy_redir_num_from_stack(ftdm_caller_data_t *ftdm, RedirNmb *redirNmb);
-ftdm_status_t cpy_calling_name_from_stack(ftdm_caller_data_t *ftdm, Display *display);
-
-ftdm_status_t cpy_calling_num_from_user(CgPtyNmb *cgPtyNmb, ftdm_caller_data_t *ftdm);
-ftdm_status_t cpy_called_num_from_user(CdPtyNmb *cdPtyNmb, ftdm_caller_data_t *ftdm);
-ftdm_status_t cpy_redir_num_from_user(RedirNmb *redirNmb, ftdm_caller_data_t *ftdm);
-ftdm_status_t cpy_calling_name_from_user(ConEvnt *conEvnt, ftdm_channel_t *ftdmchan);
-
 ftdm_status_t sngisdn_check_free_ids(void);
 
 extern ftdm_sngisdn_data_t	g_sngisdn_data;
 void get_memory_info(void);
 
-FT_DECLARE_INLINE(void) clear_call_data(sngisdn_chan_data_t *sngisdn_info)
+FT_DECLARE(void) clear_call_data(sngisdn_chan_data_t *sngisdn_info)
 {
 	uint32_t cc_id = ((sngisdn_span_data_t*)sngisdn_info->ftdmchan->span->signal_data)->cc_id;
 
@@ -66,7 +56,7 @@ FT_DECLARE_INLINE(void) clear_call_data(sngisdn_chan_data_t *sngisdn_info)
 	return;
 }
 
-FT_DECLARE_INLINE(void) clear_call_glare_data(sngisdn_chan_data_t *sngisdn_info)
+FT_DECLARE(void) clear_call_glare_data(sngisdn_chan_data_t *sngisdn_info)
 {
 	ftdm_log_chan(sngisdn_info->ftdmchan, FTDM_LOG_DEBUG, "Clearing glare data (suId:%d suInstId:%u spInstId:%u actv-suInstId:%u  actv-spInstId:%u)\n",
 										sngisdn_info->glare.suId,
@@ -91,7 +81,7 @@ FT_DECLARE_INLINE(void) clear_call_glare_data(sngisdn_chan_data_t *sngisdn_info)
 }
 
 
-FT_DECLARE_INLINE(uint32_t) get_unique_suInstId(int16_t cc_id)
+FT_DECLARE(uint32_t) get_unique_suInstId(int16_t cc_id)
 {
 	uint32_t suInstId;
 	ftdm_assert_return((cc_id > 0 && cc_id <=MAX_VARIANTS), FTDM_FAIL, "Invalid cc_id\n");
@@ -113,7 +103,7 @@ FT_DECLARE_INLINE(uint32_t) get_unique_suInstId(int16_t cc_id)
 	return 0;
 }
 
-FT_DECLARE_INLINE(ftdm_status_t) get_ftdmchan_by_suInstId(int16_t cc_id, uint32_t suInstId, sngisdn_chan_data_t **sngisdn_data)
+FT_DECLARE(ftdm_status_t) get_ftdmchan_by_suInstId(int16_t cc_id, uint32_t suInstId, sngisdn_chan_data_t **sngisdn_data)
 {
 	ftdm_assert_return((cc_id > 0 && cc_id <=MAX_VARIANTS), FTDM_FAIL, "Invalid cc_id\n");
 	ftdm_assert_return(g_sngisdn_data.ccs[cc_id].activation_done, FTDM_FAIL, "Trying to find call on unconfigured CC\n");
@@ -125,7 +115,7 @@ FT_DECLARE_INLINE(ftdm_status_t) get_ftdmchan_by_suInstId(int16_t cc_id, uint32_
 	return FTDM_SUCCESS;
 }
 
-FT_DECLARE_INLINE(ftdm_status_t) get_ftdmchan_by_spInstId(int16_t cc_id, uint32_t spInstId, sngisdn_chan_data_t **sngisdn_data)
+FT_DECLARE(ftdm_status_t) get_ftdmchan_by_spInstId(int16_t cc_id, uint32_t spInstId, sngisdn_chan_data_t **sngisdn_data)
 {
 	ftdm_assert_return((cc_id > 0 && cc_id <=MAX_VARIANTS), FTDM_FAIL, "Invalid cc_id\n");
 	ftdm_assert_return(g_sngisdn_data.ccs[cc_id].activation_done, FTDM_FAIL, "Trying to find call on unconfigured CC\n");
@@ -157,7 +147,7 @@ ftdm_status_t sngisdn_set_avail_rate(ftdm_span_t *span, sngisdn_avail_t avail)
 	return FTDM_SUCCESS;
 }
 
-ftdm_status_t cpy_calling_num_from_stack(ftdm_caller_data_t *ftdm, CgPtyNmb *cgPtyNmb)
+FT_DECLARE(ftdm_status_t) cpy_calling_num_from_stack(ftdm_caller_data_t *ftdm, CgPtyNmb *cgPtyNmb)
 {
 	if (cgPtyNmb->eh.pres != PRSNT_NODEF) {
 		return FTDM_FAIL;
@@ -184,7 +174,7 @@ ftdm_status_t cpy_calling_num_from_stack(ftdm_caller_data_t *ftdm, CgPtyNmb *cgP
 	return FTDM_SUCCESS;
 }
 
-ftdm_status_t cpy_called_num_from_stack(ftdm_caller_data_t *ftdm, CdPtyNmb *cdPtyNmb)
+FT_DECLARE(ftdm_status_t) cpy_called_num_from_stack(ftdm_caller_data_t *ftdm, CdPtyNmb *cdPtyNmb)
 {
 	if (cdPtyNmb->eh.pres != PRSNT_NODEF) {
 		return FTDM_FAIL;
@@ -206,7 +196,7 @@ ftdm_status_t cpy_called_num_from_stack(ftdm_caller_data_t *ftdm, CdPtyNmb *cdPt
 	return FTDM_SUCCESS;
 }
 
-ftdm_status_t cpy_redir_num_from_stack(ftdm_caller_data_t *ftdm, RedirNmb *redirNmb)
+FT_DECLARE(ftdm_status_t) cpy_redir_num_from_stack(ftdm_caller_data_t *ftdm, RedirNmb *redirNmb)
 {
 	if (redirNmb->eh.pres != PRSNT_NODEF) {
 		return FTDM_FAIL;
@@ -226,7 +216,7 @@ ftdm_status_t cpy_redir_num_from_stack(ftdm_caller_data_t *ftdm, RedirNmb *redir
 	return FTDM_SUCCESS;
 }
 
-ftdm_status_t cpy_calling_name_from_stack(ftdm_caller_data_t *ftdm, Display *display)
+FT_DECLARE(ftdm_status_t) cpy_calling_name_from_stack(ftdm_caller_data_t *ftdm, Display *display)
 {
 	if (display->eh.pres != PRSNT_NODEF) {
 		return FTDM_FAIL;
@@ -239,7 +229,7 @@ ftdm_status_t cpy_calling_name_from_stack(ftdm_caller_data_t *ftdm, Display *dis
 	return FTDM_SUCCESS;
 }
 
-ftdm_status_t cpy_calling_num_from_user(CgPtyNmb *cgPtyNmb, ftdm_caller_data_t *ftdm)
+FT_DECLARE(ftdm_status_t) cpy_calling_num_from_user(CgPtyNmb *cgPtyNmb, ftdm_caller_data_t *ftdm)
 {
 	uint8_t len = strlen(ftdm->cid_num.digits);
 	if (!len) {
@@ -267,7 +257,7 @@ ftdm_status_t cpy_calling_num_from_user(CgPtyNmb *cgPtyNmb, ftdm_caller_data_t *
 	return FTDM_SUCCESS;
 }
 
-ftdm_status_t cpy_called_num_from_user(CdPtyNmb *cdPtyNmb, ftdm_caller_data_t *ftdm)
+FT_DECLARE(ftdm_status_t) cpy_called_num_from_user(CdPtyNmb *cdPtyNmb, ftdm_caller_data_t *ftdm)
 {
 	uint8_t len = strlen(ftdm->dnis.digits);
 	if (!len) {
@@ -297,7 +287,7 @@ ftdm_status_t cpy_called_num_from_user(CdPtyNmb *cdPtyNmb, ftdm_caller_data_t *f
     return FTDM_SUCCESS;
 }
 
-ftdm_status_t cpy_redir_num_from_user(RedirNmb *redirNmb, ftdm_caller_data_t *ftdm)
+FT_DECLARE(ftdm_status_t) cpy_redir_num_from_user(RedirNmb *redirNmb, ftdm_caller_data_t *ftdm)
 {
 	uint8_t len = strlen(ftdm->rdnis.digits);
 	if (!len) {
@@ -329,7 +319,7 @@ ftdm_status_t cpy_redir_num_from_user(RedirNmb *redirNmb, ftdm_caller_data_t *ft
 }
 
 
-ftdm_status_t cpy_calling_name_from_user(ConEvnt *conEvnt, ftdm_channel_t *ftdmchan)
+FT_DECLARE(ftdm_status_t) cpy_calling_name_from_user(ConEvnt *conEvnt, ftdm_channel_t *ftdmchan)
 {
 	uint8_t len;
 	ftdm_caller_data_t *ftdm = &ftdmchan->caller_data;

libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cfg.c

@@ -1347,7 +1347,7 @@ int ftmod_ss7_isup_isap_config(int id)
 		cfg.t.cfg.s.siSap.natAddrInd		= ADDR_NOTPRSNT;			/* SID Nature of Addres Indicator */
 		cfg.t.cfg.s.siSap.sidNPlan			= NP_ISDN;					/* SID Numbering Plan */
 		cfg.t.cfg.s.siSap.sidPresInd		= FALSE;					/* default presentation indicator */
-		cfg.t.cfg.s.siSap.incSidPresRes		= TRUE;						/* Presentation Restriction of incoming SID */
+		cfg.t.cfg.s.siSap.incSidPresRes		= FALSE;					/* Presentation Restriction of incoming SID */
 		cfg.t.cfg.s.siSap.sidPresRes		= 0;						/* Presentation Restriction */
 	}
 	cfg.t.cfg.s.siSap.reqOpt				= FALSE;					/* Request option */

libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c

@@ -1482,7 +1482,7 @@ static ftdm_status_t handle_tx_grs(ftdm_stream_handle_t *stream, int span, int c
 
 			sngss7_info = (sngss7_chan_data_t *)g_ftdm_sngss7_data.cfg.isupCkt[x].obj;
 			ftdmchan = sngss7_info->ftdmchan;
-			sngss7_span = ftdmchan->span->mod_data;
+			sngss7_span = ftdmchan->span->signal_data;
 
 			if ((ftdmchan->physical_span_id == span) && 
 				((ftdmchan->physical_chan_id >= chan) && (ftdmchan->physical_chan_id < (chan+range)))) {
@@ -1529,7 +1529,7 @@ static ftdm_status_t handle_tx_grs(ftdm_stream_handle_t *stream, int span, int c
 
 			sngss7_info = (sngss7_chan_data_t *)g_ftdm_sngss7_data.cfg.isupCkt[x].obj;
 			ftdmchan = sngss7_info->ftdmchan;
-			sngss7_span = ftdmchan->span->mod_data;
+			sngss7_span = ftdmchan->span->signal_data;
 
 			if ((ftdmchan->physical_span_id == span) && 
 				((ftdmchan->physical_chan_id >= chan) && (ftdmchan->physical_chan_id < (chan+range)))) {
@@ -1572,7 +1572,7 @@ static ftdm_status_t handle_tx_cgb(ftdm_stream_handle_t *stream, int span, int c
 			/* extract the channel and span info for this circuit */
 			sngss7_info = (sngss7_chan_data_t *)g_ftdm_sngss7_data.cfg.isupCkt[x].obj;
 			ftdmchan = sngss7_info->ftdmchan;
-			sngss7_span = ftdmchan->span->mod_data;
+			sngss7_span = ftdmchan->span->signal_data;
 
 			/* check if this circuit is part of the block */
 			if ((ftdmchan->physical_span_id == span) && 
@@ -1628,7 +1628,7 @@ static ftdm_status_t handle_tx_cgb(ftdm_stream_handle_t *stream, int span, int c
 
 			sngss7_info = (sngss7_chan_data_t *)g_ftdm_sngss7_data.cfg.isupCkt[x].obj;
 			ftdmchan = sngss7_info->ftdmchan;
-			sngss7_span = ftdmchan->span->mod_data;
+			sngss7_span = ftdmchan->span->signal_data;
 
 			if ((ftdmchan->physical_span_id == span) && 
 				((ftdmchan->physical_chan_id >= chan) && (ftdmchan->physical_chan_id < (chan+range)))) {
@@ -1672,7 +1672,7 @@ static ftdm_status_t handle_tx_cgu(ftdm_stream_handle_t *stream, int span, int c
 			/* extract the channel and span info for this circuit */
 			sngss7_info = (sngss7_chan_data_t *)g_ftdm_sngss7_data.cfg.isupCkt[x].obj;
 			ftdmchan = sngss7_info->ftdmchan;
-			sngss7_span = ftdmchan->span->mod_data;
+			sngss7_span = ftdmchan->span->signal_data;
 
 			/* check if this circuit is part of the block */
 			if ((ftdmchan->physical_span_id == span) && 
@@ -1728,7 +1728,7 @@ static ftdm_status_t handle_tx_cgu(ftdm_stream_handle_t *stream, int span, int c
 
 			sngss7_info = (sngss7_chan_data_t *)g_ftdm_sngss7_data.cfg.isupCkt[x].obj;
 			ftdmchan = sngss7_info->ftdmchan;
-			sngss7_span = ftdmchan->span->mod_data;
+			sngss7_span = ftdmchan->span->signal_data;
 
 			if ((ftdmchan->physical_span_id == span) && 
 				((ftdmchan->physical_chan_id >= chan) && (ftdmchan->physical_chan_id < (chan+range)))) {

libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c

@@ -1722,7 +1722,7 @@ ftdm_status_t handle_grs_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 	}
 
 	/* fill in the span structure for this circuit */
-	sngss7_span = ftdmchan->span->mod_data;
+	sngss7_span = ftdmchan->span->signal_data;
 	sngss7_span->rx_grs.circuit = circuit; 
 	sngss7_span->rx_grs.range = range;
 
@@ -1758,7 +1758,7 @@ ftdm_status_t handle_grs_rsp(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 	}
 
 	/* fill in the span structure for this circuit */
-	sngss7_span = ftdmchan->span->mod_data;
+	sngss7_span = ftdmchan->span->signal_data;
 	sngss7_span->rx_gra.circuit = circuit; 
 	sngss7_span->rx_gra.range = range;
 
@@ -1866,7 +1866,7 @@ ftdm_status_t handle_ucic(uint32_t suInstId, uint32_t spInstId, uint32_t circuit
 	}
 
 	/* check if we just sent a GRS request...*/
-	sngss7_span = ftdmchan->span->mod_data;
+	sngss7_span = ftdmchan->span->signal_data;
 	if (sngss7_span->tx_grs.circuit > 0) {
 		/* we need to put all circuits on this UCIC */
 		sngss7_span->ucic.circuit = sngss7_span->tx_grs.circuit;
@@ -1917,7 +1917,7 @@ ftdm_status_t handle_cgb_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 	}
 
 	/* grab the span info */
-	sngss7_span = ftdmchan->span->mod_data;
+	sngss7_span = ftdmchan->span->signal_data;
 
 	/* figure out what type of block needs to be applied */
 	if ((siStaEvnt->cgsmti.eh.pres == PRSNT_NODEF) && (siStaEvnt->cgsmti.typeInd.pres == PRSNT_NODEF)) {
@@ -2058,7 +2058,7 @@ ftdm_status_t handle_cgu_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 	}
 
 	/* grab the span info */
-	sngss7_span = ftdmchan->span->mod_data;
+	sngss7_span = ftdmchan->span->signal_data;
 
 	/* figure out what type of block needs to be applied */
 	if ((siStaEvnt->cgsmti.eh.pres == PRSNT_NODEF) && (siStaEvnt->cgsmti.typeInd.pres == PRSNT_NODEF)) {

libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_in.c

@@ -90,7 +90,7 @@ void sngss7_con_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiCo
 	memcpy(&sngss7_event->event.siConEvnt, siConEvnt, sizeof(*siConEvnt));
 
 	/* enqueue this event */
-	ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->mod_data)->event_queue, sngss7_event);
+	ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->signal_data)->event_queue, sngss7_event);
 
 	SS7_FUNC_TRACE_EXIT(__FUNCTION__);
 }
@@ -128,7 +128,7 @@ void sngss7_con_cfm(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiCo
 	memcpy(&sngss7_event->event.siConEvnt, siConEvnt, sizeof(*siConEvnt));
 
 	/* enqueue this event */
-	ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->mod_data)->event_queue, sngss7_event);
+	ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->signal_data)->event_queue, sngss7_event);
 
 	SS7_FUNC_TRACE_EXIT(__FUNCTION__);
 }
@@ -167,7 +167,7 @@ void sngss7_con_sta(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiCn
 	memcpy(&sngss7_event->event.siCnStEvnt, siCnStEvnt, sizeof(*siCnStEvnt));
 
 	/* enqueue this event */
-	ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->mod_data)->event_queue, sngss7_event);
+	ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->signal_data)->event_queue, sngss7_event);
 
 	SS7_FUNC_TRACE_EXIT(__FUNCTION__);
 }
@@ -205,7 +205,7 @@ void sngss7_rel_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiRe
 	memcpy(&sngss7_event->event.siRelEvnt, siRelEvnt, sizeof(*siRelEvnt));
 
 	/* enqueue this event */
-	ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->mod_data)->event_queue, sngss7_event);
+	ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->signal_data)->event_queue, sngss7_event);
 
 	SS7_FUNC_TRACE_EXIT(__FUNCTION__);
 }
@@ -243,7 +243,7 @@ void sngss7_rel_cfm(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiRe
 	memcpy(&sngss7_event->event.siRelEvnt, siRelEvnt, sizeof(*siRelEvnt));
 
 	/* enqueue this event */
-	ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->mod_data)->event_queue, sngss7_event);
+	ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->signal_data)->event_queue, sngss7_event);
 
 	SS7_FUNC_TRACE_EXIT(__FUNCTION__);
 }
@@ -281,7 +281,7 @@ void sngss7_dat_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiIn
 	memcpy(&sngss7_event->event.siInfoEvnt, siInfoEvnt, sizeof(*siInfoEvnt));
 
 	/* enqueue this event */
-	ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->mod_data)->event_queue, sngss7_event);
+	ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->signal_data)->event_queue, sngss7_event);
 
 	SS7_FUNC_TRACE_EXIT(__FUNCTION__);
 }
@@ -320,7 +320,7 @@ void sngss7_fac_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint
 	memcpy(&sngss7_event->event.siFacEvnt, siFacEvnt, sizeof(*siFacEvnt));
 
 	/* enqueue this event */
-	ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->mod_data)->event_queue, sngss7_event);
+	ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->signal_data)->event_queue, sngss7_event);
 
 	SS7_FUNC_TRACE_EXIT(__FUNCTION__);
 }
@@ -359,7 +359,7 @@ void sngss7_fac_cfm(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint
 	memcpy(&sngss7_event->event.siFacEvnt, siFacEvnt, sizeof(*siFacEvnt));
 
 	/* enqueue this event */
-	ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->mod_data)->event_queue, sngss7_event);
+	ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->signal_data)->event_queue, sngss7_event);
 
 	SS7_FUNC_TRACE_EXIT(__FUNCTION__);
 }
@@ -396,7 +396,7 @@ void sngss7_umsg_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit)
 	sngss7_event->event_id	= SNGSS7_UMSG_IND_EVENT;
 
 	/* enqueue this event */
-	ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->mod_data)->event_queue, sngss7_event);
+	ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->signal_data)->event_queue, sngss7_event);
 
 	SS7_FUNC_TRACE_EXIT(__FUNCTION__);
 
@@ -438,7 +438,7 @@ void sngss7_sta_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint
 	}
 
 	/* enqueue this event */
-	ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->mod_data)->event_queue, sngss7_event);
+	ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->signal_data)->event_queue, sngss7_event);
 
 	SS7_FUNC_TRACE_EXIT(__FUNCTION__);
 }
@@ -478,7 +478,7 @@ void sngss7_susp_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiS
 	}
 
 	/* enqueue this event */
-	ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->mod_data)->event_queue, sngss7_event);
+	ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->signal_data)->event_queue, sngss7_event);
 
 	SS7_FUNC_TRACE_EXIT(__FUNCTION__);
 
@@ -519,7 +519,7 @@ void sngss7_resm_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiR
 	}
 
 	/* enqueue this event */
-	ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->mod_data)->event_queue, sngss7_event);
+	ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->signal_data)->event_queue, sngss7_event);
 
 	SS7_FUNC_TRACE_EXIT(__FUNCTION__);
 
@@ -560,7 +560,7 @@ void sngss7_ssp_sta_cfm(uint32_t infId)
 	}
 
 	/* enqueue this event */
-	ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->mod_data)->event_queue, sngss7_event);
+	ftdm_queue_enqueue(((sngss7_span_data_t*)sngss7_info->ftdmchan->span->signal_data)->event_queue, sngss7_event);
 #endif
 	SS7_FUNC_TRACE_EXIT(__FUNCTION__);
 

libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c

@@ -275,7 +275,7 @@ static void *ftdm_sangoma_ss7_run(ftdm_thread_t * me, void *obj)
 	ftdm_span_t 		*ftdmspan = (ftdm_span_t *) obj;
 	ftdm_channel_t 		*ftdmchan = NULL;
 	sngss7_event_data_t	*sngss7_event = NULL;
-	sngss7_span_data_t	*sngss7_span = (sngss7_span_data_t *)ftdmspan->mod_data;
+	sngss7_span_data_t	*sngss7_span = (sngss7_span_data_t *)ftdmspan->signal_data;
 
 	ftdm_log (FTDM_LOG_INFO, "ftmod_sangoma_ss7 monitor thread for span=%u started.\n", ftdmspan->span_id);
 
@@ -788,7 +788,7 @@ void ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 			/* check if this is the base circuit and send out the GRA
 			 * we insure that this is the last circuit to have the state change queued
 			 */
-			sngss7_span_data_t *span = ftdmchan->span->mod_data;
+			sngss7_span_data_t *span = ftdmchan->span->signal_data;
 			if (span->rx_grs.circuit == sngss7_info->circuit->id) {
 				/* send out the GRA */
 				ft_to_sngss7_gra(ftdmchan);
@@ -1350,7 +1350,7 @@ static ftdm_status_t ftdm_sangoma_ss7_start(ftdm_span_t * span)
 		ftdmchan = span->channels[x];
 		if (ftdmchan->call_data == NULL) continue;
 		sngss7_info = ftdmchan->call_data;
-		sngss7_span = ftdmchan->span->mod_data;
+		sngss7_span = ftdmchan->span->signal_data;
 		sngss7_intf = &g_ftdm_sngss7_data.cfg.isupIntf[sngss7_info->circuit->infId];
 
 
@@ -1474,7 +1474,7 @@ static FIO_CONFIGURE_SPAN_SIGNALING_FUNCTION(ftdm_sangoma_ss7_span_config)
 	span->get_channel_sig_status	= ftdm_sangoma_ss7_get_sig_status;
 	span->set_channel_sig_status 	= ftdm_sangoma_ss7_set_sig_status;
 	span->state_map			 		= &sangoma_ss7_state_map;
-	span->mod_data					= ss7_span_info;
+	span->signal_data					= ss7_span_info;
 
 	/* set the flag to indicate that this span uses channel state change queues */
 	ftdm_set_flag (span, FTDM_SPAN_USE_CHAN_QUEUE);

libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c

@@ -619,7 +619,7 @@ void ft_to_sngss7_gra (ftdm_channel_t * ftdmchan)
 {
 	SS7_FUNC_TRACE_ENTER (__FUNCTION__);
 	
-	sngss7_span_data_t *sngss7_span = ftdmchan->span->mod_data;
+	sngss7_span_data_t *sngss7_span = ftdmchan->span->signal_data;
 	sngss7_chan_data_t *sngss7_info = ftdmchan->call_data;
 	SiStaEvnt	gra;
 	
@@ -663,7 +663,7 @@ void ft_to_sngss7_grs (ftdm_channel_t * ftdmchan)
 {
 	SS7_FUNC_TRACE_ENTER (__FUNCTION__);
 	
-	sngss7_span_data_t 	*sngss7_span = ftdmchan->span->mod_data;
+	sngss7_span_data_t 	*sngss7_span = ftdmchan->span->signal_data;
 	sngss7_chan_data_t *sngss7_info = ftdmchan->call_data;
 	
 	SiStaEvnt grs;
@@ -696,7 +696,7 @@ void ft_to_sngss7_cgba(ftdm_channel_t * ftdmchan)
 {	
 	SS7_FUNC_TRACE_ENTER (__FUNCTION__);
 	
-	sngss7_span_data_t 	*sngss7_span = ftdmchan->span->mod_data;
+	sngss7_span_data_t 	*sngss7_span = ftdmchan->span->signal_data;
 	sngss7_chan_data_t	*sngss7_info = ftdmchan->call_data;
 	int					x = 0;
 	
@@ -745,7 +745,7 @@ void ft_to_sngss7_cgua(ftdm_channel_t * ftdmchan)
 {	
 	SS7_FUNC_TRACE_ENTER (__FUNCTION__);
 	
-	sngss7_span_data_t 	*sngss7_span = ftdmchan->span->mod_data;
+	sngss7_span_data_t 	*sngss7_span = ftdmchan->span->signal_data;
 	sngss7_chan_data_t	*sngss7_info = ftdmchan->call_data;
 	int					x = 0;
 	
@@ -794,7 +794,7 @@ void ft_to_sngss7_cgb(ftdm_channel_t * ftdmchan)
 {
 	SS7_FUNC_TRACE_ENTER (__FUNCTION__);
 
-	sngss7_span_data_t 	*sngss7_span = ftdmchan->span->mod_data;
+	sngss7_span_data_t 	*sngss7_span = ftdmchan->span->signal_data;
 	sngss7_chan_data_t	*sngss7_info = ftdmchan->call_data;
 	SiStaEvnt 			cgb;
 	int					x = 0;
@@ -844,7 +844,7 @@ void ft_to_sngss7_cgu(ftdm_channel_t * ftdmchan)
 {
 	SS7_FUNC_TRACE_ENTER (__FUNCTION__);
 
-	sngss7_span_data_t 	*sngss7_span = ftdmchan->span->mod_data;
+	sngss7_span_data_t 	*sngss7_span = ftdmchan->span->signal_data;
 	sngss7_chan_data_t	*sngss7_info = ftdmchan->call_data;
 	SiStaEvnt 			cgu;
 	int					x = 0;

libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c

@@ -513,7 +513,7 @@ ftdm_status_t check_if_rx_grs_started(ftdm_span_t *ftdmspan)
 {
 	ftdm_channel_t 		*ftdmchan = NULL;
 	sngss7_chan_data_t  *sngss7_info = NULL;
-	sngss7_span_data_t	*sngss7_span = (sngss7_span_data_t *)ftdmspan->mod_data;
+	sngss7_span_data_t	*sngss7_span = (sngss7_span_data_t *)ftdmspan->signal_data;
 	int 				i;
 
 	for ( i = sngss7_span->rx_grs.circuit; i < (sngss7_span->rx_grs.circuit + sngss7_span->rx_grs.range + 1); i++) {
@@ -575,7 +575,7 @@ ftdm_status_t check_if_rx_grs_processed(ftdm_span_t *ftdmspan)
 {
 	ftdm_channel_t 		*ftdmchan = NULL;
 	sngss7_chan_data_t  *sngss7_info = NULL;
-	sngss7_span_data_t	*sngss7_span = (sngss7_span_data_t *)ftdmspan->mod_data;
+	sngss7_span_data_t	*sngss7_span = (sngss7_span_data_t *)ftdmspan->signal_data;
 	int 				i;
 	int					byte = 0;
 	int					bit = 0;
@@ -667,7 +667,7 @@ ftdm_status_t check_if_rx_gra_started(ftdm_span_t *ftdmspan)
 {
 	ftdm_channel_t 		*ftdmchan = NULL;
 	sngss7_chan_data_t  *sngss7_info = NULL;
-	sngss7_span_data_t	*sngss7_span = (sngss7_span_data_t *)ftdmspan->mod_data;
+	sngss7_span_data_t	*sngss7_span = (sngss7_span_data_t *)ftdmspan->signal_data;
 	int 				i;
 
 	for (i = sngss7_span->rx_gra.circuit; i < (sngss7_span->rx_gra.circuit + sngss7_span->rx_gra.range + 1); i++) {
@@ -817,7 +817,7 @@ ftdm_status_t process_span_ucic(ftdm_span_t *ftdmspan)
 {
 	ftdm_channel_t 		*ftdmchan = NULL;
 	sngss7_chan_data_t  *sngss7_info = NULL;
-	sngss7_span_data_t	*sngss7_span = (sngss7_span_data_t *)ftdmspan->mod_data;
+	sngss7_span_data_t	*sngss7_span = (sngss7_span_data_t *)ftdmspan->signal_data;
 	int 				i;
 
 	for (i = sngss7_span->ucic.circuit; i < (sngss7_span->ucic.circuit + sngss7_span->ucic.range + 1); i++) {
@@ -869,7 +869,7 @@ ftdm_status_t clear_rx_grs_flags(sngss7_chan_data_t *sngss7_info)
 ftdm_status_t clear_rx_grs_data(sngss7_chan_data_t *sngss7_info)
 {
 	ftdm_channel_t		*ftdmchan = sngss7_info->ftdmchan;
-	sngss7_span_data_t	*sngss7_span = ftdmchan->span->mod_data;
+	sngss7_span_data_t	*sngss7_span = ftdmchan->span->signal_data;
 
 	/* clear the rx_grs data fields */
 	memset(&sngss7_span->rx_grs, 0x0, sizeof(sngss7_group_data_t));
@@ -881,7 +881,7 @@ ftdm_status_t clear_rx_grs_data(sngss7_chan_data_t *sngss7_info)
 ftdm_status_t clear_rx_gra_data(sngss7_chan_data_t *sngss7_info)
 {
 	ftdm_channel_t		*ftdmchan = sngss7_info->ftdmchan;
-	sngss7_span_data_t	*sngss7_span = ftdmchan->span->mod_data;
+	sngss7_span_data_t	*sngss7_span = ftdmchan->span->signal_data;
 
 	/* clear the rx_grs data fields */
 	memset(&sngss7_span->rx_gra, 0x0, sizeof(sngss7_group_data_t));
@@ -904,7 +904,7 @@ ftdm_status_t clear_tx_grs_flags(sngss7_chan_data_t *sngss7_info)
 ftdm_status_t clear_tx_grs_data(sngss7_chan_data_t *sngss7_info)
 {
 	ftdm_channel_t		*ftdmchan = sngss7_info->ftdmchan;
-	sngss7_span_data_t	*sngss7_span = ftdmchan->span->mod_data;
+	sngss7_span_data_t	*sngss7_span = ftdmchan->span->signal_data;
 
 	/* clear the rx_grs data fields */
 	memset(&sngss7_span->tx_grs, 0x0, sizeof(sngss7_group_data_t));

libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c

@@ -2121,7 +2121,7 @@ static int ftmod_ss7_fill_in_circuits(sng_isupCkt_t *isupCkt)
 				ftdmchan->call_data = ss7_info;
 
 				/* prepare the timer structures */
-				ss7_info->t35.sched			= ((sngss7_span_data_t *)isupCkt->span->mod_data)->sched;
+				ss7_info->t35.sched			= ((sngss7_span_data_t *)isupCkt->span->signal_data)->sched;
 				ss7_info->t35.counter		= 1;
 				ss7_info->t35.beat			= g_ftdm_sngss7_data.cfg.isupIntf[isupCkt->isupInf].t35*100; /* beat is in ms, t35 is in 100ms */
 				ss7_info->t35.callback		= handle_isup_t35;

libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c

@@ -117,29 +117,28 @@ static __inline__ int tdmv_api_wait_socket(ftdm_channel_t *ftdmchan, int timeout
 	
 #ifdef LIBSANGOMA_VERSION	
 	int err;
-    uint32_t inflags = *flags;
-    uint32_t outflags = 0;
-	sangoma_wait_obj_t *sangoma_wait_obj = ftdmchan->mod_data;
+	uint32_t inflags = *flags;
+	uint32_t outflags = 0;
+	sangoma_wait_obj_t *sangoma_wait_obj = ftdmchan->io_data;
 
 	err = sangoma_waitfor(sangoma_wait_obj, inflags, &outflags, timeout);
 	*flags = 0;
-    if (err == SANG_STATUS_SUCCESS) {
-        *flags = outflags;
-        err = 1; /* ideally should be the number of file descriptors with something to read */
-    }
-    if (err == SANG_STATUS_APIPOLL_TIMEOUT) {
-        err = 0;
-    }
-	
-    return err;
+	if (err == SANG_STATUS_SUCCESS) {
+        	*flags = outflags;
+        	err = 1; /* ideally should be the number of file descriptors with something to read */
+	}
+	if (err == SANG_STATUS_APIPOLL_TIMEOUT) {
+		err = 0;
+	}
+	return err;
 #else
  	struct pollfd pfds[1];
-    int res;
+	int res;
 
-    memset(&pfds[0], 0, sizeof(pfds[0]));
-    pfds[0].fd = ftdmchan->sockfd;
-    pfds[0].events = *flags;
-    res = poll(pfds, 1, timeout);
+	memset(&pfds[0], 0, sizeof(pfds[0]));
+	pfds[0].fd = ftdmchan->sockfd;
+	pfds[0].events = *flags;
+	res = poll(pfds, 1, timeout);
 	*flags = 0;
 
 	if (pfds[0].revents & POLLERR) {
@@ -150,7 +149,7 @@ static __inline__ int tdmv_api_wait_socket(ftdm_channel_t *ftdmchan, int timeout
 		*flags = pfds[0].revents;
 	}
 
-    return res;
+	return res;
 #endif
 	
 }
@@ -253,7 +252,7 @@ static unsigned wp_open_range(ftdm_span_t *span, unsigned spanno, unsigned start
 				ftdm_log(FTDM_LOG_ERROR, "failure create waitable object for s%dc%d\n", spanno, x);
 				continue;
 			}
-			chan->mod_data = sangoma_wait_obj;
+			chan->io_data = sangoma_wait_obj;
 #endif
 			
 			chan->physical_span_id = spanno;
@@ -542,7 +541,7 @@ static FIO_OPEN_FUNCTION(wanpipe_open)
 static FIO_CLOSE_FUNCTION(wanpipe_close)
 {
 #ifdef LIBSANGOMA_VERSION
-	sangoma_wait_obj_t *waitobj = ftdmchan->mod_data;
+	sangoma_wait_obj_t *waitobj = ftdmchan->io_data;
 	/* kick any I/O waiters */
 	sangoma_wait_obj_signal(waitobj);
 #endif
@@ -960,10 +959,10 @@ FIO_SPAN_POLL_EVENT_FUNCTION(wanpipe_poll_event)
 	for(i = 1; i <= span->chan_count; i++) {
 		ftdm_channel_t *ftdmchan = span->channels[i];
 #ifdef LIBSANGOMA_VERSION
-		if (!ftdmchan->mod_data) {
+		if (!ftdmchan->io_data) {
 			continue; /* should never happen but happens when shutting down */
 		}
-		pfds[j] = ftdmchan->mod_data;
+		pfds[j] = ftdmchan->io_data;
 		inflags[j] = poll_events ? poll_events[j] : POLLPRI;
 #else
 		memset(&pfds[j], 0, sizeof(pfds[j]));
@@ -1299,10 +1298,10 @@ FIO_SPAN_NEXT_EVENT_FUNCTION(wanpipe_next_event)
 static FIO_CHANNEL_DESTROY_FUNCTION(wanpipe_channel_destroy)
 {
 #ifdef LIBSANGOMA_VERSION
-	if (ftdmchan->mod_data) {
+	if (ftdmchan->io_data) {
 		sangoma_wait_obj_t *sangoma_wait_obj;
-		sangoma_wait_obj = ftdmchan->mod_data;
-		ftdmchan->mod_data = NULL;
+		sangoma_wait_obj = ftdmchan->io_data;
+		ftdmchan->io_data = NULL;
 		sangoma_wait_obj_delete(&sangoma_wait_obj);
 	}
 #endif

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

@@ -658,6 +658,14 @@ static FIO_OPEN_FUNCTION(zt_open)
  */
 static FIO_CLOSE_FUNCTION(zt_close)
 {
+	if (ftdmchan->type == FTDM_CHAN_TYPE_B) {
+		int value = 0;	/* disable audio mode */
+		if (ioctl(ftdmchan->sockfd, codes.AUDIOMODE, &value)) {
+			snprintf(ftdmchan->last_error, sizeof(ftdmchan->last_error), "%s", strerror(errno));
+			ftdm_log(FTDM_LOG_ERROR, "%s\n", ftdmchan->last_error);
+			return FTDM_FAIL;
+		}
+	}
 	return FTDM_SUCCESS;
 }
 

libs/freetdm/src/include/freetdm.h

@@ -1243,6 +1243,9 @@ FT_DECLARE(void) ftdm_span_set_trunk_type(ftdm_span_t *span, ftdm_trunk_type_t t
  */
 FT_DECLARE(ftdm_trunk_type_t) ftdm_span_get_trunk_type(const ftdm_span_t *span);
 
+/*! \brief For display debugging purposes you can display this string which describes the trunk type of a span */
+FT_DECLARE(const char *) ftdm_span_get_trunk_type_str(const ftdm_span_t *span);
+
 /*! 
  * \brief Return the channel identified by the provided id
  *
@@ -1262,6 +1265,12 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_set_caller_data(ftdm_channel_t *ftdmchan,
 /*! \brief Get the caller data for a channel, typically you need this when receiving FTDM_SIGEVENT_START */
 FT_DECLARE(ftdm_caller_data_t *) ftdm_channel_get_caller_data(ftdm_channel_t *channel);
 
+/*! \brief Get current state of a channel */
+FT_DECLARE(int) ftdm_channel_get_state(const ftdm_channel_t *ftdmchan);
+
+/*! \brief Get last state of a channel */
+FT_DECLARE(int) ftdm_channel_get_last_state(const ftdm_channel_t *ftdmchan);
+
 /*! \brief For display debugging purposes you can display this string which describes the current channel internal state */
 FT_DECLARE(const char *) ftdm_channel_get_state_str(const ftdm_channel_t *channel);
 

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

@@ -451,7 +451,9 @@ struct ftdm_channel {
 	ftdm_fsk_data_state_t fsk;
 	uint8_t fsk_buf[80];
 	uint32_t ring_count;
-	void *mod_data;
+	/* Private I/O data. Do not touch unless you are an I/O module */
+	void *io_data;
+	/* Private signaling data. Do not touch unless you are a signaling module */
 	void *call_data;
 	struct ftdm_caller_data caller_data;
 	struct ftdm_span *span;
@@ -484,6 +486,7 @@ struct ftdm_span {
 	ftdm_trunk_type_t trunk_type;
 	ftdm_analog_start_type_t start_type;
 	ftdm_signal_type_t signal_type;
+	/* Private signaling data. Do not touch unless you are a signaling module */
 	void *signal_data;
 	fio_signal_cb_t signal_cb;
 	ftdm_event_t event_header;
@@ -501,7 +504,8 @@ struct ftdm_span {
 	ftdm_span_start_t start;
 	ftdm_span_stop_t stop;
 	ftdm_channel_sig_read_t sig_read;
-	void *mod_data;
+	/* Private I/O data per span. Do not touch unless you are an I/O module */
+	void *io_data;
 	char *type;
 	char *dtmf_hangup;
 	size_t dtmf_hangup_len;

libs/stfu/stfu.c

@@ -38,7 +38,6 @@ struct stfu_queue {
 	uint32_t array_size;
 	uint32_t array_len;	
 	uint32_t wr_len;
-	uint32_t last_index;
 };
 typedef struct stfu_queue stfu_queue_t;
 
@@ -47,10 +46,12 @@ struct stfu_instance {
 	struct stfu_queue b_queue;
 	struct stfu_queue *in_queue;
 	struct stfu_queue *out_queue;
-	uint32_t last_ts;
+    struct stfu_frame *last_frame;
+	uint32_t last_wr_ts;
+	uint32_t last_rd_ts;
 	uint32_t interval;
 	uint32_t miss_count;
-	uint8_t running;
+	uint32_t max_plc;
 };
 
 
@@ -112,7 +113,7 @@ stfu_status_t stfu_n_resize(stfu_instance_t *i, uint32_t qlen)
     return s;
 }
 
-stfu_instance_t *stfu_n_init(uint32_t qlen)
+stfu_instance_t *stfu_n_init(uint32_t qlen, uint32_t max_plc)
 {
 	struct stfu_instance *i;
 
@@ -125,6 +126,13 @@ stfu_instance_t *stfu_n_init(uint32_t qlen)
 	stfu_n_init_aqueue(&i->b_queue, qlen);
 	i->in_queue = &i->a_queue;
 	i->out_queue = &i->b_queue;
+
+    if (max_plc) {
+        i->max_plc = max_plc;
+    } else {
+        i->max_plc = qlen / 2;
+    }
+
 	return i;
 }
 
@@ -135,10 +143,9 @@ void stfu_n_reset(stfu_instance_t *i)
 	i->in_queue->array_len = 0;
 	i->out_queue->array_len = 0;
 	i->out_queue->wr_len = 0;
-	i->out_queue->last_index = 0;
+	i->last_frame = NULL;
 	i->miss_count = 0;	
-	i->last_ts = 0;
-	i->running = 0;
+	i->last_wr_ts = 0;
 	i->miss_count = 0;
 	i->interval = 0;
 }
@@ -197,7 +204,7 @@ stfu_status_t stfu_n_add_data(stfu_instance_t *i, uint32_t ts, uint32_t pt, void
 
 		i->in_queue->array_len = 0;
 		i->out_queue->wr_len = 0;
-		i->out_queue->last_index = 0;
+		i->last_frame = NULL;
 		i->miss_count = 0;
 
 		if (stfu_n_process(i, i->out_queue) < 0) {
@@ -222,6 +229,8 @@ stfu_status_t stfu_n_add_data(stfu_instance_t *i, uint32_t ts, uint32_t pt, void
 		cplen = sizeof(frame->data);
 	}
 
+    i->last_rd_ts = ts;
+
 	memcpy(frame->data, data, cplen);
     frame->pt = pt;
 	frame->ts = ts;
@@ -231,88 +240,71 @@ stfu_status_t stfu_n_add_data(stfu_instance_t *i, uint32_t ts, uint32_t pt, void
 	return STFU_IT_WORKED;
 }
 
+static int stfu_n_find_frame(stfu_queue_t *queue, uint32_t ts, stfu_frame_t **r_frame, uint32_t *index)
+{
+    uint32_t i = 0;
+    stfu_frame_t *frame = NULL;
+
+    assert(r_frame);
+    assert(index);
+    
+    *r_frame = NULL;
+
+    for(i = 0; i < queue->array_len; i++) {
+        frame = &queue->array[i];
+        
+        if (frame->ts == ts) {
+            *r_frame = frame;
+            *index = i;
+            frame->was_read = 1;
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
 stfu_frame_t *stfu_n_read_a_frame(stfu_instance_t *i)
 {
-	uint32_t index, index2;
+	uint32_t index;
 	uint32_t should_have = 0;
-	stfu_frame_t *frame = NULL, *rframe = NULL;
+	stfu_frame_t *rframe = NULL;
 
 	if (((i->out_queue->wr_len == i->out_queue->array_len) || !i->out_queue->array_len)) {
 		return NULL;
 	}
 
-	if (i->running) {
-		should_have = i->last_ts + i->interval;
+	if (i->last_wr_ts) {
+		should_have = i->last_wr_ts + i->interval;
 	} else {
 		should_have = i->out_queue->array[0].ts;
 	}
 
-	for(index = 0; index < i->out_queue->array_len; index++) {
-		if (i->out_queue->array[index].was_read) {
-			continue;
-		}
-
-		frame = &i->out_queue->array[index];
-
-		if (frame->ts != should_have) {
-			unsigned int tried = 0;
-			for (index2 = 0; index2 < i->out_queue->array_len; index2++) {
-				if (i->out_queue->array[index2].was_read) {
-					continue;
-				}
-				tried++;
-				if (i->out_queue->array[index2].ts == should_have) {
-					rframe = &i->out_queue->array[index2];
-					i->out_queue->last_index = index2;
-					goto done;
-				}
-			}
-			for (index2 = 0; index2 < i->in_queue->array_len; index2++) {
-				if (i->in_queue->array[index2].was_read) {
-					continue;
-				}
-				tried++;
-				if (i->in_queue->array[index2].ts == should_have) {
-					rframe = &i->in_queue->array[index2];
-					goto done;
-				}
-			}
-
-			i->miss_count++;
-
-			if (i->miss_count > 10 || (i->in_queue->array_len == i->in_queue->array_size) || 
-                tried >= (i->in_queue->array_size + i->out_queue->array_size)) {
-				i->running = 0;
-				i->interval = 0;
-				i->out_queue->wr_len = i->out_queue->array_size;
-				return NULL;
-			}
-
-			i->last_ts = should_have;
-			rframe = &i->out_queue->int_frame;
-			rframe->dlen = i->out_queue->array[i->out_queue->last_index].dlen;
-			/* poor man's plc..  Copy the last frame, but we flag it so you can use a better one if you wish */
-			memcpy(rframe->data, i->out_queue->array[i->out_queue->last_index].data, rframe->dlen);
-			rframe->ts = should_have;
-			i->out_queue->wr_len++;
-			i->running = 1;
-			return rframe;			
-		} else {
-			rframe = &i->out_queue->array[index];
-			i->out_queue->last_index = index;
-			goto done;
-		}
-	}
-
-done:
-
-	if (rframe) {
+    if (stfu_n_find_frame(i->out_queue, should_have, &rframe, &index) || stfu_n_find_frame(i->in_queue, should_have, &rframe, &index)) {
+        i->last_frame = rframe;
 		i->out_queue->wr_len++;
-		i->last_ts = rframe->ts;
+		i->last_wr_ts = rframe->ts;
 		rframe->was_read = 1;
-		i->running = 1;
 		i->miss_count = 0;
-	}
+    } else {
+        i->last_wr_ts = should_have;
+        rframe = &i->out_queue->int_frame;
+
+        if (i->last_frame && i->last_frame != rframe) {
+            rframe->dlen = i->last_frame->dlen;
+            /* poor man's plc..  Copy the last frame, but we flag it so you can use a better one if you wish */
+            memcpy(rframe->data, i->last_frame->data, rframe->dlen);
+        }
+
+        rframe->ts = should_have;
+
+        if (++i->miss_count > i->max_plc) {
+            i->interval = 0;
+            i->out_queue->wr_len = i->out_queue->array_size;
+            i->last_wr_ts = 0;
+            rframe = NULL;
+        }
+    }
 
 	return rframe;
 }

libs/stfu/stfu.h

@@ -96,7 +96,7 @@ typedef struct {
 
 void stfu_n_report(stfu_instance_t *i, stfu_report_t *r);
 void stfu_n_destroy(stfu_instance_t **i);
-stfu_instance_t *stfu_n_init(uint32_t qlen);
+stfu_instance_t *stfu_n_init(uint32_t qlen, uint32_t max_plc);
 stfu_status_t stfu_n_resize(stfu_instance_t *i, uint32_t qlen);
 stfu_status_t stfu_n_add_data(stfu_instance_t *i, uint32_t ts, uint32_t pt, void *data, size_t datalen, int last);
 stfu_frame_t *stfu_n_read_a_frame(stfu_instance_t *i);