freetdm: merged konrad and david signaling work

libs/freetdm/Makefile.am

@@ -41,6 +41,9 @@ INCS +=   -I$(FT_SRCDIR)/$(SRC)/ftmod/ftmod_sangoma_boost
 if SNGSS7
 INCS += -I/usr/include/sng_ss7/
 endif 
+if SNGISDN
+INCS += -I/usr/include/sng_isdn/
+endif 
 
 MY_CFLAGS = $(INCS) $(FTDM_CFLAGS) -DFTDM_CONFIG_DIR=\"@confdir@\" -DFTDM_MOD_DIR=\"$(moddir)\" @COMP_VENDOR_CFLAGS@ @DEFS@
 COMPILE   = $(CC) $(MY_CFLAGS) $(INCS)
@@ -70,6 +73,7 @@ $(SRC)/hashtable_itr.c \
 $(SRC)/ftdm_io.c \
 $(SRC)/ftdm_queue.c \
 $(SRC)/ftdm_sched.c \
+$(SRC)/ftdm_call_utils.c \
 $(SRC)/ftdm_config.c \
 $(SRC)/ftdm_callerid.c \
 $(SRC)/fsk.c \
@@ -271,7 +275,11 @@ ftmod_sangoma_ss7_la_SOURCES =  $(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7
 				$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cntrl.c \
 				$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c \
 				$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_timers.c \
-				$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c
+				$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c \
+				$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cfg.c \
+				$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_sta.c \
+				$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_sts.c \
+				$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_logger.c
 ftmod_sangoma_ss7_la_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS) -D_GNU_SOURCE
 ftmod_sangoma_ss7_la_LDFLAGS = -module  -avoid-version -lsng_ss7
 ftmod_sangoma_ss7_la_LIBADD  = $(MYLIB)
@@ -285,17 +293,16 @@ ftmod_sangoma_isdn_la_SOURCES = $(SRC)/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_is
 				$(SRC)/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c \
 				$(SRC)/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cntrl.c \
 				$(SRC)/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cfg.c \
-				$(SRC)/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_in.c \
+				$(SRC)/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_rcv.c \
+				$(SRC)/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c \
 				$(SRC)/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_out.c
 
 
-ftmod_sangoma_isdn_la_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS)
+ftmod_sangoma_isdn_la_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS) -D_GNU_SOURCE
 ftmod_sangoma_isdn_la_LDFLAGS = -module -avoid-version -lsng_isdn
 ftmod_sangoma_isdn_la_LIBADD  = $(MYLIB)
 endif
 
-
-
 if OPENR2
 ftmod_r2_la_SOURCES = $(SRC)/ftmod/ftmod_r2/ftmod_r2.c 
 ftmod_r2_la_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS)

libs/freetdm/configure.ac

@@ -193,6 +193,18 @@ AM_CONDITIONAL([SNGISDN],[test "${have_sng_isdn}" = "yes"])
 AC_CHECK_LIB([openr2], [openr2_context_set_io_type], [have_openr2="yes"])
 AM_CONDITIONAL([OPENR2],[test "${have_openr2}" = "yes"])
 
+if test "${have_sng_isdn}" = "yes"; then
+	if test "${build}" == "${host}"
+	then
+		case "${host}" in
+		x86_64-*)
+		# X86_64 machines need additional flags when compiling against libsng_isdn
+		CFLAGS="$CFLAGS -DBIT_64 -DALIGN_64BIT"
+		;;
+		esac
+	fi
+fi
+
 COMP_VENDOR_CFLAGS="$COMP_VENDOR_CFLAGS"
 AC_SUBST(COMP_VENDOR_CFLAGS)
 AC_CONFIG_FILES([Makefile

libs/freetdm/src/ftdm_call_utils.c

+/*
+ * Copyright (c) 2010, Sangoma Technologies
+ * David Yat Sin <dyatsin@sangoma.com>
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * * Neither the name of the original author; nor the names of any contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ * 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * 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.
+ */
+
+#include "private/ftdm_core.h"
+#include <ctype.h>
+
+
+FT_DECLARE(ftdm_status_t) ftdm_span_set_npi(const char *npi_string, uint8_t *target)
+{
+	if (!strcasecmp(npi_string, "isdn") || !strcasecmp(npi_string, "e164")) {
+		*target = FTDM_NPI_ISDN;
+	} else if (!strcasecmp(npi_string, "data")) {
+		*target = FTDM_NPI_DATA;
+	} else if (!strcasecmp(npi_string, "telex")) {
+		*target = FTDM_NPI_TELEX;
+	} else if (!strcasecmp(npi_string, "national")) {
+		*target = FTDM_NPI_NATIONAL;
+	} else if (!strcasecmp(npi_string, "private")) {
+		*target = FTDM_NPI_PRIVATE;
+	} else if (!strcasecmp(npi_string, "reserved")) {
+		*target = FTDM_NPI_RESERVED;
+	} else if (!strcasecmp(npi_string, "unknown")) {
+		*target = FTDM_NPI_UNKNOWN;
+	} else {
+		ftdm_log(FTDM_LOG_WARNING, "Invalid NPI value (%s)\n", npi_string);
+		*target = FTDM_NPI_UNKNOWN;
+		return FTDM_FAIL;
+	}
+	return FTDM_SUCCESS;
+}
+
+FT_DECLARE(ftdm_status_t) ftdm_span_set_ton(const char *ton_string, uint8_t *target)
+{
+	if (!strcasecmp(ton_string, "national")) {
+		*target = FTDM_TON_NATIONAL;
+	} else if (!strcasecmp(ton_string, "international")) {
+		*target = FTDM_TON_INTERNATIONAL;
+	} else if (!strcasecmp(ton_string, "local")) {
+		*target = FTDM_TON_SUBSCRIBER_NUMBER;
+	} else if (!strcasecmp(ton_string, "unknown")) {
+		*target = FTDM_TON_UNKNOWN;
+	} else {
+		ftdm_log(FTDM_LOG_WARNING, "Invalid TON value (%s)\n", ton_string);
+		*target = FTDM_TON_UNKNOWN;
+		return FTDM_FAIL;
+	}
+	return FTDM_SUCCESS;
+}
+
+FT_DECLARE(ftdm_status_t) ftdm_is_number(char *number)
+{
+	if (!number) {
+		return FTDM_FAIL;
+	}
+
+	for ( ; *number; number++) {
+		if (!isdigit(*number)) {
+			return FTDM_FAIL;
+		}
+	}
+	return FTDM_SUCCESS;
+}
+

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

@@ -47,7 +47,8 @@ ftdm_status_t parse_switchtype(const char* switch_name, ftdm_span_t *span)
 	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*) span->signal_data;
 	switch(span->trunk_type) {
 		case FTDM_TRUNK_T1:
-			if (!strcasecmp(switch_name, "ni2")) {
+			if (!strcasecmp(switch_name, "ni2") ||
+				!strcasecmp(switch_name, "national")) {
 				signal_data->switchtype = SNGISDN_SWITCH_NI2;
 			} else if (!strcasecmp(switch_name, "5ess")) {
 				signal_data->switchtype = SNGISDN_SWITCH_5ESS;
@@ -127,6 +128,7 @@ ftdm_status_t parse_switchtype(const char* switch_name, ftdm_span_t *span)
 		dchan_data->channels[chan_id] = (sngisdn_chan_data_t*)ftdmchan->call_data;
 		dchan_data->num_chans++;
 	}
+
 	return FTDM_SUCCESS;
 }
 
@@ -144,7 +146,7 @@ ftdm_status_t parse_signalling(const char* signalling, ftdm_span_t *span)
 
 		signal_data->signalling = SNGISDN_SIGNALING_CPE;
 	} else {
-		ftdm_log(FTDM_LOG_ERROR, "Unsupported signalling %s\n", signalling);
+		ftdm_log(FTDM_LOG_ERROR, "Unsupported signalling/interface %s\n", signalling);
 		return FTDM_FAIL;
 	}
 	return FTDM_SUCCESS;
@@ -156,9 +158,28 @@ ftdm_status_t ftmod_isdn_parse_cfg(ftdm_conf_parameter_t *ftdm_parameters, ftdm_
 	const char *var, *val;
 	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*) span->signal_data;
 	/* Set defaults here */
-	signal_data->keep_link_up = 1;
 	signal_data->tei = 0;
+	signal_data->min_digits = 8;
+	signal_data->overlap_dial = SNGISDN_OPT_DEFAULT;
+	signal_data->setup_arb = SNGISDN_OPT_DEFAULT;
+
+	if (span->trunk_type == FTDM_TRUNK_BRI ||
+		span->trunk_type == FTDM_TRUNK_BRI_PTMP) {
 
+		ftdm_span_set_npi("unknown", &span->default_caller_data.dnis.plan);
+		ftdm_span_set_ton("unknown", &span->default_caller_data.dnis.type);
+		ftdm_span_set_npi("unknown", &span->default_caller_data.cid_num.plan);
+		ftdm_span_set_ton("unknown", &span->default_caller_data.cid_num.type);
+		ftdm_span_set_npi("unknown", &span->default_caller_data.rdnis.plan);
+		ftdm_span_set_ton("unknown", &span->default_caller_data.rdnis.type);
+	} else {
+		ftdm_span_set_npi("e164", &span->default_caller_data.dnis.plan);
+		ftdm_span_set_ton("national", &span->default_caller_data.dnis.type);
+		ftdm_span_set_npi("e164", &span->default_caller_data.cid_num.plan);
+		ftdm_span_set_ton("national", &span->default_caller_data.cid_num.type);
+		ftdm_span_set_npi("e164", &span->default_caller_data.rdnis.plan);
+		ftdm_span_set_ton("national", &span->default_caller_data.rdnis.type);
+	}
 
 	for (paramindex = 0; ftdm_parameters[paramindex].var; paramindex++) {
 		ftdm_log(FTDM_LOG_DEBUG, "Sangoma ISDN key=value, %s=%s\n", ftdm_parameters[paramindex].var, ftdm_parameters[paramindex].val);
@@ -169,7 +190,8 @@ ftdm_status_t ftmod_isdn_parse_cfg(ftdm_conf_parameter_t *ftdm_parameters, ftdm_
 			if (parse_switchtype(val, span) != FTDM_SUCCESS) {
 				return FTDM_FAIL;
 			}
-		} else if (!strcasecmp(var, "signalling")) {
+		} else if (!strcasecmp(var, "signalling") ||
+				   !strcasecmp(var, "interface")) {
 			if (parse_signalling(val, span) != FTDM_SUCCESS) {
 				return FTDM_FAIL;
 			}
@@ -180,15 +202,44 @@ ftdm_status_t ftmod_isdn_parse_cfg(ftdm_conf_parameter_t *ftdm_parameters, ftdm_
 				return FTDM_FAIL;
 			}
 			signal_data->tei = tei;
-		} else if (!strcasecmp(var, "keep_link_up")) {
+		} else if (!strcasecmp(var, "overlap")) {
 			if (!strcasecmp(val, "yes")) {
-				signal_data->keep_link_up = 1;
+				signal_data->overlap_dial = SNGISDN_OPT_TRUE;
 			} else if (!strcasecmp(val, "no")) {
-				signal_data->keep_link_up = 0;
+				signal_data->overlap_dial = SNGISDN_OPT_FALSE;
 			} else {
-				ftdm_log(FTDM_LOG_ERROR, "Invalid keep_link_up value, valid values are (yes/no)");
-				return FTDM_FAIL;
+				ftdm_log(FTDM_LOG_ERROR, "Invalid value for parameter:%s:%s\n", var, val);
+			}
+		} else if (!strcasecmp(var, "setup arbitration")) {
+			if (!strcasecmp(val, "yes")) {
+				signal_data->setup_arb = SNGISDN_OPT_TRUE;
+			} else if (!strcasecmp(val, "no")) {
+				signal_data->setup_arb = SNGISDN_OPT_FALSE;
+			} else {
+				ftdm_log(FTDM_LOG_ERROR, "Invalid value for parameter:%s:%s\n", var, val);
+			}
+		} else if (!strcasecmp(var, "facility")) {
+			if (!strcasecmp(val, "yes")) {
+				signal_data->facility = SNGISDN_OPT_TRUE;
+			} else if (!strcasecmp(val, "no")) {
+				signal_data->facility = SNGISDN_OPT_FALSE;
+			} else {
+				ftdm_log(FTDM_LOG_ERROR, "Invalid value for parameter:%s:%s\n", var, val);
 			}
+		} else if (!strcasecmp(var, "min_digits")) {
+			signal_data->min_digits = atoi(val);
+		} else if (!strcasecmp(var, "outbound-called-ton")) {
+			ftdm_span_set_ton(val, &span->default_caller_data.dnis.type);
+		} else if (!strcasecmp(var, "outbound-called-npi")) {
+			ftdm_span_set_npi(val, &span->default_caller_data.dnis.plan);
+		} else if (!strcasecmp(var, "outbound-calling-ton")) {
+			ftdm_span_set_ton(val, &span->default_caller_data.cid_num.type);
+		} else if (!strcasecmp(var, "outbound-calling-npi")) {
+			ftdm_span_set_npi(val, &span->default_caller_data.cid_num.plan);
+		} else if (!strcasecmp(var, "outbound-rdnis-ton")) {
+			ftdm_span_set_ton(val, &span->default_caller_data.rdnis.type);
+		} else if (!strcasecmp(var, "outbound-rdnis-npi")) {
+			ftdm_span_set_npi(val, &span->default_caller_data.rdnis.plan);
 		} else {
 			ftdm_log(FTDM_LOG_WARNING, "Ignoring unknown parameter %s\n", ftdm_parameters[paramindex].var);
 		}

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

@@ -223,17 +223,17 @@ ftdm_status_t sng_isdn_stack_cfg_phy_psap(ftdm_span_t *span)
 	switch(span->trunk_type) {
 		case FTDM_TRUNK_E1:
 			cfg.t.cfg.s.l1PSAP.chan	= 16;
-			cfg.t.cfg.s.l1PSAP.type = SNG_LINKTYPE_PRI;
+			cfg.t.cfg.s.l1PSAP.type = SNG_L1_TYPE_PRI;
 			break;
 		case FTDM_TRUNK_T1:
 		case FTDM_TRUNK_J1:
 			cfg.t.cfg.s.l1PSAP.chan	= 24;
-			cfg.t.cfg.s.l1PSAP.type = SNG_LINKTYPE_PRI;
+			cfg.t.cfg.s.l1PSAP.type = SNG_L1_TYPE_PRI;
 			break;
 		case FTDM_TRUNK_BRI:
 		case FTDM_TRUNK_BRI_PTMP:
 			cfg.t.cfg.s.l1PSAP.chan	= 3;
-			cfg.t.cfg.s.l1PSAP.type = SNG_LINKTYPE_BRI;
+			cfg.t.cfg.s.l1PSAP.type = SNG_L1_TYPE_BRI;
 			break;
 		default:
 			ftdm_log(FTDM_LOG_ERROR, "%s:Unsupported trunk type %d\n", span->name, span->trunk_type);
@@ -280,10 +280,10 @@ ftdm_status_t sng_isdn_stack_cfg_q921_gen(void)
 	cfg.t.cfg.s.bdGen.nmbASPLnks = MAX_L1_LINKS+1;
 
 #ifdef LAPD_3_4
-	cfg.t.cfg.s.bdGen.timeRes     = 10;      			 /* timer resolution */
+	cfg.t.cfg.s.bdGen.timeRes     = 100;      /* timer resolution = 1 sec */
 #endif
-    cfg.t.cfg.s.bdGen.poolTrUpper   = POOL_UP_TR;        /* upper pool threshold */
-    cfg.t.cfg.s.bdGen.poolTrLower   = POOL_LW_TR;        /* lower pool threshold */
+    cfg.t.cfg.s.bdGen.poolTrUpper   = 2;        /* upper pool threshold */
+    cfg.t.cfg.s.bdGen.poolTrLower   = 1;        /* lower pool threshold */
 
 	if (sng_isdn_q921_config(&pst, &cfg)) {
 		return FTDM_FAIL;
@@ -315,9 +315,9 @@ ftdm_status_t sng_isdn_stack_cfg_q921_msap(ftdm_span_t *span)
 
 	cfg.t.cfg.s.bdMSAP.lnkNmb      = signal_data->link_id;
 	
-	cfg.t.cfg.s.bdMSAP.maxOutsFrms = 2;            /* MAC window */
-	cfg.t.cfg.s.bdMSAP.tQUpperTrs  = 16;           /* Tx Queue Upper Threshold */
-	cfg.t.cfg.s.bdMSAP.tQLowerTrs  = 8;            /* Tx Queue Lower Threshold */	
+	cfg.t.cfg.s.bdMSAP.maxOutsFrms = 24;            /* MAC window */
+	cfg.t.cfg.s.bdMSAP.tQUpperTrs  = 32;           /* Tx Queue Upper Threshold */
+	cfg.t.cfg.s.bdMSAP.tQLowerTrs  = 24;            /* Tx Queue Lower Threshold */
 	cfg.t.cfg.s.bdMSAP.selector    = 0;       /* Selector 0 */
 	/* TODO: check if bdMSAP parameters can be initialized by calling stack_pst_init */
 	cfg.t.cfg.s.bdMSAP.mem.region  = S_REG;       /* Memory region */
@@ -327,8 +327,8 @@ ftdm_status_t sng_isdn_stack_cfg_q921_msap(ftdm_span_t *span)
 	cfg.t.cfg.s.bdMSAP.dstProcId   = SFndProcId(); /* destination proc id */
 	cfg.t.cfg.s.bdMSAP.dstEnt      = ENTL1;        /* entity */
 	cfg.t.cfg.s.bdMSAP.dstInst     = S_INST;      /* instance */	
-	cfg.t.cfg.s.bdMSAP.t201Tmr     = 5;            /* T201 */
-	cfg.t.cfg.s.bdMSAP.t202Tmr     = 200;          /* T202 */
+	cfg.t.cfg.s.bdMSAP.t201Tmr     = 1;            /* T201 - should be equal to t200Tmr */
+	cfg.t.cfg.s.bdMSAP.t202Tmr     = 2;          /* T202 */
 	cfg.t.cfg.s.bdMSAP.bndRetryCnt = 2;            /* bind retry counter */
 	cfg.t.cfg.s.bdMSAP.tIntTmr     = 200;          /* bind retry timer */
 	cfg.t.cfg.s.bdMSAP.n202        = 3;            /* N202 */
@@ -341,7 +341,21 @@ ftdm_status_t sng_isdn_stack_cfg_q921_msap(ftdm_span_t *span)
 		cfg.t.cfg.s.bdMSAP.kpL1Up      = TRUE;        /* flag to keep l1 up or not */
 	}
 
-	cfg.t.cfg.s.bdMSAP.type        = sng_isdn_stack_switchtype(signal_data->switchtype);
+	switch(signal_data->switchtype) {
+		case SNGISDN_SWITCH_NI2:
+		case SNGISDN_SWITCH_5ESS:
+		case SNGISDN_SWITCH_4ESS:
+		case SNGISDN_SWITCH_DMS100:
+			cfg.t.cfg.s.bdMSAP.type = SW_NI2;
+			break;
+		case SNGISDN_SWITCH_INSNET:
+			cfg.t.cfg.s.bdMSAP.type = SW_CCITT;
+			break;
+		case SNGISDN_SWITCH_EUROISDN:
+		case SNGISDN_SWITCH_QSIG:
+			cfg.t.cfg.s.bdMSAP.type = SW_ETSI;
+			break;
+	}
 
 	if (span->trunk_type == FTDM_TRUNK_BRI_PTMP) {
 		cfg.t.cfg.s.bdMSAP.teiChkTmr   = 20;         /* Tei check timer */
@@ -357,6 +371,12 @@ ftdm_status_t sng_isdn_stack_cfg_q921_msap(ftdm_span_t *span)
 		cfg.t.cfg.s.bdMSAP.setUpArb    = ACTIVE;       /* set up arbitration */
 	}
 
+	/* Overwrite setUpArb value if user forced it */
+	if (signal_data->setup_arb == SNGISDN_OPT_TRUE) {
+		cfg.t.cfg.s.bdMSAP.setUpArb    = ACTIVE;
+	} else if (signal_data->setup_arb == SNGISDN_OPT_FALSE) {
+ 		cfg.t.cfg.s.bdMSAP.setUpArb    = PASSIVE;
+	}
 
 	if (sng_isdn_q921_config(&pst, &cfg)) {
 		return FTDM_FAIL;
@@ -389,11 +409,18 @@ ftdm_status_t sng_isdn_stack_cfg_q921_dlsap(ftdm_span_t *span, uint8_t managemen
 	cfg.t.cfg.s.bdDLSAP.lnkNmb		= signal_data->link_id;
 
 	cfg.t.cfg.s.bdDLSAP.n201		= 1028;          	/* n201 */
+	if (span->trunk_type == FTDM_TRUNK_BRI_PTMP ||
+		span->trunk_type == FTDM_TRUNK_BRI) {
+
+		cfg.t.cfg.s.bdDLSAP.k			= 1;				/* Based on q.921 recommendations */
+	} else {
 		cfg.t.cfg.s.bdDLSAP.k			= 7;             	/* k */
+	}
+	
 	cfg.t.cfg.s.bdDLSAP.n200		= 3;             	/* n200 */
 	cfg.t.cfg.s.bdDLSAP.congTmr		= 300;           	/* congestion timer */
 	cfg.t.cfg.s.bdDLSAP.t200Tmr		= 1;				/* t1 changed from 25 */ 
-	cfg.t.cfg.s.bdDLSAP.t203Tmr		= 3;				/* t3 changed from 50 */
+	cfg.t.cfg.s.bdDLSAP.t203Tmr		= 10;				/* t3 changed from 50 */
 	cfg.t.cfg.s.bdDLSAP.mod			= 128;           	/* modulo */
 	cfg.t.cfg.s.bdDLSAP.selector	= 0;				/* Selector 0 */
 	cfg.t.cfg.s.bdDLSAP.mem.region	= S_REG;			/* Memory region */
@@ -483,7 +510,7 @@ ftdm_status_t sng_isdn_stack_cfg_q931_gen(void)
 	/* upper pool threshold */
 	cfg.t.cfg.s.inGen.poolTrUpper = INGEN_POOL_UP_TR;
 	/* time resolution */
-	cfg.t.cfg.s.inGen.timeRes = 10;
+	cfg.t.cfg.s.inGen.timeRes = 100; /* timer resolution = 1 sec */
 
 	cfg.t.cfg.s.inGen.sm.dstEnt = ENTSM;
 
@@ -594,6 +621,12 @@ ftdm_status_t sng_isdn_stack_cfg_q931_dlsap(ftdm_span_t *span)
 
 	cfg.t.cfg.s.inDLSAP.tCbId = signal_data->cc_id;
 
+	if (signal_data->facility == SNGISDN_OPT_TRUE) {
+		cfg.t.cfg.s.inDLSAP.facilityHandling = IN_FACILITY_STANDRD;
+	} else {
+		cfg.t.cfg.s.inDLSAP.facilityHandling = 0;
+	}
+
 	/* TODO : NFAS configuration */
 	cfg.t.cfg.s.inDLSAP.nfasInt = FALSE; /* pass this later */
 
@@ -687,38 +720,46 @@ ftdm_status_t sng_isdn_stack_cfg_q931_dlsap(ftdm_span_t *span)
 	cfg.t.cfg.s.inDLSAP.cndSubsc = TRUE;         /* calling adddress delivery service subscription */
 
 	/* TODO: Fill in these timers with proper values - eventually pass them */
-	cfg.t.cfg.s.inDLSAP.tmr.t301.enb = FALSE;
-	cfg.t.cfg.s.inDLSAP.tmr.t301.val = 35;
-	cfg.t.cfg.s.inDLSAP.tmr.t302.enb = FALSE;
-	cfg.t.cfg.s.inDLSAP.tmr.t302.val = 35;
-	cfg.t.cfg.s.inDLSAP.tmr.t303.enb = FALSE;
-	cfg.t.cfg.s.inDLSAP.tmr.t303.val = 35;
+	cfg.t.cfg.s.inDLSAP.tmr.t301.enb = TRUE;
+	cfg.t.cfg.s.inDLSAP.tmr.t301.val = 180;
+	cfg.t.cfg.s.inDLSAP.tmr.t302.enb = TRUE;
+	cfg.t.cfg.s.inDLSAP.tmr.t302.val = 15;
+	cfg.t.cfg.s.inDLSAP.tmr.t303.enb = TRUE;
+	cfg.t.cfg.s.inDLSAP.tmr.t303.val = 4;
 	cfg.t.cfg.s.inDLSAP.tmr.t304.enb = TRUE;
-	cfg.t.cfg.s.inDLSAP.tmr.t304.val = 35;
+	cfg.t.cfg.s.inDLSAP.tmr.t304.val = 30;
 	cfg.t.cfg.s.inDLSAP.tmr.t305.enb = TRUE;
-	cfg.t.cfg.s.inDLSAP.tmr.t305.val = 35;
+	cfg.t.cfg.s.inDLSAP.tmr.t305.val = 30;
 	cfg.t.cfg.s.inDLSAP.tmr.t306.enb = FALSE;
 	cfg.t.cfg.s.inDLSAP.tmr.t306.val = 35;
 	cfg.t.cfg.s.inDLSAP.tmr.t307.enb = FALSE;
 	cfg.t.cfg.s.inDLSAP.tmr.t307.val = 35;
 	cfg.t.cfg.s.inDLSAP.tmr.t308.enb = TRUE;
-	cfg.t.cfg.s.inDLSAP.tmr.t308.val = 35;
-	cfg.t.cfg.s.inDLSAP.tmr.t310.enb = FALSE;
-	cfg.t.cfg.s.inDLSAP.tmr.t310.val = 35;
+	cfg.t.cfg.s.inDLSAP.tmr.t308.val = 4;
+
+	if (signal_data->signalling == SNGISDN_SIGNALING_NET) {
+		cfg.t.cfg.s.inDLSAP.tmr.t310.enb = TRUE;
+		cfg.t.cfg.s.inDLSAP.tmr.t310.val = 10;
+		cfg.t.cfg.s.inDLSAP.tmr.t312.enb = TRUE;
+		cfg.t.cfg.s.inDLSAP.tmr.t312.val = cfg.t.cfg.s.inDLSAP.tmr.t303.val+2;
+	} else {
+		cfg.t.cfg.s.inDLSAP.tmr.t310.enb = TRUE;
+		cfg.t.cfg.s.inDLSAP.tmr.t310.val = 120;
 		cfg.t.cfg.s.inDLSAP.tmr.t312.enb = FALSE;
-	cfg.t.cfg.s.inDLSAP.tmr.t312.val = 35;
+	}
+
 	cfg.t.cfg.s.inDLSAP.tmr.t313.enb = TRUE;
-	cfg.t.cfg.s.inDLSAP.tmr.t313.val = 35;
+	cfg.t.cfg.s.inDLSAP.tmr.t313.val = 4;
 	cfg.t.cfg.s.inDLSAP.tmr.t316.enb = TRUE;
-	cfg.t.cfg.s.inDLSAP.tmr.t316.val = 35;
-	cfg.t.cfg.s.inDLSAP.tmr.t316c.enb = TRUE;
+	cfg.t.cfg.s.inDLSAP.tmr.t316.val = 120;
+	cfg.t.cfg.s.inDLSAP.tmr.t316c.enb = FALSE;
 	cfg.t.cfg.s.inDLSAP.tmr.t316c.val = 35;
-	cfg.t.cfg.s.inDLSAP.tmr.t318.enb = FALSE;
-	cfg.t.cfg.s.inDLSAP.tmr.t318.val = 35;
-	cfg.t.cfg.s.inDLSAP.tmr.t319.enb = FALSE;
-	cfg.t.cfg.s.inDLSAP.tmr.t319.val = 35;
+	cfg.t.cfg.s.inDLSAP.tmr.t318.enb = TRUE;
+	cfg.t.cfg.s.inDLSAP.tmr.t318.val = 4;
+	cfg.t.cfg.s.inDLSAP.tmr.t319.enb = TRUE;
+	cfg.t.cfg.s.inDLSAP.tmr.t319.val = 4;
 	cfg.t.cfg.s.inDLSAP.tmr.t322.enb = TRUE;
-	cfg.t.cfg.s.inDLSAP.tmr.t322.val = 35;
+	cfg.t.cfg.s.inDLSAP.tmr.t322.val = 4;
 	cfg.t.cfg.s.inDLSAP.tmr.t332.enb = FALSE;
 	cfg.t.cfg.s.inDLSAP.tmr.t332.val = 35;
 	cfg.t.cfg.s.inDLSAP.tmr.tRst.enb = TRUE;
@@ -893,8 +934,9 @@ ftdm_status_t sng_isdn_stack_cfg_cc_gen(void)
 	stack_pst_init(&cfg.t.cfg.s.ccGenCfg.smPst);
 	cfg.t.cfg.s.ccGenCfg.smPst.dstEnt = ENTSM;
 
-	cfg.t.cfg.s.ccGenCfg.poolTrLower = 2;
-	cfg.t.cfg.s.ccGenCfg.poolTrUpper = 4;
+	cfg.t.cfg.s.ccGenCfg.poolTrUpper = 2;
+	cfg.t.cfg.s.ccGenCfg.poolTrLower = 1;
+
 	cfg.t.cfg.s.ccGenCfg.nmbSaps	 = MAX_VARIANTS+1; /* Set to number of variants + 1 */
 
 	if (sng_isdn_cc_config(&pst, &cfg)) {
@@ -1013,7 +1055,7 @@ uint8_t sng_isdn_stack_switchtype(sngisdn_switchtype_t switchtype)
 		case SNGISDN_SWITCH_QSIG:
 			return SW_QSIG;
 		case SNGISDN_SWITCH_INSNET:
-			return SW_QSIG;
+			return SW_INSNET;
 		case SNGISDN_SWITCH_INVALID:
 			ftdm_log(FTDM_LOG_ERROR, "%s:Invalid switchtype:%d\n", switchtype);
 			break;

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

@@ -46,8 +46,11 @@ ftdm_status_t sng_isdn_activate_trace(ftdm_span_t *span, sngisdn_tracetype_t tra
 ftdm_status_t sng_isdn_cntrl_q931(ftdm_span_t *span, uint8_t action, uint8_t subaction);
 ftdm_status_t sng_isdn_cntrl_q921(ftdm_span_t *span, uint8_t action, uint8_t subaction);
 
+
 extern ftdm_sngisdn_data_t	g_sngisdn_data;
 
+ftdm_status_t sng_isdn_stack_stop(ftdm_span_t *span);
+
 
 ftdm_status_t sng_isdn_stack_activate(ftdm_span_t *span)
 {
@@ -77,6 +80,12 @@ ftdm_status_t sng_isdn_stack_activate(ftdm_span_t *span)
 	return FTDM_SUCCESS;
 }
 
+ftdm_status_t	sng_isdn_stack_stop(ftdm_span_t *span)
+{
+
+	return FTDM_SUCCESS;
+}
+
 
 ftdm_status_t sng_isdn_activate_phy(ftdm_span_t *span)
 {
@@ -302,6 +311,7 @@ void stack_resp_hdr_init(Header *hdr)
 }
 
 
+
 /* For Emacs:
  * Local Variables:
  * mode:c

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

@@ -205,7 +205,7 @@ void sngisdn_trace_q931(char* str, uint8_t* data, uint32_t data_len)
 		i=i+1;
 		c=c+1;
 	}
-	str_len += sprintf(&str[str_len], " (%s side)\n", callRefFlag?"Destination":"Origination");
+	str_len += sprintf(&str[str_len], " (%s side)\n", callRefFlag?"Destination":"Originating");
 
 	/* Decode message type */
 	str_len+= sprintf(&str[str_len], "  Type:%s (0x%x)\n", get_code_2_str((int)(data[2+lenCallRef] & 0xFF), dcodQ931MsgTypeTable), (int)(data[2+lenCallRef] & 0xFF));
@@ -337,7 +337,7 @@ uint32_t sngisdn_decode_ie(char *str, uint32_t *str_len, uint8_t current_codeset
 				}
 				
 				if (numberMap) {
-					*str_len+= sprintf(&str[*str_len], " MAP\n");
+					*str_len+= sprintf(&str[*str_len], " MAP:%s ", get_code_2_str(infoChannelSelection, dcodQ931InfoChannelSelTable));
 				} else {
 					*str_len+= sprintf(&str[*str_len], "No:%d ", channelNo);
 				}
@@ -608,6 +608,9 @@ uint32_t sngisdn_decode_ie(char *str, uint32_t *str_len, uint8_t current_codeset
 			break;
 		case PROT_Q931_IE_SENDING_COMPLETE:
 			/* No need to decode sending complete IE, as no additional info is available except that sending is done */
+			/* This is a single octet IE */
+			*str_len+= sprintf(&str[*str_len], "\n");
+			return 0;
 			break;
 		case PROT_Q931_IE_CALLED_PARTY_SUBADDRESS:
 		case PROT_Q931_IE_REDIRECTION_NUMBER:

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

@@ -373,6 +373,14 @@ struct code2str dcodQ931ScreeningTable[] = {
 	{-1, "invalid" },
 };
 
+struct code2str dcodQ931InfoChannelSelTable[] = {
+	{0, "No Chan"},
+	{1, "B1"},
+	{2, "B2"},
+	{3, "Any Chan"},
+	{-1, "invalid" },
+};
+
 struct code2str dcodQ931ReasonTable[] = {
 	{0x0, "Unknown"},
 	{0x1, "Call forwarding busy"},

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

+/*
+ * Copyright (c) 2009 Konrad Hammel <konrad@sangoma.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms|with or without
+ * modification|are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice|this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice|this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the original author; nor the names of any contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES|INCLUDING|BUT NOT
+ * LIMITED TO|THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT|INDIRECT|INCIDENTAL|SPECIAL,
+ * EXEMPLARY|OR CONSEQUENTIAL DAMAGES (INCLUDING|BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE|DATA|OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * 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.
+ */
+
+/* INCLUDE ********************************************************************/
+#include "ftmod_sangoma_ss7_main.h"
+/******************************************************************************/
+
+/* DEFINES ********************************************************************/
+/******************************************************************************/
+
+/* GLOBALS ********************************************************************/
+/******************************************************************************/
+
+/* PROTOTYPES *****************************************************************/
+int ftmod_ss7_mtplink_sta(uint32_t id, SnMngmt *cfm);
+int ftmod_ss7_mtplinkSet_sta(uint32_t id, SnMngmt *cfm);
+/******************************************************************************/
+
+/* FUNCTIONS ******************************************************************/
+int ftmod_ss7_mtplink_sta(uint32_t id, SnMngmt *cfm)
+{
+	SnMngmt	sta;
+
+	memset(&sta, 0x0, sizeof(sta));
+
+	sta.hdr.elmId.elmnt 		= STDLSAP;
+	sta.hdr.elmId.elmntInst1	= g_ftdm_sngss7_data.cfg.mtpLink[id].id;
+
+	return(sng_sta_mtp3(&sta, cfm));
+}
+
+/******************************************************************************/
+int ftmod_ss7_mtplinkSet_sta(uint32_t id, SnMngmt *cfm)
+{
+	SnMngmt	sta;
+
+	memset(&sta, 0x0, sizeof(sta));
+
+	sta.hdr.elmId.elmnt 		= STLNKSET;
+	sta.hdr.elmId.elmntInst1	= g_ftdm_sngss7_data.cfg.mtpLinkSet[id].id;
+	sta.hdr.elmId.elmntInst2	= 1;
+
+	return(sng_sta_mtp3(&sta, cfm));
+}
+/******************************************************************************/
+
+/******************************************************************************/
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
+ */
+/******************************************************************************/

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

+/*
+ * Copyright (c) 2009 Konrad Hammel <konrad@sangoma.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms|with or without
+ * modification|are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice|this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice|this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the original author; nor the names of any contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES|INCLUDING|BUT NOT
+ * LIMITED TO|THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT|INDIRECT|INCIDENTAL|SPECIAL,
+ * EXEMPLARY|OR CONSEQUENTIAL DAMAGES (INCLUDING|BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE|DATA|OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * 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.
+ */
+
+/* INCLUDE ********************************************************************/
+#include "ftmod_sangoma_ss7_main.h"
+/******************************************************************************/
+
+/* DEFINES ********************************************************************/
+/******************************************************************************/
+
+/* GLOBALS ********************************************************************/
+/******************************************************************************/
+
+/* PROTOTYPES *****************************************************************/
+/******************************************************************************/
+
+/* FUNCTIONS ******************************************************************/
+/******************************************************************************/
+
+/******************************************************************************/
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
+ */
+/******************************************************************************/