Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv12705/channels
Modified Files:
chan_sip.c
Log Message:
remove unnecessary conditional logic (bug #4313, take two)
Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.736
retrieving revision 1.737
diff -u -d -r1.736 -r1.737
--- chan_sip.c 19 May 2005 04:49:12 -0000 1.736
+++ chan_sip.c 19 May 2005 12:51:58 -0000 1.737
@@ -1546,12 +1546,9 @@
else
r->noncodeccapability &= ~AST_RTP_DTMF;
ast_copy_string(r->context, p->context,sizeof(r->context));
- if (!p->rtptimeout)
- r->rtptimeout = p->rtptimeout;
- if (!p->rtpholdtimeout)
- r->rtpholdtimeout = p->rtpholdtimeout;
- if (!p->rtpkeepalive)
- r->rtpkeepalive = p->rtpkeepalive;
+ r->rtptimeout = p->rtptimeout;
+ r->rtpholdtimeout = p->rtpholdtimeout;
+ r->rtpkeepalive = p->rtpkeepalive;
if ((p->addr.sin_addr.s_addr || p->defaddr.sin_addr.s_addr) &&
(!p->maxms || ((p->lastms >= 0) && (p->lastms <=
p->maxms)))) {
if (p->addr.sin_addr.s_addr) {
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
