[asterisk-commits] twilson: branch 10 r340578 - in /branches/10: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Wed Oct 12 15:57:19 2011
New Revision: 340578

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=340578
Log:
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
........

Modified:
    branches/10/   (props changed)
    branches/10/channels/chan_sip.c

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/channels/chan_sip.c?view=diff&rev=340578&r1=340577&r2=340578
==============================================================================
--- branches/10/channels/chan_sip.c (original)
+++ branches/10/channels/chan_sip.c Wed Oct 12 15:57:19 2011
@@ -4643,7 +4643,7 @@
 	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);
 	}
 }