diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-14 23:59:13 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-14 23:59:13 +0000 |
commit | c80ba945f67ded788d14ecfd638e2ae0a1934880 (patch) | |
tree | bafe09f797429595bf31dddb6c569c7d0aff21d2 /channels | |
parent | 22f6926dad617ea56407acf8b2e40510b2bf05ae (diff) |
Override the callerid in all cases when the callerid is set in the user, not
just when a remote callerid is set. Also, if not set in the user, allow the
remote CallerID to pass through.
(closes issue #12875)
Reported by: dimas
Patches:
20080714__bug12875.diff.txt uploaded by Corydon76 (license 14)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@130889 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_iax2.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index c97b52189..db0a72ed8 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -5283,20 +5283,17 @@ static int check_access(int callno, struct sockaddr_in *sin, struct iax_ies *ies /* And the permitted authentication methods */ iaxs[callno]->authmethods = user->authmethods; iaxs[callno]->adsi = user->adsi; - /* If they have callerid, override the given caller id. Always store the ANI */ - if (!ast_strlen_zero(iaxs[callno]->cid_num) || !ast_strlen_zero(iaxs[callno]->cid_name)) { - if (ast_test_flag(user, IAX_HASCALLERID)) { - iaxs[callno]->calling_tns = 0; - iaxs[callno]->calling_ton = 0; - ast_string_field_set(iaxs[callno], cid_num, user->cid_num); - ast_string_field_set(iaxs[callno], cid_name, user->cid_name); - iaxs[callno]->calling_pres = AST_PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN; - } - if (ast_strlen_zero(iaxs[callno]->ani)) - ast_string_field_set(iaxs[callno], ani, user->cid_num); - } else { + /* If the user has callerid, override the remote caller id. */ + if (ast_test_flag(user, IAX_HASCALLERID)) { + iaxs[callno]->calling_tns = 0; + iaxs[callno]->calling_ton = 0; + ast_string_field_set(iaxs[callno], cid_num, user->cid_num); + ast_string_field_set(iaxs[callno], cid_name, user->cid_name); + ast_string_field_set(iaxs[callno], ani, user->cid_num); + iaxs[callno]->calling_pres = AST_PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN; + } else if (ast_strlen_zero(iaxs[callno]->cid_num) && ast_strlen_zero(iaxs[callno]->cid_name)) { iaxs[callno]->calling_pres = AST_PRES_NUMBER_NOT_AVAILABLE; - } + } /* else user is allowed to set their own CID settings */ if (!ast_strlen_zero(user->accountcode)) ast_string_field_set(iaxs[callno], accountcode, user->accountcode); if (!ast_strlen_zero(user->mohinterpret)) |