diff options
author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-14 23:18:17 +0000 |
---|---|---|
committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-14 23:18:17 +0000 |
commit | b16478f1d950c7d76300c94f3844a53cae7e6a4a (patch) | |
tree | 04c7cb733bbe4924b44c4945eb919d593ed7639a /channels | |
parent | 4a0a8ce11f1f7076d4e8e3a6579cea967b5161da (diff) |
Merged revisions 149208 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r149208 | mmichelson | 2008-10-14 18:15:04 -0500 (Tue, 14 Oct 2008) | 17 lines
Merged revisions 149207 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r149207 | mmichelson | 2008-10-14 18:10:26 -0500 (Tue, 14 Oct 2008) | 9 lines
Call register_peer_exten even in the case that the peer's
IP/port does not change.
(closes issue #13309)
Reported by: dimas
Patches:
v2-13309.patch uploaded by dimas (license 88)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@149209 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_sip.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 59d207fbf..258051d41 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -3739,8 +3739,10 @@ static void register_peer_exten(struct sip_peer *peer, int onoff) context = global_regcontext; } if (onoff) { - ast_add_extension(context, 1, ext, 1, NULL, NULL, "Noop", - ast_strdup(peer->name), ast_free_ptr, "SIP"); + if (!ast_exists_extension(NULL, context, ext, 1, NULL)) { + ast_add_extension(context, 1, ext, 1, NULL, NULL, "Noop", + ast_strdup(peer->name), ast_free, "SIP"); + } } else if (pbx_find_extension(NULL, NULL, &q, context, ext, 1, NULL, "", E_MATCH)) { ast_context_remove_extension(context, ext, 1, NULL); } @@ -10437,11 +10439,11 @@ static enum parse_register_result parse_register_contact(struct sip_pvt *pvt, st manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "ChannelType: SIP\r\nPeer: SIP/%s\r\nPeerStatus: Registered\r\nAddress: %s\r\nPort: %d\r\n", peer->name, ast_inet_ntoa(peer->addr.sin_addr), ntohs(peer->addr.sin_port)); /* Is this a new IP address for us? */ - if (inaddrcmp(&peer->addr, &oldsin)) { - sip_poke_peer(peer, 0); - ast_verb(3, "Registered SIP '%s' at %s port %d expires %d\n", peer->name, ast_inet_ntoa(peer->addr.sin_addr), ntohs(peer->addr.sin_port), expire); - register_peer_exten(peer, TRUE); + if (VERBOSITY_ATLEAST(2) && inaddrcmp(&peer->addr, &oldsin)) { + ast_verbose(VERBOSE_PREFIX_3 "Registered SIP '%s' at %s port %d\n", peer->name, ast_inet_ntoa(peer->addr.sin_addr), ntohs(peer->addr.sin_port)); } + sip_poke_peer(peer, 0); + register_peer_exten(peer, 1); /* Save User agent */ useragent = get_header(req, "User-Agent"); |