summaryrefslogtreecommitdiff
path: root/channels/chan_sip.c
diff options
context:
space:
mode:
authorCorey Farrell <git@cfware.com>2017-07-27 21:58:22 -0400
committerGeorge Joseph <gjoseph@digium.com>2017-08-01 15:46:00 -0600
commitcc1180ed949e2810b4a86c6dcd91431a33f6fa18 (patch)
tree60bdae0192a9be495d4dd566bc075b1c9aabde36 /channels/chan_sip.c
parente92c1988ead53a84da4908d3e807f45a1cbd2b3d (diff)
Fix compiler warnings on Fedora 26 / GCC 7.
GCC 7 has added capability to produce warnings, this fixes most of those warnings. The specific warnings are disabled in a few places: * app_voicemail.c: truncation of paths more than 4096 chars in many places. * chan_mgcp.c: callid truncated to 80 chars. * cdr.c: two userfields are combined to cdr copy, fix would break ABI. * tcptls.c: ignore use of deprecated method SSLv3_client_method(). ASTERISK-27156 #close Change-Id: I65f280e7d3cfad279d16f41823a4d6fddcbc4c88
Diffstat (limited to 'channels/chan_sip.c')
-rw-r--r--channels/chan_sip.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 679cc3dfc..cd5cc0c77 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -2082,7 +2082,7 @@ static int sip_cc_monitor_request_cc(struct ast_cc_monitor *monitor, int *availa
static int construct_pidf_body(enum sip_cc_publish_state state, char *pidf_body, size_t size, const char *presentity)
{
struct ast_str *body = ast_str_alloca(size);
- char tuple_id[32];
+ char tuple_id[64];
generate_random_string(tuple_id, sizeof(tuple_id));
@@ -15333,7 +15333,7 @@ static int transmit_cc_notify(struct ast_cc_agent *agent, struct sip_pvt *subscr
{
struct sip_request req;
struct sip_cc_agent_pvt *agent_pvt = agent->private_data;
- char uri[SIPBUFSIZE];
+ char uri[SIPBUFSIZE + sizeof("cc-URI: \r\n") - 1];
char state_str[64];
char subscription_state_hdr[64];
@@ -15350,7 +15350,7 @@ static int transmit_cc_notify(struct ast_cc_agent *agent, struct sip_pvt *subscr
add_header(&req, "Subscription-State", subscription_state_hdr);
if (state == CC_READY) {
generate_uri(subscription, agent_pvt->notify_uri, sizeof(agent_pvt->notify_uri));
- snprintf(uri, sizeof(uri) - 1, "cc-URI: %s\r\n", agent_pvt->notify_uri);
+ snprintf(uri, sizeof(uri), "cc-URI: %s\r\n", agent_pvt->notify_uri);
}
add_content(&req, state_str);
if (state == CC_READY) {