From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 11 Apr 2007 15:09:39 +0000 (+0000)
Subject: Merged revisions 61426 via svnmerge from
X-Git-Tag: 1.4.7.1~440
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a0d75effd5b856acf64949ee783a3238aae01ccc;p=thirdparty%2Fasterisk.git

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)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@61427 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 9921e30bd1..151e135ede 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -15940,7 +15940,7 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, str
 
 	if (peer) {
 		/* Already in the list, remove it and it will be added back (or FREE'd)  */
-		found++;
+		found = 1;
 		if (!(peer->objflags & ASTOBJ_FLAG_MARKED))
 			firstpass = 0;
  	} else {
@@ -16009,10 +16009,9 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, str
 					ast_log(LOG_WARNING, "You can't have a dynamic outbound proxy, you big silly head at line %d.\n", v->lineno);
 				} else {
 					/* 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 be
+						 * non-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 */
@@ -16020,6 +16019,7 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, str
 							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 */