diff options
| author | Jonathan Rose <jrose@digium.com> | 2011-08-10 15:45:57 +0000 |
|---|---|---|
| committer | Jonathan Rose <jrose@digium.com> | 2011-08-10 15:45:57 +0000 |
| commit | dc9513a69d8d8d12e80a287d8f99c7d3de5d249a (patch) | |
| tree | 62956c7d7fd1ff958ae507f854c1a6031b8f6cc3 /channels | |
| parent | 0208f0ac71812e60a3cf5ac91ded40c1f2fed1b5 (diff) | |
SIP display-name needed to be empty for Avaya IP500
In order to address a compatability issue with certain features on certain devices
which rely on display name content to change behavior, initreqprep in chan_sip.c
has been changed to no longer substitute cid_number into the display name when
cid_name isn't present. Instead, it will send no display name in that case.
(closes issue ASTERISK-16198)
Reported by: Walter Doekes
Review: https://reviewboard.asterisk.org/r/1341/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331371 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index ed0e3bb65..0223f1377 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -11792,6 +11792,8 @@ static void initreqprep(struct sip_request *req, struct sip_pvt *p, int sipmetho const char *d = NULL; /* domain in from header */ const char *urioptions = ""; int ourport; + int cid_has_name = 1; + int cid_has_num = 1; if (ast_test_flag(&p->flags[0], SIP_USEREQPHONE)) { const char *s = p->username; /* being a string field, cannot be NULL */ @@ -11838,10 +11840,15 @@ static void initreqprep(struct sip_request *req, struct sip_pvt *p, int sipmetho l = p->mwi_from; } - if (ast_strlen_zero(l)) + if (ast_strlen_zero(l)) { + cid_has_num = 0; l = default_callerid; - if (ast_strlen_zero(n)) + } + if (ast_strlen_zero(n)) { + cid_has_name = 0; n = l; + } + /* Allow user to be overridden */ if (!ast_strlen_zero(p->fromuser)) l = p->fromuser; @@ -11862,10 +11869,20 @@ static void initreqprep(struct sip_request *req, struct sip_pvt *p, int sipmetho } ourport = (p->fromdomainport) ? p->fromdomainport : ast_sockaddr_port(&p->ourip); + + /* If a caller id name was specified, add a display name. */ + if (cid_has_name || !cid_has_num) { + snprintf(from, sizeof(from), "\"%s\" ", n); + } else { + from[0] = '\0'; + } + if (!sip_standard_port(p->socket.type, ourport)) { - snprintf(from, sizeof(from), "\"%s\" <sip:%s@%s:%d>;tag=%s", n, l, d, ourport, p->tag); + size_t offset = strlen(from); + snprintf(&from[offset], sizeof(from) - offset, "<sip:%s@%s:%d>;tag=%s", l, d, ourport, p->tag); } else { - snprintf(from, sizeof(from), "\"%s\" <sip:%s@%s>;tag=%s", n, l, d, p->tag); + size_t offset = strlen(from); + snprintf(&from[offset], sizeof(from) - offset, "<sip:%s@%s>;tag=%s", l, d, p->tag); } if (!ast_strlen_zero(explicit_uri)) { |