[asterisk-commits] branch crichter/0.3.0 r9363 - /team/crichter/0.3.0/channels/chan_misdn.c

[asterisk-commits at lists.digium.com]

Author: crichter
Date: Fri Feb 10 03:20:16 2006
New Revision: 9363

URL: http://svn.digium.com/view/asterisk?rev=9363&view=rev
Log:
added Proceeding state, to be more ETSI conform with outgoing setups on the Network side (no release_complete but disconnect or release in proceeding state)

Modified:
    team/crichter/0.3.0/channels/chan_misdn.c

Modified: team/crichter/0.3.0/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/team/crichter/0.3.0/channels/chan_misdn.c?rev=9363&r1=9362&r2=9363&view=diff
==============================================================================
--- team/crichter/0.3.0/channels/chan_misdn.c (original)
+++ team/crichter/0.3.0/channels/chan_misdn.c Fri Feb 10 03:20:16 2006
@@ -119,6 +119,7 @@
 	MISDN_EXTCANTMATCH, /*!<  when asterisk couldnt match our ext */
 	MISDN_DIALING, /*!<  when pbx_start */
 	MISDN_PROGRESS, /*!<  we got a progress */
+	MISDN_PROCEEDING, /*!<  we got a progress */
 	MISDN_CALLING, /*!<  when misdn_call is called */
 	MISDN_CALLING_ACKNOWLEDGE, /*!<  when we get SETUP_ACK */
 	MISDN_ALERTING, /*!<  when Alerting */
@@ -1420,7 +1421,6 @@
 	struct misdn_bchannel *newbc;
 	char *opts=NULL, *ext,*tokb;
 	char dest_cp[256];
-	struct ast_channel *bridged;
 	
 	{
 		strncpy(dest_cp,dest,sizeof(dest_cp)-1);
@@ -1861,6 +1861,8 @@
 			break;
       
 		case MISDN_ALERTING:
+		case MISDN_PROGRESS:
+		case MISDN_PROCEEDING:
 			chan_misdn_log(2, bc->port, " --> * State Alerting\n");
 
 			if (p->orginator != ORG_AST) 
@@ -3264,6 +3266,8 @@
 			start_bc_tones(ch);
 		}
 
+		ch->state = MISDN_PROCEEDING;
+		
 		ast_queue_control(ch->ast, AST_CONTROL_PROCEEDING);
 	}
 	break;
@@ -3881,6 +3885,7 @@
 			chan_misdn_log(1, ch->bc->port, "SETOPT: EchoCancel\n");
 			
 			if (neglect) {
+				chan_misdn_log(1, ch->bc->port, " --> disabled\n");
 				ch->bc->ec_enable=0;
 			} else {
 				ch->bc->ec_enable=1;