[asterisk-commits] branch oej/rtcp r32184 - in /team/oej/rtcp: ./ channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: oej
Date: Mon Jun  5 01:27:54 2006
New Revision: 32184

URL: http://svn.digium.com/view/asterisk?rev=32184&view=rev
Log:
Manual update

Modified:
    team/oej/rtcp/   (props changed)
    team/oej/rtcp/channels/chan_sip.c

Propchange: team/oej/rtcp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jun  5 01:27:54 2006
@@ -1,1 +1,1 @@
-/trunk:1-32174
+/trunk:1-32183

Modified: team/oej/rtcp/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/channels/chan_sip.c?rev=32184&r1=32183&r2=32184&view=diff
==============================================================================
--- team/oej/rtcp/channels/chan_sip.c (original)
+++ team/oej/rtcp/channels/chan_sip.c Mon Jun  5 01:27:54 2006
@@ -7739,7 +7739,8 @@
 			p->amaflags = user->amaflags;
 			p->callgroup = user->callgroup;
 			p->pickupgroup = user->pickupgroup;
-			p->callingpres = user->callingpres;
+			if (user->callingpres)	/* User callingpres setting will override RPID header */
+				p->callingpres = user->callingpres;
 			p->capability = user->capability;
 			p->jointcapability = user->capability;
 			p->maxcallbitrate = user->maxcallbitrate;
@@ -7811,7 +7812,8 @@
 			ast_string_field_set(p, peersecret, peer->secret);
 			ast_string_field_set(p, peermd5secret, peer->md5secret);
 			ast_string_field_set(p, subscribecontext, peer->subscribecontext);
-			p->callingpres = peer->callingpres;
+			if (peer->callingpres)	/* Peer calling pres setting will override RPID */
+				p->callingpres = peer->callingpres;
 			if (peer->maxms && peer->lastms)
 				p->timer_t1 = peer->lastms;
 			if (ast_test_flag(&peer->flags[0], SIP_INSECURE_INVITE)) {