[svn-commits] tilghman: trunk r89247 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue Nov 13 11:41:02 2007
New Revision: 89247

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89247
Log:
Merged revisions 89246 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89246 | tilghman | 2007-11-13 11:34:11 -0600 (Tue, 13 Nov 2007) | 2 lines

If we set a value for qualify, we should actually pay attention to it, instead of overriding the value

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=89247&r1=89246&r2=89247
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Tue Nov 13 11:41:02 2007
@@ -16826,7 +16826,7 @@
 		sip_poke_noanswer(peer);	/* Immediately unreachable, network problems */
 	else {
 		peer->pokeexpire = ast_sched_replace(peer->pokeexpire, sched, 
-			DEFAULT_MAXMS * 2, sip_poke_noanswer, peer);
+			peer->maxms * 2, sip_poke_noanswer, peer);
 	}
 
 	return 0;
@@ -17769,7 +17769,7 @@
 			if (!strcasecmp(v->value, "no")) {
 				peer->maxms = 0;
 			} else if (!strcasecmp(v->value, "yes")) {
-				peer->maxms = DEFAULT_MAXMS;
+				peer->maxms = default_qualify ? default_qualify : DEFAULT_MAXMS;
 			} else if (sscanf(v->value, "%d", &peer->maxms) != 1) {
 				ast_log(LOG_WARNING, "Qualification of peer '%s' should be 'yes', 'no', or a number of milliseconds at line %d of sip.conf\n", peer->name, v->lineno);
 				peer->maxms = 0;