From 463320e8b63aef27c87b0166edadb1e186d71d0b Mon Sep 17 00:00:00 2001 From: tilghman Date: Sat, 21 Feb 2009 16:04:09 +0000 Subject: Merged revisions 177944 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r177944 | tilghman | 2009-02-21 09:59:49 -0600 (Sat, 21 Feb 2009) | 2 lines On update, test against the existence of sipregs. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@177945 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_sip.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'channels') diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 1690568f2..9fd534730 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -10366,7 +10366,7 @@ static void destroy_association(struct sip_peer *peer) if (!sip_cfg.ignore_regexpire) { if (peer->rt_fromcontact) { ast_update_realtime(tablename, "name", peer->name, "fullcontact", "", "ipaddr", "", "port", "", "regseconds", "0", peer->deprecated_username ? "username" : "defaultuser", "", "regserver", "", "useragent", "", SENTINEL); - ast_update_realtime("sippeers", "name", peer->name, "lastms", "", SENTINEL); + ast_update_realtime(tablename, "name", peer->name, "lastms", "", SENTINEL); } else { ast_db_del("SIP/Registry", peer->name); } @@ -16347,7 +16347,7 @@ static void handle_response_peerpoke(struct sip_pvt *p, int resp, struct sip_req ast_log(LOG_NOTICE, "Peer '%s' is now %s. (%dms / %dms)\n", peer->name, s, pingtime, peer->maxms); ast_devstate_changed(AST_DEVICE_UNKNOWN, "SIP/%s", peer->name); - ast_update_realtime("sippeers", "name", peer->name, "lastms", str_lastms, SENTINEL); + ast_update_realtime(ast_check_realtime("sipregs") ? "sipregs" : "sippeers", "name", peer->name, "lastms", str_lastms, SENTINEL); manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "ChannelType: SIP\r\nPeer: SIP/%s\r\nPeerStatus: %s\r\nTime: %d\r\n", peer->name, s, pingtime); @@ -20695,7 +20695,7 @@ static int sip_poke_noanswer(const void *data) if (peer->lastms > -1) { ast_log(LOG_NOTICE, "Peer '%s' is now UNREACHABLE! Last qualify: %d\n", peer->name, peer->lastms); - ast_update_realtime("sippeers", "name", peer->name, "lastms", "-1", SENTINEL); + ast_update_realtime(ast_check_realtime("sipregs") ? "sipregs" : "sippeers", "name", peer->name, "lastms", "-1", SENTINEL); manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "ChannelType: SIP\r\nPeer: SIP/%s\r\nPeerStatus: Unreachable\r\nTime: %d\r\n", peer->name, -1); if (global_regextenonqualify) { register_peer_exten(peer, FALSE); -- cgit v1.2.3