kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 14:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

chan_sip: Always use fromdomain if set for domain, even if callerid is set to restricted.

Browse Source 
(closes issue ASTERISK-20841)
Reported by: Kelly Goedert
........

Merged revisions 411021 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 411022 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 411023 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@411024 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2014-03-24 21:39:46 +00:00
parent 236d17362d
commit 6d81951f0d
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
channels/chan_sip.c
View File

@@ -13957,7 +13957,9 @@ static void initreqprep(struct sip_request *req, struct sip_pvt *p, int sipmetho
snprintf(p->lastmsg, sizeof(p->lastmsg), "Init: %s", sip_methods[sipmethod].text); snprintf(p->lastmsg, sizeof(p->lastmsg), "Init: %s", sip_methods[sipmethod].text);
d = S_OR(p->fromdomain, ast_sockaddr_stringify_host_remote(&p->ourip)); if (ast_strlen_zero(p->fromdomain)) {
d = ast_sockaddr_stringify_host_remote(&p->ourip);
}
if (p->owner) { if (p->owner) {
connected_id = ast_channel_connected_effective_id(p->owner); connected_id = ast_channel_connected_effective_id(p->owner);
@@ -14008,6 +14010,12 @@ static void initreqprep(struct sip_request *req, struct sip_pvt *p, int sipmetho
else /* Save for any further attempts */ else /* Save for any further attempts */
ast_string_field_set(p, fromname, n); ast_string_field_set(p, fromname, n);
/* Allow domain to be overridden */
if (!ast_strlen_zero(p->fromdomain))
d = p->fromdomain;
else /* Save for any further attempts */
ast_string_field_set(p, fromdomain, d);
ast_copy_string(tmp_l, l, sizeof(tmp_l)); ast_copy_string(tmp_l, l, sizeof(tmp_l));
if (sip_cfg.pedanticsipchecking) { if (sip_cfg.pedanticsipchecking) {
ast_escape_quoted(n, tmp_n, sizeof(tmp_n)); ast_escape_quoted(n, tmp_n, sizeof(tmp_n));