[svn-commits] mattf: trunk r46256 - /trunk/channels/chan_zap.c

[svn-commits at lists.digium.com]

Author: mattf
Date: Wed Oct 25 14:24:40 2006
New Revision: 46256

URL: http://svn.digium.com/view/asterisk?rev=46256&view=rev
Log:
Send CPG when we get a CONTROL_PROGRESS frame and make sure that it sends ACM (not CPG) when 
we get CONTROL_PROCEEDING.

Modified:
    trunk/channels/chan_zap.c

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?rev=46256&r1=46255&r2=46256&view=diff
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Wed Oct 25 14:24:40 2006
@@ -5359,7 +5359,7 @@
 			if (!p->proceeding && p->sig==SIG_SS7 && p->ss7 && !p->outgoing) {
 				if (p->ss7->ss7) {
 					ss7_grab(p, p->ss7);
-					isup_cpg(p->ss7->ss7, p->ss7call, CPG_EVENT_INBANDINFO);
+					isup_acm(p->ss7->ss7, p->ss7call);
 					p->proceeding = 1;
 					ss7_rel(p->ss7);
 
@@ -5384,6 +5384,17 @@
 						ast_log(LOG_WARNING, "Unable to grab PRI on span %d\n", p->span);
 				}
 				p->progress = 1;
+			}
+#endif
+#ifdef HAVE_SS7
+			if (!p->progress && p->sig==SIG_SS7 && p->ss7 && !p->outgoing) {
+				if (p->ss7->ss7) {
+					ss7_grab(p, p->ss7);
+					isup_cpg(p->ss7->ss7, p->ss7call, CPG_EVENT_INBANDINFO);
+					p->progress = 1;
+					ss7_rel(p->ss7);
+
+				}
 			}
 #endif
 			/* don't continue in ast_indicate */
@@ -8358,6 +8369,7 @@
 	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);
 
 	ast_mutex_unlock(&linkset->lock);
@@ -8602,7 +8614,6 @@
 
 				zt_loopback(p, 0);
 				
-				isup_acm(ss7, p->ss7call);
 				ss7_start_call(p, linkset);
 				break;
 			case ISUP_EVENT_REL: