diff options
| author | Terry Wilson <twilson@digium.com> | 2011-10-12 21:02:24 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2011-10-12 21:02:24 +0000 |
| commit | e7ebf7d5ab34656414cad0bf917edba0108981c9 (patch) | |
| tree | 27059d524053f8af1f9c257fcb6111b79585e0f6 /channels | |
| parent | 3bc3e9bbb7535078a6a532ada6cd60953cd21dc8 (diff) | |
Merged revisions 340578 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10
................
r340578 | twilson | 2011-10-12 13:57:19 -0700 (Wed, 12 Oct 2011) | 16 lines
Merged revisions 340534 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r340534 | twilson | 2011-10-12 13:19:36 -0700 (Wed, 12 Oct 2011) | 9 lines
Update SIP realtime fullcontact regardless of caching
We should update the fullcontact field in the realtime table whether or
not rtcachefriends is set. There is no reason to treat a non-cached
realtime entity differently than a cached in this regard.
(closes issue ASTERISK-18446)
Reported by: wdoekes
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340579 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 32e0f793c..83af7501e 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -4645,7 +4645,7 @@ static void update_peer(struct sip_peer *p, int expire) int rtcachefriends = ast_test_flag(&p->flags[1], SIP_PAGE2_RTCACHEFRIENDS); if (sip_cfg.peer_rtupdate && (p->is_realtime || rtcachefriends)) { - realtime_update_peer(p->name, &p->addr, p->username, rtcachefriends ? p->fullcontact : NULL, p->useragent, expire, p->deprecated_username, p->lastms); + realtime_update_peer(p->name, &p->addr, p->username, p->fullcontact, p->useragent, expire, p->deprecated_username, p->lastms); } } |