[asterisk-commits] mattf: branch 1.6.0 r128127 - in /branches/1.6.0: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: mattf
Date: Fri Jul  4 22:40:10 2008
New Revision: 128127

URL: http://svn.digium.com/view/asterisk?view=rev&rev=128127
Log:
Merged revisions 128125 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r128125 | mattf | 2008-07-04 22:39:07 -0500 (Fri, 04 Jul 2008) | 1 line

It would help if we actually parsed the ss7_explicitacm option in the config file...
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_dahdi.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_dahdi.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_dahdi.c?view=diff&rev=128127&r1=128126&r2=128127
==============================================================================
--- branches/1.6.0/channels/chan_dahdi.c (original)
+++ branches/1.6.0/channels/chan_dahdi.c Fri Jul  4 22:40:10 2008
@@ -14166,6 +14166,17 @@
 				res = linkset_addsigchan(sigchan);
 				if (res < 0)
 					return -1;
+
+			} else if (!strcasecmp(v->name, "ss7_explicitacm")) {
+				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 (ast_true(v->value))
+					link->flags |= LINKSET_FLAG_EXPLICITACM;
+
 #endif /* HAVE_SS7 */
 			} else if (!strcasecmp(v->name, "cadence")) {
 				/* setup to scan our argument */