kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-06-28 03:10:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 61426 via svnmerge from

Browse Source 
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
This commit is contained in:
Russell Bryant
2007-04-11 15:09:39 +00:00
parent 63ef5e53b0
commit a0d75effd5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_sip.c
+5 -5
View File
@@ -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 */