[asterisk-commits] tilghman: branch 1.6.2 r237969 - in /branches/1.6.2: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Jan  6 00:54:03 2010
New Revision: 237969

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=237969
Log:
Merged revisions 237968 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r237968 | tilghman | 2010-01-06 00:53:23 -0600 (Wed, 06 Jan 2010) | 2 lines
  
  Whoa, duplicate setting (dead code).
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/channels/chan_sip.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/chan_sip.c?view=diff&rev=237969&r1=237968&r2=237969
==============================================================================
--- branches/1.6.2/channels/chan_sip.c (original)
+++ branches/1.6.2/channels/chan_sip.c Wed Jan  6 00:54:03 2010
@@ -23940,11 +23940,6 @@
 						ast_log(LOG_WARNING, "Timer B has been set lower than recommended. (RFC 3261, 17.1.1.2)\n");
 					}
 				}
-			} else if (!strcasecmp(v->name, "rtpkeepalive")) {
-				if ((sscanf(v->value, "%30d", &peer->rtpkeepalive) != 1) || (peer->rtpkeepalive < 0)) {
-					ast_log(LOG_WARNING, "'%s' is not a valid RTP keepalive time at line %d.  Using default.\n", v->value, v->lineno);
-					peer->rtpkeepalive = global_rtpkeepalive;
-				}
 			} else if (!strcasecmp(v->name, "setvar")) {
 				peer->chanvars = add_var(v->value, peer->chanvars);
 			} else if (!strcasecmp(v->name, "qualifyfreq")) {