[Asterisk-cvs] asterisk/channels chan_h323.c,1.45,1.46 chan_sip.c,1.345,1.346

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv9880/channels

Modified Files:
	chan_h323.c chan_sip.c 
Log Message:
Run setstate after setting all appropriate variables including callerid


Index: chan_h323.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_h323.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- chan_h323.c	22 Apr 2004 00:20:33 -0000	1.45
+++ chan_h323.c	28 Apr 2004 14:35:20 -0000	1.46
@@ -656,7 +656,6 @@
 		fmt = ast_best_codec(ch->nativeformats);
 		ch->type = type;
 		ch->fds[0] = ast_rtp_fd(i->rtp);
-		ast_setstate(ch, state);
 		
 		if (state == AST_STATE_RING)
 			ch->rings = 1;
@@ -700,6 +699,7 @@
 			strncpy(ch->accountcode, i->accountcode, sizeof(ch->accountcode)-1);
 		if (i->amaflags)
 			ch->amaflags = i->amaflags;
+		ast_setstate(ch, state);
 		if (state != AST_STATE_DOWN) {
 			if (ast_pbx_start(ch)) {
 				ast_log(LOG_WARNING, "Unable to start PBX on %s\n", ch->name);

Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -d -r1.345 -r1.346
--- chan_sip.c	27 Apr 2004 22:32:57 -0000	1.345
+++ chan_sip.c	28 Apr 2004 14:35:20 -0000	1.346
@@ -1557,7 +1557,6 @@
 			tmp->fds[2] = ast_rtp_fd(i->vrtp);
 			tmp->fds[3] = ast_rtcp_fd(i->vrtp);
 		}
-		ast_setstate(tmp, state);
 		if (state == AST_STATE_RING)
 			tmp->rings = 1;
 		tmp->adsicpe = AST_ADSI_UNAVAILABLE;
@@ -1605,7 +1604,7 @@
 		if (strlen(i->domain)) {
 			pbx_builtin_setvar_helper(tmp, "SIPDOMAIN", i->domain);
 		}
-						
+		ast_setstate(tmp, state);
 		if (state != AST_STATE_DOWN) {
 			if (ast_pbx_start(tmp)) {
 				ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmp->name);