kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 04:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "chan_sip: Fix From header truncation for extremely long CALLERID(name)."

Browse Source
This commit is contained in:
Joshua Colp
2015-09-19 08:31:52 -05:00
committed by Gerrit Code Review
parent dcaf9c9aba e4df271a3e
commit 9f673544a4
1 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
channels/chan_sip.c
View File

@@ -13940,6 +13940,7 @@ static void initreqprep(struct sip_request *req, struct sip_pvt *p, int sipmetho
int cid_has_name = 1; int cid_has_name = 1;
int cid_has_num = 1; int cid_has_num = 1;
struct ast_party_id connected_id; struct ast_party_id connected_id;
int ret;
if (ast_test_flag(&p->flags[0], SIP_USEREQPHONE)) { if (ast_test_flag(&p->flags[0], SIP_USEREQPHONE)) {
const char *s = p->username; /* being a string field, cannot be NULL */ const char *s = p->username; /* being a string field, cannot be NULL */
@@ -14024,26 +14025,41 @@ static void initreqprep(struct sip_request *req, struct sip_pvt *p, int sipmetho
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));
n = tmp_n;
ast_uri_encode(l, tmp_l, sizeof(tmp_l), ast_uri_sip_user); ast_uri_encode(l, tmp_l, sizeof(tmp_l), ast_uri_sip_user);
} }
ourport = (p->fromdomainport && (p->fromdomainport != STANDARD_SIP_PORT)) ? p->fromdomainport : ast_sockaddr_port(&p->ourip); ourport = (p->fromdomainport && (p->fromdomainport != STANDARD_SIP_PORT)) ? p->fromdomainport : ast_sockaddr_port(&p->ourip);
/* If a caller id name was specified, add a display name. */ if (!sip_standard_port(p->socket.type, ourport)) {
if (cid_has_name || !cid_has_num) { ret = snprintf(from, sizeof(from), "<sip:%s@%s:%d>;tag=%s", tmp_l, d, ourport, p->tag);
snprintf(from, sizeof(from), "\"%s\" ", n);
} else { } else {
from[0] = '\0'; ret = snprintf(from, sizeof(from), "<sip:%s@%s>;tag=%s", tmp_l, d, p->tag);
}
if (ret < 0 || ret >= sizeof(from)) { /* a return value of size or more means that the output was truncated */
/* We don't have an escape path from here... */
ast_log(LOG_ERROR, "The From header was truncated in call '%s'. This call setup will fail.\n", p->callid);
} }
if (!sip_standard_port(p->socket.type, ourport)) { /* If a caller id name was specified, prefix a display name, if there is enough room. */
size_t offset = strlen(from); if (cid_has_name || !cid_has_num) {
snprintf(&from[offset], sizeof(from) - offset, "<sip:%s@%s:%d>;tag=%s", tmp_l, d, ourport, p->tag); size_t written = strlen(from);
} else { ssize_t left = sizeof(from) - written - 4; /* '"" \0' */
size_t offset = strlen(from); if (left > 0) {
snprintf(&from[offset], sizeof(from) - offset, "<sip:%s@%s>;tag=%s", tmp_l, d, p->tag); size_t name_len;
if (sip_cfg.pedanticsipchecking) {
ast_escape_quoted(n, tmp_n, MIN(left + 1, sizeof(tmp_n)));
n = tmp_n;
}
name_len = strlen(n);
if (left < name_len) {
name_len = left;
}
memmove(from + name_len + 3, from, written + 1);
from[0] = '"';
memcpy(from + 1, n, name_len);
from[name_len + 1] = '"';
from[name_len + 2] = ' ';
}
} }
if (!ast_strlen_zero(explicit_uri)) { if (!ast_strlen_zero(explicit_uri)) {
@@ -14085,21 +14101,25 @@ static void initreqprep(struct sip_request *req, struct sip_pvt *p, int sipmetho
/*! \todo Need to add back the VXML URL here at some point, possibly use build_string for all this junk */ /*! \todo Need to add back the VXML URL here at some point, possibly use build_string for all this junk */
if (!strchr(p->todnid, '@')) { if (!strchr(p->todnid, '@')) {
/* We have no domain in the dnid */ /* We have no domain in the dnid */
snprintf(to, sizeof(to), "<sip:%s@%s>%s%s", p->todnid, p->tohost, ast_strlen_zero(p->theirtag) ? "" : ";tag=", p->theirtag); ret = snprintf(to, sizeof(to), "<sip:%s@%s>%s%s", p->todnid, p->tohost, ast_strlen_zero(p->theirtag) ? "" : ";tag=", p->theirtag);
} else { } else {
snprintf(to, sizeof(to), "<sip:%s>%s%s", p->todnid, ast_strlen_zero(p->theirtag) ? "" : ";tag=", p->theirtag); ret = snprintf(to, sizeof(to), "<sip:%s>%s%s", p->todnid, ast_strlen_zero(p->theirtag) ? "" : ";tag=", p->theirtag);
} }
} else { } else {
if (sipmethod == SIP_NOTIFY && !ast_strlen_zero(p->theirtag)) { if (sipmethod == SIP_NOTIFY && !ast_strlen_zero(p->theirtag)) {
/* If this is a NOTIFY, use the From: tag in the subscribe (RFC 3265) */ /* If this is a NOTIFY, use the From: tag in the subscribe (RFC 3265) */
snprintf(to, sizeof(to), "<%s%s>;tag=%s", (strncasecmp(p->uri, "sip:", 4) ? "sip:" : ""), p->uri, p->theirtag); ret = snprintf(to, sizeof(to), "<%s%s>;tag=%s", (strncasecmp(p->uri, "sip:", 4) ? "sip:" : ""), p->uri, p->theirtag);
} else if (p->options && p->options->vxml_url) { } else if (p->options && p->options->vxml_url) {
/* If there is a VXML URL append it to the SIP URL */ /* If there is a VXML URL append it to the SIP URL */
snprintf(to, sizeof(to), "<%s>;%s", p->uri, p->options->vxml_url); ret = snprintf(to, sizeof(to), "<%s>;%s", p->uri, p->options->vxml_url);
} else { } else {
snprintf(to, sizeof(to), "<%s>", p->uri); ret = snprintf(to, sizeof(to), "<%s>", p->uri);
} }
} }
if (ret < 0 || ret >= sizeof(to)) { /* a return value of size or more means that the output was truncated */
/* We don't have an escape path from here... */
ast_log(LOG_ERROR, "The To header was truncated in call '%s'. This call setup will fail.\n", p->callid);
}
init_req(req, sipmethod, p->uri); init_req(req, sipmethod, p->uri);
/* now tmp_n is available so reuse it to build the CSeq */ /* now tmp_n is available so reuse it to build the CSeq */