diff options
author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-23 14:34:21 +0000 |
---|---|---|
committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-23 14:34:21 +0000 |
commit | c97045f28d9eeca594783bf78de7ce9c764702c6 (patch) | |
tree | a4fee80e5f5bb37b7daca911638acfa7683301b1 | |
parent | a5b64b7274622eae62bce29b4349f6a7e900de81 (diff) |
Merged revisions 76560 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r76560 | file | 2007-07-23 11:32:07 -0300 (Mon, 23 Jul 2007) | 6 lines
(closes issue #10236)
Reported by: homesick
Patches:
rpid_1.4_75840.patch uploaded by homesick (license 91)
Accept Remote Party ID on guest calls.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@76561 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | channels/chan_sip.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index a99872ad9..79eea0e24 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -9335,7 +9335,14 @@ static enum check_auth_result check_user_full(struct sip_pvt *p, struct sip_requ res = AUTH_FAKE_AUTH; /* reject with fake authorization request */ else res = AUTH_SECRET_FAILED; /* we don't want any guests, authentication will fail */ - } + } else if (!ast_strlen_zero(rpid_num) && ast_test_flag(&p->flags[0], SIP_TRUSTRPID)) { + char *tmp = ast_strdupa(rpid_num); + if (*calleridname) + ast_string_field_set(p, cid_name, calleridname); + if (ast_is_shrinkable_phonenumber(tmp)) + ast_shrink_phone_number(tmp); + ast_string_field_set(p, cid_num, tmp); + } } } |