Merge remote-tracking branch 'fsorig/master'

2026-07-24 13:12:03 +00:00 · 2012-01-31 15:57:07 -05:00
parent 7e31b9cc28 b9b77bd615
commit 1ad0bc250c
488 changed files with 108347 additions and 4416 deletions
@@ -124,7 +124,7 @@ int Curl_select(curl_socket_t readfd, curl_socket_t writefd, int timeout_ms)
  if (writefd != CURL_SOCKET_BAD) {
    if (pfd[num].revents & POLLOUT)
      ret |= CSELECT_OUT;
-    if (pfd[num].revents & POLLERR)
+	if (pfd[num].revents & (POLLERR|POLLHUP)) 
      ret |= CSELECT_ERR;
  }

@@ -614,8 +614,7 @@ static void clear_line(void)

 static void redisplay(void)
 {
-#ifdef WIN32
-#else
+#ifndef WIN32
 	const LineInfo *lf = el_line(el);
 	const char *c = lf->buffer;
 	if (!(write_str(prompt_str))) goto done;
@@ -1124,7 +1123,6 @@ int main(int argc, char *argv[])
 	char dft_cfile[512] = "fs_cli.conf";
 #endif
 	char *home = getenv("HOME");
-	char *term = getenv("TERM");
 	/* Vars for optargs */
 	int opt;
 	static struct option options[] = {
@@ -1159,15 +1157,11 @@ int main(int argc, char *argv[])
 	int argv_quiet = 0;
 	int loops = 2, reconnect = 0, timeout = 0;

-	if (term && (!strncasecmp("screen", term, 6) ||
-		!strncasecmp("vt100", term, 5))) {
-		feature_level = 1;
-	} else {
-		feature_level = 0;
-	}

 #ifdef WIN32
 	feature_level = 0;
+#else
+	feature_level = 1;
 #endif

 	strncpy(internal_profile.host, "127.0.0.1", sizeof(internal_profile.host));
@@ -1357,7 +1351,12 @@ int main(int argc, char *argv[])
 	}
 	global_handle = &handle;
 	global_profile = profile;
-	esl_thread_create_detached(msg_thread_run, &handle);
+
+	if (esl_thread_create_detached(msg_thread_run, &handle) != ESL_SUCCESS) {
+		printf("Error starting thread!\n");
+		esl_disconnect(&handle);
+		return 0;
+	}

 #ifdef HAVE_EDITLINE
 	el = el_init(__FILE__, stdin, stdout, stderr);
@@ -166,7 +166,7 @@ namespace ManagedEslTest
           ESLconnection eslConnection = new ESLconnection(sckClient.Handle.ToInt32());

           ESLevent eslEvent = eslConnection.GetInfo();
-           string strUuid = eslEvent.GetHeader("UNIQUE-ID");
+           string strUuid = eslEvent.GetHeader("UNIQUE-ID", 0);

           eslConnection.SendRecv("myevents");
           eslConnection.SendRecv("divert_events on");
@@ -72,6 +72,16 @@
 #include <poll.h>
 #endif

+#ifndef ESL_MIN
+#define ESL_MIN(x,y)	((x) < (y) ? (x) : (y))
+#endif
+#ifndef ESL_MAX
+#define ESL_MAX(x,y)	((x) > (y) ? (x) : (y))
+#endif
+#ifndef ESL_CLAMP
+#define ESL_CLAMP(min,max,val)	(ESL_MIN(max,ESL_MAX(val,min)))
+#endif
+

 /* Written by Marc Espie, public domain */
 #define ESL_CTYPE_NUM_CHARS       256
@@ -1187,7 +1197,7 @@ ESL_DECLARE(esl_status_t) esl_recv_event(esl_handle_t *handle, int check_q, esl_
 		}

 		rrval = handle_recv(handle, handle->socket_buf, sizeof(handle->socket_buf) - 1);
-		*((char *)handle->socket_buf + rrval) = '\0';
+		*((char *)handle->socket_buf + ESL_CLAMP(0, sizeof(handle->socket_buf) - 1, rrval)) = '\0';
 		
 		if (rrval == 0) {
 			if (++zc >= 100) {
@@ -1224,7 +1234,7 @@ ESL_DECLARE(esl_status_t) esl_recv_event(esl_handle_t *handle, int check_q, esl_
 				sofar = esl_buffer_read(handle->packet_buf, body, len);
 			} else {
 				r = handle_recv(handle, handle->socket_buf, sizeof(handle->socket_buf) - 1);
-				*((char *)handle->socket_buf + r) = '\0';
+				*((char *)handle->socket_buf + ESL_CLAMP(0, sizeof(handle->socket_buf) - 1, r)) = '\0';

 				if (r < 0) {
 					strerror_r(handle->errnum, handle->err, sizeof(handle->err));
@@ -285,7 +285,7 @@ ESL_DECLARE(char *)esl_event_get_body(esl_event_t *event)
 ESL_DECLARE(esl_status_t) esl_event_del_header_val(esl_event_t *event, const char *header_name, const char *val)
 {
 	esl_event_header_t *hp, *lp = NULL, *tp;
-	esl_status_t status = ESL_FALSE;
+	esl_status_t status = (esl_status_t) ESL_FALSE;
 	int x = 0;
 	esl_ssize_t hlen = -1;
 	unsigned long hash = 0;
@@ -875,12 +875,12 @@ ESL_DECLARE(esl_status_t) esl_event_create_json(esl_event_t **event, const char


 	if (!(cj = cJSON_Parse(json))) {
-		return ESL_FALSE;
+		return (esl_status_t) ESL_FALSE;
 	}

 	if (esl_event_create(&new_event, ESL_EVENT_CLONE) != ESL_SUCCESS) {
 		cJSON_Delete(cj);
-		return ESL_FALSE;
+		return (esl_status_t) ESL_FALSE;
 	}

 	for (cjp = cj->child; cjp; cjp = cjp->next) {
@@ -60,7 +60,7 @@ struct esl_thread {
 #endif
 };

-size_t thread_default_stacksize = 0;
+size_t thread_default_stacksize = 240 * 1024;

 void esl_thread_override_default_stacksize(size_t size)
 {
@@ -119,7 +119,9 @@ esl_status_t esl_thread_create_detached_ex(esl_thread_function_t func, void *dat

 	status = ESL_SUCCESS;
 	goto done;
+
 failpthread:
+
 	pthread_attr_destroy(&thread->attribute);
 #endif

@@ -281,6 +281,253 @@ with the signaling protocols that you can run on top of your I/O interfaces.
 		</span>
 	</r2_spans>

+	<!-- Sangoma ISDN PRI/BRI spans. Requires libsng_isdn to be installed -->
+	<sangoma_pri_spans>
+		<span name="wp1">
+			<!-- 
+				Switch emulation/Variant
+				Possible values are:
+					national
+					4ess
+					5ess
+					qsig
+					euroisdn
+					ntt
+			
+			<param name="switchtype" value="national"/>
+			-->
+			<!--
+				Signalling
+				Possible values are:
+					net
+					cpe
+				
+				<param name="signalling" value="cpe"/>
+			-->
+			<!--
+				Overlap - whether to support overlap receive
+				Possible values are: Yes/No
+
+				<param name="overlap" value="yes"/>
+			-->
+			<!--
+				Facility - whether to support facility messages
+				Possible values are: Yes/No
+
+				<param name="facility" value="yes"/>
+			-->
+			<!--
+				Minimum Digits
+				In overlap receive mode.
+				Minimum number of digits to receive before sending notification
+				to the dialplan
+				Possible values are: <Any digit>
+
+				<param name="min-digits" value="8"/>
+			-->
+			<!--
+				TEI - default value for Terminal Equipment Identifier.
+				Used in Point-to-point connections
+				Possible values are: <1-127>
+
+				<param name="tei" value="0"/>
+			-->
+			<!--
+				Type of Number (TON)
+				Set the TON on outbound calls
+				Possible values are:
+				unknown
+				international
+				national
+				network-specific
+				subscriber-number
+				abbreviated-number
+
+				<param name="outbound-called-ton" value="unknown"/>
+				<param name="outbound-calling-ton" value="unknown"/>
+				<param name="outbound-rdnis-ton" value="unknown"/>
+			-->
+			<!--
+				Numbering Plan Indendification (NPI)
+				Set the NPI on outbound calls
+				Possible values are:
+				unknown
+				isdn
+				data
+				telex
+				national
+				private
+				reserved
+
+				<param name="outbound-called-npi" value="unknown"/>
+				<param name="outbound-calling-npi" value="unknown"/>
+				<param name="outbound-rdnis-npi" value="unknown"/>
+			-->
+			<!--
+				Bearer Capability - Transfer Capability
+				Set the Bearer Capability - Transfer Capability on outbound calls
+				Possible values are:
+				speech
+				unrestricted-digital-information
+				restricted-digital-information
+				3.1-Khz-audio
+				7-Khz-audio
+				15-Khz-audio
+				video
+
+				<param name="outbound-bc-transfer-cap" value="speech"/>
+			-->
+			<!--
+				Bearer Capability - User Layer 1
+				Set the Bearer Capability - User Layer 1 on outbound calls
+				Possible values are:
+				
+				V.110
+				ulaw
+				alaw
+
+				<param name="outbound-bc-user-layer1" value="speech"/>
+			-->
+			<!--
+				Channel Restart Timeout
+				If we do not receive a RESTART message within this timeout on link
+				UP, we will send a channel restart.
+				
+				
+				<param name="channel-restart-timeout" value="20"/>
+			-->
+			<!--
+				Local Number (MSN)
+				On incoming calls, we will only respond to this call if 
+				the Called Party Number matches this value.
+
+				Note: Up to 8 local numbers can be added per span.
+				<param name="local-number" value="9054741990"/>
+			-->
+			<!--
+				Facility Timeout
+				Amount of time to wait for the FACILITY message after a SETUP message is
+				received
+				<param name="facility-timeout" value="1"/>
+			-->
+			<!--
+				Transfer Timeout
+				Amount of time to wait for the remote switch to respond to a transfer request
+				<param name="transfer-timeout" value="20"/>
+			-->
+			<!--
+				AT&T Transfer - Remove DTMF
+				Whether to remove DTMF tones received from remote switch when performing
+				AT&T Transfer.
+
+				<param name="att-remove-dtmf" value="yes/no"/>
+			-->
+			<!--
+				Facility Information Element Decoding
+				Whether to decode contents within Facility IE. You should only disable this option if your custom application has its own Facility IE decoding.
+
+				<param name="facility-ie-decode" value="yes/no"/>
+			-->
+			<!--
+				Ignore cause value
+				When using 5ESS switchtype, whether or not do initiate disconnects based on cause code.
+
+				<param name="ignore-cause-value" value="yes/no"/>
+			-->
+			<!--
+				Trace (Interpreted)
+				Whether or not to enable Q921/Q931 trace on start
+
+				<param name="q931-trace" value="yes/no"/>
+				<param name="q921-trace" value="yes/no"/>
+			-->
+			<!--
+				Trace (Raw)
+				Whether or not to enable Q921/Q931 trace on start
+
+				<param name="q931-raw-trace" value="yes/no"/>
+				<param name="q921-raw-trace" value="yes/no"/>
+			-->
+			<!--
+				Force sending complete
+				Will add Sending Complete IE to outgoing SETUP message
+				By default, enabled on EuroISDN, disabled on US variants.
+				
+				<param name="force-sending-complete" value="yes/no"/>
+			-->
+			<!--
+				Early Media Override
+				Assume early media is available, even if Q.931 message does not have
+				progress indicator IE = in-band data ready
+
+				Possible values
+					on-proceed
+					on-progress
+					on-alert
+				
+				<param name="early-media-override" value="on-alert"/>
+			-->
+			<!--
+				Invert Channel ID Invert Bit
+
+				Invert the Channel ID Extend Bit 
+
+				<param name="chan-id-invert-extend-bit" value="yes/no"/>
+			-->
+			<!--
+				CID Name transmit method
+
+				How to transmit Caller ID Name
+				
+				Possible values:
+				display-ie
+				user-user-ie
+				facility-ie
+				default (will transmit CID-Name based on variant)
+
+				<param name="cid-name-transmit-method" value="default"/>
+			-->
+			<!--
+				CID Name transmit
+
+				Whether to transmit Caller ID Name
+
+				Possible values:
+				yes	 	- always send CID-name
+				no		- nether send CID-name
+				default (will transmit CID-Name based on variant)
+
+				<param name="cid-name-transmit-method" value="default"/>
+			-->
+			<!-- 
+				Q.931 Timers in seconds
+				
+				Override default Q.931 values
+				
+				timers:
+				timer-t301
+				timer-t302
+				timer-t303
+				timer-t304
+				timer-t305
+				timer-t306
+				timer-t307
+				timer-t308
+				timer-t310
+				timer-t312
+				timer-t313
+				timer-t314
+				timer-t316
+				timer-t318
+				timer-t319
+				timer-t322
+
+				<param name="timer-t301" value="10"/>
+				-->
+		</span>
+	</sangoma_pri_spans>
+	
+
 	<!-- 
 		PRI passive tapping spans. Requires patched version from libpri at http://svn.digium.com/svn/libpri/team/moy/tap-1.4
 		You must also configure FreeTDM with "-with-pritap" (see ./configure help for details)
@@ -4251,6 +4251,42 @@ end:
 	return SWITCH_STATUS_SUCCESS;
 }

+FTDM_CLI_DECLARE(ftdm_cmd_alarms)
+{
+        ftdm_alarm_flag_t alarmbits = FTDM_ALARM_NONE;
+        uint32_t chan_id = 0;
+        ftdm_span_t *span;
+
+        if (argc < 3) {
+                print_usage(stream, cli);
+                goto end;
+        }
+
+        ftdm_span_find_by_name(argv[1], &span);
+        chan_id = atoi(argv[2]);
+        if (!span) {
+                stream->write_function(stream, "-ERR invalid span\n");
+        } else if (chan_id) {
+                if(chan_id > ftdm_span_get_chan_count(span)) {
+                        stream->write_function(stream, "-ERR invalid channel\n");
+                } else {
+                        ftdm_channel_t *chan = ftdm_span_get_channel(span, chan_id);
+                        if (!chan) {
+                                stream->write_function(stream, "-ERR channel not configured\n");
+                        } else {
+                                ftdm_channel_get_alarms(chan, &alarmbits);
+                                if (!strlen(ftdm_channel_get_last_error(chan))) {
+                                        stream->write_function(stream, "+OK No alarms\n");
+                                } else {
+                                        stream->write_function(stream, "-ERR %s on %s:%d\n", ftdm_channel_get_last_error(chan), argv[1], chan);
+                                }
+                        }
+                }
+        }
+end:
+        return SWITCH_STATUS_SUCCESS;
+}
+
 FTDM_CLI_DECLARE(ftdm_cmd_sigstatus)
 {
 	ftdm_span_t *span = NULL;
@@ -4657,6 +4693,7 @@ static ftdm_cli_entry_t ftdm_cli_options[] =
 	{ "start", "<span_id|span_name>", "", ftdm_cmd_start_stop },
 	{ "stop", "<span_id|span_name>", "", ftdm_cmd_start_stop },
 	{ "reset", "<span_id|span_name> [<chan_id>]", "", ftdm_cmd_reset },
+	{ "alarms", "<span_id> <chan_id>", "", ftdm_cmd_alarms },
 	{ "dump", "<span_id|span_name> [<chan_id>]", "", ftdm_cmd_dump },
 	{ "sigstatus", "get|set <span_id|span_name> [<chan_id>] [<sigstatus>]", "::[set:get", ftdm_cmd_sigstatus },
 	{ "trace", "<path> <span_id|span_name> [<chan_id>]", "", ftdm_cmd_trace },
@@ -1188,7 +1188,7 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_read_event(ftdm_channel_t *ftdmchan, ftdm
 	ftdm_channel_lock(ftdmchan);

 	if (!span->fio->channel_next_event) {
-		ftdm_log(FTDM_LOG_ERROR, "channel_next_event method not implemented in module %s!", span->fio->name);
+		ftdm_log(FTDM_LOG_ERROR, "channel_next_event method not implemented in module %s!\n", span->fio->name);
 		status = FTDM_NOTIMPL;
 		goto done;
 	}
@@ -2548,7 +2548,9 @@ FT_DECLARE(ftdm_status_t) _ftdm_call_place(const char *file, const char *func, i
 		goto done;
 	}

+	/* let the user know which channel was picked and which call id was generated */
 	caller_data->fchan = fchan;
+	caller_data->call_id = fchan->caller_data.call_id;
 done:
 	ftdm_channel_unlock(fchan);

@@ -4574,7 +4576,7 @@ FT_DECLARE(ftdm_status_t) ftdm_configure_span_channels(ftdm_span_t *span, const
 	ftdm_assert_return(span->fio != NULL, FTDM_EINVAL, "span with no I/O configured\n");
 	ftdm_assert_return(span->fio->configure_span != NULL, FTDM_NOTIMPL, "span I/O with no channel configuration implemented\n");

-       	currindex = span->chan_count;
+	currindex = span->chan_count;
 	*configured = 0;
 	*configured = span->fio->configure_span(span, str, chan_config->type, chan_config->name, chan_config->number);
 	if (!*configured) {
@@ -4604,8 +4606,10 @@ FT_DECLARE(ftdm_status_t) ftdm_configure_span_channels(ftdm_span_t *span, const
 		}

 		if (chan_config->debugdtmf) {
-				span->channels[chan_index]->dtmfdbg.requested = 1;
+			span->channels[chan_index]->dtmfdbg.requested = 1;
 		}
+
+		span->channels[chan_index]->dtmfdetect.duration_ms = chan_config->dtmfdetect_ms;
 	}

 	return FTDM_SUCCESS;
@@ -4628,6 +4632,7 @@ static ftdm_status_t load_config(void)

 	memset(&chan_config, 0, sizeof(chan_config));
 	sprintf(chan_config.group_name, "__default");
+	chan_config.dtmfdetect_ms = 45;

 	if (!ftdm_config_open_file(&cfg, cfg_name)) {
 		return FTDM_FAIL;
@@ -4802,6 +4807,10 @@ static ftdm_status_t load_config(void)
 			} else if (!strcasecmp(var, "debugdtmf")) {
 				chan_config.debugdtmf = ftdm_true(val);
 				ftdm_log(FTDM_LOG_DEBUG, "Setting debugdtmf to '%s'\n", chan_config.debugdtmf ? "yes" : "no");
+			} else if (!strncasecmp(var, "dtmfdetect_ms", sizeof("dtmfdetect_ms")-1)) {
+				if (sscanf(val, "%d", &(chan_config.dtmfdetect_ms)) != 1) {
+					ftdm_log(FTDM_LOG_ERROR, "invalid dtmfdetect_ms: '%s'\n", val);
+				}
 			} else if (!strncasecmp(var, "iostats", sizeof("iostats")-1)) {
 				if (ftdm_true(val)) {
 					chan_config.iostats = FTDM_TRUE;
@@ -391,7 +391,7 @@ static void *ftdm_sangoma_isdn_io_run(ftdm_thread_t *me, void *obj)
 			case FTDM_SUCCESS:
 				/* Check if there are any channels that have data available */
 				for (citer = ftdm_span_get_chan_iterator(span, chaniter); citer; citer = ftdm_iterator_next(citer)) {
-					len = 1000;
+					len = sizeof(data);
 					ftdmchan = ftdm_iterator_current(citer);
 					if (FTDM_IS_VOICE_CHANNEL(ftdmchan)) {
 						if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_RX_DISABLED)) {
@@ -49,7 +49,11 @@
 #include "private/ftdm_core.h"
 #include "ftmod_sangoma_isdn_user.h"

+#ifdef WIN32
+#include <sng_isdn.h>
+#else
 #include <sng_isdn/sng_isdn.h>
+#endif

 /* Theoretical limit for MAX_SPANS_PER_NFAS_LINK is 31,
   but set to 8 for now to save some memory */
@@ -67,8 +71,6 @@
 #define MI_NOTIFY 0x14
 #endif

-/* TODO: rename all *_cc_* to *_an_*  */
-
 typedef enum {
 	FLAG_RESET_RX           = (1 << 0),
 	FLAG_RESET_TX           = (1 << 1),
@@ -258,7 +260,7 @@ typedef struct sngisdn_span_data {
 	uint8_t			setup_arb;
 	uint8_t			facility_ie_decode;
 	uint8_t			facility;
-	int8_t			facility_timeout;
+	int32_t			facility_timeout;
 	uint8_t			att_remove_dtmf;
 	int32_t			transfer_timeout;
 	uint8_t			num_local_numbers;
@@ -273,6 +275,24 @@ typedef struct sngisdn_span_data {
 	uint8_t			force_sending_complete;
 	uint8_t			cid_name_method;
 	uint8_t			send_cid_name;
+
+	int32_t			timer_t301;
+	int32_t			timer_t302;
+	int32_t			timer_t303;
+	int32_t			timer_t304;
+	int32_t			timer_t305;
+	int32_t			timer_t306;
+	int32_t			timer_t307;
+	int32_t			timer_t308;
+	int32_t			timer_t310;
+	int32_t			timer_t312;
+	int32_t			timer_t313;
+	int32_t			timer_t314;
+	int32_t			timer_t316;
+	int32_t			timer_t318;
+	int32_t			timer_t319;
+	int32_t			timer_t322;
+	
 	char*			local_numbers[SNGISDN_NUM_LOCAL_NUMBERS];
 	ftdm_timer_id_t timers[SNGISDN_NUM_SPAN_TIMERS];
 	ftdm_sched_t 	*sched;
@@ -479,6 +499,7 @@ ftdm_status_t get_calling_subaddr(ftdm_channel_t *ftdmchan, CgPtySad *cgPtySad);
 ftdm_status_t get_prog_ind_ie(ftdm_channel_t *ftdmchan, ProgInd *progInd);
 ftdm_status_t get_facility_ie(ftdm_channel_t *ftdmchan, FacilityStr *facilityStr);
 ftdm_status_t get_facility_ie_str(ftdm_channel_t *ftdmchan, uint8_t *data, uint8_t data_len);
+ftdm_status_t get_network_specific_fac(ftdm_channel_t *ftdmchan, NetFac *netFac);

 ftdm_status_t set_calling_num(ftdm_channel_t *ftdmchan, CgPtyNmb *cgPtyNmb);
 ftdm_status_t set_calling_num2(ftdm_channel_t *ftdmchan, CgPtyNmb *cgPtyNmb);
@@ -488,6 +509,7 @@ ftdm_status_t set_calling_name(ftdm_channel_t *ftdmchan, ConEvnt *conEvnt);
 ftdm_status_t set_calling_subaddr(ftdm_channel_t *ftdmchan, CgPtySad *cgPtySad);
 ftdm_status_t set_prog_ind_ie(ftdm_channel_t *ftdmchan, ProgInd *progInd, ftdm_sngisdn_progind_t prog_ind);
 ftdm_status_t set_bear_cap_ie(ftdm_channel_t *ftdmchan, BearCap *bearCap);
+ftdm_status_t set_network_specific_fac(ftdm_channel_t *ftdmchan, NetFac *netFac);
 ftdm_status_t set_chan_id_ie(ftdm_channel_t *ftdmchan, ChanId *chanId);
 ftdm_status_t set_restart_ind_ie(ftdm_channel_t *ftdmchan, RstInd *rstInd);
 ftdm_status_t set_facility_ie(ftdm_channel_t *ftdmchan, FacilityStr *facilityStr);
@@ -34,6 +34,7 @@

 #include "ftmod_sangoma_isdn.h"

+static ftdm_status_t parse_timer(const char* val, int32_t *target);
 static ftdm_status_t parse_switchtype(const char* switch_name, ftdm_span_t *span);
 static ftdm_status_t parse_signalling(const char* signalling, ftdm_span_t *span);
 static ftdm_status_t add_local_number(const char* val, ftdm_span_t *span);
@@ -42,6 +43,16 @@ static ftdm_status_t set_switchtype_defaults(ftdm_span_t *span);

 extern ftdm_sngisdn_data_t	g_sngisdn_data;

+
+static ftdm_status_t parse_timer(const char* val, int32_t *target)
+{
+	*target = atoi(val);
+	if (*target < 0) {
+		*target = 0;
+	}
+	return FTDM_SUCCESS;
+}
+
 static ftdm_status_t parse_yesno(const char* var, const char* val, uint8_t *target)
 {
 	if (ftdm_true(val)) {
@@ -369,15 +380,9 @@ ftdm_status_t ftmod_isdn_parse_cfg(ftdm_conf_parameter_t *ftdm_parameters, ftdm_
 				return FTDM_FAIL;
 			}
 		} else if (!strcasecmp(var, "facility-timeout")) {
-			signal_data->facility_timeout = atoi(val);
-			if (signal_data->facility_timeout < 0) {
-				signal_data->facility_timeout = 0;
-			}
+			parse_timer(val, &signal_data->facility_timeout);
 		} else if (!strcasecmp(var, "transfer-timeout")) {
-			signal_data->transfer_timeout = atoi(val);
-			if (signal_data->transfer_timeout < 0) {
-				signal_data->transfer_timeout = 0;
-			}
+			parse_timer(val, &signal_data->transfer_timeout);
 		} else if (!strcasecmp(var, "att-remove-dtmf")) {
 			parse_yesno(var, val, &signal_data->att_remove_dtmf);
 		} else if (!strcasecmp(var, "facility-ie-decode")) {
@@ -428,6 +433,38 @@ ftdm_status_t ftmod_isdn_parse_cfg(ftdm_conf_parameter_t *ftdm_parameters, ftdm_
 				ftdm_log(FTDM_LOG_WARNING, "Invalid option %s for parameter %s\n", val, var);
 				signal_data->send_cid_name = SNGISDN_OPT_DEFAULT;
 			}
+		} else if (!strcasecmp(var, "timer-t301")) {
+			parse_timer(val, &signal_data->timer_t301);
+		} else if (!strcasecmp(var, "timer-t302")) {
+			parse_timer(val, &signal_data->timer_t302);
+		} else if (!strcasecmp(var, "timer-t303")) {
+			parse_timer(val, &signal_data->timer_t303);
+		} else if (!strcasecmp(var, "timer-t304")) {
+			parse_timer(val, &signal_data->timer_t304);
+		} else if (!strcasecmp(var, "timer-t305")) {
+			parse_timer(val, &signal_data->timer_t305);
+		} else if (!strcasecmp(var, "timer-t306")) {
+			parse_timer(val, &signal_data->timer_t306);
+		} else if (!strcasecmp(var, "timer-t307")) {
+			parse_timer(val, &signal_data->timer_t307);
+		} else if (!strcasecmp(var, "timer-t308")) {
+			parse_timer(val, &signal_data->timer_t308);
+		} else if (!strcasecmp(var, "timer-t310")) {
+			parse_timer(val, &signal_data->timer_t310);
+		} else if (!strcasecmp(var, "timer-t312")) {
+			parse_timer(val, &signal_data->timer_t312);
+		} else if (!strcasecmp(var, "timer-t313")) {
+			parse_timer(val, &signal_data->timer_t313);
+		} else if (!strcasecmp(var, "timer-t314")) {
+			parse_timer(val, &signal_data->timer_t314);
+		} else if (!strcasecmp(var, "timer-t316")) {
+			parse_timer(val, &signal_data->timer_t316);
+		} else if (!strcasecmp(var, "timer-t318")) {
+			parse_timer(val, &signal_data->timer_t318);
+		} else if (!strcasecmp(var, "timer-t319")) {
+			parse_timer(val, &signal_data->timer_t319);
+		} else if (!strcasecmp(var, "timer-t322")) {
+			parse_timer(val, &signal_data->timer_t322);
 		} else {
 			ftdm_log(FTDM_LOG_WARNING, "Ignoring unknown parameter %s\n", ftdm_parameters[paramindex].var);
 		}
@@ -750,10 +750,12 @@ ftdm_status_t sngisdn_stack_cfg_q931_dlsap(ftdm_span_t *span)
 	cfg.t.cfg.s.inDLSAP.redirAdr.eh.pres = NOTPRSNT; /* redirAdr Numbering Plan */
 	cfg.t.cfg.s.inDLSAP.forwSubsc = FALSE;        /* programmed forwarding subscription */
 	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 = TRUE;
 	cfg.t.cfg.s.inDLSAP.tmr.t301.val = 180;
+	if (signal_data->timer_t301 > 0) {
+		cfg.t.cfg.s.inDLSAP.tmr.t301.val = signal_data->timer_t301;
+	}

 	/* It looks like ETSI is the only variant that supports Overlap */
 	if (signal_data->switchtype == SNGISDN_SWITCH_EUROISDN) {
@@ -764,21 +766,54 @@ ftdm_status_t sngisdn_stack_cfg_q931_dlsap(ftdm_span_t *span)
 		cfg.t.cfg.s.inDLSAP.tmr.t302.val = 0;
 	}

+	if (signal_data->timer_t302 > 0) {
+		cfg.t.cfg.s.inDLSAP.tmr.t302.val = signal_data->timer_t302;
+	}
+
 	cfg.t.cfg.s.inDLSAP.tmr.t303.enb = TRUE;
 	cfg.t.cfg.s.inDLSAP.tmr.t303.val = 4;
+
+	if (signal_data->timer_t303 > 0) {
+		cfg.t.cfg.s.inDLSAP.tmr.t303.val = signal_data->timer_t303;
+	}
+	
 	cfg.t.cfg.s.inDLSAP.tmr.t304.enb = TRUE;
 	cfg.t.cfg.s.inDLSAP.tmr.t304.val = 30;
+
+	if (signal_data->timer_t304 > 0) {
+		cfg.t.cfg.s.inDLSAP.tmr.t304.val = signal_data->timer_t304;
+	}
+	
 	cfg.t.cfg.s.inDLSAP.tmr.t305.enb = TRUE;
 	cfg.t.cfg.s.inDLSAP.tmr.t305.val = 30;
+
+	if (signal_data->timer_t305 > 0) {
+		cfg.t.cfg.s.inDLSAP.tmr.t305.val = signal_data->timer_t305;
+	}
+	
 	cfg.t.cfg.s.inDLSAP.tmr.t306.enb = FALSE;
 	cfg.t.cfg.s.inDLSAP.tmr.t306.val = 35;
+
+	if (signal_data->timer_t306 > 0) {
+		cfg.t.cfg.s.inDLSAP.tmr.t306.val = signal_data->timer_t306;
+	}
+	
 	cfg.t.cfg.s.inDLSAP.tmr.t307.enb = FALSE;
 	cfg.t.cfg.s.inDLSAP.tmr.t307.val = 35;
+
+	if (signal_data->timer_t307 > 0) {
+		cfg.t.cfg.s.inDLSAP.tmr.t307.val = signal_data->timer_t307;
+	}
+	
 	cfg.t.cfg.s.inDLSAP.tmr.t308.enb = TRUE;
 	cfg.t.cfg.s.inDLSAP.tmr.t308.val = 4;
 	cfg.t.cfg.s.inDLSAP.tmr.t310.enb = TRUE;
 	cfg.t.cfg.s.inDLSAP.tmr.t310.val = 120;

+	if (signal_data->timer_t308 > 0) {
+		cfg.t.cfg.s.inDLSAP.tmr.t308.val = signal_data->timer_t308;
+	}
+
 	if (signal_data->signalling == SNGISDN_SIGNALING_NET) {
 		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;
@@ -786,18 +821,52 @@ ftdm_status_t sngisdn_stack_cfg_q931_dlsap(ftdm_span_t *span)
 		cfg.t.cfg.s.inDLSAP.tmr.t312.enb = FALSE;
 	}

+	if (signal_data->timer_t310 > 0) {
+		cfg.t.cfg.s.inDLSAP.tmr.t310.val = signal_data->timer_t310;
+	}
+
+	if (signal_data->timer_t312 > 0) {
+		cfg.t.cfg.s.inDLSAP.tmr.t312.val = signal_data->timer_t312;
+	}
+
 	cfg.t.cfg.s.inDLSAP.tmr.t313.enb = TRUE;
 	cfg.t.cfg.s.inDLSAP.tmr.t313.val = 4;
+
+	if (signal_data->timer_t313 > 0) {
+		cfg.t.cfg.s.inDLSAP.tmr.t313.val = signal_data->timer_t313;
+	}
+	
 	cfg.t.cfg.s.inDLSAP.tmr.t316.enb = TRUE;
 	cfg.t.cfg.s.inDLSAP.tmr.t316.val = 120;
+
+	if (signal_data->timer_t316 > 0) {
+		cfg.t.cfg.s.inDLSAP.tmr.t316.val = signal_data->timer_t316;
+	}
+
 	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 = TRUE;
 	cfg.t.cfg.s.inDLSAP.tmr.t318.val = 4;
+
+	if (signal_data->timer_t318 > 0) {
+		cfg.t.cfg.s.inDLSAP.tmr.t318.val = signal_data->timer_t318;
+	}
+	
 	cfg.t.cfg.s.inDLSAP.tmr.t319.enb = TRUE;
 	cfg.t.cfg.s.inDLSAP.tmr.t319.val = 4;
+
+	if (signal_data->timer_t319 > 0) {
+		cfg.t.cfg.s.inDLSAP.tmr.t319.val = signal_data->timer_t319;
+	}
+	
 	cfg.t.cfg.s.inDLSAP.tmr.t322.enb = TRUE;
 	cfg.t.cfg.s.inDLSAP.tmr.t322.val = 4;
+
+	if (signal_data->timer_t322 > 0) {
+		cfg.t.cfg.s.inDLSAP.tmr.t322.val = signal_data->timer_t322;
+	}
+	
 	cfg.t.cfg.s.inDLSAP.tmr.t332.enb = FALSE;
 	cfg.t.cfg.s.inDLSAP.tmr.t332.val = 35;

@@ -133,8 +133,9 @@ void sngisdn_process_con_ind (sngisdn_event_data_t *sngisdn_event)
 			get_redir_num(ftdmchan, &conEvnt->redirNmb);
 			get_calling_subaddr(ftdmchan, &conEvnt->cgPtySad);
 			get_prog_ind_ie(ftdmchan, &conEvnt->progInd);
-			get_facility_ie(ftdmchan, &conEvnt->facilityStr);			
+			get_facility_ie(ftdmchan, &conEvnt->facilityStr);
 			get_calling_name(ftdmchan, conEvnt);
+			get_network_specific_fac(ftdmchan, &conEvnt->netFac[0]);
 			
 			ftdm_log_chan(sngisdn_info->ftdmchan, FTDM_LOG_INFO, "Incoming call: Called No:[%s] Calling No:[%s]\n", ftdmchan->caller_data.dnis.digits, ftdmchan->caller_data.cid_num.digits);

@@ -945,14 +946,8 @@ void sngisdn_process_sta_cfm (sngisdn_event_data_t *sngisdn_event)
 						break;
 				}
 				break;
-				case 2: /* overlap sending/receiving */
+				case 2: /* overlap sending */
 					switch (ftdmchan->state) {
-						case FTDM_CHANNEL_STATE_COLLECT:
-							/* T302 Timeout reached */
-							/* Send the call to user, and see if they accept it */
-							ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "T302 Timer expired, proceeding with call\n");
-							ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_RING);
-							break;
 						case FTDM_CHANNEL_STATE_PROCEED:
 						case FTDM_CHANNEL_STATE_PROGRESS:
 						case FTDM_CHANNEL_STATE_RINGING:
@@ -1069,7 +1064,10 @@ void sngisdn_process_sta_cfm (sngisdn_event_data_t *sngisdn_event)
 			case 25: /* Overlap receiving */
 				switch (ftdmchan->state) {
 					case FTDM_CHANNEL_STATE_COLLECT:
-						/* do nothing */
+						/* T302 Timeout reached */
+						/* Send the call to user, and see if they accept it */
+						ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "T302 Timer expired, proceeding with call\n");
+						ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_RING);
 						break;
 					default:
 						ftdm_log_chan(ftdmchan, FTDM_LOG_CRIT, "Don't know how to handle incompatible state. remote call state:%d our state:%s\n", call_state, ftdm_channel_state2str(ftdmchan->state));
@@ -69,6 +69,7 @@ void sngisdn_snd_setup(ftdm_channel_t *ftdmchan)
 	set_calling_subaddr(ftdmchan, &conEvnt.cgPtySad);
 	set_redir_num(ftdmchan, &conEvnt.redirNmb);
 	set_calling_name(ftdmchan, &conEvnt);
+	set_network_specific_fac(ftdmchan, &conEvnt.netFac[0]);

 	/* set_facility_ie will overwrite Calling Name for NI-2 if user specifies custom Facility IE */
 	set_facility_ie(ftdmchan, &conEvnt.facilityStr);
@@ -481,6 +482,12 @@ void sngisdn_snd_data(ftdm_channel_t *dchan, uint8_t *data, ftdm_size_t len)
 	sng_l1_frame_t l1_frame;
 	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*) dchan->span->signal_data;

+	if (len > sizeof(l1_frame.data)) {
+		ftdm_log_chan(dchan, FTDM_LOG_ERROR, "Received frame of %"FTDM_SIZE_FMT" bytes, exceeding max size of %"FTDM_SIZE_FMT" bytes\n", 
+				len, sizeof(l1_frame.data));
+		return;
+	}
+
 	memset(&l1_frame, 0, sizeof(l1_frame));
 	l1_frame.len = len;

@@ -43,8 +43,21 @@ SNGISDN_STR2ENUM(ftdm_str2ftdm_sngisdn_progind_descr, ftdm_sngisdn_progind_descr
 SNGISDN_ENUM_NAMES(SNGISDN_PROGIND_LOC_NAMES, SNGISDN_PROGIND_LOC_STRINGS)
 SNGISDN_STR2ENUM(ftdm_str2ftdm_sngisdn_progind_loc, ftdm_sngisdn_progind_loc2str, ftdm_sngisdn_progind_loc_t, SNGISDN_PROGIND_LOC_NAMES, SNGISDN_PROGIND_LOC_INVALID)

-static uint8_t get_trillium_val(ftdm2trillium_t *vals, uint8_t ftdm_val, uint8_t default_val);
-static uint8_t get_ftdm_val(ftdm2trillium_t *vals, uint8_t trillium_val, uint8_t default_val);
+SNGISDN_ENUM_NAMES(SNGISDN_NETSPECFAC_TYPE_NAMES, SNGISDN_NETSPECFAC_TYPE_STRINGS)
+SNGISDN_STR2ENUM(ftdm_str2ftdm_sngisdn_netspecfac_type, ftdm_sngisdn_netspecfac_type2str, ftdm_sngisdn_netspecfac_type_t, SNGISDN_NETSPECFAC_TYPE_NAMES, SNGISDN_NETSPECFAC_TYPE_INVALID)
+
+SNGISDN_ENUM_NAMES(SNGISDN_NETSPECFAC_PLAN_NAMES, SNGISDN_NETSPECFAC_PLAN_STRINGS)
+SNGISDN_STR2ENUM(ftdm_str2ftdm_sngisdn_netspecfac_plan, ftdm_sngisdn_netspecfac_plan2str, ftdm_sngisdn_netspecfac_plan_t, SNGISDN_NETSPECFAC_PLAN_NAMES, SNGISDN_NETSPECFAC_PLAN_INVALID)
+
+SNGISDN_ENUM_NAMES(SNGISDN_NETSPECFAC_SPEC_NAMES, SNGISDN_NETSPECFAC_SPEC_STRINGS)
+SNGISDN_STR2ENUM(ftdm_str2ftdm_sngisdn_netspecfac_spec, ftdm_sngisdn_netspecfac_spec2str, ftdm_sngisdn_netspecfac_spec_t, SNGISDN_NETSPECFAC_SPEC_NAMES, SNGISDN_NETSPECFAC_SPEC_INVALID)
+
+static uint8_t _get_trillium_val(ftdm2trillium_t *vals, unsigned int num_vals, uint8_t ftdm_val, uint8_t default_val);
+static uint8_t _get_ftdm_val(ftdm2trillium_t *vals, unsigned int num_vals, uint8_t trillium_val, uint8_t default_val);
+
+#define get_trillium_val(vals, ftdm_val, default_val) _get_trillium_val(vals, ftdm_array_len(vals), ftdm_val, default_val)
+#define get_ftdm_val(vals, trillium_val, default_val) _get_ftdm_val(vals, ftdm_array_len(vals), trillium_val, default_val)
+
 ftdm_status_t get_calling_name_from_usr_usr(ftdm_channel_t *ftdmchan, UsrUsr *usrUsr);
 ftdm_status_t get_calling_name_from_display(ftdm_channel_t *ftdmchan, Display *display);
 ftdm_status_t get_calling_name_from_ntDisplay(ftdm_channel_t *ftdmchan, NtDisplay *display);
@@ -71,29 +84,51 @@ ftdm2trillium_t ton_codes[] = {
 	{FTDM_TON_RESERVED,				IN_TON_EXT},
 };

-static uint8_t get_trillium_val(ftdm2trillium_t *vals, uint8_t ftdm_val, uint8_t default_val)
+ftdm2trillium_t nsf_spec_codes[] = {
+	{SNGISDN_NETSPECFAC_SPEC_ACCUNET,		0xe6},
+	{SNGISDN_NETSPECFAC_SPEC_MEGACOM,		0xe3},
+	{SNGISDN_NETSPECFAC_SPEC_MEGACOM_800,	0xe2},
+	{SNGISDN_NETSPECFAC_SPEC_SDDN,			0xe1},
+	{SNGISDN_NETSPECFAC_SPEC_INVALID,		0x00},
+};
+
+ftdm2trillium_t nsf_type_codes[] = {
+	{SNGISDN_NETSPECFAC_TYPE_USER_SPEC,						0x00},
+	{SNGISDN_NETSPECFAC_TYPE_NATIONAL_NETWORK_IDENT,		0x02},
+	{SNGISDN_NETSPECFAC_TYPE_INTERNATIONAL_NETWORK_IDENT,	0x03},
+	{SNGISDN_NETSPECFAC_TYPE_INVALID,						0x00},
+};
+
+ftdm2trillium_t nsf_plan_codes[] = {
+	{SNGISDN_NETSPECFAC_PLAN_UNKNOWN,						0x00},
+	{SNGISDN_NETSPECFAC_PLAN_CARRIER_IDENT,		0x01},
+	{SNGISDN_NETSPECFAC_PLAN_DATA_NETWORK_IDENT,	0x03},
+	{SNGISDN_NETSPECFAC_PLAN_INVALID,						0x00},
+};
+
+static uint8_t _get_trillium_val(ftdm2trillium_t *vals, unsigned int num_vals, uint8_t ftdm_val, uint8_t default_val)
 {
-	ftdm2trillium_t *val = vals;
-	while(val++) {
-		if (val->ftdm_val == ftdm_val) {
-			return val->trillium_val;
+	int i;
+	for (i = 0; i < num_vals; i++) {
+		if (vals[i].ftdm_val == ftdm_val) {
+			return vals[i].trillium_val;
+		}
+	}
+	
+	return default_val;
+}
+
+static uint8_t _get_ftdm_val(ftdm2trillium_t *vals, unsigned int num_vals, uint8_t trillium_val, uint8_t default_val)
+{
+	int i;
+	for (i = 0; i < num_vals; i++) {
+		if (vals[i].trillium_val == trillium_val) {
+			return vals[i].ftdm_val;
 		}
 	}
 	return default_val;
 }

-static uint8_t get_ftdm_val(ftdm2trillium_t *vals, uint8_t trillium_val, uint8_t default_val)
-{
-	ftdm2trillium_t *val = vals;
-	while(val++) {
-		if (val->trillium_val == trillium_val) {
-			return val->ftdm_val;
-		}
-	}
-	return default_val;
-}
-
-
 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;
@@ -530,6 +565,29 @@ ftdm_status_t get_prog_ind_ie(ftdm_channel_t *ftdmchan, ProgInd *progInd)
 }


+ftdm_status_t get_network_specific_fac(ftdm_channel_t *ftdmchan, NetFac *netFac)
+{
+	if (!netFac->eh.pres) {
+		return FTDM_FAIL;
+	}
+
+	if (netFac->netFacSpec.pres == PRSNT_NODEF) {
+		char digits_string [32];
+		memcpy(digits_string, (const char*)netFac->netFacSpec.val, netFac->netFacSpec.len);
+		digits_string[netFac->netFacSpec.len] = '\0';
+		sngisdn_add_var((sngisdn_chan_data_t*)ftdmchan->call_data, "isdn.netFac.spec", digits_string);
+	}
+
+	if (netFac->typeNetId.pres == PRSNT_NODEF) {
+		sngisdn_add_var((sngisdn_chan_data_t*)ftdmchan->call_data, "isdn.netFac.type", ftdm_sngisdn_netspecfac_type2str(get_ftdm_val(nsf_type_codes, netFac->typeNetId.val, 0x00)));
+	}
+
+	if (netFac->netIdPlan.pres == PRSNT_NODEF) {
+		sngisdn_add_var((sngisdn_chan_data_t*)ftdmchan->call_data, "isdn.netFac.plan", ftdm_sngisdn_netspecfac_type2str(get_ftdm_val(nsf_plan_codes, netFac->netIdPlan.val, 0x00)));
+	}
+	return FTDM_SUCCESS;
+}
+
 ftdm_status_t set_calling_num(ftdm_channel_t *ftdmchan, CgPtyNmb *cgPtyNmb)
 {
 	ftdm_caller_data_t *caller_data = &ftdmchan->caller_data;
@@ -900,6 +958,67 @@ ftdm_status_t set_prog_ind_ie(ftdm_channel_t *ftdmchan, ProgInd *progInd, ftdm_s
 	return FTDM_SUCCESS;
 }

+ftdm_status_t set_network_specific_fac(ftdm_channel_t *ftdmchan, NetFac *netFac)
+{
+	const char *str = NULL;
+	
+	str = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "isdn.netFac.spec");
+	if (ftdm_strlen_zero(str)) {
+		/* Network-specific facility specification is mandatory, cannot send IE
+			without it */
+		return FTDM_SUCCESS;
+	} else {
+		ftdm_sngisdn_netspecfac_spec_t spec = ftdm_str2ftdm_sngisdn_netspecfac_spec(str);
+
+		netFac->eh.pres = PRSNT_NODEF;
+		netFac->netFacSpec.pres = PRSNT_NODEF;
+
+		if (spec == SNGISDN_NETSPECFAC_SPEC_INVALID) {
+			int byte = 0;
+			ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Non-standard NSF specified:%s\n", str);
+
+			if (sscanf(str, "%x", &byte) == 1) {
+				netFac->netFacSpec.val[0] = byte & 0xFF;
+			}
+
+			netFac->netFacSpec.len = 1;
+		} else {
+			/* User is using one of the pre-specified NSF's */
+			netFac->netFacSpec.val[0] = get_trillium_val(nsf_spec_codes, spec, 0x00);
+			netFac->netFacSpec.len = 1;
+		}
+	}
+
+	netFac->lenNetId.pres = PRSNT_NODEF;
+	netFac->lenNetId.val = 0;
+
+	str = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "isdn.netFac.type");
+	if (!ftdm_strlen_zero(str)) {
+		netFac->typeNetId.pres = PRSNT_NODEF;
+		netFac->typeNetId.val = ftdm_str2ftdm_sngisdn_netspecfac_type(str);
+	}
+
+	str = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "isdn.netFac.plan"); 
+	if (!ftdm_strlen_zero(str)) {
+		netFac->netIdPlan.pres = PRSNT_NODEF;
+		netFac->netIdPlan.val = ftdm_str2ftdm_sngisdn_netspecfac_plan(str);
+	}
+
+	if (netFac->netIdPlan.pres == PRSNT_NODEF || netFac->typeNetId.pres == PRSNT_NODEF) {
+		netFac->lenNetId.val++;
+	}
+
+	str = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "isdn.netFac.ident");
+	if (!ftdm_strlen_zero(str)) {
+		netFac->lenNetId.val++;
+
+		netFac->netId.pres = PRSNT_NODEF;
+		memcpy(netFac->netId.val, str, strlen(str));
+	}
+
+	return FTDM_SUCCESS;	
+}
+
 ftdm_status_t set_user_to_user_ie(ftdm_channel_t *ftdmchan, UsrUsr *usrUsr)
 {
 	sngisdn_chan_data_t *sngisdn_info = ftdmchan->call_data;
@@ -771,7 +771,7 @@ uint32_t sngisdn_decode_ie(char *str, uint32_t *str_len, uint8_t current_codeset
 		default:
 			{
 				*str_len += sprintf(&str[*str_len], "Undecoded");
-				print_hex_dump((char*)str, str_len, data, index_start, index_end);
+				print_hex_dump((char*)str, str_len, data, index_start, index_end + 1);
 			}
 			break;
 	}
@@ -101,6 +101,42 @@ typedef enum {
 #define SNGISDN_PROGIND_LOC_STRINGS "user", "private-net-local-user", "public-net-local-user", "transit-network", "public-net-remote-user", "private-net-remote-user", "beyond-interworking", "invalid"
 SNGISDN_STR2ENUM_P(ftdm_str2ftdm_sngisdn_progind_loc, ftdm_sngisdn_progind_loc2str, ftdm_sngisdn_progind_loc_t);

+typedef enum {
+	/* User Specified */
+	SNGISDN_NETSPECFAC_TYPE_USER_SPEC,
+	/* National network identification */
+	SNGISDN_NETSPECFAC_TYPE_NATIONAL_NETWORK_IDENT,
+	/* International network identification */
+	SNGISDN_NETSPECFAC_TYPE_INTERNATIONAL_NETWORK_IDENT,
+	/* Invalid */
+	SNGISDN_NETSPECFAC_TYPE_INVALID,
+} ftdm_sngisdn_netspecfac_type_t;
+#define SNGISDN_NETSPECFAC_TYPE_STRINGS "user-specified", "national-network-identification", "national-network-identification", "invalid"
+SNGISDN_STR2ENUM_P(ftdm_str2ftdm_sngisdn_netspecfac_type, ftdm_sngisdn_netspecfac_type2str, ftdm_sngisdn_netspecfac_type_t);
+
+typedef enum {
+	/* Unknown */
+	SNGISDN_NETSPECFAC_PLAN_UNKNOWN,
+	/* Carrier Identification Code */
+	SNGISDN_NETSPECFAC_PLAN_CARRIER_IDENT,
+	/* Data network identification code */
+	SNGISDN_NETSPECFAC_PLAN_DATA_NETWORK_IDENT,
+	/* Invalid */
+	SNGISDN_NETSPECFAC_PLAN_INVALID,
+} ftdm_sngisdn_netspecfac_plan_t;
+#define SNGISDN_NETSPECFAC_PLAN_STRINGS "unknown", "carrier-identification", "data-network-identification", "invalid"
+SNGISDN_STR2ENUM_P(ftdm_str2ftdm_sngisdn_netspecfac_plan, ftdm_sngisdn_netspecfac_plan2str, ftdm_sngisdn_netspecfac_plan_t);
+
+typedef enum {
+	/* Unknown */
+	SNGISDN_NETSPECFAC_SPEC_ACCUNET,
+	SNGISDN_NETSPECFAC_SPEC_MEGACOM,
+	SNGISDN_NETSPECFAC_SPEC_MEGACOM_800,
+	SNGISDN_NETSPECFAC_SPEC_SDDN,
+	SNGISDN_NETSPECFAC_SPEC_INVALID,
+} ftdm_sngisdn_netspecfac_spec_t;
+#define SNGISDN_NETSPECFAC_SPEC_STRINGS "accunet", "megacom", "megacom-800", "sddn", "invalid"
+SNGISDN_STR2ENUM_P(ftdm_str2ftdm_sngisdn_netspecfac_spec, ftdm_sngisdn_netspecfac_spec2str, ftdm_sngisdn_netspecfac_spec_t);

 #endif /* __FTMOD_SANGOMA_ISDN_USER_H__*/

@@ -233,11 +233,11 @@ int ftmod_ss7_parse_xml(ftdm_conf_parameter_t *ftdm_parameters, ftdm_span_t *spa

 		if (!strcasecmp(var, "dialplan")) {
 		/**********************************************************************/
-			/* do i give a shit about this??? */
+			/* don't care for now */
 		/**********************************************************************/
 		} else if (!strcasecmp(var, "context")) {
 		/**********************************************************************/
-			/* do i give a shit about this??? */
+			/* don't care for now */
 		/**********************************************************************/
 		} else if (!strcasecmp(var, "ccSpanId")) {
 		/**********************************************************************/
@@ -471,6 +471,7 @@ static FIO_CONFIGURE_FUNCTION(wanpipe_configure)
 				wp_globals.ring_off_ms = num;
 			}
 		}
+		
 	}

 	return FTDM_SUCCESS;
@@ -1010,7 +1011,7 @@ static FIO_READ_FUNCTION(wanpipe_read)

 	memset(&hdrframe, 0, sizeof(hdrframe));
 	rx_len = sangoma_readmsg_tdm(ftdmchan->sockfd, &hdrframe, (int)sizeof(hdrframe), data, (int)*datalen, 0);
-	*datalen = rx_len;
+	*datalen = 0;

 	if (rx_len == 0) {
 		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_WARNING, "Read 0 bytes\n");
@@ -1027,6 +1028,7 @@ static FIO_READ_FUNCTION(wanpipe_read)
 #endif
 		return FTDM_FAIL;
 	}
+	*datalen = rx_len;

 	if (ftdm_channel_test_feature(ftdmchan, FTDM_CHANNEL_FEATURE_IO_STATS)) {
 		wanpipe_read_stats(ftdmchan, &hdrframe);
@@ -1468,13 +1470,19 @@ static __inline__ ftdm_status_t wanpipe_channel_process_event(ftdm_channel_t *fc

 			if (tdm_api->wp_tdm_cmd.event.wp_tdm_api_event_dtmf_type == WAN_EC_TONE_PRESENT) {
 				ftdm_set_flag(fchan, FTDM_CHANNEL_MUTE);
+				fchan->dtmfdetect.start_time = ftdm_current_time_in_ms();
 			}

 			if (tdm_api->wp_tdm_cmd.event.wp_tdm_api_event_dtmf_type == WAN_EC_TONE_STOP) {
 				ftdm_clear_flag(fchan, FTDM_CHANNEL_MUTE);
 				if (ftdm_test_flag(fchan, FTDM_CHANNEL_INUSE)) {
-					ftdm_log_chan(fchan, FTDM_LOG_DEBUG, "Queuing wanpipe DTMF: %c\n", tmp_dtmf[0]);
-					ftdm_channel_queue_dtmf(fchan, tmp_dtmf);
+					ftdm_time_t diff = ftdm_current_time_in_ms() - fchan->dtmfdetect.start_time;
+					if (diff > fchan->dtmfdetect.duration_ms) {
+						ftdm_log_chan(fchan, FTDM_LOG_DEBUG, "Queuing wanpipe DTMF: %c (duration:%d min:%d)\n", tmp_dtmf[0], diff, fchan->dtmfdetect.duration_ms);
+						ftdm_channel_queue_dtmf(fchan, tmp_dtmf);
+					} else {
+						ftdm_log_chan(fchan, FTDM_LOG_DEBUG, "Ignoring wanpipe DTMF: %c (duration:%d min:%d)\n", tmp_dtmf[0], diff, fchan->dtmfdetect.duration_ms);
+					}
 				}
 			} 
 		}
@@ -34,6 +34,7 @@
 *
 * Moises Silva <moy@sangoma.com>
 * W McRoberts <fs@whmcr.com>
+ * Puskás Zsolt <errotan@gmail.com>
 *
 */

@@ -877,10 +878,13 @@ static FIO_COMMAND_FUNCTION(zt_command)
 static FIO_GET_ALARMS_FUNCTION(zt_get_alarms)
 {
 	struct zt_spaninfo info;
+	zt_params_t params;

 	memset(&info, 0, sizeof(info));
 	info.span_no = ftdmchan->physical_span_id;

+	memset(&params, 0, sizeof(params));
+
 	if (ioctl(CONTROL_FD, codes.SPANSTAT, &info)) {
 		snprintf(ftdmchan->last_error, sizeof(ftdmchan->last_error), "ioctl failed (%s)", strerror(errno));
 		snprintf(ftdmchan->span->last_error, sizeof(ftdmchan->span->last_error), "ioctl failed (%s)", strerror(errno));
@@ -889,6 +893,27 @@ static FIO_GET_ALARMS_FUNCTION(zt_get_alarms)

 	ftdmchan->alarm_flags = info.alarms;

+	/* get channel alarms if span has no alarms */
+	if (info.alarms == FTDM_ALARM_NONE) {
+		if (ioctl(ftdmchan->sockfd, codes.GET_PARAMS, &params)) {
+			snprintf(ftdmchan->last_error, sizeof(ftdmchan->last_error), "ioctl failed (%s)", strerror(errno));
+			snprintf(ftdmchan->span->last_error, sizeof(ftdmchan->span->last_error), "ioctl failed (%s)", strerror(errno));
+			return FTDM_FAIL;
+		}
+
+		if (params.chan_alarms > 0) {
+			if (params.chan_alarms == DAHDI_ALARM_YELLOW) {
+				ftdmchan->alarm_flags = FTDM_ALARM_YELLOW;
+			}
+			else if (params.chan_alarms == DAHDI_ALARM_BLUE) {
+				ftdmchan->alarm_flags = FTDM_ALARM_BLUE;
+			}
+			else {
+				ftdmchan->alarm_flags = FTDM_ALARM_RED;
+			}
+		}
+	}
+
 	return FTDM_SUCCESS;
 }

@@ -1350,6 +1375,7 @@ static FIO_IO_LOAD_FUNCTION(zt_init)
 	zt_interface.write = zt_write;
 	zt_interface.poll_event = zt_poll_event;
 	zt_interface.next_event = zt_next_event;
+	zt_interface.channel_next_event = zt_channel_next_event;
 	zt_interface.channel_destroy = zt_channel_destroy;
 	zt_interface.get_alarms = zt_get_alarms;
 	*fio = &zt_interface;
@@ -339,6 +339,10 @@ ZT_ABIT = 8
 #define		DAHDI_HDLCRAWMODE	_IOW (DAHDI_CODE, 36, int)				/* Set a clear channel into HDLC w/out FCS checking/calculation mode */
 #define		DAHDI_HDLCFCSMODE	_IOW (DAHDI_CODE, 37, int)				/* Set a clear channel into HDLC w/ FCS mode */

+/* Dahdi channel alarms */
+#define		DAHDI_ALARM_YELLOW (1 << 2) /* Yellow Alarm */
+#define		DAHDI_ALARM_BLUE (1 << 4) /* Blue Alarm */
+
 /* Specify a channel on /dev/dahdi/chan -- must be done before any other ioctl's and is only valid on /dev/dahdi/chan */
 #define		DAHDI_SPECIFY		_IOW  (DAHDI_CODE, 38, int)

@@ -480,7 +480,7 @@ typedef enum {
 FTDM_STR2ENUM_P(ftdm_str2ftdm_trunk_type, ftdm_trunk_type2str, ftdm_trunk_type_t)

 /*! \brief Basic channel configuration provided to ftdm_configure_span_channels */
-typedef struct ftdm_channel_config {    
+typedef struct ftdm_channel_config {
 	char name[FTDM_MAX_NAME_STR_SZ];
 	char number[FTDM_MAX_NUMBER_STR_SZ];
 	char group_name[FTDM_MAX_NAME_STR_SZ];
@@ -488,6 +488,7 @@ typedef struct ftdm_channel_config {
 	float rxgain;
 	float txgain;
 	uint8_t debugdtmf;
+	uint32_t dtmfdetect_ms;
 	uint8_t iostats;
 } ftdm_channel_config_t;

@@ -384,6 +384,11 @@ typedef struct {
 	ftdm_mutex_t *mutex;
 } ftdm_dtmf_debug_t;

+typedef struct {
+	uint32_t duration_ms;
+	ftdm_time_t start_time;
+} ftdm_dtmf_detect_t;
+
 /* 2^8 table size, one for each byte (sample) value */
 #define FTDM_GAINS_TABLE_SIZE 256
 struct ftdm_channel {
@@ -463,6 +468,7 @@ struct ftdm_channel {
 	ftdm_timer_id_t hangup_timer;
 	ftdm_channel_iostats_t iostats;
 	ftdm_dtmf_debug_t dtmfdbg;
+	ftdm_dtmf_detect_t dtmfdetect;
 	ftdm_io_dump_t rxdump;
 	ftdm_io_dump_t txdump;
 	ftdm_interrupt_t *state_completed_interrupt; /*!< Notify when a state change is completed */
@@ -0,0 +1,59 @@
+
+
+dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
+dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
+dnl also defines GSTUFF_PKG_ERRORS on error
+AC_DEFUN([PKG_CHECK_MODULES], [
+  succeeded=no
+
+  if test -z "$PKG_CONFIG"; then
+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+  fi
+
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        AC_MSG_CHECKING(for $2)
+
+        if $PKG_CONFIG --exists "$2" ; then
+            AC_MSG_RESULT(yes)
+            succeeded=yes
+
+            AC_MSG_CHECKING($1_CFLAGS)
+            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
+            AC_MSG_RESULT($$1_CFLAGS)
+
+            AC_MSG_CHECKING($1_LIBS)
+            $1_LIBS=`$PKG_CONFIG --libs "$2"`
+            AC_MSG_RESULT($$1_LIBS)
+        else
+            $1_CFLAGS=""
+            $1_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but 
+            ## do set a variable so people can do so.
+            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+            ifelse([$4], ,echo $$1_PKG_ERRORS,)
+        fi
+
+        AC_SUBST($1_CFLAGS)
+        AC_SUBST($1_LIBS)
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
+
+  if test $succeeded = yes; then
+     ifelse([$3], , :, [$3])
+  else
+     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
+  fi
+])
+
+
+
@@ -838,12 +838,12 @@ static void do_presence(ldl_handle_t *handle, char *from, char *to, char *type,
 	char buf[512];
 	iks *tag;

-	if (!strchr(from, '/')) {
+	if (from && !strchr(from, '/')) {
 		snprintf(buf, sizeof(buf), "%s/talk", from);
 		from = buf;
 	}

-	if (ldl_test_flag(handle, LDL_FLAG_COMPONENT) && ldl_jid_domcmp(from, to)) {
+	if (ldl_test_flag(handle, LDL_FLAG_COMPONENT) && from && to && ldl_jid_domcmp(from, to)) {
 		globals.logger(DL_LOG_ERR, "Refusal to send presence from and to the same domain in component mode [%s][%s]\n", from, to);
 		return;
 	}
@@ -1372,7 +1372,6 @@ static void on_log(ldl_handle_t *handle, const char *data, size_t size, int is_i
 		} else {
 			globals.logger(DL_LOG_NOTICE, "+xml:%s%s:%s", iks_is_secure(handle->parser) ? "Sec" : "", is_incoming ? "RECV" : "SEND", data);
 		}
-						   
 	}
 }

@@ -1444,7 +1443,11 @@ static ldl_queue_t ldl_flush_queue(ldl_handle_t *handle, int done)
 	while(apr_queue_trypop(handle->queue, &pop) == APR_SUCCESS) {
 		if (pop) {
 			msg = (iks *) pop;
-			if (!done) iks_send(handle->parser, msg);
+			if (!done) {
+				if (iks_send(handle->parser, msg) != IKS_OK) {
+					globals.logger(DL_LOG_DEBUG, "Failed sending data!\n");
+				};
+			};
 			iks_delete(msg);
 			pop = NULL;
 			sent_data = LDL_QUEUE_SENT;
@@ -1474,7 +1477,9 @@ static ldl_queue_t ldl_flush_queue(ldl_handle_t *handle, int done)
 					if (globals.debug) {
 						globals.logger(DL_LOG_DEBUG, "Sending packet %s (%d left)\n", packet_node->id, packet_node->retries);
 					}
-					iks_send(handle->parser, packet_node->xml);
+					if (iks_send(handle->parser, packet_node->xml) != IKS_OK) {
+						globals.logger(DL_LOG_DEBUG, "Failed trying re-sending data!\n");
+					};
 					packet_node->next = now + 5000000;
 					sent_data = LDL_QUEUE_SENT;
 				}
@@ -1500,8 +1505,8 @@ static ldl_queue_t ldl_flush_queue(ldl_handle_t *handle, int done)

 static void xmpp_connect(ldl_handle_t *handle, char *jabber_id, char *pass)
 {
-	int timeout_ka = LDL_KEEPALIVE_TIMEOUT;
-	int count_ka = timeout_ka;	
+	int count_ka = LDL_KEEPALIVE_TIMEOUT;	
+	time_t tstart, tnow;

 	while (ldl_test_flag((&globals), LDL_FLAG_READY) && ldl_test_flag(handle, LDL_FLAG_RUNNING)) {
 		int e;
@@ -1532,6 +1537,8 @@ static void xmpp_connect(ldl_handle_t *handle, char *jabber_id, char *pass)

 		j_setup_filter(handle);

+		globals.logger(DL_LOG_DEBUG, "xmpp connecting\n");
+
 		e = iks_connect_via(handle->parser,
 							handle->server ? handle->server : handle->acc->server,
 							handle->port ? handle->port : IKS_JABBER_PORT,
@@ -1555,17 +1562,13 @@ static void xmpp_connect(ldl_handle_t *handle, char *jabber_id, char *pass)
 		}

 		handle->counter = opt_timeout;
+		if ((tstart = time(NULL)) == -1) {
+			globals.logger(DL_LOG_DEBUG, "error determining connection time");
+		}

 		while (ldl_test_flag((&globals), LDL_FLAG_READY) && ldl_test_flag(handle, LDL_FLAG_RUNNING)) {
 			e = iks_recv(handle->parser, 1);

-			if (count_ka-- <= 0) {
-				if( iks_send_raw(handle->parser, " ") == IKS_OK) {
-					count_ka = timeout_ka;
-					globals.logger(DL_LOG_DEBUG, "Sent keep alive signal\n");
-				}
-			}
-
 			if (handle->loop_callback) {
 				if (handle->loop_callback(handle) != LDL_STATUS_SUCCESS) {
 					ldl_clear_flag_locked(handle, LDL_FLAG_RUNNING);	
@@ -1582,14 +1585,24 @@ static void xmpp_connect(ldl_handle_t *handle, char *jabber_id, char *pass)
 			}

 			if (IKS_OK != e || ldl_test_flag(handle, LDL_FLAG_BREAK)) {
-				globals.logger(DL_LOG_DEBUG, "io error 2 %d retry in %d second(s)\n", e, ++handle->fail_count);
+				globals.logger(DL_LOG_DEBUG, "io error 2 %d retry in %d second(s)", e, ++handle->fail_count);
+				if ((tnow = time(NULL)) == -1) {
+					globals.logger(DL_LOG_DEBUG, "error deterniming io error time");
+				}
+				if (difftime(tnow, tstart) > 30) {
+					/* this is a new error situation: reset counter */ 
+					globals.logger(DL_LOG_DEBUG, "resetting fail count");
+					handle->fail_count = 1;
+				}
 				microsleep(1000 * handle->fail_count);
 				goto fail;
 			}

 			if (ldl_test_flag(handle, LDL_FLAG_RUNNING)) {
-				ldl_flush_queue(handle, 0);
-			}
+				if (ldl_flush_queue(handle, 0) == LDL_QUEUE_SENT) {
+					count_ka = LDL_KEEPALIVE_TIMEOUT;
+				}
+			} 

 			handle->counter--;
 			if (!ldl_test_flag(handle, LDL_FLAG_CONNECTED)) {
@@ -1606,7 +1619,17 @@ static void xmpp_connect(ldl_handle_t *handle, char *jabber_id, char *pass)
 				}
 			}

-			microsleep(100);
+			if (count_ka-- <= 0) {
+				if( iks_send_raw(handle->parser, " ") == IKS_OK) {
+					globals.logger(DL_LOG_DEBUG, "Sent keep alive signal");
+					count_ka = LDL_KEEPALIVE_TIMEOUT;
+				} else {
+					globals.logger(DL_LOG_DEBUG, "Failed sending keep alive signal");
+					microsleep(500);
+					break;
+				}
+			}
+
 		}

 	fail:
@@ -64,8 +64,8 @@ extern "C" {
 #define LDL_MAX_PAYLOADS 50
 #define LDL_RETRY 3
 #define IKS_NS_COMPONENT "jabber:component:accept"
-/* period between keep alive signals in 0.1sec units*/
-#define LDL_KEEPALIVE_TIMEOUT 6000
+/* period between keep alive signals in 1sec units*/
+#define LDL_KEEPALIVE_TIMEOUT 300

 /*! \brief A structure to store a jingle candidate */
 struct ldl_candidate {
@@ -609,10 +609,15 @@ mc_again:
 	}
 	del = where - el->el_cursor.h;

+#if 0
+	/* workaround miscounting of control characters in prompt by
+	   avoiding absolute horizontal positioning */
 	if ((del < -4 || del > 4) && GoodStr(T_ch))
 		/* go there directly */
 		(void) tputs(tgoto(Str(T_ch), where, where), where, term__putc);
-	else {
+	else
+#endif
+	  {
 		if (del > 0) {	/* moving forward */
 			if ((del > 4) && GoodStr(T_RI))
 				(void) tputs(tgoto(Str(T_RI), del, del),
@@ -171,9 +171,9 @@ int sendnewportmappingrequest(natpmp_t * p, int protocol,
 	p->pending_request[1] = (char)protocol;
 	p->pending_request[2] = 0;
 	p->pending_request[3] = 0;
-	*((uint16_t *)(p->pending_request + 4)) = htons(privateport);
-	*((uint16_t *)(p->pending_request + 6)) = htons(publicport);
-	*((uint32_t *)(p->pending_request + 8)) = htonl(lifetime);
+	*((uint16_t *)(intptr_t)(p->pending_request + 4)) = htons(privateport);
+	*((uint16_t *)(intptr_t)(p->pending_request + 6)) = htons(publicport);
+	*((uint32_t *)(intptr_t)(p->pending_request + 8)) = htonl(lifetime);
 	p->pending_request_len = 12;
 	return sendnatpmprequest(p);
 }
@@ -1 +1 @@
-Fri Dec 16 10:29:41 CST 2011
+Mon Jan 16 17:26:19 CST 2012
@@ -428,12 +428,16 @@ int nua_subscribe_server_report(nua_server_request_t *sr, tagi_t const *tags)
 * @sa @RFC3265, #nua_i_subscribe, #nua_i_refer, NUTAG_ALLOW_EVENTS()
 */

+#if 0
 static int nua_notify_client_init(nua_client_request_t *cr,
 				  msg_t *, sip_t *,
 				  tagi_t const *tags);
+
+
 static int nua_notify_client_init_etag(nua_client_request_t *cr,
 				       msg_t *msg, sip_t *sip,
 				       tagi_t const *tags);
+
 static int nua_notify_client_request(nua_client_request_t *cr,
 				     msg_t *, sip_t *,
 				     tagi_t const *tags);
@@ -442,7 +446,8 @@ static int nua_notify_client_report(nua_client_request_t *cr,
 				    sip_t const *sip,
 				    nta_outgoing_t *orq,
 				    tagi_t const *tags);
-
+#endif
+#if 0
 static nua_client_methods_t const nua_notify_client_methods = {
  SIP_METHOD_NOTIFY,		/* crm_method, crm_method_name */
  0,				/* crm_extra */
@@ -460,6 +465,25 @@ static nua_client_methods_t const nua_notify_client_methods = {
  nua_notify_client_report,	/* crm_report */
  NULL,				/* crm_complete */
 };
+#endif
+
+nua_client_methods_t const nua_notify_client_methods = {
+  SIP_METHOD_NOTIFY,		/* crm_method, crm_method_name */
+  0,				/* crm_extra */
+  {				/* crm_flags */
+    /* create_dialog */ 1,
+    /* in_dialog */ 1,
+    /* target refresh */ 1
+  },
+  NULL,				/* crm_template */
+  NULL,		/* crm_init */
+  NULL,	/* crm_send */
+  NULL,				/* crm_check_restart */
+  NULL,				/* crm_recv */
+  NULL,				/* crm_preliminary */
+  NULL,				/* crm_report */
+  NULL,				/* crm_complete */
+};

 /**@internal Send NOTIFY. */
 int nua_stack_notify(nua_t *nua,
@@ -469,7 +493,7 @@ int nua_stack_notify(nua_t *nua,
 {
  return nua_client_create(nh, e, &nua_notify_client_methods, tags);
 }
-
+#if 0
 static int nua_notify_client_init(nua_client_request_t *cr,
 				  msg_t *msg, sip_t *sip,
 				  tagi_t const *tags)
@@ -715,7 +739,7 @@ int nua_notify_client_request(nua_client_request_t *cr,

  return nua_base_client_request(cr, msg, sip, tags);
 }
-
+#endif
 /** @NUA_EVENT nua_r_notify
 *
 * Response to an outgoing @b NOTIFY request.
@@ -747,7 +771,7 @@ int nua_notify_client_request(nua_client_request_t *cr,
 *
 * @END_NUA_EVENT
 */
-
+#if 0
 static int nua_notify_client_report(nua_client_request_t *cr,
 				    int status, char const *phrase,
 				    sip_t const *sip,
@@ -782,7 +806,7 @@ static int nua_notify_client_report(nua_client_request_t *cr,

  return 0;
 }
-
+#endif

 static void nua_notify_usage_refresh(nua_handle_t *nh,
 				     nua_dialog_state_t *ds,
@@ -198,6 +198,12 @@ enum tport_tls_verify_policy {
  TPTLS_VERIFY_SUBJECTS_ALL = 0xF,
 };

+TPORT_DLL extern tag_typedef_t tptag_tls_passphrase;
+#define TPTAG_TLS_PASSPHRASE(x)  tptag_tls_passphrase, tag_str_v(x)
+
+TPORT_DLL extern tag_typedef_t tptag_tls_passphrase_ref;
+#define TPTAG_TLS_PASSPHRASE_REF(x)  tptag_tls_passphrase_ref, tag_str_vr(&(x))
+
 TPORT_DLL extern tag_typedef_t tptag_tls_verify_policy;
 #define TPTAG_TLS_VERIFY_POLICY(x) tptag_tls_verify_policy, tag_uint_v((x))

@@ -359,7 +359,7 @@ void tport_capt_msg(tport_t const *self, msg_t *msg, size_t n,
   assert(self); assert(msg);

   su = msg_addr(msg);
-   su_self = self->tp_addr;
+   su_self = self->tp_pri->pri_primary->tp_addr;

   mr = self->tp_master;

@@ -402,8 +402,8 @@ void tport_capt_msg(tport_t const *self, msg_t *msg, size_t n,
   }
 #endif     

-   hep_header.hp_dport = dst ? su->su_port : htons(atoi(self->tp_port));   
-   hep_header.hp_sport = dst ? htons(atoi(self->tp_port)) : su->su_port;
+   hep_header.hp_dport = dst ? su->su_port : su_self->su_port;
+   hep_header.hp_sport = dst ? su_self->su_port : su->su_port;

      
   /* Copy hepheader */
@@ -288,6 +288,16 @@ tag_typedef_t tptag_tls_version = UINTTAG_TYPEDEF(tls_version);
 */
 tag_typedef_t tptag_tls_verify_peer = UINTTAG_TYPEDEF(tls_verify_peer);

+/**@def TPTAG_TLS_PASSPHRASE(x)
+ *
+ * Sets the passphrase password to be used by openSSL to encrypt/decrypt
+ * private key files.
+ *
+ * @NEW_1_12_11.
+ */
+tag_typedef_t tptag_tls_passphrase = STRTAG_TYPEDEF(tls_passphrase);
+
+
 /**@def TPTAG_TLS_VERIFY_POLICY(x)
 *
 * The verification of certificates can be controlled:
@@ -160,6 +160,27 @@ void tls_log_errors(unsigned level, char const *s, unsigned long e)
  }
 }

+/*
+ * This callback hands back the password to be used during decryption.
+ *
+ * buf      : the function will write the password into this buffer
+ * size     : the size of "buf"
+ * rwflag   : indicates whether the callback is being used for reading/
+ *            decryption (0) or writing/encryption (1)
+ * userdata : pointer tls_issues_t where the passphrase is stored
+ */
+static int passwd_cb(char *buf, int size, int rwflag, void *userdata)
+{
+	if (rwflag == 0) { // reading/decryption
+		tls_issues_t *tlsi = (tls_issues_t *)userdata;
+
+		strncpy(buf, tlsi->passphrase, size);
+		buf[size - 1] = '\0';
+
+		return strlen(tlsi->passphrase);
+	}
+	return 0;
+}

 static
 tls_t *tls_create(int type)
@@ -290,6 +311,12 @@ int tls_init_context(tls_t *tls, tls_issues_t const *ti)
    return -1;
  }

+  /* Set callback if we have a passphrase */
+  if (ti->passphrase != NULL) {
+    SSL_CTX_set_default_passwd_cb(tls->ctx, passwd_cb);
+    SSL_CTX_set_default_passwd_cb_userdata(tls->ctx, (void *)ti);
+  }
+
  if (!SSL_CTX_use_certificate_file(tls->ctx,
 				    ti->cert,
 				    SSL_FILETYPE_PEM)) {
@@ -56,6 +56,7 @@ typedef struct tls_issues_s {
  int   configured;	/* If non-zero, complain about certificate errors */
  char *cert;		/* CERT file name. File format is PEM         */
  char *key;		/* Private key file. PEM format               */
+  char *passphrase;     /* Passphrase for password protected private key */
  char *randFile;       /* Seed file for the PRNG (default: tls_seed.dat) */
  char *CAfile;		/* PEM file of CA's                           */
  char *CApath;		/* PEM file path of CA's		      */
@@ -182,6 +182,7 @@ static int tport_tls_init_master(tport_primary_t *pri,
  char const *path = NULL;
  unsigned tls_version = 1;
  unsigned tls_verify = 0;
+  char const *passphrase = NULL;
  unsigned tls_policy = TPTLS_VERIFY_NONE;
  unsigned tls_depth = 0;
  unsigned tls_date = 1;
@@ -198,6 +199,7 @@ static int tport_tls_init_master(tport_primary_t *pri,
 	  TPTAG_CERTIFICATE_REF(path),
 	  TPTAG_TLS_VERSION_REF(tls_version),
 	  TPTAG_TLS_VERIFY_PEER_REF(tls_verify),
+	  TPTAG_TLS_PASSPHRASE_REF(passphrase),
 	  TPTAG_TLS_VERIFY_POLICY_REF(tls_policy),
 	  TPTAG_TLS_VERIFY_DEPTH_REF(tls_depth),
 	  TPTAG_TLS_VERIFY_DATE_REF(tls_date),
@@ -218,6 +220,7 @@ static int tport_tls_init_master(tport_primary_t *pri,
    ti.configured = path != tbf;
    ti.randFile = su_sprintf(autohome, "%s/%s", path, "tls_seed.dat");
    ti.key = su_sprintf(autohome, "%s/%s", path, "agent.pem");
+    ti.passphrase = su_strdup(autohome, passphrase);
    ti.cert = ti.key;
    ti.CAfile = su_sprintf(autohome, "%s/%s", path, "cafile.pem");
    ti.version = tls_version;