[Asterisk-cvs] asterisk/channels chan_sip.c,1.436,1.437

[markster at lists.digium.com]

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

Modified Files:
	chan_sip.c 
Log Message:
Cleanups to the ordering of events in dial, don't freak out on the wrong codec


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.436
retrieving revision 1.437
diff -u -d -r1.436 -r1.437
--- chan_sip.c	30 Jun 2004 16:56:51 -0000	1.436
+++ chan_sip.c	7 Jul 2004 16:02:13 -0000	1.437
@@ -1799,7 +1799,7 @@
 		if (!(frame->subclass & ast->nativeformats)) {
 			ast_log(LOG_WARNING, "Asked to transmit frame type %d, while native formats is %d (read/write = %d/%d)\n",
 				frame->subclass, ast->nativeformats, ast->readformat, ast->writeformat);
-			return -1;
+			return 0;
 		}
 		if (p) {
 			ast_mutex_lock(&p->lock);
@@ -7864,7 +7864,7 @@
 				peer->promiscredir = ast_true(v->value);
 			else if (!strcasecmp(v->name, "fromuser"))
 				strncpy(peer->fromuser, v->value, sizeof(peer->fromuser)-1);
-                       else if (!strcasecmp(v->name, "dtmfmode")) {
+            else if (!strcasecmp(v->name, "dtmfmode")) {
 				if (!strcasecmp(v->value, "inband"))
 					peer->dtmfmode=SIP_DTMF_INBAND;
 				else if (!strcasecmp(v->value, "rfc2833"))