From 2bb5307c8d6a0c543582a82e10346d1e8b4d8212 Mon Sep 17 00:00:00 2001 From: Matthew Nicholson Date: Tue, 14 Sep 2010 19:29:43 +0000 Subject: Merged revisions 286758 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r286758 | mnicholson | 2010-09-14 14:28:38 -0500 (Tue, 14 Sep 2010) | 27 lines Merged revisions 286757 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r286757 | mnicholson | 2010-09-14 14:27:28 -0500 (Tue, 14 Sep 2010) | 20 lines Merged revisions 286756 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r286756 | mnicholson | 2010-09-14 14:26:18 -0500 (Tue, 14 Sep 2010) | 13 lines Don't clear the username from a realtime database when a registration expires. Non-realtime chan_sip does not clear the username from memory when a registration expiries so realtime probably shouldn't either. (closes issue #17551) Reported by: ricardolandim Patches: reg-expiry-username-1.4-fix1.diff uploaded by mnicholson (license 96) reg-expiry-username-1.6.2-fix1.diff uploaded by mnicholson (license 96) reg-expiry-username-1.8-fix1.diff uploaded by mnicholson (license 96) reg-expiry-username-trunk-fix1.diff uploaded by mnicholson (license 96) Tested by: ricardolandim, mnicholson ........ ................ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@286759 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 2fd6b53ee..8aa0d04a4 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -12690,7 +12690,7 @@ static void destroy_association(struct sip_peer *peer) if (!sip_cfg.ignore_regexpire) { if (peer->rt_fromcontact && sip_cfg.peer_rtupdate) { - ast_update_realtime(tablename, "name", peer->name, "fullcontact", "", "ipaddr", "", "port", "", "regseconds", "0", peer->deprecated_username ? "username" : "defaultuser", "", "regserver", "", "useragent", "", "lastms", "", SENTINEL); + ast_update_realtime(tablename, "name", peer->name, "fullcontact", "", "ipaddr", "", "port", "", "regseconds", "0", "regserver", "", "useragent", "", "lastms", "", SENTINEL); } else { ast_db_del("SIP/Registry", peer->name); ast_db_del("SIP/PeerMethods", peer->name); -- cgit v1.2.3