proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-11 23:53:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4267 from qlyoung/fix-misc-compile-warnings

Browse Source 
Fix misc compile warnings, remove strcpy & strcat
This commit is contained in:
Renato Westphal 2019-05-29 23:55:17 -03:00 committed by GitHub
commit 0ad79902fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 152 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
bgpd/bgp_community.c
View File

@ -205,7 +205,6 @@ static void set_community_string(struct community *com, bool make_json)
{
int i;
char *str;
char *pnt;
int len;
int first;
uint32_t comval;
@ -297,7 +296,7 @@ static void set_community_string(struct community *com, bool make_json)
}
/* Allocate memory. */
str = pnt = XMALLOC(MTYPE_COMMUNITY_STR, len);
str = XCALLOC(MTYPE_COMMUNITY_STR, len);
first = 1;
/* Fill in string. */
@ -308,12 +307,11 @@ static void set_community_string(struct community *com, bool make_json)
if (first)
first = 0;
else
*pnt++ = ' ';
strlcat(str, " ", len);
switch (comval) {
case COMMUNITY_INTERNET:
strcpy(pnt, "internet");
pnt += strlen("internet");
strlcat(str, "internet", len);
if (make_json) {
json_string =
json_object_new_string("internet");
@ -322,8 +320,7 @@ static void set_community_string(struct community *com, bool make_json)
}
break;
case COMMUNITY_GSHUT:
strcpy(pnt, "graceful-shutdown");
pnt += strlen("graceful-shutdown");
strlcat(str, "graceful-shutdown", len);
if (make_json) {
json_string = json_object_new_string(
"gracefulShutdown");
@ -332,8 +329,7 @@ static void set_community_string(struct community *com, bool make_json)
}
break;
case COMMUNITY_ACCEPT_OWN:
strcpy(pnt, "accept-own");
pnt += strlen("accept-own");
strlcat(str, "accept-own", len);
if (make_json) {
json_string = json_object_new_string(
"acceptown");
@ -342,8 +338,7 @@ static void set_community_string(struct community *com, bool make_json)
}
break;
case COMMUNITY_ROUTE_FILTER_TRANSLATED_v4:
strcpy(pnt, "route-filter-translated-v4");
pnt += strlen("route-filter-translated-v4");
strlcat(str, "route-filter-translated-v4", len);
if (make_json) {
json_string = json_object_new_string(
"routeFilterTranslatedV4");
@ -352,8 +347,7 @@ static void set_community_string(struct community *com, bool make_json)
}
break;
case COMMUNITY_ROUTE_FILTER_v4:
strcpy(pnt, "route-filter-v4");
pnt += strlen("route-filter-v4");
strlcat(str, "route-filter-v4", len);
if (make_json) {
json_string = json_object_new_string(
"routeFilterV4");
@ -362,8 +356,7 @@ static void set_community_string(struct community *com, bool make_json)
}
break;
case COMMUNITY_ROUTE_FILTER_TRANSLATED_v6:
strcpy(pnt, "route-filter-translated-v6");
pnt += strlen("route-filter-translated-v6");
strlcat(str, "route-filter-translated-v6", len);
if (make_json) {
json_string = json_object_new_string(
"routeFilterTranslatedV6");
@ -372,8 +365,7 @@ static void set_community_string(struct community *com, bool make_json)
}
break;
case COMMUNITY_ROUTE_FILTER_v6:
strcpy(pnt, "route-filter-v6");
pnt += strlen("route-filter-v6");
strlcat(str, "route-filter-v6", len);
if (make_json) {
json_string = json_object_new_string(
"routeFilterV6");
@ -382,8 +374,7 @@ static void set_community_string(struct community *com, bool make_json)
}
break;
case COMMUNITY_LLGR_STALE:
strcpy(pnt, "llgr-stale");
pnt += strlen("llgr-stale");
strlcat(str, "llgr-stale", len);
if (make_json) {
json_string = json_object_new_string(
"llgrStale");
@ -392,8 +383,7 @@ static void set_community_string(struct community *com, bool make_json)
}
break;
case COMMUNITY_NO_LLGR:
strcpy(pnt, "no-llgr");
pnt += strlen("no-llgr");
strlcat(str, "no-llgr", len);
if (make_json) {
json_string = json_object_new_string(
"noLlgr");
@ -402,8 +392,7 @@ static void set_community_string(struct community *com, bool make_json)
}
break;
case COMMUNITY_ACCEPT_OWN_NEXTHOP:
strcpy(pnt, "accept-own-nexthop");
pnt += strlen("accept-own-nexthop");
strlcat(str, "accept-own-nexthop", len);
if (make_json) {
json_string = json_object_new_string(
"acceptownnexthop");
@ -412,8 +401,7 @@ static void set_community_string(struct community *com, bool make_json)
}
break;
case COMMUNITY_BLACKHOLE:
strcpy(pnt, "blackhole");
pnt += strlen("blackhole");
strlcat(str, "blackhole", len);
if (make_json) {
json_string = json_object_new_string(
"blackhole");
@ -422,8 +410,7 @@ static void set_community_string(struct community *com, bool make_json)
}
break;
case COMMUNITY_NO_EXPORT:
strcpy(pnt, "no-export");
pnt += strlen("no-export");
strlcat(str, "no-export", len);
if (make_json) {
json_string =
json_object_new_string("noExport");
@ -432,8 +419,7 @@ static void set_community_string(struct community *com, bool make_json)
}
break;
case COMMUNITY_NO_ADVERTISE:
strcpy(pnt, "no-advertise");
pnt += strlen("no-advertise");
strlcat(str, "no-advertise", len);
if (make_json) {
json_string =
json_object_new_string("noAdvertise");
@ -442,8 +428,7 @@ static void set_community_string(struct community *com, bool make_json)
}
break;
case COMMUNITY_LOCAL_AS:
strcpy(pnt, "local-AS");
pnt += strlen("local-AS");
strlcat(str, "local-AS", len);
if (make_json) {
json_string = json_object_new_string("localAs");
json_object_array_add(json_community_list,
@ -451,8 +436,7 @@ static void set_community_string(struct community *com, bool make_json)
}
break;
case COMMUNITY_NO_PEER:
strcpy(pnt, "no-peer");
pnt += strlen("no-peer");
strlcat(str, "no-peer", len);
if (make_json) {
json_string = json_object_new_string("noPeer");
json_object_array_add(json_community_list,
@ -462,17 +446,17 @@ static void set_community_string(struct community *com, bool make_json)
default:
as = (comval >> 16) & 0xFFFF;
val = comval & 0xFFFF;
sprintf(pnt, "%u:%d", as, val);
char buf[32];
snprintf(buf, sizeof(buf), "%u:%d", as, val);
strlcat(str, buf, len);
if (make_json) {
json_string = json_object_new_string(pnt);
json_string = json_object_new_string(buf);
json_object_array_add(json_community_list,
json_string);
}
pnt += strlen(pnt);
break;
}
}
*pnt = '\0';
if (make_json) {
json_object_string_add(com->json, "string", str);

26
bgpd/bgp_packet.c
View File

@ -709,12 +709,15 @@ void bgp_notify_send_with_data(struct peer *peer, uint8_t code,
XMALLOC(MTYPE_TMP, bgp_notify.length * 3);
for (i = 0; i < bgp_notify.length; i++)
if (first) {
sprintf(c, " %02x", data[i]);
strcat(bgp_notify.data, c);
snprintf(c, sizeof(c), " %02x",
data[i]);
strlcat(bgp_notify.data, c,
bgp_notify.length);
} else {
first = 1;
sprintf(c, "%02x", data[i]);
strcpy(bgp_notify.data, c);
snprintf(c, sizeof(c), "%02x", data[i]);
strlcpy(bgp_notify.data, c,
bgp_notify.length);
}
}
bgp_notify_print(peer, &bgp_notify, "sending");
@ -1700,14 +1703,16 @@ static int bgp_notify_receive(struct peer *peer, bgp_size_t size)
XMALLOC(MTYPE_TMP, bgp_notify.length * 3);
for (i = 0; i < bgp_notify.length; i++)
if (first) {
sprintf(c, " %02x",
snprintf(c, sizeof(c), " %02x",
stream_getc(peer->curr));
strcat(bgp_notify.data, c);
strlcat(bgp_notify.data, c,
bgp_notify.length);
} else {
first = 1;
sprintf(c, "%02x",
stream_getc(peer->curr));
strcpy(bgp_notify.data, c);
snprintf(c, sizeof(c), "%02x",
stream_getc(peer->curr));
strlcpy(bgp_notify.data, c,
bgp_notify.length);
}
bgp_notify.raw_data = (uint8_t *)peer->notify.data;
}
@ -2299,6 +2304,9 @@ int bgp_process_packet(struct thread *thread)
__FUNCTION__, peer->host);
break;
default:
/* Suppress uninitialized variable warning */
mprc = 0;
(void)mprc;
/*
* The message type should have been sanitized before
* we ever got here. Receipt of a message with an

8
bgpd/bgp_routemap.c
View File

@ -4222,10 +4222,10 @@ DEFUN (set_community,
str = community_str(com, false);
if (additive) {
argstr = XCALLOC(MTYPE_TMP,
strlen(str) + strlen(" additive") + 1);
strcpy(argstr, str);
strcpy(argstr + strlen(str), " additive");
size_t argstr_sz = strlen(str) + strlen(" additive") + 1;
argstr = XCALLOC(MTYPE_TMP, argstr_sz);
strlcpy(argstr, str, argstr_sz);
strlcat(argstr, " additive", argstr_sz);
ret = generic_set_add(vty, VTY_GET_CONTEXT(route_map_index),
"community", argstr);
XFREE(MTYPE_TMP, argstr);

3
bgpd/rfapi/rfapi_import.c
View File

@ -4111,6 +4111,9 @@ static void rfapiProcessPeerDownRt(struct peer *peer,
timer_service_func = rfapiWithdrawTimerEncap;
break;
default:
/* Suppress uninitialized variable warning */
rt = NULL;
timer_service_func = NULL;
assert(0);
}

8
lib/command.c
View File

@ -1760,10 +1760,10 @@ static int file_write_config(struct vty *vty)
dirfd = open(".", O_DIRECTORY | O_RDONLY);
/* if dirfd is invalid, directory sync fails, but we're still OK */
config_file_sav = XMALLOC(
MTYPE_TMP, strlen(config_file) + strlen(CONF_BACKUP_EXT) + 1);
strcpy(config_file_sav, config_file);
strcat(config_file_sav, CONF_BACKUP_EXT);
size_t config_file_sav_sz = strlen(config_file) + strlen(CONF_BACKUP_EXT) + 1;
config_file_sav = XMALLOC(MTYPE_TMP, config_file_sav_sz);
strlcpy(config_file_sav, config_file, config_file_sav_sz);
strlcat(config_file_sav, CONF_BACKUP_EXT, config_file_sav_sz);
config_file_tmp = XMALLOC(MTYPE_TMP, strlen(config_file) + 8);

4
lib/command_match.c
View File

@ -723,7 +723,7 @@ static enum match_type match_ipv4(const char *str)
if (str - sp > 3)
return no_match;
strncpy(buf, sp, str - sp);
memcpy(buf, sp, str - sp);
if (atoi(buf) > 255)
return no_match;
@ -774,7 +774,7 @@ static enum match_type match_ipv4_prefix(const char *str)
if (str - sp > 3)
return no_match;
strncpy(buf, sp, str - sp);
memcpy(buf, sp, str - sp);
if (atoi(buf) > 255)
return no_match;

4
lib/libfrr.c
View File

@ -80,8 +80,8 @@ static void opt_extend(const struct optspec *os)
{
const struct option *lo;
strcat(comb_optstr, os->optstr);
strcat(comb_helpstr, os->helpstr);
strlcat(comb_optstr, os->optstr, sizeof(comb_optstr));
strlcat(comb_helpstr, os->helpstr, sizeof(comb_helpstr));
for (lo = os->longopts; lo->name; lo++)
memcpy(comb_next_lo++, lo, sizeof(*lo));
}

2
lib/log.c
View File

@ -602,6 +602,8 @@ void zlog_backtrace_sigsafe(int priority, void *program_counter)
backtrace_symbols_fd(array, size, FD); \
}
#elif defined(HAVE_PRINTSTACK)
size = 0;
#define DUMP(FD) \
{ \
if (program_counter) \

2
lib/prefix.c
View File

@ -1365,7 +1365,7 @@ void prefix_mcast_inet4_dump(const char *onfail, struct in_addr addr,
int save_errno = errno;
if (addr.s_addr == INADDR_ANY)
strcpy(buf, "*");
strlcpy(buf, "*", buf_size);
else {
if (!inet_ntop(AF_INET, &addr, buf, buf_size)) {
if (onfail)

2
lib/table.h
View File

@ -298,6 +298,8 @@ static inline struct route_node *route_table_iter_next(route_table_iter_t *iter)
return NULL;
default:
/* Suppress uninitialized variable warning */
node = NULL;
assert(0);
}

25
lib/vty.c
View File

@ -84,7 +84,7 @@ static char *vty_ipv6_accesslist_name = NULL;
static vector Vvty_serv_thread;
/* Current directory. */
char *vty_cwd = NULL;
char vty_cwd[MAXPATHLEN];
/* Login password check. */
static int no_password_check = 0;
@ -998,7 +998,7 @@ static void vty_describe_fold(struct vty *vty, int cmd_width,
if (pos == 0)
break;
strncpy(buf, p, pos);
memcpy(buf, p, pos);
buf[pos] = '\0';
vty_out(vty, " %-*s %s\n", cmd_width, cmd, buf);
@ -1659,7 +1659,7 @@ static struct vty *vty_create(int vty_sock, union sockunion *su)
/* configurable parameters not part of basic init */
vty->v_timeout = vty_timeout_val;
strcpy(vty->address, buf);
strlcpy(vty->address, buf, sizeof(vty->address));
if (no_password_check) {
if (host.advanced)
vty->node = ENABLE_NODE;
@ -1795,7 +1795,7 @@ struct vty *vty_stdio(void (*atclose)(int isexit))
*/
vty->node = ENABLE_NODE;
vty->v_timeout = 0;
strcpy(vty->address, "console");
strlcpy(vty->address, "console", sizeof(vty->address));
vty_stdio_resume();
return vty;
@ -2384,9 +2384,10 @@ static FILE *vty_use_backup_config(const char *fullpath)
int c;
char buffer[512];
fullpath_sav = malloc(strlen(fullpath) + strlen(CONF_BACKUP_EXT) + 1);
strcpy(fullpath_sav, fullpath);
strcat(fullpath_sav, CONF_BACKUP_EXT);
size_t fullpath_sav_sz = strlen(fullpath) + strlen(CONF_BACKUP_EXT) + 1;
fullpath_sav = malloc(fullpath_sav_sz);
strlcpy(fullpath_sav, fullpath, fullpath_sav_sz);
strlcat(fullpath_sav, CONF_BACKUP_EXT, fullpath_sav_sz);
sav = open(fullpath_sav, O_RDONLY);
if (sav < 0) {
@ -3055,10 +3056,9 @@ void vty_reset(void)
static void vty_save_cwd(void)
{
char cwd[MAXPATHLEN];
char *c;
c = getcwd(cwd, MAXPATHLEN);
c = getcwd(vty_cwd, sizeof(vty_cwd));
if (!c) {
/*
@ -3072,15 +3072,12 @@ static void vty_save_cwd(void)
SYSCONFDIR, errno);
exit(-1);
}
if (getcwd(cwd, MAXPATHLEN) == NULL) {
if (getcwd(vty_cwd, sizeof(vty_cwd)) == NULL) {
flog_err_sys(EC_LIB_SYSTEM_CALL,
"Failure to getcwd, errno: %d", errno);
exit(-1);
}
}
vty_cwd = XMALLOC(MTYPE_TMP, strlen(cwd) + 1);
strcpy(vty_cwd, cwd);
}
char *vty_get_cwd(void)
@ -3146,7 +3143,7 @@ void vty_init(struct thread_master *master_thread)
void vty_terminate(void)
{
XFREE(MTYPE_TMP, vty_cwd);
memset(vty_cwd, 0x00, sizeof(vty_cwd));
if (vtyvec && Vvty_serv_thread) {
vty_reset();

2
ospfd/ospf_te.c
View File

@ -2535,7 +2535,7 @@ DEFUN (show_ip_ospf_mpls_te_link,
struct interface *ifp = NULL;
struct listnode *node;
char *vrf_name = NULL;
bool all_vrf;
bool all_vrf = false;
int inst = 0;
int idx_vrf = 0;
struct ospf *ospf = NULL;

2
pbrd/pbr_nht.c
View File

@ -191,7 +191,7 @@ static void *pbr_nhgc_alloc(void *p)
new = XCALLOC(MTYPE_PBR_NHG, sizeof(*new));
strcpy(new->name, pnhgc->name);
strlcpy(new->name, pnhgc->name, sizeof(pnhgc->name));
new->table_id = pbr_nht_get_next_tableid(false);
DEBUGD(&pbr_dbg_nht, "%s: NHT: %s assigned Table ID: %u",

92
pimd/pim_cmd.c
View File

@ -2001,9 +2001,9 @@ static void pim_show_state(struct pim_instance *pim, struct vty *vty,
ifp_in = pim_if_find_by_vif_index(pim, c_oil->oil.mfcc_parent);
if (ifp_in)
strcpy(in_ifname, ifp_in->name);
strlcpy(in_ifname, ifp_in->name, sizeof(in_ifname));
else
strcpy(in_ifname, "<iif?>");
strlcpy(in_ifname, "<iif?>", sizeof(in_ifname));
if (src_or_group) {
if (strcmp(src_or_group, src_str)
@ -2085,9 +2085,9 @@ static void pim_show_state(struct pim_instance *pim, struct vty *vty,
now - c_oil->oif_creation[oif_vif_index]);
if (ifp_out)
strcpy(out_ifname, ifp_out->name);
strlcpy(out_ifname, ifp_out->name, sizeof(out_ifname));
else
strcpy(out_ifname, "<oif?>");
strlcpy(out_ifname, "<oif?>", sizeof(out_ifname));
if (uj) {
json_ifp_out = json_object_new_object();
@ -2366,37 +2366,37 @@ static void json_object_pim_upstream_add(json_object *json,
static const char *
pim_upstream_state2brief_str(enum pim_upstream_state join_state,
char *state_str)
char *state_str, size_t state_str_len)
{
switch (join_state) {
case PIM_UPSTREAM_NOTJOINED:
strcpy(state_str, "NotJ");
strlcpy(state_str, "NotJ", state_str_len);
break;
case PIM_UPSTREAM_JOINED:
strcpy(state_str, "J");
strlcpy(state_str, "J", state_str_len);
break;
default:
strcpy(state_str, "Unk");
strlcpy(state_str, "Unk", state_str_len);
}
return state_str;
}
static const char *pim_reg_state2brief_str(enum pim_reg_state reg_state,
char *state_str)
char *state_str, size_t state_str_len)
{
switch (reg_state) {
case PIM_REG_NOINFO:
strcpy(state_str, "RegNI");
strlcpy(state_str, "RegNI", state_str_len);
break;
case PIM_REG_JOIN:
strcpy(state_str, "RegJ");
strlcpy(state_str, "RegJ", state_str_len);
break;
case PIM_REG_JOIN_PENDING:
case PIM_REG_PRUNE:
strcpy(state_str, "RegP");
strlcpy(state_str, "RegP", state_str_len);
break;
default:
strcpy(state_str, "Unk");
strlcpy(state_str, "Unk", state_str_len);
}
return state_str;
}
@ -2464,13 +2464,13 @@ static void pim_show_upstream(struct pim_instance *pim, struct vty *vty,
pim_time_timer_to_hhmmss(msdp_reg_timer, sizeof(msdp_reg_timer),
up->t_msdp_reg_timer);
pim_upstream_state2brief_str(up->join_state, state_str);
pim_upstream_state2brief_str(up->join_state, state_str, sizeof(state_str));
if (up->reg_state != PIM_REG_NOINFO) {
char tmp_str[PIM_REG_STATE_STR_LEN];
sprintf(state_str + strlen(state_str), ",%s",
pim_reg_state2brief_str(up->reg_state,
tmp_str));
pim_reg_state2brief_str(up->reg_state, tmp_str,
sizeof(tmp_str)));
}
if (uj) {
@ -2521,7 +2521,7 @@ static void pim_show_upstream(struct pim_instance *pim, struct vty *vty,
pim_upstream_state2str(up->join_state));
json_object_string_add(
json_row, "regState",
pim_reg_state2str(up->reg_state, state_str));
pim_reg_state2str(up->reg_state, state_str, sizeof(state_str)));
json_object_string_add(json_row, "upTime", uptime);
json_object_string_add(json_row, "joinTimer",
join_timer);
@ -5234,9 +5234,9 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty,
ifp_in = pim_if_find_by_vif_index(pim, c_oil->oil.mfcc_parent);
if (ifp_in)
strcpy(in_ifname, ifp_in->name);
strlcpy(in_ifname, ifp_in->name, sizeof(in_ifname));
else
strcpy(in_ifname, "<iif?>");
strlcpy(in_ifname, "<iif?>", sizeof(in_ifname));
if (uj) {
@ -5291,9 +5291,9 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty,
found_oif = 1;
if (ifp_out)
strcpy(out_ifname, ifp_out->name);
strlcpy(out_ifname, ifp_out->name, sizeof(out_ifname));
else
strcpy(out_ifname, "<oif?>");
strlcpy(out_ifname, "<oif?>", sizeof(out_ifname));
if (uj) {
json_ifp_out = json_object_new_object();
@ -5351,27 +5351,27 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty,
} else {
if (c_oil->oif_flags[oif_vif_index]
& PIM_OIF_FLAG_PROTO_PIM) {
strcpy(proto, "PIM");
strlcpy(proto, "PIM", sizeof(proto));
}
if (c_oil->oif_flags[oif_vif_index]
& PIM_OIF_FLAG_PROTO_IGMP) {
strcpy(proto, "IGMP");
strlcpy(proto, "IGMP", sizeof(proto));
}
if (c_oil->oif_flags[oif_vif_index]
& PIM_OIF_FLAG_PROTO_VXLAN) {
strcpy(proto, "VxLAN");
strlcpy(proto, "VxLAN", sizeof(proto));
}
if (c_oil->oif_flags[oif_vif_index]
& PIM_OIF_FLAG_PROTO_SOURCE) {
strcpy(proto, "SRC");
strlcpy(proto, "SRC", sizeof(proto));
}
if (c_oil->oif_flags[oif_vif_index]
& PIM_OIF_FLAG_PROTO_STAR) {
strcpy(proto, "STAR");
strlcpy(proto, "STAR", sizeof(proto));
}
vty_out(vty,
@ -5410,9 +5410,9 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty,
found_oif = 0;
if (ifp_in)
strcpy(in_ifname, ifp_in->name);
strlcpy(in_ifname, ifp_in->name, sizeof(in_ifname));
else
strcpy(in_ifname, "<iif?>");
strlcpy(in_ifname, "<iif?>", sizeof(in_ifname));
if (uj) {
@ -5439,7 +5439,7 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty,
json_object_string_add(json_source, "iif", in_ifname);
json_oil = NULL;
} else {
strcpy(proto, "STATIC");
strlcpy(proto, "STATIC", sizeof(proto));
}
for (oif_vif_index = 0; oif_vif_index < MAXVIFS;
@ -5461,9 +5461,9 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty,
found_oif = 1;
if (ifp_out)
strcpy(out_ifname, ifp_out->name);
strlcpy(out_ifname, ifp_out->name, sizeof(out_ifname));
else
strcpy(out_ifname, "<oif?>");
strlcpy(out_ifname, "<oif?>", sizeof(out_ifname));
if (uj) {
json_ifp_out = json_object_new_object();
@ -9089,7 +9089,7 @@ static void ip_msdp_show_peers(struct pim_instance *pim, struct vty *vty,
pim_time_uptime(timebuf, sizeof(timebuf),
now - mp->uptime);
} else {
strcpy(timebuf, "-");
strlcpy(timebuf, "-", sizeof(timebuf));
}
pim_inet4_dump("<peer?>", mp->peer, peer_str, sizeof(peer_str));
pim_inet4_dump("<local?>", mp->local, local_str,
@ -9146,7 +9146,7 @@ static void ip_msdp_show_peers_detail(struct pim_instance *pim, struct vty *vty,
pim_time_uptime(timebuf, sizeof(timebuf),
now - mp->uptime);
} else {
strcpy(timebuf, "-");
strlcpy(timebuf, "-", sizeof(timebuf));
}
pim_inet4_dump("<local?>", mp->local, local_str,
sizeof(local_str));
@ -9325,18 +9325,18 @@ static void ip_msdp_show_sa(struct pim_instance *pim, struct vty *vty, bool uj)
if (sa->flags & PIM_MSDP_SAF_PEER) {
pim_inet4_dump("<rp?>", sa->rp, rp_str, sizeof(rp_str));
if (sa->up) {
strcpy(spt_str, "yes");
strlcpy(spt_str, "yes", sizeof(spt_str));
} else {
strcpy(spt_str, "no");
strlcpy(spt_str, "no", sizeof(spt_str));
}
} else {
strcpy(rp_str, "-");
strcpy(spt_str, "-");
strlcpy(rp_str, "-", sizeof(rp_str));
strlcpy(spt_str, "-", sizeof(spt_str));
}
if (sa->flags & PIM_MSDP_SAF_LOCAL) {
strcpy(local_str, "yes");
strlcpy(local_str, "yes", sizeof(local_str));
} else {
strcpy(local_str, "no");
strlcpy(local_str, "no", sizeof(local_str));
}
if (uj) {
json_object_object_get_ex(json, grp_str, &json_group);
@ -9390,19 +9390,19 @@ static void ip_msdp_show_sa_entry_detail(struct pim_msdp_sa *sa,
pim_inet4_dump("<rp?>", sa->rp, rp_str, sizeof(rp_str));
pim_inet4_dump("<peer?>", sa->peer, peer_str, sizeof(peer_str));
if (sa->up) {
strcpy(spt_str, "yes");
strlcpy(spt_str, "yes", sizeof(spt_str));
} else {
strcpy(spt_str, "no");
strlcpy(spt_str, "no", sizeof(spt_str));
}
} else {
strcpy(rp_str, "-");
strcpy(peer_str, "-");
strcpy(spt_str, "-");
strlcpy(rp_str, "-", sizeof(rp_str));
strlcpy(peer_str, "-", sizeof(peer_str));
strlcpy(spt_str, "-", sizeof(spt_str));
}
if (sa->flags & PIM_MSDP_SAF_LOCAL) {
strcpy(local_str, "yes");
strlcpy(local_str, "yes", sizeof(local_str));
} else {
strcpy(local_str, "no");
strlcpy(local_str, "no", sizeof(local_str));
}
pim_time_timer_to_hhmmss(statetimer, sizeof(statetimer),
sa->sa_state_timer);

2
pimd/pim_msdp.c
View File

@ -1078,7 +1078,7 @@ static enum pim_msdp_err pim_msdp_peer_new(struct pim_instance *pim,
mp->mesh_group_name = XSTRDUP(MTYPE_PIM_MSDP_MG_NAME, mesh_group_name);
mp->state = PIM_MSDP_INACTIVE;
mp->fd = -1;
strcpy(mp->last_reset, "-");
strlcpy(mp->last_reset, "-", sizeof(mp->last_reset));
/* higher IP address is listener */
if (ntohl(mp->local.s_addr) > ntohl(mp->peer.s_addr)) {
mp->flags |= PIM_MSDP_PEERF_LISTENER;

15
pimd/pim_upstream.c
View File

@ -1399,23 +1399,24 @@ const char *pim_upstream_state2str(enum pim_upstream_state join_state)
return "Unknown";
}
const char *pim_reg_state2str(enum pim_reg_state reg_state, char *state_str)
const char *pim_reg_state2str(enum pim_reg_state reg_state, char *state_str,
size_t state_str_len)
{
switch (reg_state) {
case PIM_REG_NOINFO:
strcpy(state_str, "RegNoInfo");
strlcpy(state_str, "RegNoInfo", state_str_len);
break;
case PIM_REG_JOIN:
strcpy(state_str, "RegJoined");
strlcpy(state_str, "RegJoined", state_str_len);
break;
case PIM_REG_JOIN_PENDING:
strcpy(state_str, "RegJoinPend");
strlcpy(state_str, "RegJoinPend", state_str_len);
break;
case PIM_REG_PRUNE:
strcpy(state_str, "RegPrune");
strlcpy(state_str, "RegPrune", state_str_len);
break;
default:
strcpy(state_str, "RegUnknown");
strlcpy(state_str, "RegUnknown", state_str_len);
}
return state_str;
}
@ -1432,7 +1433,7 @@ static int pim_upstream_register_stop_timer(struct thread *t)
char state_str[PIM_REG_STATE_STR_LEN];
zlog_debug("%s: (S,G)=%s[%s] upstream register stop timer %s",
__PRETTY_FUNCTION__, up->sg_str, pim->vrf->name,
pim_reg_state2str(up->reg_state, state_str));
pim_reg_state2str(up->reg_state, state_str, sizeof(state_str)));
}
switch (up->reg_state) {

3
pimd/pim_upstream.h
View File

@ -283,7 +283,8 @@ void pim_upstream_switch(struct pim_instance *pim, struct pim_upstream *up,
const char *pim_upstream_state2str(enum pim_upstream_state join_state);
#define PIM_REG_STATE_STR_LEN 12
const char *pim_reg_state2str(enum pim_reg_state state, char *state_str);
const char *pim_reg_state2str(enum pim_reg_state state, char *state_str,
size_t state_str_len);
int pim_upstream_inherited_olist_decide(struct pim_instance *pim,
struct pim_upstream *up);

14
ripngd/ripngd.c
View File

@ -2011,26 +2011,26 @@ static char *ripng_route_subtype_print(struct ripng_info *rinfo)
memset(str, 0, 3);
if (rinfo->suppress)
strcat(str, "S");
strlcat(str, "S", sizeof(str));
switch (rinfo->sub_type) {
case RIPNG_ROUTE_RTE:
strcat(str, "n");
strlcat(str, "n", sizeof(str));
break;
case RIPNG_ROUTE_STATIC:
strcat(str, "s");
strlcat(str, "s", sizeof(str));
break;
case RIPNG_ROUTE_DEFAULT:
strcat(str, "d");
strlcat(str, "d", sizeof(str));
break;
case RIPNG_ROUTE_REDISTRIBUTE:
strcat(str, "r");
strlcat(str, "r", sizeof(str));
break;
case RIPNG_ROUTE_INTERFACE:
strcat(str, "i");
strlcat(str, "i", sizeof(str));
break;
default:
strcat(str, "?");
strlcat(str, "?", sizeof(str));
break;
}

2
staticd/static_routes.c
View File

@ -127,7 +127,7 @@ int static_add_route(afi_t afi, safi_t safi, uint8_t type, struct prefix *p,
si->tag = tag;
si->vrf_id = svrf->vrf->vrf_id;
si->nh_vrf_id = nh_svrf->vrf->vrf_id;
strcpy(si->nh_vrfname, nh_svrf->vrf->name);
strlcpy(si->nh_vrfname, nh_svrf->vrf->name, sizeof(si->nh_vrfname));
si->table_id = table_id;
si->onlink = onlink;

9
vtysh/vtysh.c
View File

@ -681,7 +681,7 @@ int vtysh_mark_file(const char *filename)
while (fgets(vty->buf, VTY_BUFSIZ, confp)) {
lineno++;
tried = 0;
strcpy(vty_buf_copy, vty->buf);
strlcpy(vty_buf_copy, vty->buf, VTY_BUFSIZ);
vty_buf_trimmed = trim(vty_buf_copy);
switch (vty->node) {
@ -2702,9 +2702,10 @@ static void backup_config_file(const char *fbackup)
{
char *integrate_sav = NULL;
integrate_sav = malloc(strlen(fbackup) + strlen(CONF_BACKUP_EXT) + 1);
strcpy(integrate_sav, fbackup);
strcat(integrate_sav, CONF_BACKUP_EXT);
size_t integrate_sav_sz = strlen(fbackup) + strlen(CONF_BACKUP_EXT) + 1;
integrate_sav = malloc(integrate_sav_sz);
strlcpy(integrate_sav, fbackup, integrate_sav_sz);
strlcat(integrate_sav, CONF_BACKUP_EXT, integrate_sav_sz);
/* Move current configuration file to backup config file. */
if (unlink(integrate_sav) != 0) {

4
zebra/ioctl.c
View File

@ -245,7 +245,7 @@ static int if_set_prefix_ctx(const struct zebra_dplane_ctx *ctx)
p = (struct prefix_ipv4 *)dplane_ctx_get_intf_addr(ctx);
memset(&addreq, 0, sizeof(addreq));
strncpy((char *)&addreq.ifra_name, dplane_ctx_get_ifname(ctx),
strlcpy((char *)&addreq.ifra_name, dplane_ctx_get_ifname(ctx),
sizeof(addreq.ifra_name));
memset(&addr, 0, sizeof(struct sockaddr_in));
@ -296,7 +296,7 @@ static int if_unset_prefix_ctx(const struct zebra_dplane_ctx *ctx)
p = (struct prefix_ipv4 *)dplane_ctx_get_intf_addr(ctx);
memset(&addreq, 0, sizeof(addreq));
strncpy((char *)&addreq.ifra_name, dplane_ctx_get_ifname(ctx),
strlcpy((char *)&addreq.ifra_name, dplane_ctx_get_ifname(ctx),
sizeof(addreq.ifra_name));
memset(&addr, 0, sizeof(struct sockaddr_in));

2
zebra/ioctl_solaris.c
View File

@ -286,7 +286,7 @@ static int if_unset_prefix_ctx(const struct zebra_dplane_ctx *ctx)
p = (struct prefix_ipv4 *)dplane_ctx_get_intf_addr(ctx);
strncpy(ifreq.ifr_name, dplane_ctx_get_ifname(ctx),
strlcpy(ifreq.ifr_name, dplane_ctx_get_ifname(ctx),
sizeof(ifreq.ifr_name));
memset(&addr, 0, sizeof(struct sockaddr_in));

5
zebra/kernel_socket.c
View File

@ -304,12 +304,13 @@ size_t rta_getattr(caddr_t sap, void *destp, size_t destlen)
size_t rta_getsdlname(caddr_t sap, void *destp, short *destlen)
{
struct sockaddr_dl *sdl = (struct sockaddr_dl *)sap;
struct sockaddr *sa = (struct sockaddr *)sap;
uint8_t *dest = destp;
size_t tlen, copylen;
copylen = sdl->sdl_nlen;
#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
struct sockaddr *sa = (struct sockaddr *)sap;
tlen = (sa->sa_len == 0) ? sizeof(ROUNDUP_TYPE) : ROUNDUP(sa->sa_len);
#else /* !HAVE_STRUCT_SOCKADDR_SA_LEN */
tlen = SAROUNDUP(sap);
@ -522,7 +523,7 @@ static enum zebra_link_type sdl_to_zebra_link_type(unsigned int sdlt)
int ifm_read(struct if_msghdr *ifm)
{
struct interface *ifp = NULL;
struct sockaddr_dl *sdl;
struct sockaddr_dl *sdl = NULL;
char ifname[IFNAMSIZ];
short ifnlen = 0;
int maskbit;

2
zebra/rt_netlink.c
View File

@ -813,7 +813,7 @@ static int netlink_route_change_read_multicast(struct nlmsghdr *h,
sprintf(temp, "%s(%d) ", ifp ? ifp->name : "Unknown",
oif[count]);
strcat(oif_list, temp);
strlcat(oif_list, temp, sizeof(oif_list));
}
struct zebra_vrf *zvrf = zebra_vrf_lookup_by_id(vrf);
ifp = if_lookup_by_index(iif, vrf);

5
zebra/zebra_mpls.c
View File

@ -1693,8 +1693,9 @@ static char *snhlfe2str(zebra_snhlfe_t *snhlfe, char *buf, int size)
case NEXTHOP_TYPE_IPV6_IFINDEX:
inet_ntop(AF_INET6, &snhlfe->gate.ipv6, buf, size);
if (snhlfe->ifindex)
strcat(buf,
ifindex2ifname(snhlfe->ifindex, VRF_DEFAULT));
strlcat(buf,
ifindex2ifname(snhlfe->ifindex, VRF_DEFAULT),
size);
break;
default:
break;

2
zebra/zebra_rib.c
View File

@ -129,7 +129,7 @@ _rnode_zlog(const char *_func, vrf_id_t vrf_id, struct route_node *rn,
srcdest_rnode2str(rn, buf, sizeof(buf));
if (info->safi == SAFI_MULTICAST)
strcat(buf, " (MRIB)");
strlcat(buf, " (MRIB)", sizeof(buf));
} else {
snprintf(buf, sizeof(buf), "{(route_node *) NULL}");
}