[svn-commits] mattf: branch mattf/bug13495 r190978 - in /team/mattf/bug13495: channels/ con...

[SVN commits to the Digium repositories]

Author: mattf
Date: Tue Apr 28 17:28:31 2009
New Revision: 190978

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=190978
Log:
Temporarily disable current SUS/RES implmentation for SS7.  Also, add support for allowing signalling to indicate non ISDN portions of call

Modified:
    team/mattf/bug13495/channels/chan_dahdi.c
    team/mattf/bug13495/configs/chan_dahdi.conf.sample

Modified: team/mattf/bug13495/channels/chan_dahdi.c
URL: http://svn.digium.com/svn-view/asterisk/team/mattf/bug13495/channels/chan_dahdi.c?view=diff&rev=190978&r1=190977&r2=190978
==============================================================================
--- team/mattf/bug13495/channels/chan_dahdi.c (original)
+++ team/mattf/bug13495/channels/chan_dahdi.c Tue Apr 28 17:28:31 2009
@@ -6417,14 +6417,14 @@
 #endif
 				ast_moh_start(chan, data, p->mohinterpret);
 #ifdef HAVE_SS7
-			if (p->ss7) {
+			/* if (p->ss7) {
 				if (!ss7_grab(p, p->ss7)) {
 					if (p->ss7call)
 						isup_sus(p->ss7->ss7, p->ss7call, 0);
 					ss7_rel(p->ss7);
 				} else
 					ast_log(LOG_WARNING, "Unable to grab SS& on linkset %d\n", p->span);
-			}
+			} it was just a mistake */
 #endif
 			break;
 		case AST_CONTROL_UNHOLD:
@@ -6439,14 +6439,14 @@
 #endif
 				ast_moh_stop(chan);
 #ifdef HAVE_SS7
-			if (p->ss7) {
+			/* if (p->ss7) {
 				if (!ss7_grab(p, p->ss7)) {
 					if (p->ss7call)
 						isup_res(p->ss7->ss7, p->ss7call, 0);
 					ss7_rel(p->ss7);
 				} else
 					ast_log(LOG_WARNING, "Unable to grab SS& on linkset %d\n", p->span);
-			}
+			} it was just a mistake */
 #endif
 			break;
 		case AST_CONTROL_RADIO_KEY:
@@ -14388,7 +14388,7 @@
 		ast_log(LOG_ERROR, "Invalid sigchan!\n");
 		return -1;
 	} else {
-		if (link->numsigchans >= NUM_DCHANS) {
+		if (link->numsigchans >= (NUM_DCHANS + SS7_MAX_SLAVES)) {
 			ast_log(LOG_ERROR, "Too many sigchans on linkset %d\n", cur_linkset);
 			return -1;
 		}
@@ -16611,6 +16611,17 @@
 					ast_log(LOG_ERROR, "Please specify inr_if_no_calling after sigchan!\n");
 				else if (ast_true(v->value))
 					ss7_set_flags(link->ss7, SS7_INR_IF_NO_CALLING);
+			} else if (!strcasecmp(v->name, "non_isdn_access")) {
+				struct dahdi_ss7 *link;
+				link = ss7_resolve_linkset(cur_linkset);
+				if (!link) {
+					ast_log(LOG_ERROR, "Invalid linkset number.  Must be between 1 and %d\n", NUM_SPANS + 1);
+					return -1;
+				}
+				if(!link->ss7)
+					ast_log(LOG_ERROR, "Please specify non_isdn_access after sigchan!\n");
+				else if (ast_true(v->value))
+					ss7_clear_flags(link->ss7, SS7_ISDN_ACCESS_INDICATOR);
 			} else if (!strcasecmp(v->name, "sls_shift")) {
 				struct dahdi_ss7 *link;
 				link = ss7_resolve_linkset(cur_linkset);

Modified: team/mattf/bug13495/configs/chan_dahdi.conf.sample
URL: http://svn.digium.com/svn-view/asterisk/team/mattf/bug13495/configs/chan_dahdi.conf.sample?view=diff&rev=190978&r1=190977&r2=190978
==============================================================================
--- team/mattf/bug13495/configs/chan_dahdi.conf.sample (original)
+++ team/mattf/bug13495/configs/chan_dahdi.conf.sample Tue Apr 28 17:28:31 2009
@@ -953,6 +953,11 @@
 ;
 ;inr_if_no_calling=yes
 ;
+; Set this to set whether or not the originating access is ISDN in the forward and backward
+; call indicators.
+;
+;non_isdn_access=yes
+;
 ; The following are for enabling ISUP and MTP3 timers for SS7 in chan_dahdi.  The default
 ; values specified are the defaults for ITU style links and are measured in milliseconds.
 ;