[svn-commits] mattf: branch 1.6.0 r128124 - in /branches/1.6.0: ./ channels/ configs/

[SVN commits to the Digium repositories]

Author: mattf
Date: Fri Jul  4 22:29:45 2008
New Revision: 128124

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

........
r128122 | mattf | 2008-07-04 22:26:42 -0500 (Fri, 04 Jul 2008) | 1 line

Add option to wait to be able to explicitly send ACM via the Proceeding() application in the dialplan.  Also minor documentation update explaining how to setup multiple signalling links within a linkset
........

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

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=128124&r1=128123&r2=128124
==============================================================================
--- branches/1.6.0/channels/chan_dahdi.c (original)
+++ branches/1.6.0/channels/chan_dahdi.c Fri Jul  4 22:29:45 2008
@@ -336,6 +336,8 @@
 
 #define SS7_NAI_DYNAMIC		-1
 
+#define LINKSET_FLAG_EXPLICITACM (1 << 0)
+
 struct dahdi_ss7 {
 	pthread_t master;						/*!< Thread of master */
 	ast_mutex_t lock;
@@ -356,6 +358,7 @@
 	char unknownprefix[20];						/*!< for unknown dialplans */
 	struct ss7 *ss7;
 	struct dahdi_pvt *pvts[MAX_CHANNELS];				/*!< Member channel pvt structs */
+	int flags;							/*!< Linkset flags */
 };
 
 static struct dahdi_ss7 linksets[NUM_SPANS];
@@ -9144,8 +9147,10 @@
 	if (res < 0) 
 		ast_log(LOG_WARNING, "Unable to set law on channel %d\n", p->channel);
 	
-	p->proceeding = 1;
-	isup_acm(ss7, p->ss7call);
+	if (!(linkset->flags & LINKSET_FLAG_EXPLICITACM)) {
+		p->proceeding = 1;
+		isup_acm(ss7, p->ss7call);
+	}
 
 	ast_mutex_unlock(&linkset->lock);
 	c = dahdi_new(p, AST_STATE_RING, 1, SUB_REAL, law, 0);

Modified: branches/1.6.0/configs/chan_dahdi.conf.sample
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configs/chan_dahdi.conf.sample?view=diff&rev=128124&r1=128123&r2=128124
==============================================================================
--- branches/1.6.0/configs/chan_dahdi.conf.sample (original)
+++ branches/1.6.0/configs/chan_dahdi.conf.sample Fri Jul  4 22:29:45 2008
@@ -892,6 +892,11 @@
 ;ss7_unknownprefix = 
 ;
 
+; This option is used to disable automatic sending of ACM when the call is started
+; in the dialplan.  If you do use this option, you will need to use the Proceeding()
+; application in the dialplan to send ACM.
+;ss7_explictacm=yes
+
 ; All settings apply to linkset 1
 ;linkset = 1
 
@@ -918,6 +923,12 @@
 
 ; First signalling channel
 ;sigchan = 48
+
+; Additional signalling channel for this linkset (So you can have a linkset
+; with two signalling links in it).  It seems like a silly way to do it, but
+; for linksets with multiple signalling links, you add an additional sigchan
+; line for every additional signalling link on the linkset.
+;sigchan = 96
 
 ; Channels to associate with CICs on this linkset
 ;channel = 25-47