[svn-commits] russell: trunk r61428 - in /trunk: ./ channels/chan_sip.c

[svn-commits at lists.digium.com]

Author: russell
Date: Wed Apr 11 10:13:12 2007
New Revision: 61428

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

................
r61427 | russell | 2007-04-11 10:09:39 -0500 (Wed, 11 Apr 2007) | 14 lines

Merged revisions 61426 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r61426 | russell | 2007-04-11 10:05:36 -0500 (Wed, 11 Apr 2007) | 6 lines

Fix a bug with switching between host=dynamic and using specific hosts for
peers.  The code would only reset the peer's address when it is dynamic if
it was a new peer structure.  Now, it will also reset the address if it was
already in the peer list, but before the reload, it was not dynamic.
(issue #9515, reported by caio1982, fixed by me)

........

................

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=61428&r1=61427&r2=61428
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed Apr 11 10:13:12 2007
@@ -16727,10 +16727,9 @@
 		} else if (!strcasecmp(v->name, "host")) {
 			if (!strcasecmp(v->value, "dynamic")) {
 				/* They'll register with us */
-				ast_set_flag(&peer->flags[1], SIP_PAGE2_DYNAMIC);
-				if (!found) {
-					/* Initialize stuff iff we're not found, otherwise
-					   we keep going with what we had */
+				if (!found || !ast_test_flag(&peer->flags[1], SIP_PAGE2_DYNAMIC)) {
+					/* Initialize stuff if this is a new peer, or if it used to
+					 * not be dynamic before the reload. */
 					memset(&peer->addr.sin_addr, 0, 4);
 					if (peer->addr.sin_port) {
 						/* If we've already got a port, make it the default rather than absolute */
@@ -16738,6 +16737,7 @@
 						peer->addr.sin_port = 0;
 					}
 				}
+				ast_set_flag(&peer->flags[1], SIP_PAGE2_DYNAMIC);
 			} else {
 				/* Non-dynamic.  Make sure we become that way if we're not */
 				if (peer->expire > -1)