[asterisk-commits] branch oej/siptransfer r18753 - /team/oej/siptransfer/channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: oej
Date: Mon Apr 10 00:42:26 2006
New Revision: 18753

URL: http://svn.digium.com/view/asterisk?rev=18753&view=rev
Log:
Small fixes

Modified:
    team/oej/siptransfer/channels/chan_sip.c

Modified: team/oej/siptransfer/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/siptransfer/channels/chan_sip.c?rev=18753&r1=18752&r2=18753&view=diff
==============================================================================
--- team/oej/siptransfer/channels/chan_sip.c (original)
+++ team/oej/siptransfer/channels/chan_sip.c Mon Apr 10 00:42:26 2006
@@ -3046,8 +3046,7 @@
 				/* Send 180 ringing if out-of-band seems reasonable */
 				transmit_response(p, "180 Ringing", &p->initreq);
 				ast_set_flag(&p->flags[0], SIP_RINGING);
-				/* Enable this to allow Ringing from L3 - Nuvio */
-				ast_set_flag(&p->flags[0], SIP_PROGRESS_SENT);
+
 				if (ast_test_flag(&p->flags[0], SIP_PROG_INBAND) != SIP_PROG_INBAND_YES)
 					break;
 			} else {
@@ -4910,10 +4909,8 @@
 					 debug);
 	}
 
-	/* Check for L3 DTMF - Nuvio */
 	for (x = 1; x <= AST_RTP_MAX; x <<= 1) {
-		if (!((p->noncodeccapability & x) || (!ast_strlen_zero(p->peername) ? 
-						!strncmp(p->peername, "ser", sizeof(p->peername) -1) && x == AST_RTP_DTMF : 0)))
+		if (!((p->noncodeccapability & x))
 			continue;
 
 		add_noncodec_to_sdp(p, x, 8000,