diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-10-29 16:23:32 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-10-29 16:23:32 +0000 |
| commit | 997ec02e5f2a039bc6ef0c928217d6646888bbce (patch) | |
| tree | 0fae01d28559a1113302948fbbcd2b8911898ac7 | |
| parent | 8c43d1ec0596d3adb4f69009a0e3aeae8a716707 (diff) | |
Fix minor iax2 device state issue (bug #5540)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6889 f38db490-d61c-443f-a65b-d21fe96a405b
| -rwxr-xr-x | channels/chan_iax2.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 354d10742..ffadb6583 100755 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -5608,6 +5608,8 @@ static int update_registry(char *name, struct sockaddr_in *sin, int callno, char if (inaddrcmp(&p->addr, sin)) { if (iax2_regfunk) iax2_regfunk(p->name, 1); + /* Stash the IP address from which they registered */ + memcpy(&p->addr, sin, sizeof(p->addr)); snprintf(data, sizeof(data), "%s:%d:%d", ast_inet_ntoa(iabuf, sizeof(iabuf), sin->sin_addr), ntohs(sin->sin_port), p->expiry); if (!ast_test_flag(p, IAX_TEMPONLY) && sin->sin_addr.s_addr) { ast_db_put("IAX/Registry", p->name, data); @@ -5615,19 +5617,18 @@ static int update_registry(char *name, struct sockaddr_in *sin, int callno, char ast_verbose(VERBOSE_PREFIX_3 "Registered IAX2 '%s' (%s) at %s:%d\n", p->name, iaxs[callno]->state & IAX_STATE_AUTHENTICATED ? "AUTHENTICATED" : "UNAUTHENTICATED", ast_inet_ntoa(iabuf, sizeof(iabuf), sin->sin_addr), ntohs(sin->sin_port)); manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "Peer: IAX2/%s\r\nPeerStatus: Registered\r\n", p->name); - ast_device_state_changed("IAX2/%s", p->name); /* Activate notification */ register_peer_exten(p, 1); + ast_device_state_changed("IAX2/%s", p->name); /* Activate notification */ } else if (!ast_test_flag(p, IAX_TEMPONLY)) { if (option_verbose > 2) ast_verbose(VERBOSE_PREFIX_3 "Unregistered IAX2 '%s' (%s)\n", p->name, iaxs[callno]->state & IAX_STATE_AUTHENTICATED ? "AUTHENTICATED" : "UNAUTHENTICATED"); manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "Peer: IAX2/%s\r\nPeerStatus: Unregistered\r\n", p->name); - ast_device_state_changed("IAX2/%s", p->name); /* Activate notification */ register_peer_exten(p, 0); ast_db_del("IAX/Registry", p->name); + ast_device_state_changed("IAX2/%s", p->name); /* Activate notification */ } /* Update the host */ - memcpy(&p->addr, sin, sizeof(p->addr)); /* Verify that the host is really there */ iax2_poke_peer(p, callno); } |