From: Matthew Fredrickson <creslin@digium.com>
Date: Sat, 5 Jul 2008 03:26:42 +0000 (+0000)
Subject: Add option to wait to be able to explicitly send ACM via the Proceeding() application... 
X-Git-Tag: 1.6.2.0-beta1~1782
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=199067da4ff325a5262a09f2931ebdd528243c03;p=thirdparty%2Fasterisk.git

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@128122 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index b00bd239e7..081b4bbb6b 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -339,6 +339,8 @@ static int ringt_base = DEFAULT_RINGT;
 
 #define SS7_NAI_DYNAMIC		-1
 
+#define LINKSET_FLAG_EXPLICITACM (1 << 0)
+
 struct dahdi_ss7 {
 	pthread_t master;						/*!< Thread of master */
 	ast_mutex_t lock;
@@ -359,6 +361,7 @@ struct dahdi_ss7 {
 	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];
@@ -9303,8 +9306,10 @@ static void ss7_start_call(struct dahdi_pvt *p, struct dahdi_ss7 *linkset)
 	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);
diff --git a/configs/chan_dahdi.conf.sample b/configs/chan_dahdi.conf.sample
index f08bca9ab8..d90139f5ab 100644
--- a/configs/chan_dahdi.conf.sample
+++ b/configs/chan_dahdi.conf.sample
@@ -892,6 +892,11 @@ pickupgroup=1
 ;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
 
@@ -919,6 +924,12 @@ pickupgroup=1
 ; 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
 ;