Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Only override callingpres set by rpid if user/peer preference is set. (Issue #7240)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@32183 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.4
Olle Johansson 20 years ago
parent 588b54f8c2
commit 62dd0dc6f2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File

2
channels/chan_sip.c
Unescape View File

@ -7739,6 +7739,7 @@ static enum check_auth_result check_user_full(struct sip_pvt *p, struct sip_requ
p->amaflags = user->amaflags; p->amaflags = user->amaflags;
p->callgroup = user->callgroup; p->callgroup = user->callgroup;
p->pickupgroup = user->pickupgroup; p->pickupgroup = user->pickupgroup;
if (user->callingpres) /* User callingpres setting will override RPID header */
p->callingpres = user->callingpres; p->callingpres = user->callingpres;
p->capability = user->capability; p->capability = user->capability;
p->jointcapability = user->capability; p->jointcapability = user->capability;
@ -7811,6 +7812,7 @@ static enum check_auth_result check_user_full(struct sip_pvt *p, struct sip_requ
ast_string_field_set(p, peersecret, peer->secret); ast_string_field_set(p, peersecret, peer->secret);
ast_string_field_set(p, peermd5secret, peer->md5secret); ast_string_field_set(p, peermd5secret, peer->md5secret);
ast_string_field_set(p, subscribecontext, peer->subscribecontext); ast_string_field_set(p, subscribecontext, peer->subscribecontext);
if (peer->callingpres) /* Peer calling pres setting will override RPID */
p->callingpres = peer->callingpres; p->callingpres = peer->callingpres;
if (peer->maxms && peer->lastms) if (peer->maxms && peer->lastms)
p->timer_t1 = peer->lastms; p->timer_t1 = peer->lastms;

Write Preview
Loading…
Cancel
Save