diff options
| author | Joshua Colp <jcolp@digium.com> | 2006-09-06 15:58:21 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2006-09-06 15:58:21 +0000 |
| commit | e77c51f5c69702df5a0dc3cc754f3debc28e5846 (patch) | |
| tree | e5ce1ccf0b6d371013feafeb71cfa4d422f1c0fd /channels | |
| parent | 228d50806c64448295026dd0a5c408ed6861ba27 (diff) | |
Merged revisions 42086 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r42086 | file | 2006-09-06 11:55:20 -0400 (Wed, 06 Sep 2006) | 2 lines
Make realtime regseconds work as people expected (0 on registration expiration or release, and actual on normal state) (issue #7684 reported by kshumard)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@42087 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_iax2.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 7d90a087a..54675b86a 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -2550,14 +2550,12 @@ static struct iax2_user *realtime_user(const char *username) return user; } -static void realtime_update_peer(const char *peername, struct sockaddr_in *sin) +static void realtime_update_peer(const char *peername, struct sockaddr_in *sin, time_t regtime) { char port[10]; char regseconds[20]; - time_t nowtime; - time(&nowtime); - snprintf(regseconds, sizeof(regseconds), "%d", (int)nowtime); + snprintf(regseconds, sizeof(regseconds), "%d", (int)regtime); snprintf(port, sizeof(port), "%d", ntohs(sin->sin_port)); ast_update_realtime("iaxpeers", "name", peername, "ipaddr", ast_inet_ntoa(sin->sin_addr), "port", port, @@ -5487,6 +5485,8 @@ static void __expire_registry(void *data) return; ast_log(LOG_DEBUG, "Expiring registration for peer '%s'\n", p->name); + if (ast_test_flag((&globalflags), IAX_RTUPDATE) && (ast_test_flag(p, IAX_TEMPONLY|IAX_RTCACHEFRIENDS))) + realtime_update_peer(p->name, &p->addr, 0); manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "Peer: IAX2/%s\r\nPeerStatus: Unregistered\r\nCause: Expired\r\n", p->name); /* Reset the address */ memset(&p->addr, 0, sizeof(p->addr)); @@ -5571,8 +5571,15 @@ static int update_registry(const char *name, struct sockaddr_in *sin, int callno return -1; } - if (ast_test_flag((&globalflags), IAX_RTUPDATE) && (ast_test_flag(p, IAX_TEMPONLY|IAX_RTCACHEFRIENDS))) - realtime_update_peer(name, sin); + if (ast_test_flag((&globalflags), IAX_RTUPDATE) && (ast_test_flag(p, IAX_TEMPONLY|IAX_RTCACHEFRIENDS))) { + if (sin->sin_addr.s_addr) { + time_t nowtime; + time(&nowtime); + realtime_update_peer(name, sin, nowtime); + } else { + realtime_update_peer(name, sin, 0); + } + } if (inaddrcmp(&p->addr, sin)) { if (iax2_regfunk) iax2_regfunk(p->name, 1); |