diff options
author | Corey Farrell <git@cfware.com> | 2017-07-27 21:58:22 -0400 |
---|---|---|
committer | George Joseph <gjoseph@digium.com> | 2017-08-01 15:42:38 -0600 |
commit | 58d032112b28294946427a379c40d51e5238999a (patch) | |
tree | d523247ac7e72502120025c6f7b56a99edd38d34 /channels | |
parent | 3f98488279dbc576c7569e8dd23e3120c07bbe7e (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')
-rw-r--r-- | channels/Makefile | 2 | ||||
-rw-r--r-- | channels/chan_iax2.c | 2 | ||||
-rw-r--r-- | channels/chan_motif.c | 2 | ||||
-rw-r--r-- | channels/chan_sip.c | 6 | ||||
-rw-r--r-- | channels/chan_unistim.c | 4 | ||||
-rw-r--r-- | channels/iax2/firmware.c | 13 |
6 files changed, 17 insertions, 12 deletions
diff --git a/channels/Makefile b/channels/Makefile index 44a0429a9..ae7107f7c 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -29,6 +29,8 @@ $(call MOD_ADD_C,chan_pjsip,$(wildcard pjsip/*.c)) $(call MOD_ADD_C,chan_dahdi,$(wildcard dahdi/*.c) sig_analog.c sig_pri.c sig_ss7.c) $(call MOD_ADD_C,chan_misdn,misdn_config.c misdn/isdn_lib.c misdn/isdn_msg_parser.c) +chan_mgcp.o: _ASTCFLAGS+=-Wno-format-truncation + chan_misdn.o: _ASTCFLAGS+=-Imisdn misdn_config.o: _ASTCFLAGS+=-Imisdn misdn/isdn_lib.o: _ASTCFLAGS+=-Wno-strict-aliasing diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 5abb6c37f..490c4cea5 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -8545,7 +8545,7 @@ static int try_transfer(struct chan_iax2_pvt *pvt, struct iax_ies *ies) { int newcall = 0; struct iax_ie_data ied; - struct ast_sockaddr new; + struct ast_sockaddr new = { {0,} }; memset(&ied, 0, sizeof(ied)); if (!ast_sockaddr_isnull(&ies->apparent_addr)) { diff --git a/channels/chan_motif.c b/channels/chan_motif.c index 7d696e87d..210cf36c6 100644 --- a/channels/chan_motif.c +++ b/channels/chan_motif.c @@ -1901,7 +1901,7 @@ static struct ast_channel *jingle_request(const char *type, struct ast_format_ca { RAII_VAR(struct jingle_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup); RAII_VAR(struct jingle_endpoint *, endpoint, NULL, ao2_cleanup); - char *dialed, target[200] = ""; + char *dialed, target[1024] = ""; struct ast_xmpp_buddy *buddy; struct jingle_session *session; struct ast_channel *chan; diff --git a/channels/chan_sip.c b/channels/chan_sip.c index f2daf2b8f..beaa3de0b 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -2085,7 +2085,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) { diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c index b820cf51e..f124c0f2b 100644 --- a/channels/chan_unistim.c +++ b/channels/chan_unistim.c @@ -370,7 +370,7 @@ struct unistim_subchannel { struct unistim_line { ast_mutex_t lock; char name[80]; /*! Like 200 */ - char fullname[80]; /*! Like USTM/200\@black */ + char fullname[101]; /*! Like USTM/200\@black */ char exten[AST_MAX_EXTENSION]; /*! Extension where to start */ char cid_num[AST_MAX_EXTENSION]; /*! CallerID Number */ char mailbox[AST_MAX_EXTENSION]; /*! Mailbox for MWI */ @@ -3698,7 +3698,7 @@ static void key_select_option(struct unistimsession *pte, char keycode) #define SELECTCODEC_MSG "Codec number : .." static void handle_select_codec(struct unistimsession *pte) { - char buf[30], buf2[5]; + char buf[30], buf2[6]; pte->state = STATE_SELECTCODEC; ast_copy_string(buf, ustmtext("Using codec", pte), sizeof(buf)); diff --git a/channels/iax2/firmware.c b/channels/iax2/firmware.c index 00a9d9ebb..500cf8938 100644 --- a/channels/iax2/firmware.c +++ b/channels/iax2/firmware.c @@ -44,6 +44,8 @@ #include "include/firmware.h" +#define IAX_FIRMWARE_SUBDIR "/firmware/iax" + struct iax_firmware { AST_LIST_ENTRY(iax_firmware) list; int fd; @@ -206,7 +208,7 @@ void iax_firmware_reload(void) struct iax_firmware *cur = NULL; DIR *fwd; struct dirent *de; - char dir[256], fn[256]; + char fn[PATH_MAX + sizeof(IAX_FIRMWARE_SUBDIR) + sizeof(de->d_name)]; AST_LIST_LOCK(&firmwares); @@ -216,12 +218,13 @@ void iax_firmware_reload(void) } /* Now that we have marked them dead... load new ones */ - snprintf(dir, sizeof(dir), "%s/firmware/iax", ast_config_AST_DATA_DIR); - fwd = opendir(dir); + snprintf(fn, sizeof(fn), "%s%s", ast_config_AST_DATA_DIR, IAX_FIRMWARE_SUBDIR); + fwd = opendir(fn); if (fwd) { while((de = readdir(fwd))) { if (de->d_name[0] != '.') { - snprintf(fn, sizeof(fn), "%s/%s", dir, de->d_name); + snprintf(fn, sizeof(fn), "%s%s/%s", + ast_config_AST_DATA_DIR, IAX_FIRMWARE_SUBDIR, de->d_name); if (!try_firmware(fn)) { ast_verb(2, "Loaded firmware '%s'\n", de->d_name); } @@ -229,7 +232,7 @@ void iax_firmware_reload(void) } closedir(fwd); } else { - ast_log(LOG_WARNING, "Error opening firmware directory '%s': %s\n", dir, strerror(errno)); + ast_log(LOG_WARNING, "Error opening firmware directory '%s': %s\n", fn, strerror(errno)); } /* Clean up leftovers */ |