diff options
82 files changed, 240 insertions, 242 deletions
diff --git a/bgpd/bgp_aspath.c b/bgpd/bgp_aspath.c index 41166de050..39886337f3 100644 --- a/bgpd/bgp_aspath.c +++ b/bgpd/bgp_aspath.c @@ -854,7 +854,7 @@ struct aspath *aspath_parse(struct stream *s, size_t length, int use32bit) if (length % AS16_VALUE_SIZE) return NULL; - memset(&as, 0, sizeof(struct aspath)); + memset(&as, 0, sizeof(as)); if (assegments_parse(s, length, &as.segments, use32bit) < 0) return NULL; diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c index f45362f811..6c10469da8 100644 --- a/bgpd/bgp_attr.c +++ b/bgpd/bgp_attr.c @@ -980,7 +980,7 @@ struct attr *bgp_attr_aggregate_intern( struct attr *new; int ret; - memset(&attr, 0, sizeof(struct attr)); + memset(&attr, 0, sizeof(attr)); /* Origin attribute. */ attr.origin = origin; @@ -1043,7 +1043,7 @@ struct attr *bgp_attr_aggregate_intern( struct attr attr_tmp = attr; struct bgp_path_info rmap_path; - memset(&rmap_path, 0, sizeof(struct bgp_path_info)); + memset(&rmap_path, 0, sizeof(rmap_path)); rmap_path.peer = bgp->peer_self; rmap_path.attr = &attr_tmp; diff --git a/bgpd/bgp_attr_evpn.c b/bgpd/bgp_attr_evpn.c index e528fadedd..d379f40a88 100644 --- a/bgpd/bgp_attr_evpn.c +++ b/bgpd/bgp_attr_evpn.c @@ -49,7 +49,7 @@ void bgp_add_routermac_ecom(struct attr *attr, struct ethaddr *routermac) struct ecommunity_val routermac_ecom; struct ecommunity *ecomm = bgp_attr_get_ecommunity(attr); - memset(&routermac_ecom, 0, sizeof(struct ecommunity_val)); + memset(&routermac_ecom, 0, sizeof(routermac_ecom)); routermac_ecom.val[0] = ECOMMUNITY_ENCODE_EVPN; routermac_ecom.val[1] = ECOMMUNITY_EVPN_SUBTYPE_ROUTERMAC; memcpy(&routermac_ecom.val[2], routermac->octet, ETH_ALEN); diff --git a/bgpd/bgp_debug.c b/bgpd/bgp_debug.c index 0993d6de57..ef71b191fa 100644 --- a/bgpd/bgp_debug.c +++ b/bgpd/bgp_debug.c @@ -639,7 +639,7 @@ static int bgp_debug_parse_evpn_prefix(struct vty *vty, struct cmd_token **argv, return CMD_WARNING; if (evpn_type == BGP_EVPN_MAC_IP_ROUTE) { - memset(&ip, 0, sizeof(struct ipaddr)); + memset(&ip, 0, sizeof(ip)); argv_find(argv, argc, "mac", &mac_idx); (void)prefix_str2mac(argv[mac_idx + 1]->arg, &mac); @@ -650,7 +650,7 @@ static int bgp_debug_parse_evpn_prefix(struct vty *vty, struct cmd_token **argv, build_evpn_type2_prefix((struct prefix_evpn *)argv_p, &mac, &ip); } else if (evpn_type == BGP_EVPN_IMET_ROUTE) { - memset(&ip, 0, sizeof(struct ipaddr)); + memset(&ip, 0, sizeof(ip)); argv_find(argv, argc, "ip", &ip_idx); str2ipaddr(argv[ip_idx + 1]->arg, &ip); @@ -660,7 +660,7 @@ static int bgp_debug_parse_evpn_prefix(struct vty *vty, struct cmd_token **argv, } else if (evpn_type == BGP_EVPN_IP_PREFIX_ROUTE) { struct prefix ip_prefix; - memset(&ip_prefix, 0, sizeof(struct prefix)); + memset(&ip_prefix, 0, sizeof(ip_prefix)); if (argv_find(argv, argc, "ip", &ip_idx)) { (void)str2prefix(argv[ip_idx + 1]->arg, &ip_prefix); apply_mask(&ip_prefix); diff --git a/bgpd/bgp_dump.c b/bgpd/bgp_dump.c index c389fec5f4..e57f449f78 100644 --- a/bgpd/bgp_dump.c +++ b/bgpd/bgp_dump.c @@ -851,9 +851,9 @@ static int config_write_bgp_dump(struct vty *vty) /* Initialize BGP packet dump functionality. */ void bgp_dump_init(void) { - memset(&bgp_dump_all, 0, sizeof(struct bgp_dump)); - memset(&bgp_dump_updates, 0, sizeof(struct bgp_dump)); - memset(&bgp_dump_routes, 0, sizeof(struct bgp_dump)); + memset(&bgp_dump_all, 0, sizeof(bgp_dump_all)); + memset(&bgp_dump_updates, 0, sizeof(bgp_dump_updates)); + memset(&bgp_dump_routes, 0, sizeof(bgp_dump_routes)); bgp_dump_obuf = stream_new((BGP_STANDARD_MESSAGE_MAX_PACKET_SIZE * 2) diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c index ddb34258c4..74395bb0e2 100644 --- a/bgpd/bgp_evpn.c +++ b/bgpd/bgp_evpn.c @@ -209,7 +209,7 @@ static struct vrf_irt_node *lookup_vrf_import_rt(struct ecommunity_val *rt) return NULL; } - memset(&tmp, 0, sizeof(struct vrf_irt_node)); + memset(&tmp, 0, sizeof(tmp)); memcpy(&tmp.rt, rt, ECOMMUNITY_SIZE); irt = hash_lookup(bgp_evpn->vrf_import_rt_hash, &tmp); return irt; @@ -291,7 +291,7 @@ static struct irt_node *lookup_import_rt(struct bgp *bgp, struct irt_node *irt; struct irt_node tmp; - memset(&tmp, 0, sizeof(struct irt_node)); + memset(&tmp, 0, sizeof(tmp)); memcpy(&tmp.rt, rt, ECOMMUNITY_SIZE); irt = hash_lookup(bgp->import_rt_hash, &tmp); return irt; @@ -1291,7 +1291,7 @@ static int update_evpn_type5_route(struct bgp *bgp_vrf, struct prefix_evpn *evp, if (src_attr) attr = *src_attr; else { - memset(&attr, 0, sizeof(struct attr)); + memset(&attr, 0, sizeof(attr)); bgp_attr_default_set(&attr, BGP_ORIGIN_IGP); } @@ -1728,7 +1728,7 @@ static int update_evpn_route(struct bgp *bgp, struct bgpevpn *vpn, int route_change; bool old_is_sync = false; - memset(&attr, 0, sizeof(struct attr)); + memset(&attr, 0, sizeof(attr)); /* Build path-attribute for this route. */ bgp_attr_default_set(&attr, BGP_ORIGIN_IGP); @@ -3977,7 +3977,7 @@ static int process_type3_route(struct peer *peer, afi_t afi, safi_t safi, pfx += 8; /* Make EVPN prefix. */ - memset(&p, 0, sizeof(struct prefix_evpn)); + memset(&p, 0, sizeof(p)); p.family = AF_EVPN; p.prefixlen = EVPN_ROUTE_PREFIXLEN; p.prefix.route_type = BGP_EVPN_IMET_ROUTE; @@ -4047,7 +4047,7 @@ static int process_type5_route(struct peer *peer, afi_t afi, safi_t safi, pfx += 8; /* Make EVPN prefix. */ - memset(&p, 0, sizeof(struct prefix_evpn)); + memset(&p, 0, sizeof(p)); p.family = AF_EVPN; p.prefixlen = EVPN_ROUTE_PREFIXLEN; p.prefix.route_type = BGP_EVPN_IP_PREFIX_ROUTE; @@ -4427,7 +4427,7 @@ void bgp_evpn_install_uninstall_default_route(struct bgp *bgp_vrf, afi_t afi, struct prefix ip_prefix; /* form the default prefix 0.0.0.0/0 */ - memset(&ip_prefix, 0, sizeof(struct prefix)); + memset(&ip_prefix, 0, sizeof(ip_prefix)); ip_prefix.family = afi2family(afi); if (add) { @@ -4990,7 +4990,7 @@ int bgp_nlri_parse_evpn(struct peer *peer, struct attr *attr, for (; pnt < lim; pnt += psize) { /* Clear prefix structure. */ - memset(&p, 0, sizeof(struct prefix)); + memset(&p, 0, sizeof(p)); /* Deal with path-id if AddPath is supported. */ if (addpath_capable) { @@ -5274,7 +5274,7 @@ struct bgpevpn *bgp_evpn_lookup_vni(struct bgp *bgp, vni_t vni) struct bgpevpn *vpn; struct bgpevpn tmp; - memset(&tmp, 0, sizeof(struct bgpevpn)); + memset(&tmp, 0, sizeof(tmp)); tmp.vni = vni; vpn = hash_lookup(bgp->vnihash, &tmp); return vpn; @@ -6306,7 +6306,7 @@ static struct bgpevpn *bgp_evpn_vni_svi_hash_lookup(struct bgp *bgp, struct bgpevpn *vpn; struct bgpevpn tmp; - memset(&tmp, 0, sizeof(struct bgpevpn)); + memset(&tmp, 0, sizeof(tmp)); tmp.svi_ifindex = svi; vpn = hash_lookup(bgp->vni_svi_hash, &tmp); return vpn; @@ -6376,7 +6376,7 @@ bool bgp_evpn_is_gateway_ip_resolved(struct bgp_nexthop_cache *bnc) * which stores all the remote IP addresses received via MAC/IP routes * in this EVI */ - memset(&tmp, 0, sizeof(struct evpn_remote_ip)); + memset(&tmp, 0, sizeof(tmp)); p = &bnc->prefix; if (p->family == AF_INET) { @@ -6409,7 +6409,7 @@ static void bgp_evpn_remote_ip_process_nexthops(struct bgpevpn *vpn, if (!vpn->bgp_vrf || vpn->svi_ifindex == 0) return; - memset(&p, 0, sizeof(struct prefix)); + memset(&p, 0, sizeof(p)); if (addr->ipa_type == IPADDR_V4) { afi = AFI_IP; diff --git a/bgpd/bgp_evpn_mh.c b/bgpd/bgp_evpn_mh.c index 6ce97d22c4..a1c32403b3 100644 --- a/bgpd/bgp_evpn_mh.c +++ b/bgpd/bgp_evpn_mh.c @@ -599,7 +599,7 @@ static void bgp_evpn_type4_route_extcomm_build(struct bgp_evpn_es *es, bgp_attr_set_ecommunity(attr, ecommunity_dup(&ecom_encap)); /* ES import RT */ - memset(&mac, 0, sizeof(struct ethaddr)); + memset(&mac, 0, sizeof(mac)); memset(&ecom_es_rt, 0, sizeof(ecom_es_rt)); es_get_system_mac(&es->esi, &mac); encode_es_rt_extcomm(&eval_es_rt, &mac); @@ -633,7 +633,7 @@ static int bgp_evpn_type4_route_update(struct bgp *bgp, struct bgp_dest *dest = NULL; struct bgp_path_info *pi = NULL; - memset(&attr, 0, sizeof(struct attr)); + memset(&attr, 0, sizeof(attr)); /* Build path-attribute for this route. */ bgp_attr_default_set(&attr, BGP_ORIGIN_IGP); @@ -943,7 +943,7 @@ static int bgp_evpn_type1_route_update(struct bgp *bgp, struct bgp_evpn_es *es, int route_changed = 0; struct prefix_rd *global_rd; - memset(&attr, 0, sizeof(struct attr)); + memset(&attr, 0, sizeof(attr)); /* Build path-attribute for this route. */ bgp_attr_default_set(&attr, BGP_ORIGIN_IGP); @@ -4507,7 +4507,7 @@ static struct bgp_evpn_nh *bgp_evpn_nh_add(struct bgp *bgp_vrf, struct bgp_evpn_nh tmp_n; struct bgp_evpn_nh *n = NULL; - memset(&tmp_n, 0, sizeof(struct bgp_evpn_nh)); + memset(&tmp_n, 0, sizeof(tmp_n)); memcpy(&tmp_n.ip, ip, sizeof(struct ipaddr)); n = hash_get(bgp_vrf->evpn_nh_table, &tmp_n, bgp_evpn_nh_alloc); ipaddr2str(ip, n->nh_str, sizeof(n->nh_str)); diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c index 0c9cd3b721..3d59c9df79 100644 --- a/bgpd/bgp_evpn_vty.c +++ b/bgpd/bgp_evpn_vty.c @@ -2367,7 +2367,7 @@ static void evpn_show_routes_vni_all(struct vty *vty, struct bgp *bgp, num_vnis = hashcount(bgp->vnihash); if (!num_vnis) return; - memset(&wctx, 0, sizeof(struct vni_walk_ctx)); + memset(&wctx, 0, sizeof(wctx)); wctx.bgp = bgp; wctx.vty = vty; wctx.vtep_ip = vtep_ip; diff --git a/bgpd/bgp_flowspec.c b/bgpd/bgp_flowspec.c index de3f2a9d47..39c0cfe514 100644 --- a/bgpd/bgp_flowspec.c +++ b/bgpd/bgp_flowspec.c @@ -121,7 +121,7 @@ int bgp_nlri_parse_flowspec(struct peer *peer, struct attr *attr, for (; pnt < lim; pnt += psize) { /* Clear prefix structure. */ - memset(&p, 0, sizeof(struct prefix)); + memset(&p, 0, sizeof(p)); /* All FlowSpec NLRI begin with length. */ if (pnt + 1 > lim) diff --git a/bgpd/bgp_flowspec_util.c b/bgpd/bgp_flowspec_util.c index 348dc7c9d1..9f3ea499ff 100644 --- a/bgpd/bgp_flowspec_util.c +++ b/bgpd/bgp_flowspec_util.c @@ -97,7 +97,7 @@ bool bgp_flowspec_contains_prefix(const struct prefix *pfs, switch (type) { case FLOWSPEC_DEST_PREFIX: case FLOWSPEC_SRC_PREFIX: - memset(&compare, 0, sizeof(struct prefix)); + memset(&compare, 0, sizeof(compare)); ret = bgp_flowspec_ip_address( BGP_FLOWSPEC_CONVERT_TO_NON_OPAQUE, nlri_content+offset, @@ -185,7 +185,7 @@ int bgp_flowspec_ip_address(enum bgp_flowspec_util_nlri_t type, uint8_t prefix_offset = 0; *error = 0; - memset(&prefix_local, 0, sizeof(struct prefix)); + memset(&prefix_local, 0, sizeof(prefix_local)); /* read the prefix length */ prefix_local.prefixlen = nlri_ptr[offset]; psize = PSIZE(prefix_local.prefixlen); @@ -665,7 +665,7 @@ bool bgp_flowspec_get_first_nh(struct bgp *bgp, struct bgp_path_info *pi, struct bgp_dest *dest = pi->net; struct bgp_pbr_entry_action *api_action; - memset(&api, 0, sizeof(struct bgp_pbr_entry_main)); + memset(&api, 0, sizeof(api)); if (bgp_pbr_build_and_validate_entry(bgp_dest_get_prefix(dest), pi, &api) < 0) diff --git a/bgpd/bgp_keepalives.c b/bgpd/bgp_keepalives.c index 4cb7bd788a..86202a0e3d 100644 --- a/bgpd/bgp_keepalives.c +++ b/bgpd/bgp_keepalives.c @@ -121,7 +121,7 @@ static void peer_process(struct hash_bucket *hb, void *arg) bgp_keepalive_send(pkat->peer); monotime(&pkat->last); - memset(&elapsed, 0x00, sizeof(struct timeval)); + memset(&elapsed, 0, sizeof(elapsed)); diff = ka; } @@ -220,7 +220,7 @@ void *bgp_keepalives_start(void *arg) hash_iterate(peerhash, peer_process, &next_update); if (next_update.tv_sec == -1) - memset(&next_update, 0x00, sizeof(next_update)); + memset(&next_update, 0, sizeof(next_update)); monotime_since(&currtime, &aftertime); diff --git a/bgpd/bgp_label.c b/bgpd/bgp_label.c index f53deb63b3..a9c4b4c678 100644 --- a/bgpd/bgp_label.c +++ b/bgpd/bgp_label.c @@ -55,7 +55,7 @@ int bgp_parse_fec_update(void) s = zclient->ibuf; - memset(&p, 0, sizeof(struct prefix)); + memset(&p, 0, sizeof(p)); p.family = stream_getw(s); p.prefixlen = stream_getc(s); stream_get(p.u.val, s, PSIZE(p.prefixlen)); @@ -350,7 +350,7 @@ int bgp_nlri_parse_label(struct peer *peer, struct attr *attr, for (; pnt < lim; pnt += psize) { /* Clear prefix structure. */ - memset(&p, 0, sizeof(struct prefix)); + memset(&p, 0, sizeof(p)); if (addpath_capable) { diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c index 4d8c4ac2ac..d1a6daa8f5 100644 --- a/bgpd/bgp_mplsvpn.c +++ b/bgpd/bgp_mplsvpn.c @@ -131,7 +131,7 @@ int bgp_nlri_parse_vpn(struct peer *peer, struct attr *attr, #define VPN_PREFIXLEN_MIN_BYTES (3 + 8) /* label + RD */ while (STREAM_READABLE(data) > 0) { /* Clear prefix structure. */ - memset(&p, 0, sizeof(struct prefix)); + memset(&p, 0, sizeof(p)); if (addpath_capable) { STREAM_GET(&addpath_id, data, BGP_ADDPATH_ID_LEN); diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c index de48c97513..c6043807dd 100644 --- a/bgpd/bgp_nexthop.c +++ b/bgpd/bgp_nexthop.c @@ -560,7 +560,7 @@ bool bgp_nexthop_self(struct bgp *bgp, afi_t afi, uint8_t type, return true; if (new_afi == AF_INET && hashcount(bgp->tip_hash)) { - memset(&tmp_tip, 0, sizeof(struct tip_addr)); + memset(&tmp_tip, 0, sizeof(tmp_tip)); tmp_tip.addr = attr->nexthop; if (attr->flag & ATTR_FLAG_BIT(BGP_ATTR_NEXT_HOP)) { diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c index 9a1216a031..459b4d5e3f 100644 --- a/bgpd/bgp_packet.c +++ b/bgpd/bgp_packet.c @@ -1710,7 +1710,7 @@ static int bgp_update_receive(struct peer *peer, bgp_size_t size) } /* Set initial values. */ - memset(&attr, 0, sizeof(struct attr)); + memset(&attr, 0, sizeof(attr)); attr.label_index = BGP_INVALID_LABEL_INDEX; attr.label = MPLS_INVALID_LABEL; memset(&nlris, 0, sizeof(nlris)); @@ -2249,8 +2249,7 @@ static int bgp_route_refresh_receive(struct peer *peer, bgp_size_t size) * to maximise debug information. */ int ok; - memset(&orfp, 0, - sizeof(struct orf_prefix)); + memset(&orfp, 0, sizeof(orfp)); common = *p_pnt++; /* after ++: p_pnt <= p_end */ if (common diff --git a/bgpd/bgp_pbr.c b/bgpd/bgp_pbr.c index 352670e6c1..7b5e287242 100644 --- a/bgpd/bgp_pbr.c +++ b/bgpd/bgp_pbr.c @@ -2679,9 +2679,9 @@ static void bgp_pbr_handle_entry(struct bgp *bgp, struct bgp_path_info *path, struct bgp_pbr_val_mask bpvm; memset(&range, 0, sizeof(range)); - memset(&nh, 0, sizeof(struct nexthop)); - memset(&bpf, 0, sizeof(struct bgp_pbr_filter)); - memset(&bpof, 0, sizeof(struct bgp_pbr_or_filter)); + memset(&nh, 0, sizeof(nh)); + memset(&bpf, 0, sizeof(bpf)); + memset(&bpof, 0, sizeof(bpof)); if (api->match_bitmask & PREFIX_SRC_PRESENT || (api->type == BGP_PBR_IPRULE && api->match_bitmask_iprule & PREFIX_SRC_PRESENT)) @@ -2692,7 +2692,7 @@ static void bgp_pbr_handle_entry(struct bgp *bgp, struct bgp_path_info *path, dst = &api->dst_prefix; if (api->type == BGP_PBR_IPRULE) bpf.type = api->type; - memset(&nh, 0, sizeof(struct nexthop)); + memset(&nh, 0, sizeof(nh)); nh.vrf_id = VRF_UNKNOWN; if (api->match_protocol_num) { proto = (uint8_t)api->protocol[0].value; diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 2544ea5208..500e2f45ef 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -1597,7 +1597,7 @@ static int bgp_input_modifier(struct peer *peer, const struct prefix *p, /* Route map apply. */ if (rmap) { - memset(&rmap_path, 0, sizeof(struct bgp_path_info)); + memset(&rmap_path, 0, sizeof(rmap_path)); /* Duplicate current value to new structure for modification. */ rmap_path.peer = peer; rmap_path.attr = attr; @@ -1653,7 +1653,7 @@ static int bgp_output_modifier(struct peer *peer, const struct prefix *p, if (rmap == NULL) return RMAP_DENY; - memset(&rmap_path, 0, sizeof(struct bgp_path_info)); + memset(&rmap_path, 0, sizeof(rmap_path)); /* Route map apply. */ /* Duplicate current value to new structure for modification. */ rmap_path.peer = peer; @@ -2698,7 +2698,7 @@ void subgroup_process_announce_selected(struct update_subgroup *subgrp, PEER_STATUS_ORF_WAIT_REFRESH)) return; - memset(&attr, 0, sizeof(struct attr)); + memset(&attr, 0, sizeof(attr)); /* It's initialized in bgp_announce_check() */ /* Announcement to the subgroup. If the route is filtered withdraw it. @@ -3758,7 +3758,7 @@ int bgp_update(struct peer *peer, const struct prefix *p, uint32_t addpath_id, if (orig_safi == SAFI_LABELED_UNICAST) safi = SAFI_UNICAST; - memset(&new_attr, 0, sizeof(struct attr)); + memset(&new_attr, 0, sizeof(new_attr)); new_attr.label_index = BGP_INVALID_LABEL_INDEX; new_attr.label = MPLS_INVALID_LABEL; @@ -5656,7 +5656,7 @@ int bgp_nlri_parse_ip(struct peer *peer, struct attr *attr, then the Error Subcode is set to Invalid Network Field. */ for (; pnt < lim; pnt += psize) { /* Clear prefix structure. */ - memset(&p, 0, sizeof(struct prefix)); + memset(&p, 0, sizeof(p)); if (addpath_capable) { @@ -5833,7 +5833,7 @@ void bgp_static_update(struct bgp *bgp, const struct prefix *p, if (bgp_static->rmap.name) { struct attr attr_tmp = attr; - memset(&rmap_path, 0, sizeof(struct bgp_path_info)); + memset(&rmap_path, 0, sizeof(rmap_path)); rmap_path.peer = bgp->peer_self; rmap_path.attr = &attr_tmp; @@ -6145,7 +6145,7 @@ static void bgp_static_update_safi(struct bgp *bgp, const struct prefix *p, memcpy(&attr.esi, bgp_static->eth_s_id, sizeof(esi_t)); if (bgp_static->encap_tunneltype == BGP_ENCAP_TYPE_VXLAN) { struct bgp_encap_type_vxlan bet; - memset(&bet, 0, sizeof(struct bgp_encap_type_vxlan)); + memset(&bet, 0, sizeof(bet)); bet.vnid = p->u.prefix_evpn.prefix_addr.eth_tag; bgp_encap_type_vxlan_to_tlv(&bet, &attr); } @@ -6645,7 +6645,7 @@ int bgp_static_set_safi(afi_t afi, safi_t safi, struct vty *vty, return CMD_WARNING_CONFIG_FAILED; } if (gwip) { - memset(&gw_ip, 0, sizeof(struct prefix)); + memset(&gw_ip, 0, sizeof(gw_ip)); ret = str2prefix(gwip, &gw_ip); if (!ret) { vty_out(vty, "%% Malformed GatewayIp\n"); @@ -8372,7 +8372,7 @@ void bgp_redistribute_add(struct bgp *bgp, struct prefix *p, /* Apply route-map. */ if (red->rmap.name) { - memset(&rmap_path, 0, sizeof(struct bgp_path_info)); + memset(&rmap_path, 0, sizeof(rmap_path)); rmap_path.peer = bgp->peer_self; rmap_path.attr = &attr_new; diff --git a/bgpd/bgp_snmp.c b/bgpd/bgp_snmp.c index 868801c14e..e25d8d90db 100644 --- a/bgpd/bgp_snmp.c +++ b/bgpd/bgp_snmp.c @@ -461,7 +461,7 @@ static int write_bgpPeerTable(int action, uint8_t *var_val, intval = *(long *)var_val; - memset(&addr, 0, sizeof(struct in_addr)); + memset(&addr, 0, sizeof(addr)); peer = bgpPeerTable_lookup(NULL, name, &length, &addr, 1); if (!peer) @@ -518,7 +518,7 @@ static uint8_t *bgpPeerTable(struct variable *v, oid name[], size_t *length, if (smux_header_table(v, name, length, exact, var_len, write_method) == MATCH_FAILED) return NULL; - memset(&addr, 0, sizeof(struct in_addr)); + memset(&addr, 0, sizeof(addr)); peer = bgpPeerTable_lookup(v, name, length, &addr, exact); if (!peer) @@ -802,7 +802,7 @@ static uint8_t *bgp4PathAttrTable(struct variable *v, oid name[], if (smux_header_table(v, name, length, exact, var_len, write_method) == MATCH_FAILED) return NULL; - memset(&addr, 0, sizeof(struct prefix_ipv4)); + memset(&addr, 0, sizeof(addr)); path = bgp4PathAttrLookup(v, name, length, bgp, &addr, exact); if (!path) diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c index 77b8a8ab96..2c1d561721 100644 --- a/bgpd/bgp_zebra.c +++ b/bgpd/bgp_zebra.c @@ -2890,8 +2890,8 @@ static int bgp_zebra_process_local_l3vni(ZAPI_CALLBACK_ARGS) ifindex_t svi_ifindex; bool is_anycast_mac = false; - memset(&svi_rmac, 0, sizeof(struct ethaddr)); - memset(&originator_ip, 0, sizeof(struct in_addr)); + memset(&svi_rmac, 0, sizeof(svi_rmac)); + memset(&originator_ip, 0, sizeof(originator_ip)); s = zclient->ibuf; l3vni = stream_getl(s); if (cmd == ZEBRA_L3VNI_ADD) { @@ -3048,7 +3048,7 @@ static int bgp_zebra_process_local_ip_prefix(ZAPI_CALLBACK_ARGS) struct bgp *bgp_vrf = NULL; struct prefix p; - memset(&p, 0, sizeof(struct prefix)); + memset(&p, 0, sizeof(p)); s = zclient->ibuf; stream_get(&p, s, sizeof(struct prefix)); @@ -3519,7 +3519,7 @@ void bgp_zebra_announce_default(struct bgp *bgp, struct nexthop *nh, if (!vrf_is_backend_netns() && bgp->vrf_id != nh->vrf_id) return; - memset(&p, 0, sizeof(struct prefix)); + memset(&p, 0, sizeof(p)); if (afi != AFI_IP && afi != AFI_IP6) return; p.family = afi2family(afi); @@ -3620,7 +3620,7 @@ int bgp_zebra_send_capabilities(struct bgp *bgp, bool disable) /* Check if capability is already sent. If the flag force is set * send the capability since this can be initial bgp configuration */ - memset(&api, 0, sizeof(struct zapi_cap)); + memset(&api, 0, sizeof(api)); if (disable) { api.cap = ZEBRA_CLIENT_GR_DISABLE; api.vrf_id = bgp->vrf_id; @@ -3700,7 +3700,7 @@ int bgp_zebra_stale_timer_update(struct bgp *bgp) return BGP_GR_FAILURE; } - memset(&api, 0, sizeof(struct zapi_cap)); + memset(&api, 0, sizeof(api)); api.cap = ZEBRA_CLIENT_RIB_STALE_TIME; api.stale_removal_time = bgp->rib_stale_time; api.vrf_id = bgp->vrf_id; diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index 33ed7d1d94..48ee84cd32 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -7820,7 +7820,7 @@ void bgp_master_init(struct thread_master *master, const int buffer_size, { qobj_init(); - memset(&bgp_master, 0, sizeof(struct bgp_master)); + memset(&bgp_master, 0, sizeof(bgp_master)); bm = &bgp_master; bm->bgp = list_new(); diff --git a/bgpd/rfapi/vnc_import_bgp.c b/bgpd/rfapi/vnc_import_bgp.c index 994de7d729..acbc413917 100644 --- a/bgpd/rfapi/vnc_import_bgp.c +++ b/bgpd/rfapi/vnc_import_bgp.c @@ -238,7 +238,7 @@ static void vnc_rhnck(char *tag) struct prefix pfx_orig_nexthop; memset(&pfx_orig_nexthop, 0, - sizeof(struct prefix)); /* keep valgrind happy */ + sizeof(pfx_orig_nexthop)); /* keep valgrind happy */ pkey = p->key; pb = p->value; @@ -303,7 +303,7 @@ static int process_unicast_route(struct bgp *bgp, /* in */ struct prefix pfx_orig_nexthop; memset(&pfx_orig_nexthop, 0, - sizeof(struct prefix)); /* keep valgrind happy */ + sizeof(pfx_orig_nexthop)); /* keep valgrind happy */ /* * prefix list check @@ -346,7 +346,7 @@ static int process_unicast_route(struct bgp *bgp, /* in */ * must be freed before we return. It's easier to put it after * all of the possible returns above. */ - memset(&hattr, 0, sizeof(struct attr)); + memset(&hattr, 0, sizeof(hattr)); /* hattr becomes a ghost attr */ hattr = *attr; @@ -773,7 +773,7 @@ static void vnc_import_bgp_add_route_mode_plain(struct bgp *bgp, * must be freed before we return. It's easier to put it after * all of the possible returns above. */ - memset(&hattr, 0, sizeof(struct attr)); + memset(&hattr, 0, sizeof(hattr)); /* hattr becomes a ghost attr */ hattr = *attr; @@ -966,7 +966,7 @@ static void vnc_import_bgp_add_route_mode_nvegroup( * must be freed before we return. It's easier to put it after * all of the possible returns above. */ - memset(&hattr, 0, sizeof(struct attr)); + memset(&hattr, 0, sizeof(hattr)); /* hattr becomes a ghost attr */ hattr = *attr; @@ -1420,7 +1420,7 @@ void vnc_import_bgp_add_vnc_host_route_mode_resolve_nve( uint32_t local_pref; memset(&pfx_unicast_nexthop, 0, - sizeof(struct prefix)); /* keep valgrind happy */ + sizeof(pfx_unicast_nexthop)); /* keep valgrind happy */ if (VNC_DEBUG(IMPORT_BGP_ADD_ROUTE)) vnc_zlog_debug_any( @@ -1538,7 +1538,7 @@ void vnc_import_bgp_del_vnc_host_route_mode_resolve_nve( struct prefix pfx_unicast_nexthop; memset(&pfx_unicast_nexthop, 0, - sizeof(struct prefix)); /* keep valgrind happy */ + sizeof(pfx_unicast_nexthop)); /* keep valgrind happy */ if (process_unicast_route(bgp, afi, &pb->upfx, pb->ubpi, &ecom, &pfx_unicast_nexthop)) { @@ -1713,7 +1713,7 @@ static void vnc_import_bgp_exterior_add_route_it( prd = NULL; /* use local_pref from unicast route */ - memset(&new_attr, 0, sizeof(struct attr)); + memset(&new_attr, 0, sizeof(new_attr)); new_attr = *bpi_interior->attr; if (info->attr->flag & ATTR_FLAG_BIT(BGP_ATTR_LOCAL_PREF)) { @@ -1807,7 +1807,7 @@ void vnc_import_bgp_exterior_del_route( return; memset(&pfx_orig_nexthop, 0, - sizeof(struct prefix)); /* keep valgrind happy */ + sizeof(pfx_orig_nexthop)); /* keep valgrind happy */ h = bgp_default->rfapi; hc = bgp_default->rfapi_cfg; @@ -2473,7 +2473,7 @@ void vnc_import_bgp_exterior_del_route_interior( prd = NULL; /* use local_pref from unicast route */ - memset(&new_attr, 0, sizeof(struct attr)); + memset(&new_attr, 0, sizeof(new_attr)); new_attr = *bpi->attr; if (bpi_exterior && (bpi_exterior->attr->flag diff --git a/bgpd/rfp-example/librfp/rfp_example.c b/bgpd/rfp-example/librfp/rfp_example.c index 060fc76550..9a4ec7dbf3 100644 --- a/bgpd/rfp-example/librfp/rfp_example.c +++ b/bgpd/rfp-example/librfp/rfp_example.c @@ -287,7 +287,7 @@ static int rfp_cfg_write_cb(struct vty *vty, void *rfp_start_val) void *rfp_start(struct thread_master *master, struct rfapi_rfp_cfg **cfgp, struct rfapi_rfp_cb_methods **cbmp) { - memset(&global_rfi, 0, sizeof(struct rfp_instance_t)); + memset(&global_rfi, 0, sizeof(global_rfi)); global_rfi.master = master; /* for BGPD threads */ /* initilize struct rfapi_rfp_cfg, see rfapi.h */ diff --git a/eigrpd/eigrp_packet.c b/eigrpd/eigrp_packet.c index 491b2994b0..dd5ba8a164 100644 --- a/eigrpd/eigrp_packet.c +++ b/eigrpd/eigrp_packet.c @@ -370,7 +370,7 @@ void eigrp_write(struct thread *thread) if (ep->dst.s_addr == htonl(EIGRP_MULTICAST_ADDRESS)) eigrp_if_ipmulticast(eigrp, &ei->address, ei->ifp->ifindex); - memset(&iph, 0, sizeof(struct ip)); + memset(&iph, 0, sizeof(iph)); memset(&sa_dst, 0, sizeof(sa_dst)); /* @@ -713,7 +713,7 @@ static struct stream *eigrp_recv_packet(struct eigrp *eigrp, char buff[CMSG_SPACE(SOPT_SIZE_CMSG_IFINDEX_IPV4())]; struct msghdr msgh; - memset(&msgh, 0, sizeof(struct msghdr)); + memset(&msgh, 0, sizeof(msgh)); msgh.msg_iov = &iov; msgh.msg_iovlen = 1; msgh.msg_control = (caddr_t)buff; diff --git a/eigrpd/eigrp_snmp.c b/eigrpd/eigrp_snmp.c index 9ada292feb..5a930424c0 100644 --- a/eigrpd/eigrp_snmp.c +++ b/eigrpd/eigrp_snmp.c @@ -1034,7 +1034,7 @@ static uint8_t *eigrpPeerEntry(struct variable *v, oid *name, size_t *length, == MATCH_FAILED) return NULL; - memset(&nbr_addr, 0, sizeof(struct in_addr)); + memset(&nbr_addr, 0, sizeof(nbr_addr)); ifindex = 0; nbr = eigrpNbrLookup(v, name, length, &nbr_addr, &ifindex, exact); diff --git a/eigrpd/eigrpd.c b/eigrpd/eigrpd.c index 84d4f6aeeb..7bc7be9706 100644 --- a/eigrpd/eigrpd.c +++ b/eigrpd/eigrpd.c @@ -123,7 +123,7 @@ void eigrp_master_init(void) { struct timeval tv; - memset(&eigrp_master, 0, sizeof(struct eigrp_master)); + memset(&eigrp_master, 0, sizeof(eigrp_master)); eigrp_om = &eigrp_master; eigrp_om->eigrp = list_new(); diff --git a/isisd/isis_bpf.c b/isisd/isis_bpf.c index 88c3bfa63c..5f3d70ed3a 100644 --- a/isisd/isis_bpf.c +++ b/isisd/isis_bpf.c @@ -161,7 +161,7 @@ static int open_bpf_dev(struct isis_circuit *circuit) /* * And set the filter */ - memset(&bpf_prog, 0, sizeof(struct bpf_program)); + memset(&bpf_prog, 0, sizeof(bpf_prog)); bpf_prog.bf_len = 8; bpf_prog.bf_insns = &(llcfilter[0]); if (ioctl(fd, BIOCSETF, (caddr_t)&bpf_prog) < 0) { diff --git a/isisd/isis_pfpacket.c b/isisd/isis_pfpacket.c index d58cd1c5bc..a448e0043c 100644 --- a/isisd/isis_pfpacket.c +++ b/isisd/isis_pfpacket.c @@ -144,7 +144,7 @@ static int open_packet_socket(struct isis_circuit *circuit) /* * Bind to the physical interface */ - memset(&s_addr, 0, sizeof(struct sockaddr_ll)); + memset(&s_addr, 0, sizeof(s_addr)); s_addr.sll_family = AF_PACKET; s_addr.sll_protocol = htons(ETH_P_ALL); s_addr.sll_ifindex = circuit->interface->ifindex; @@ -233,7 +233,7 @@ int isis_recv_pdu_bcast(struct isis_circuit *circuit, uint8_t *ssnpa) addr_len = sizeof(s_addr); - memset(&s_addr, 0, sizeof(struct sockaddr_ll)); + memset(&s_addr, 0, sizeof(s_addr)); bytesread = recvfrom(circuit->fd, (void *)&llc, LLC_LEN, MSG_PEEK, @@ -306,7 +306,7 @@ int isis_recv_pdu_p2p(struct isis_circuit *circuit, uint8_t *ssnpa) int bytesread, addr_len; struct sockaddr_ll s_addr; - memset(&s_addr, 0, sizeof(struct sockaddr_ll)); + memset(&s_addr, 0, sizeof(s_addr)); addr_len = sizeof(s_addr); /* we can read directly to the stream */ @@ -351,7 +351,7 @@ int isis_send_pdu_bcast(struct isis_circuit *circuit, int level) struct sockaddr_ll sa; stream_set_getp(circuit->snd_stream, 0); - memset(&sa, 0, sizeof(struct sockaddr_ll)); + memset(&sa, 0, sizeof(sa)); sa.sll_family = AF_PACKET; size_t frame_size = stream_get_endp(circuit->snd_stream) + LLC_LEN; @@ -398,7 +398,7 @@ int isis_send_pdu_p2p(struct isis_circuit *circuit, int level) ssize_t rv; stream_set_getp(circuit->snd_stream, 0); - memset(&sa, 0, sizeof(struct sockaddr_ll)); + memset(&sa, 0, sizeof(sa)); sa.sll_family = AF_PACKET; sa.sll_ifindex = circuit->interface->ifindex; sa.sll_halen = ETH_ALEN; diff --git a/isisd/isisd.c b/isisd/isisd.c index 85307f448b..996a62f4d5 100644 --- a/isisd/isisd.c +++ b/isisd/isisd.c @@ -177,7 +177,7 @@ struct isis *isis_lookup_by_sysid(const uint8_t *sysid) void isis_master_init(struct thread_master *master) { - memset(&isis_master, 0, sizeof(struct isis_master)); + memset(&isis_master, 0, sizeof(isis_master)); im = &isis_master; im->isis = list_new(); im->master = master; diff --git a/lib/keychain.c b/lib/keychain.c index c29c45a114..5dcb572a3c 100644 --- a/lib/keychain.c +++ b/lib/keychain.c @@ -542,7 +542,7 @@ static time_t key_str2time(const char *time_str, const char *day_str, /* Check year_str. Year must be <1993-2035>. */ GET_LONG_RANGE(year, year_str, 1993, 2035); - memset(&tm, 0, sizeof(struct tm)); + memset(&tm, 0, sizeof(tm)); tm.tm_sec = sec; tm.tm_min = min; tm.tm_hour = hour; diff --git a/lib/routemap.c b/lib/routemap.c index 46161fd817..722693ea27 100644 --- a/lib/routemap.c +++ b/lib/routemap.c @@ -759,7 +759,7 @@ struct route_map *route_map_lookup_by_name(const char *name) return NULL; // map.deleted is false via memset - memset(&tmp_map, 0, sizeof(struct route_map)); + memset(&tmp_map, 0, sizeof(tmp_map)); tmp_map.name = XSTRDUP(MTYPE_ROUTE_MAP_NAME, name); map = hash_lookup(route_map_master_hash, &tmp_map); XFREE(MTYPE_ROUTE_MAP_NAME, tmp_map.name); @@ -797,7 +797,7 @@ int route_map_mark_updated(const char *name) * with deleted=true */ if (!map) { - memset(&tmp_map, 0, sizeof(struct route_map)); + memset(&tmp_map, 0, sizeof(tmp_map)); tmp_map.name = XSTRDUP(MTYPE_ROUTE_MAP_NAME, name); tmp_map.deleted = true; map = hash_lookup(route_map_master_hash, &tmp_map); @@ -2481,7 +2481,7 @@ void route_map_notify_pentry_dependencies(const char *affected_name, if (!dep->this_hash) dep->this_hash = upd8_hash; - memset(&pentry_dep, 0, sizeof(struct route_map_pentry_dep)); + memset(&pentry_dep, 0, sizeof(pentry_dep)); pentry_dep.pentry = pentry; pentry_dep.plist_name = affected_name; pentry_dep.event = event; @@ -2760,7 +2760,7 @@ static void route_map_clear_reference(struct hash_bucket *bucket, void *arg) struct route_map_dep *dep = bucket->data; struct route_map_dep_data *dep_data = NULL, tmp_dep_data; - memset(&tmp_dep_data, 0, sizeof(struct route_map_dep_data)); + memset(&tmp_dep_data, 0, sizeof(tmp_dep_data)); tmp_dep_data.rname = arg; dep_data = hash_release(dep->dep_rmap_hash, &tmp_dep_data); if (dep_data) { @@ -2873,7 +2873,7 @@ static int route_map_dep_update(struct hash *dephash, const char *dep_name, if (!dep->this_hash) dep->this_hash = dephash; - memset(&tmp_dep_data, 0, sizeof(struct route_map_dep_data)); + memset(&tmp_dep_data, 0, sizeof(tmp_dep_data)); tmp_dep_data.rname = rname; dep_data = hash_lookup(dep->dep_rmap_hash, &tmp_dep_data); if (!dep_data) @@ -2897,7 +2897,7 @@ static int route_map_dep_update(struct hash *dephash, const char *dep_name, goto out; } - memset(&tmp_dep_data, 0, sizeof(struct route_map_dep_data)); + memset(&tmp_dep_data, 0, sizeof(tmp_dep_data)); tmp_dep_data.rname = rname; dep_data = hash_lookup(dep->dep_rmap_hash, &tmp_dep_data); /* diff --git a/lib/sockunion.c b/lib/sockunion.c index 9763b38e28..97b198c018 100644 --- a/lib/sockunion.c +++ b/lib/sockunion.c @@ -107,7 +107,7 @@ static void sockunion_normalise_mapped(union sockunion *su) if (su->sa.sa_family == AF_INET6 && IN6_IS_ADDR_V4MAPPED(&su->sin6.sin6_addr)) { - memset(&sin, 0, sizeof(struct sockaddr_in)); + memset(&sin, 0, sizeof(sin)); sin.sin_family = AF_INET; sin.sin_port = su->sin6.sin6_port; memcpy(&sin.sin_addr, ((char *)&su->sin6.sin6_addr) + 12, 4); diff --git a/lib/table.c b/lib/table.c index 523183bef2..6c4c6c7d36 100644 --- a/lib/table.c +++ b/lib/table.c @@ -228,7 +228,7 @@ struct route_node *route_node_match_ipv4(struct route_table *table, { struct prefix_ipv4 p; - memset(&p, 0, sizeof(struct prefix_ipv4)); + memset(&p, 0, sizeof(p)); p.family = AF_INET; p.prefixlen = IPV4_MAX_BITLEN; p.prefix = *addr; @@ -241,7 +241,7 @@ struct route_node *route_node_match_ipv6(struct route_table *table, { struct prefix_ipv6 p; - memset(&p, 0, sizeof(struct prefix_ipv6)); + memset(&p, 0, sizeof(p)); p.family = AF_INET6; p.prefixlen = IPV6_MAX_BITLEN; p.prefix = *addr; @@ -1827,7 +1827,7 @@ static void vty_serv_sock_addrinfo(const char *hostname, unsigned short port) int sock; char port_str[BUFSIZ]; - memset(&req, 0, sizeof(struct addrinfo)); + memset(&req, 0, sizeof(req)); req.ai_flags = AI_PASSIVE; req.ai_family = AF_UNSPEC; req.ai_socktype = SOCK_STREAM; @@ -1912,7 +1912,7 @@ static void vty_serv_un(const char *path) } /* Make server socket. */ - memset(&serv, 0, sizeof(struct sockaddr_un)); + memset(&serv, 0, sizeof(serv)); serv.sun_family = AF_UNIX; strlcpy(serv.sun_path, path, sizeof(serv.sun_path)); #ifdef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN @@ -1976,7 +1976,7 @@ static void vtysh_accept(struct thread *thread) vty_event_serv(VTYSH_SERV, vtyserv); - memset(&client, 0, sizeof(struct sockaddr_un)); + memset(&client, 0, sizeof(client)); client_len = sizeof(struct sockaddr_un); sock = accept(accept_sock, (struct sockaddr *)&client, diff --git a/nhrpd/vici.c b/nhrpd/vici.c index 56adde406e..6ba2399e05 100644 --- a/nhrpd/vici.c +++ b/nhrpd/vici.c @@ -600,7 +600,7 @@ int sock_open_unix(const char *path) if (fd < 0) return -1; - memset(&addr, 0, sizeof(struct sockaddr_un)); + memset(&addr, 0, sizeof(addr)); addr.sun_family = AF_UNIX; strlcpy(addr.sun_path, path, sizeof(addr.sun_path)); diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c index 0ca4eb3d5d..899c78c9fb 100644 --- a/ospf6d/ospf6_asbr.c +++ b/ospf6d/ospf6_asbr.c @@ -628,7 +628,7 @@ void ospf6_asbr_lsa_add(struct ospf6_lsa *lsa) if (CHECK_FLAG(external->bits_metric, OSPF6_ASBR_BIT_F)) { offset = sizeof(*external) + OSPF6_PREFIX_SPACE(external->prefix.prefix_length); - memset(&fwd_addr, 0, sizeof(struct prefix)); + memset(&fwd_addr, 0, sizeof(fwd_addr)); fwd_addr.family = AF_INET6; fwd_addr.prefixlen = IPV6_MAX_BITLEN; memcpy(&fwd_addr.u.prefix6, (caddr_t)external + offset, diff --git a/ospf6d/ospf6_auth_trailer.c b/ospf6d/ospf6_auth_trailer.c index 1f3f87751a..77ac4a1877 100644 --- a/ospf6d/ospf6_auth_trailer.c +++ b/ospf6d/ospf6_auth_trailer.c @@ -406,7 +406,7 @@ int ospf6_auth_validate_pkt(struct ospf6_interface *oi, unsigned int *pkt_len, return OSPF6_AUTH_VALIDATE_FAILURE; } - memset(&ospf6_auth_info, 0, sizeof(struct ospf6_auth_hdr)); + memset(&ospf6_auth_info, 0, sizeof(ospf6_auth_info)); if ((*pkt_len - hdr_len - (*lls_block_len)) > sizeof(ospf6_auth_info)) { if (IS_OSPF6_DEBUG_AUTH_RX) zlog_err("RECV[%s] : Wrong auth data in %s packet", diff --git a/ospf6d/ospf6_intra.c b/ospf6d/ospf6_intra.c index f3fd9dab66..b5ea3ada36 100644 --- a/ospf6d/ospf6_intra.c +++ b/ospf6d/ospf6_intra.c @@ -2010,7 +2010,7 @@ void ospf6_intra_prefix_lsa_remove(struct ospf6_lsa *lsa) break; prefix_num--; - memset(&prefix, 0, sizeof(struct prefix)); + memset(&prefix, 0, sizeof(prefix)); prefix.family = AF_INET6; prefix.prefixlen = op->prefix_length; ospf6_prefix_in6_addr(&prefix.u.prefix6, intra_prefix_lsa, op); diff --git a/ospf6d/ospf6_network.c b/ospf6d/ospf6_network.c index 7501f49fe0..9a549e2fc7 100644 --- a/ospf6d/ospf6_network.c +++ b/ospf6d/ospf6_network.c @@ -173,7 +173,7 @@ int ospf6_sendmsg(struct in6_addr *src, struct in6_addr *dst, memset(&cmsgbuf, 0, sizeof(cmsgbuf)); scmsgp = (struct cmsghdr *)&cmsgbuf; pktinfo = (struct in6_pktinfo *)(CMSG_DATA(scmsgp)); - memset(&dst_sin6, 0, sizeof(struct sockaddr_in6)); + memset(&dst_sin6, 0, sizeof(dst_sin6)); /* source address */ pktinfo->ipi6_ifindex = ifindex; @@ -226,7 +226,7 @@ int ospf6_recvmsg(struct in6_addr *src, struct in6_addr *dst, rcmsgp = (struct cmsghdr *)cmsgbuf; pktinfo = (struct in6_pktinfo *)(CMSG_DATA(rcmsgp)); - memset(&src_sin6, 0, sizeof(struct sockaddr_in6)); + memset(&src_sin6, 0, sizeof(src_sin6)); /* receive control msg */ rcmsgp->cmsg_level = IPPROTO_IPV6; diff --git a/ospf6d/ospf6_route.c b/ospf6d/ospf6_route.c index 3c74ca55c1..8e964393f1 100644 --- a/ospf6d/ospf6_route.c +++ b/ospf6d/ospf6_route.c @@ -1550,7 +1550,7 @@ int ospf6_route_table_show(struct vty *vty, int argc_start, int argc, int arg_end = use_json ? (argc - 1) : argc; json_object *json = NULL; - memset(&prefix, 0, sizeof(struct prefix)); + memset(&prefix, 0, sizeof(prefix)); if (use_json) json = json_object_new_object(); @@ -1723,9 +1723,9 @@ int ospf6_linkstate_table_show(struct vty *vty, int idx_ipv4, int argc, int i, ret; struct prefix router, id, prefix; - memset(&router, 0, sizeof(struct prefix)); - memset(&id, 0, sizeof(struct prefix)); - memset(&prefix, 0, sizeof(struct prefix)); + memset(&router, 0, sizeof(router)); + memset(&id, 0, sizeof(id)); + memset(&prefix, 0, sizeof(prefix)); for (i = idx_ipv4; i < argc; i++) { if (strmatch(argv[i]->text, "detail")) { diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c index 634eabbf70..8f482d7077 100644 --- a/ospf6d/ospf6_top.c +++ b/ospf6d/ospf6_top.c @@ -579,7 +579,7 @@ static void ospf6_disable(struct ospf6 *o) void ospf6_master_init(struct thread_master *master) { - memset(&ospf6_master, 0, sizeof(struct ospf6_master)); + memset(&ospf6_master, 0, sizeof(ospf6_master)); om6 = &ospf6_master; om6->ospf6 = list_new(); @@ -1758,7 +1758,7 @@ bool ospf6_is_valid_summary_addr(struct vty *vty, struct prefix *p) { struct in6_addr addr_zero; - memset(&addr_zero, 0, sizeof(struct in6_addr)); + memset(&addr_zero, 0, sizeof(addr_zero)); /* Default prefix validation*/ if ((is_default_prefix(p)) || diff --git a/ospf6d/ospf6_zebra.c b/ospf6d/ospf6_zebra.c index 18b1959b9b..8366716585 100644 --- a/ospf6d/ospf6_zebra.c +++ b/ospf6d/ospf6_zebra.c @@ -241,7 +241,7 @@ static int ospf6_zebra_gr_update(struct ospf6 *ospf6, int command, if (!zclient || zclient->sock < 0 || !ospf6) return 1; - memset(&api, 0, sizeof(struct zapi_cap)); + memset(&api, 0, sizeof(api)); api.cap = command; api.stale_removal_time = stale_time; api.vrf_id = ospf6->vrf_id; diff --git a/ospfclient/ospf_apiclient.c b/ospfclient/ospf_apiclient.c index 1908604bd9..e84c6f5b3c 100644 --- a/ospfclient/ospf_apiclient.c +++ b/ospfclient/ospf_apiclient.c @@ -124,7 +124,7 @@ struct ospf_apiclient *ospf_apiclient_connect(char *host, int syncport) /* Prepare socket for asynchronous messages */ /* Initialize async address structure */ - memset(&myaddr_async, 0, sizeof(struct sockaddr_in)); + memset(&myaddr_async, 0, sizeof(myaddr_async)); myaddr_async.sin_family = AF_INET; myaddr_async.sin_addr.s_addr = htonl(INADDR_ANY); myaddr_async.sin_port = htons(syncport + 1); @@ -219,7 +219,7 @@ struct ospf_apiclient *ospf_apiclient_connect(char *host, int syncport) want the sync port number on a fixed port number. The reverse async channel will be at this port+1 */ - memset(&myaddr_sync, 0, sizeof(struct sockaddr_in)); + memset(&myaddr_sync, 0, sizeof(myaddr_sync)); myaddr_sync.sin_family = AF_INET; myaddr_sync.sin_port = htons(syncport); #ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN diff --git a/ospfd/ospf_apiserver.c b/ospfd/ospf_apiserver.c index 97bd125aee..5229c6f44c 100644 --- a/ospfd/ospf_apiserver.c +++ b/ospfd/ospf_apiserver.c @@ -615,7 +615,7 @@ void ospf_apiserver_accept(struct thread *thread) /* Get port address and port number of peer to make reverse connection. The reverse channel uses the port number of the peer port+1. */ - memset(&peer_sync, 0, sizeof(struct sockaddr_in)); + memset(&peer_sync, 0, sizeof(peer_sync)); peerlen = sizeof(struct sockaddr_in); ret = getpeername(new_sync_sock, (struct sockaddr *)&peer_sync, diff --git a/ospfd/ospf_asbr.c b/ospfd/ospf_asbr.c index 9d4ce97fa5..2d746946a5 100644 --- a/ospfd/ospf_asbr.c +++ b/ospfd/ospf_asbr.c @@ -648,7 +648,7 @@ struct ospf_lsa *ospf_originate_summary_lsa(struct ospf *ospf, } /* Prepare the extrenal_info for aggregator */ - memset(&ei_aggr, 0, sizeof(struct external_info)); + memset(&ei_aggr, 0, sizeof(ei_aggr)); ei_aggr.p = aggr->p; ei_aggr.tag = aggr->tag; ei_aggr.type = 0; @@ -1011,7 +1011,7 @@ static void ospf_handle_external_aggr_update(struct ospf *ospf) aggr->action = OSPF_ROUTE_AGGR_NONE; /* Prepare the extrenal_info for aggregator */ - memset(&ei_aggr, 0, sizeof(struct external_info)); + memset(&ei_aggr, 0, sizeof(ei_aggr)); ei_aggr.p = aggr->p; ei_aggr.tag = aggr->tag; ei_aggr.type = 0; diff --git a/ospfd/ospf_ext.c b/ospfd/ospf_ext.c index 69847088e4..1288686a10 100644 --- a/ospfd/ospf_ext.c +++ b/ospfd/ospf_ext.c @@ -114,7 +114,7 @@ int ospf_ext_init(void) { int rc = 0; - memset(&OspfEXT, 0, sizeof(struct ospf_ext_lp)); + memset(&OspfEXT, 0, sizeof(OspfEXT)); OspfEXT.enabled = false; /* Only Area flooding is supported yet */ OspfEXT.scope = OSPF_OPAQUE_AREA_LSA; diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c index 59e1b73d24..2be81042a6 100644 --- a/ospfd/ospf_lsa.c +++ b/ospfd/ospf_lsa.c @@ -3149,7 +3149,7 @@ void ospf_lsa_maxage_delete(struct ospf *ospf, struct ospf_lsa *lsa) struct route_node *rn; struct prefix lsa_prefix; - memset(&lsa_prefix, 0, sizeof(struct prefix)); + memset(&lsa_prefix, 0, sizeof(lsa_prefix)); lsa_prefix.family = AF_UNSPEC; lsa_prefix.prefixlen = sizeof(lsa_prefix.u.ptr) * CHAR_BIT; lsa_prefix.u.ptr = (uintptr_t)lsa; @@ -3190,7 +3190,7 @@ void ospf_lsa_maxage(struct ospf *ospf, struct ospf_lsa *lsa) return; } - memset(&lsa_prefix, 0, sizeof(struct prefix)); + memset(&lsa_prefix, 0, sizeof(lsa_prefix)); lsa_prefix.family = AF_UNSPEC; lsa_prefix.prefixlen = sizeof(lsa_prefix.u.ptr) * CHAR_BIT; lsa_prefix.u.ptr = (uintptr_t)lsa; @@ -3865,8 +3865,7 @@ struct ospf_lsa *ospf_lsa_refresh(struct ospf *ospf, struct ospf_lsa *lsa) if (aggr) { struct external_info ei_aggr; - memset(&ei_aggr, 0, - sizeof(struct external_info)); + memset(&ei_aggr, 0, sizeof(ei_aggr)); ei_aggr.p = aggr->p; ei_aggr.tag = aggr->tag; ei_aggr.instance = ospf->instance; diff --git a/ospfd/ospf_lsdb.c b/ospfd/ospf_lsdb.c index b0881c098f..f4fb858a5f 100644 --- a/ospfd/ospf_lsdb.c +++ b/ospfd/ospf_lsdb.c @@ -198,7 +198,7 @@ struct ospf_lsa *ospf_lsdb_lookup_by_id(struct ospf_lsdb *lsdb, uint8_t type, table = lsdb->type[type].db; - memset(&lp, 0, sizeof(struct prefix_ls)); + memset(&lp, 0, sizeof(lp)); lp.family = AF_UNSPEC; lp.prefixlen = 64; lp.id = id; @@ -225,7 +225,7 @@ struct ospf_lsa *ospf_lsdb_lookup_by_id_next(struct ospf_lsdb *lsdb, table = lsdb->type[type].db; - memset(&lp, 0, sizeof(struct prefix_ls)); + memset(&lp, 0, sizeof(lp)); lp.family = AF_UNSPEC; lp.prefixlen = 64; lp.id = id; diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c index 55a010a293..c319f8068a 100644 --- a/ospfd/ospf_packet.c +++ b/ospfd/ospf_packet.c @@ -696,7 +696,7 @@ static void ospf_write(struct thread *thread) /* reset get pointer */ stream_set_getp(op->s, 0); - memset(&iph, 0, sizeof(struct ip)); + memset(&iph, 0, sizeof(iph)); memset(&sa_dst, 0, sizeof(sa_dst)); sa_dst.sin_family = AF_INET; @@ -2310,7 +2310,7 @@ static struct stream *ospf_recv_packet(struct ospf *ospf, int fd, char buff[CMSG_SPACE(SOPT_SIZE_CMSG_IFINDEX_IPV4())]; struct msghdr msgh; - memset(&msgh, 0, sizeof(struct msghdr)); + memset(&msgh, 0, sizeof(msgh)); msgh.msg_iov = &iov; msgh.msg_iovlen = 1; msgh.msg_control = (caddr_t)buff; diff --git a/ospfd/ospf_ri.c b/ospfd/ospf_ri.c index 3efdb53102..e227a3151f 100644 --- a/ospfd/ospf_ri.c +++ b/ospfd/ospf_ri.c @@ -90,7 +90,7 @@ int ospf_router_info_init(void) zlog_info("RI (%s): Initialize Router Information", __func__); - memset(&OspfRI, 0, sizeof(struct ospf_router_info)); + memset(&OspfRI, 0, sizeof(OspfRI)); OspfRI.enabled = false; OspfRI.registered = 0; OspfRI.scope = OSPF_OPAQUE_AS_LSA; diff --git a/ospfd/ospf_snmp.c b/ospfd/ospf_snmp.c index bf37556863..9727c7039c 100644 --- a/ospfd/ospf_snmp.c +++ b/ospfd/ospf_snmp.c @@ -693,7 +693,7 @@ static uint8_t *ospfAreaEntry(struct variable *v, oid *name, size_t *length, == MATCH_FAILED) return NULL; - memset(&addr, 0, sizeof(struct in_addr)); + memset(&addr, 0, sizeof(addr)); area = ospfAreaLookup(v, name, length, &addr, exact); if (!area) @@ -821,7 +821,7 @@ static uint8_t *ospfStubAreaEntry(struct variable *v, oid *name, size_t *length, == MATCH_FAILED) return NULL; - memset(&addr, 0, sizeof(struct in_addr)); + memset(&addr, 0, sizeof(addr)); area = ospfStubAreaLookup(v, name, length, &addr, exact); if (!area) @@ -1044,10 +1044,10 @@ static uint8_t *ospfLsdbEntry(struct variable *v, oid *name, size_t *length, /* INDEX { ospfLsdbAreaId, ospfLsdbType, ospfLsdbLsid, ospfLsdbRouterId } */ - memset(&area_id, 0, sizeof(struct in_addr)); + memset(&area_id, 0, sizeof(area_id)); type = 0; - memset(&ls_id, 0, sizeof(struct in_addr)); - memset(&router_id, 0, sizeof(struct in_addr)); + memset(&ls_id, 0, sizeof(ls_id)); + memset(&router_id, 0, sizeof(router_id)); /* Check OSPF instance. */ ospf = ospf_lookup_by_vrf_id(VRF_DEFAULT); @@ -1279,7 +1279,7 @@ static uint8_t *ospfHostEntry(struct variable *v, oid *name, size_t *length, if (ospf == NULL) return NULL; - memset(&addr, 0, sizeof(struct in_addr)); + memset(&addr, 0, sizeof(addr)); nbr_nbma = ospfHostLookup(v, name, length, &addr, exact); if (nbr_nbma == NULL) @@ -1595,7 +1595,7 @@ static uint8_t *ospfIfEntry(struct variable *v, oid *name, size_t *length, return NULL; ifindex = 0; - memset(&ifaddr, 0, sizeof(struct in_addr)); + memset(&ifaddr, 0, sizeof(ifaddr)); /* Check OSPF instance. */ ospf = ospf_lookup_by_vrf_id(VRF_DEFAULT); @@ -1742,7 +1742,7 @@ static uint8_t *ospfIfMetricEntry(struct variable *v, oid *name, size_t *length, return NULL; ifindex = 0; - memset(&ifaddr, 0, sizeof(struct in_addr)); + memset(&ifaddr, 0, sizeof(ifaddr)); /* Check OSPF instance. */ ospf = ospf_lookup_by_vrf_id(VRF_DEFAULT); @@ -1778,7 +1778,7 @@ static int ospf_snmp_vl_add(struct ospf_vl_data *vl_data) struct prefix_ls lp; struct route_node *rn; - memset(&lp, 0, sizeof(struct prefix_ls)); + memset(&lp, 0, sizeof(lp)); lp.family = AF_UNSPEC; lp.prefixlen = 64; lp.id = vl_data->vl_area_id; @@ -1797,7 +1797,7 @@ static int ospf_snmp_vl_delete(struct ospf_vl_data *vl_data) struct prefix_ls lp; struct route_node *rn; - memset(&lp, 0, sizeof(struct prefix_ls)); + memset(&lp, 0, sizeof(lp)); lp.family = AF_UNSPEC; lp.prefixlen = 64; lp.id = vl_data->vl_area_id; @@ -1819,7 +1819,7 @@ static struct ospf_vl_data *ospf_snmp_vl_lookup(struct in_addr *area_id, struct route_node *rn; struct ospf_vl_data *vl_data; - memset(&lp, 0, sizeof(struct prefix_ls)); + memset(&lp, 0, sizeof(lp)); lp.family = AF_UNSPEC; lp.prefixlen = 64; lp.id = *area_id; @@ -1842,7 +1842,7 @@ static struct ospf_vl_data *ospf_snmp_vl_lookup_next(struct in_addr *area_id, struct route_node *rn; struct ospf_vl_data *vl_data; - memset(&lp, 0, sizeof(struct prefix_ls)); + memset(&lp, 0, sizeof(lp)); lp.family = AF_UNSPEC; lp.prefixlen = 64; lp.id = *area_id; @@ -1927,8 +1927,8 @@ static uint8_t *ospfVirtIfEntry(struct variable *v, oid *name, size_t *length, == MATCH_FAILED) return NULL; - memset(&area_id, 0, sizeof(struct in_addr)); - memset(&neighbor, 0, sizeof(struct in_addr)); + memset(&area_id, 0, sizeof(area_id)); + memset(&neighbor, 0, sizeof(neighbor)); vl_data = ospfVirtIfLookup(v, name, length, &area_id, &neighbor, exact); if (!vl_data) @@ -2139,7 +2139,7 @@ static uint8_t *ospfNbrEntry(struct variable *v, oid *name, size_t *length, == MATCH_FAILED) return NULL; - memset(&nbr_addr, 0, sizeof(struct in_addr)); + memset(&nbr_addr, 0, sizeof(nbr_addr)); ifindex = 0; nbr = ospfNbrLookup(v, name, length, &nbr_addr, &ifindex, exact); @@ -2190,8 +2190,8 @@ static uint8_t *ospfVirtNbrEntry(struct variable *v, oid *name, size_t *length, == MATCH_FAILED) return NULL; - memset(&area_id, 0, sizeof(struct in_addr)); - memset(&neighbor, 0, sizeof(struct in_addr)); + memset(&area_id, 0, sizeof(area_id)); + memset(&neighbor, 0, sizeof(neighbor)); /* Check OSPF instance. */ ospf = ospf_lookup_by_vrf_id(VRF_DEFAULT); @@ -2331,8 +2331,8 @@ static uint8_t *ospfExtLsdbEntry(struct variable *v, oid *name, size_t *length, return NULL; type = OSPF_AS_EXTERNAL_LSA; - memset(&ls_id, 0, sizeof(struct in_addr)); - memset(&router_id, 0, sizeof(struct in_addr)); + memset(&ls_id, 0, sizeof(ls_id)); + memset(&router_id, 0, sizeof(router_id)); /* Check OSPF instance. */ ospf = ospf_lookup_by_vrf_id(VRF_DEFAULT); diff --git a/ospfd/ospf_sr.c b/ospfd/ospf_sr.c index 090a655cee..8fa5ce77bb 100644 --- a/ospfd/ospf_sr.c +++ b/ospfd/ospf_sr.c @@ -608,7 +608,7 @@ int ospf_sr_init(void) osr_debug("SR (%s): Initialize SR Data Base", __func__); - memset(&OspfSR, 0, sizeof(struct ospf_sr_db)); + memset(&OspfSR, 0, sizeof(OspfSR)); OspfSR.status = SR_OFF; /* Only AREA flooding is supported in this release */ OspfSR.scope = OSPF_OPAQUE_AREA_LSA; diff --git a/ospfd/ospf_te.c b/ospfd/ospf_te.c index ddc62982bd..75f4e0c9f0 100644 --- a/ospfd/ospf_te.c +++ b/ospfd/ospf_te.c @@ -159,7 +159,7 @@ int ospf_mpls_te_init(void) return rc; } - memset(&OspfMplsTE, 0, sizeof(struct ospf_mpls_te)); + memset(&OspfMplsTE, 0, sizeof(OspfMplsTE)); OspfMplsTE.enabled = false; OspfMplsTE.export = false; OspfMplsTE.inter_as = Off; diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c index 496d85fd7b..46eb625383 100644 --- a/ospfd/ospf_zebra.c +++ b/ospfd/ospf_zebra.c @@ -1253,7 +1253,7 @@ static int ospf_zebra_gr_update(struct ospf *ospf, int command, if (!zclient || zclient->sock < 0 || !ospf) return 1; - memset(&api, 0, sizeof(struct zapi_cap)); + memset(&api, 0, sizeof(api)); api.cap = command; api.stale_removal_time = stale_time; api.vrf_id = ospf->vrf_id; diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c index 221f6e7e4e..337456ecd8 100644 --- a/ospfd/ospfd.c +++ b/ospfd/ospfd.c @@ -2114,7 +2114,7 @@ int ospf_nbr_nbma_poll_interval_unset(struct ospf *ospf, struct in_addr addr) void ospf_master_init(struct thread_master *master) { - memset(&ospf_master, 0, sizeof(struct ospf_master)); + memset(&ospf_master, 0, sizeof(ospf_master)); om = &ospf_master; om->ospf = list_new(); diff --git a/pathd/path_pcep_cli.c b/pathd/path_pcep_cli.c index a6f253d3e3..d2b49a7d95 100644 --- a/pathd/path_pcep_cli.c +++ b/pathd/path_pcep_cli.c @@ -1027,7 +1027,7 @@ static int path_pcep_cli_pcc_pcc_peer(struct vty *vty, const char *peer_name, /* Verify the PCE has the IP set */ struct in6_addr zero_v6_addr; - memset(&zero_v6_addr, 0, sizeof(struct in6_addr)); + memset(&zero_v6_addr, 0, sizeof(zero_v6_addr)); if (memcmp(&pce_opts->addr.ip, &zero_v6_addr, IPADDRSZ(&pce_opts->addr)) == 0) { vty_out(vty, diff --git a/pceplib/pcep_pcc.c b/pceplib/pcep_pcc.c index 649704f55b..18ccf250ae 100644 --- a/pceplib/pcep_pcc.c +++ b/pceplib/pcep_pcc.c @@ -215,7 +215,7 @@ void handle_signal_action(int sig_number) int setup_signals() { struct sigaction sa; - memset(&sa, 0, sizeof(struct sigaction)); + memset(&sa, 0, sizeof(sa)); sa.sa_handler = handle_signal_action; if (sigaction(SIGINT, &sa, 0) != 0) { perror("sigaction()"); diff --git a/pimd/pim_nht.c b/pimd/pim_nht.c index ac46605dbd..22716c2a92 100644 --- a/pimd/pim_nht.c +++ b/pimd/pim_nht.c @@ -114,7 +114,7 @@ static struct pim_nexthop_cache *pim_nht_get(struct pim_instance *pim, struct zclient *zclient = NULL; zclient = pim_zebra_zclient_get(); - memset(&rpf, 0, sizeof(struct pim_rpf)); + memset(&rpf, 0, sizeof(rpf)); rpf.rpf_addr = *addr; pnc = pim_nexthop_cache_find(pim, &rpf); diff --git a/pimd/pim_register.c b/pimd/pim_register.c index fef5339749..f86453f936 100644 --- a/pimd/pim_register.c +++ b/pimd/pim_register.c @@ -305,7 +305,7 @@ void pim_null_register_send(struct pim_upstream *up) return; } - memset(&ip_hdr, 0, sizeof(struct ip)); + memset(&ip_hdr, 0, sizeof(ip_hdr)); ip_hdr.ip_p = PIM_IP_PROTO_PIM; ip_hdr.ip_hl = 5; ip_hdr.ip_v = 4; diff --git a/pimd/pim_sock.c b/pimd/pim_sock.c index d41bc3f436..321775cce3 100644 --- a/pimd/pim_sock.c +++ b/pimd/pim_sock.c @@ -360,7 +360,7 @@ int pim_socket_recvfromto(int fd, uint8_t *buf, size_t len, *tolen = sizeof(*to); } - memset(&msgh, 0, sizeof(struct msghdr)); + memset(&msgh, 0, sizeof(msgh)); iov.iov_base = buf; iov.iov_len = len; msgh.msg_control = cbuf; diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c index 042c9713b2..7ac37b7ee2 100644 --- a/ripd/rip_interface.c +++ b/ripd/rip_interface.c @@ -929,7 +929,7 @@ int rip_neighbor_lookup(struct rip *rip, struct sockaddr_in *from) struct prefix_ipv4 p; struct route_node *node; - memset(&p, 0, sizeof(struct prefix_ipv4)); + memset(&p, 0, sizeof(p)); p.family = AF_INET; p.prefix = from->sin_addr; p.prefixlen = IPV4_MAX_BITLEN; diff --git a/ripd/rip_nb_config.c b/ripd/rip_nb_config.c index c640ca27af..5b1917e17a 100644 --- a/ripd/rip_nb_config.c +++ b/ripd/rip_nb_config.c @@ -132,7 +132,7 @@ int ripd_instance_default_information_originate_modify( rip = nb_running_get_entry(args->dnode, NULL, true); default_information = yang_dnode_get_bool(args->dnode, NULL); - memset(&p, 0, sizeof(struct prefix_ipv4)); + memset(&p, 0, sizeof(p)); p.family = AF_INET; if (default_information) { struct nexthop nh; diff --git a/ripd/rip_snmp.c b/ripd/rip_snmp.c index 436dc4de0e..0ce3804069 100644 --- a/ripd/rip_snmp.c +++ b/ripd/rip_snmp.c @@ -356,7 +356,7 @@ static uint8_t *rip2IfStatEntry(struct variable *v, oid name[], size_t *length, == MATCH_FAILED) return NULL; - memset(&addr, 0, sizeof(struct in_addr)); + memset(&addr, 0, sizeof(addr)); /* Lookup interface. */ ifp = rip2IfLookup(v, name, length, &addr, exact); @@ -457,7 +457,7 @@ static uint8_t *rip2IfConfAddress(struct variable *v, oid name[], == MATCH_FAILED) return NULL; - memset(&addr, 0, sizeof(struct in_addr)); + memset(&addr, 0, sizeof(addr)); /* Lookup interface. */ ifp = rip2IfLookup(v, name, length, &addr, exact); @@ -529,7 +529,7 @@ static uint8_t *rip2PeerTable(struct variable *v, oid name[], size_t *length, == MATCH_FAILED) return NULL; - memset(&addr, 0, sizeof(struct in_addr)); + memset(&addr, 0, sizeof(addr)); /* Lookup interface. */ peer = rip2PeerLookup(v, name, length, &addr, exact); diff --git a/ripd/ripd.c b/ripd/ripd.c index 74a06b6893..cc21c0bd69 100644 --- a/ripd/ripd.c +++ b/ripd/ripd.c @@ -1475,7 +1475,7 @@ static int rip_send_packet(uint8_t *buf, int size, struct sockaddr_in *to, } /* Make destination address. */ - memset(&sin, 0, sizeof(struct sockaddr_in)); + memset(&sin, 0, sizeof(sin)); sin.sin_family = AF_INET; #ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN sin.sin_len = sizeof(struct sockaddr_in); @@ -1543,7 +1543,7 @@ void rip_redistribute_add(struct rip *rip, int type, int sub_type, rp = route_node_get(rip->table, (struct prefix *)p); - memset(&newinfo, 0, sizeof(struct rip_info)); + memset(&newinfo, 0, sizeof(newinfo)); newinfo.type = type; newinfo.sub_type = sub_type; newinfo.metric = 1; @@ -1737,7 +1737,7 @@ static void rip_read(struct thread *t) rip_event(rip, RIP_READ, sock); /* RIPd manages only IPv4. */ - memset(&from, 0, sizeof(struct sockaddr_in)); + memset(&from, 0, sizeof(from)); fromlen = sizeof(struct sockaddr_in); len = recvfrom(sock, (char *)&rip_buf.buf, sizeof(rip_buf.buf), 0, @@ -2384,7 +2384,7 @@ static void rip_update_interface(struct connected *ifc, uint8_t version, if (if_is_broadcast(ifp) || if_is_pointopoint(ifp)) { if (ifc->address->family == AF_INET) { /* Destination address and port setting. */ - memset(&to, 0, sizeof(struct sockaddr_in)); + memset(&to, 0, sizeof(to)); if (ifc->destination) /* use specified broadcast or peer destination * addr */ @@ -2833,7 +2833,7 @@ uint8_t rip_distance_apply(struct rip *rip, struct rip_info *rinfo) struct rip_distance *rdistance; struct access_list *alist; - memset(&p, 0, sizeof(struct prefix_ipv4)); + memset(&p, 0, sizeof(p)); p.family = AF_INET; p.prefix = rinfo->from; p.prefixlen = IPV4_MAX_BITLEN; diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c index 5fc1e34592..e7d2928697 100644 --- a/ripngd/ripngd.c +++ b/ripngd/ripngd.c @@ -196,7 +196,7 @@ int ripng_send_packet(caddr_t buf, int bufsize, struct sockaddr_in6 *to, zlog_debug(" send packet size %d", bufsize); } - memset(&addr, 0, sizeof(struct sockaddr_in6)); + memset(&addr, 0, sizeof(addr)); addr.sin6_family = AF_INET6; #ifdef SIN6_LEN addr.sin6_len = sizeof(struct sockaddr_in6); @@ -259,7 +259,7 @@ static int ripng_recv_packet(int sock, uint8_t *buf, int bufsize, struct cmsghdr *cmsgptr; struct in6_addr dst = {.s6_addr = {0}}; - memset(&dst, 0, sizeof(struct in6_addr)); + memset(&dst, 0, sizeof(dst)); /* Ancillary data. This store cmsghdr and in6_pktinfo. But at this point I can't determine size of cmsghdr */ @@ -940,7 +940,7 @@ void ripng_redistribute_add(struct ripng *ripng, int type, int sub_type, rp = agg_node_get(ripng->table, (struct prefix *)p); - memset(&newinfo, 0, sizeof(struct ripng_info)); + memset(&newinfo, 0, sizeof(newinfo)); newinfo.type = type; newinfo.sub_type = sub_type; newinfo.ifindex = ifindex; @@ -1145,7 +1145,7 @@ static void ripng_response_process(struct ripng_packet *packet, int size, ripng_peer_update(ripng, from, packet->version); /* Reset nexthop. */ - memset(&nexthop, 0, sizeof(struct ripng_nexthop)); + memset(&nexthop, 0, sizeof(nexthop)); nexthop.flag = RIPNG_NEXTHOP_UNSPEC; /* Set RTE pointer. */ @@ -1272,7 +1272,7 @@ static void ripng_request_process(struct ripng_packet *packet, int size, field. Once all the entries have been filled in, change the command from Request to Response and send the datagram back to the requestor. */ - memset(&p, 0, sizeof(struct prefix_ipv6)); + memset(&p, 0, sizeof(p)); p.family = AF_INET6; for (; ((caddr_t)rte) < lim; rte++) { diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index 74886254bd..828d2d73b0 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -4119,7 +4119,7 @@ static int vtysh_connect(struct vtysh_client *vclient) return -1; } - memset(&addr, 0, sizeof(struct sockaddr_un)); + memset(&addr, 0, sizeof(addr)); addr.sun_family = AF_UNIX; strlcpy(addr.sun_path, path, sizeof(addr.sun_path)); #ifdef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN diff --git a/watchfrr/watchfrr.c b/watchfrr/watchfrr.c index 51e4f802c9..fc285c748a 100644 --- a/watchfrr/watchfrr.c +++ b/watchfrr/watchfrr.c @@ -798,7 +798,7 @@ static int try_connect(struct daemon *dmn) zlog_debug("%s: attempting to connect", dmn->name); dmn->connect_tries++; - memset(&addr, 0, sizeof(struct sockaddr_un)); + memset(&addr, 0, sizeof(addr)); addr.sun_family = AF_UNIX; snprintf(addr.sun_path, sizeof(addr.sun_path), "%s/%s.vty", gs.vtydir, dmn->name); diff --git a/zebra/connected.c b/zebra/connected.c index eb2720335e..c01be58e82 100644 --- a/zebra/connected.c +++ b/zebra/connected.c @@ -512,14 +512,14 @@ void connected_delete_ipv4(struct interface *ifp, int flags, struct prefix p, d; struct connected *ifc; - memset(&p, 0, sizeof(struct prefix)); + memset(&p, 0, sizeof(p)); p.family = AF_INET; p.u.prefix4 = *addr; p.prefixlen = CHECK_FLAG(flags, ZEBRA_IFA_PEER) ? IPV4_MAX_BITLEN : prefixlen; if (dest) { - memset(&d, 0, sizeof(struct prefix)); + memset(&d, 0, sizeof(d)); d.family = AF_INET; d.u.prefix4 = *dest; d.prefixlen = prefixlen; @@ -603,7 +603,7 @@ void connected_delete_ipv6(struct interface *ifp, struct prefix p, d; struct connected *ifc; - memset(&p, 0, sizeof(struct prefix)); + memset(&p, 0, sizeof(p)); p.family = AF_INET6; memcpy(&p.u.prefix6, address, sizeof(struct in6_addr)); p.prefixlen = prefixlen; @@ -613,7 +613,7 @@ void connected_delete_ipv6(struct interface *ifp, rtadv_delete_prefix(ifp->info, &p); if (dest) { - memset(&d, 0, sizeof(struct prefix)); + memset(&d, 0, sizeof(d)); d.family = AF_INET6; IPV6_ADDR_COPY(&d.u.prefix6, dest); d.prefixlen = prefixlen; diff --git a/zebra/ioctl.c b/zebra/ioctl.c index a895ed9410..facd8e318d 100644 --- a/zebra/ioctl.c +++ b/zebra/ioctl.c @@ -242,7 +242,7 @@ static int if_set_prefix_ctx(const struct zebra_dplane_ctx *ctx) strlcpy((char *)&addreq.ifra_name, dplane_ctx_get_ifname(ctx), sizeof(addreq.ifra_name)); - memset(&addr, 0, sizeof(struct sockaddr_in)); + memset(&addr, 0, sizeof(addr)); addr.sin_addr = p->prefix; addr.sin_family = p->family; #ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN @@ -252,7 +252,7 @@ static int if_set_prefix_ctx(const struct zebra_dplane_ctx *ctx) if (dplane_ctx_intf_is_connected(ctx)) { p = (struct prefix_ipv4 *)dplane_ctx_get_intf_dest(ctx); - memset(&mask, 0, sizeof(struct sockaddr_in)); + memset(&mask, 0, sizeof(mask)); peer.sin_addr = p->prefix; peer.sin_family = p->family; #ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN @@ -262,7 +262,7 @@ static int if_set_prefix_ctx(const struct zebra_dplane_ctx *ctx) sizeof(struct sockaddr_in)); } - memset(&mask, 0, sizeof(struct sockaddr_in)); + memset(&mask, 0, sizeof(mask)); masklen2ip(p->prefixlen, &mask.sin_addr); mask.sin_family = p->family; #ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN @@ -293,7 +293,7 @@ static int if_unset_prefix_ctx(const struct zebra_dplane_ctx *ctx) strlcpy((char *)&addreq.ifra_name, dplane_ctx_get_ifname(ctx), sizeof(addreq.ifra_name)); - memset(&addr, 0, sizeof(struct sockaddr_in)); + memset(&addr, 0, sizeof(addr)); addr.sin_addr = p->prefix; addr.sin_family = p->family; #ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN @@ -303,7 +303,7 @@ static int if_unset_prefix_ctx(const struct zebra_dplane_ctx *ctx) if (dplane_ctx_intf_is_connected(ctx)) { p = (struct prefix_ipv4 *)dplane_ctx_get_intf_dest(ctx); - memset(&mask, 0, sizeof(struct sockaddr_in)); + memset(&mask, 0, sizeof(mask)); peer.sin_addr = p->prefix; peer.sin_family = p->family; #ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN @@ -313,7 +313,7 @@ static int if_unset_prefix_ctx(const struct zebra_dplane_ctx *ctx) sizeof(struct sockaddr_in)); } - memset(&mask, 0, sizeof(struct sockaddr_in)); + memset(&mask, 0, sizeof(mask)); masklen2ip(p->prefixlen, &mask.sin_addr); mask.sin_family = p->family; #ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN @@ -394,7 +394,7 @@ int if_unset_prefix_ctx(const struct zebra_dplane_ctx *ctx) strlcpy(ifreq.ifr_name, dplane_ctx_get_ifname(ctx), sizeof(ifreq.ifr_name)); - memset(&addr, 0, sizeof(struct sockaddr_in)); + memset(&addr, 0, sizeof(addr)); addr.sin_family = p->family; memcpy(&ifreq.ifr_addr, &addr, sizeof(struct sockaddr_in)); ret = if_ioctl(SIOCSIFADDR, (caddr_t)&ifreq); @@ -508,7 +508,7 @@ int if_set_flags(struct interface *ifp, uint64_t flags) int ret; struct ifreq ifreq; - memset(&ifreq, 0, sizeof(struct ifreq)); + memset(&ifreq, 0, sizeof(ifreq)); ifreq_set_name(&ifreq, ifp); ifreq.ifr_flags = ifp->flags; @@ -529,7 +529,7 @@ int if_unset_flags(struct interface *ifp, uint64_t flags) int ret; struct ifreq ifreq; - memset(&ifreq, 0, sizeof(struct ifreq)); + memset(&ifreq, 0, sizeof(ifreq)); ifreq_set_name(&ifreq, ifp); ifreq.ifr_flags = ifp->flags; @@ -568,7 +568,7 @@ static int if_set_prefix6_ctx(const struct zebra_dplane_ctx *ctx) strlcpy((char *)&addreq.ifra_name, dplane_ctx_get_ifname(ctx), sizeof(addreq.ifra_name)); - memset(&addr, 0, sizeof(struct sockaddr_in6)); + memset(&addr, 0, sizeof(addr)); addr.sin6_addr = p->prefix; addr.sin6_family = p->family; #ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN @@ -576,7 +576,7 @@ static int if_set_prefix6_ctx(const struct zebra_dplane_ctx *ctx) #endif memcpy(&addreq.ifra_addr, &addr, sizeof(struct sockaddr_in6)); - memset(&mask, 0, sizeof(struct sockaddr_in6)); + memset(&mask, 0, sizeof(mask)); masklen2ip6(p->prefixlen, &mask.sin6_addr); mask.sin6_family = p->family; #ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN @@ -615,7 +615,7 @@ static int if_unset_prefix6_ctx(const struct zebra_dplane_ctx *ctx) strlcpy((char *)&addreq.ifra_name, dplane_ctx_get_ifname(ctx), sizeof(addreq.ifra_name)); - memset(&addr, 0, sizeof(struct sockaddr_in6)); + memset(&addr, 0, sizeof(addr)); addr.sin6_addr = p->prefix; addr.sin6_family = p->family; #ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN @@ -623,7 +623,7 @@ static int if_unset_prefix6_ctx(const struct zebra_dplane_ctx *ctx) #endif memcpy(&addreq.ifra_addr, &addr, sizeof(struct sockaddr_in6)); - memset(&mask, 0, sizeof(struct sockaddr_in6)); + memset(&mask, 0, sizeof(mask)); masklen2ip6(p->prefixlen, &mask.sin6_addr); mask.sin6_family = p->family; #ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c index d6ca92f54e..57fd304ae8 100644 --- a/zebra/kernel_socket.c +++ b/zebra/kernel_socket.c @@ -1156,7 +1156,7 @@ int rtm_write(int message, union sockunion *dest, union sockunion *mask, return ZEBRA_ERR_EPERM; /* Clear and set rt_msghdr values */ - memset(&msg, 0, sizeof(struct rt_msghdr)); + memset(&msg, 0, sizeof(msg)); msg.rtm.rtm_version = RTM_VERSION; msg.rtm.rtm_type = message; msg.rtm.rtm_seq = msg_seq++; diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c index 4e97323cf6..1803103a74 100644 --- a/zebra/rt_netlink.c +++ b/zebra/rt_netlink.c @@ -3783,7 +3783,7 @@ static int netlink_ipneigh_change(struct nlmsghdr *h, int len, ns_id_t ns_id) return 0; } - memset(&ip, 0, sizeof(struct ipaddr)); + memset(&ip, 0, sizeof(ip)); ip.ipa_type = (ndm->ndm_family == AF_INET) ? IPADDR_V4 : IPADDR_V6; memcpy(&ip.ip.addr, RTA_DATA(tb[NDA_DST]), RTA_PAYLOAD(tb[NDA_DST])); @@ -3863,7 +3863,7 @@ static int netlink_ipneigh_change(struct nlmsghdr *h, int len, ns_id_t ns_id) return 0; } - memset(&mac, 0, sizeof(struct ethaddr)); + memset(&mac, 0, sizeof(mac)); if (h->nlmsg_type == RTM_NEWNEIGH) { if (tb[NDA_LLADDR]) { if (RTA_PAYLOAD(tb[NDA_LLADDR]) != ETH_ALEN) { diff --git a/zebra/rtadv.c b/zebra/rtadv.c index ca833999cb..e1d2016e66 100644 --- a/zebra/rtadv.c +++ b/zebra/rtadv.c @@ -2847,7 +2847,7 @@ static int if_join_all_router(int sock, struct interface *ifp) struct ipv6_mreq mreq; - memset(&mreq, 0, sizeof(struct ipv6_mreq)); + memset(&mreq, 0, sizeof(mreq)); inet_pton(AF_INET6, ALLROUTER, &mreq.ipv6mr_multiaddr); mreq.ipv6mr_interface = ifp->ifindex; @@ -2873,7 +2873,7 @@ static int if_leave_all_router(int sock, struct interface *ifp) struct ipv6_mreq mreq; - memset(&mreq, 0, sizeof(struct ipv6_mreq)); + memset(&mreq, 0, sizeof(mreq)); inet_pton(AF_INET6, ALLROUTER, &mreq.ipv6mr_multiaddr); mreq.ipv6mr_interface = ifp->ifindex; diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c index 9972d32fb7..408d420be6 100644 --- a/zebra/zapi_msg.c +++ b/zebra/zapi_msg.c @@ -1592,7 +1592,7 @@ static struct nexthop *nexthop_from_zapi(const struct zapi_nexthop *api_nh, * the nexthop and associated MAC need to be installed. */ if (CHECK_FLAG(flags, ZEBRA_FLAG_EVPN_ROUTE)) { - memset(&vtep_ip, 0, sizeof(struct ipaddr)); + memset(&vtep_ip, 0, sizeof(vtep_ip)); vtep_ip.ipa_type = IPADDR_V4; memcpy(&(vtep_ip.ipaddr_v4), &(api_nh->gate.ipv4), sizeof(struct in_addr)); @@ -1625,7 +1625,7 @@ static struct nexthop *nexthop_from_zapi(const struct zapi_nexthop *api_nh, * the nexthop and associated MAC need to be installed. */ if (CHECK_FLAG(flags, ZEBRA_FLAG_EVPN_ROUTE)) { - memset(&vtep_ip, 0, sizeof(struct ipaddr)); + memset(&vtep_ip, 0, sizeof(vtep_ip)); vtep_ip.ipa_type = IPADDR_V6; memcpy(&vtep_ip.ipaddr_v6, &(api_nh->gate.ipv6), sizeof(struct in6_addr)); diff --git a/zebra/zebra_evpn.c b/zebra/zebra_evpn.c index 121092a55b..190341a85c 100644 --- a/zebra/zebra_evpn.c +++ b/zebra/zebra_evpn.c @@ -1000,7 +1000,7 @@ struct zebra_evpn *zebra_evpn_lookup(vni_t vni) zvrf = zebra_vrf_get_evpn(); assert(zvrf); - memset(&tmp_vni, 0, sizeof(struct zebra_evpn)); + memset(&tmp_vni, 0, sizeof(tmp_vni)); tmp_vni.vni = vni; zevpn = hash_lookup(zvrf->evpn_table, &tmp_vni); @@ -1019,7 +1019,7 @@ struct zebra_evpn *zebra_evpn_add(vni_t vni) zvrf = zebra_vrf_get_evpn(); assert(zvrf); - memset(&tmp_zevpn, 0, sizeof(struct zebra_evpn)); + memset(&tmp_zevpn, 0, sizeof(tmp_zevpn)); tmp_zevpn.vni = vni; zevpn = hash_get(zvrf->evpn_table, &tmp_zevpn, zebra_evpn_alloc); diff --git a/zebra/zebra_evpn_mac.c b/zebra/zebra_evpn_mac.c index 5a1f5af5d7..86364d08a0 100644 --- a/zebra/zebra_evpn_mac.c +++ b/zebra/zebra_evpn_mac.c @@ -1102,7 +1102,7 @@ struct zebra_mac *zebra_evpn_mac_add(struct zebra_evpn *zevpn, struct zebra_mac tmp_mac; struct zebra_mac *mac = NULL; - memset(&tmp_mac, 0, sizeof(struct zebra_mac)); + memset(&tmp_mac, 0, sizeof(tmp_mac)); memcpy(&tmp_mac.macaddr, macaddr, ETH_ALEN); mac = hash_get(zevpn->mac_table, &tmp_mac, zebra_evpn_mac_alloc); @@ -1255,7 +1255,7 @@ void zebra_evpn_mac_del_all(struct zebra_evpn *zevpn, int uninstall, if (!zevpn->mac_table) return; - memset(&wctx, 0, sizeof(struct mac_walk_ctx)); + memset(&wctx, 0, sizeof(wctx)); wctx.zevpn = zevpn; wctx.uninstall = uninstall; wctx.upd_client = upd_client; @@ -1930,7 +1930,7 @@ void zebra_evpn_send_mac_list_to_client(struct zebra_evpn *zevpn) if (!zevpn->mac_table) return; - memset(&wctx, 0, sizeof(struct mac_walk_ctx)); + memset(&wctx, 0, sizeof(wctx)); wctx.zevpn = zevpn; hash_iterate(zevpn->mac_table, zebra_evpn_send_mac_hash_entry_to_client, diff --git a/zebra/zebra_evpn_neigh.c b/zebra/zebra_evpn_neigh.c index 734a53c571..b1bf09522d 100644 --- a/zebra/zebra_evpn_neigh.c +++ b/zebra/zebra_evpn_neigh.c @@ -550,7 +550,7 @@ static struct zebra_neigh *zebra_evpn_neigh_add(struct zebra_evpn *zevpn, struct zebra_neigh tmp_n; struct zebra_neigh *n = NULL; - memset(&tmp_n, 0, sizeof(struct zebra_neigh)); + memset(&tmp_n, 0, sizeof(tmp_n)); memcpy(&tmp_n.ip, ip, sizeof(struct ipaddr)); n = hash_get(zevpn->neigh_table, &tmp_n, zebra_evpn_neigh_alloc); @@ -881,7 +881,7 @@ void zebra_evpn_neigh_del_all(struct zebra_evpn *zevpn, int uninstall, if (!zevpn->neigh_table) return; - memset(&wctx, 0, sizeof(struct neigh_walk_ctx)); + memset(&wctx, 0, sizeof(wctx)); wctx.zevpn = zevpn; wctx.uninstall = uninstall; wctx.upd_client = upd_client; @@ -1653,7 +1653,7 @@ void zebra_evpn_send_neigh_to_client(struct zebra_evpn *zevpn) { struct neigh_walk_ctx wctx; - memset(&wctx, 0, sizeof(struct neigh_walk_ctx)); + memset(&wctx, 0, sizeof(wctx)); wctx.zevpn = zevpn; hash_iterate(zevpn->neigh_table, diff --git a/zebra/zebra_fpm.c b/zebra/zebra_fpm.c index 7c57dfac6a..39b7156ce4 100644 --- a/zebra/zebra_fpm.c +++ b/zebra/zebra_fpm.c @@ -1573,7 +1573,7 @@ static int zfpm_trigger_rmac_update(struct zebra_mac *rmac, vxlan_if = zl3vni_map_to_vxlan_if(zl3vni); svi_if = zl3vni_map_to_svi_if(zl3vni); - memset(&key, 0, sizeof(struct fpm_mac_info_t)); + memset(&key, 0, sizeof(key)); memcpy(&key.macaddr, &rmac->macaddr, ETH_ALEN); key.vni = zl3vni->vni; diff --git a/zebra/zebra_mpls.c b/zebra/zebra_mpls.c index de7b6a177d..8237bebf3b 100644 --- a/zebra/zebra_mpls.c +++ b/zebra/zebra_mpls.c @@ -612,7 +612,7 @@ static int nhlfe_nexthop_active_ipv4(struct zebra_nhlfe *nhlfe, return 0; /* Lookup nexthop in IPv4 routing table. */ - memset(&p, 0, sizeof(struct prefix_ipv4)); + memset(&p, 0, sizeof(p)); p.family = AF_INET; p.prefixlen = IPV4_MAX_BITLEN; p.prefix = nexthop->gate.ipv4; @@ -661,7 +661,7 @@ static int nhlfe_nexthop_active_ipv6(struct zebra_nhlfe *nhlfe, return 0; /* Lookup nexthop in IPv6 routing table. */ - memset(&p, 0, sizeof(struct prefix_ipv6)); + memset(&p, 0, sizeof(p)); p.family = AF_INET6; p.prefixlen = IPV6_MAX_BITLEN; p.prefix = nexthop->gate.ipv6; diff --git a/zebra/zebra_mpls_vty.c b/zebra/zebra_mpls_vty.c index fd9b1ae387..ca66e0310a 100644 --- a/zebra/zebra_mpls_vty.c +++ b/zebra/zebra_mpls_vty.c @@ -206,7 +206,7 @@ static int zebra_mpls_bind(struct vty *vty, int add_cmd, const char *prefix, return CMD_WARNING_CONFIG_FAILED; } - memset(&p, 0, sizeof(struct prefix)); + memset(&p, 0, sizeof(p)); ret = str2prefix(prefix, &p); if (ret <= 0) { vty_out(vty, "%% Malformed address\n"); diff --git a/zebra/zebra_netns_notify.c b/zebra/zebra_netns_notify.c index af6046c9ad..b3cb061242 100644 --- a/zebra/zebra_netns_notify.c +++ b/zebra/zebra_netns_notify.c @@ -221,7 +221,7 @@ static bool zebra_ns_notify_is_default_netns(const char *name) if (zebra_ns_notify_self_identify(&default_netns_stat)) return false; - memset(&st, 0, sizeof(struct stat)); + memset(&st, 0, sizeof(st)); snprintf(netnspath, sizeof(netnspath), "%s/%s", NS_RUN_DIR, name); /* compare with local stat */ if (stat(netnspath, &st) == 0 && diff --git a/zebra/zebra_ptm.c b/zebra/zebra_ptm.c index c28e251e3a..fda5ef02cf 100644 --- a/zebra/zebra_ptm.c +++ b/zebra/zebra_ptm.c @@ -114,7 +114,7 @@ void zebra_ptm_init(void) { char buf[64]; - memset(&ptm_cb, 0, sizeof(struct zebra_ptm_cb)); + memset(&ptm_cb, 0, sizeof(ptm_cb)); ptm_cb.out_data = calloc(1, ZEBRA_PTM_SEND_MAX_SOCKBUF); if (!ptm_cb.out_data) { @@ -389,7 +389,7 @@ static int zebra_ptm_socket_init(void) } /* Make server socket. */ - memset(&addr, 0, sizeof(struct sockaddr_un)); + memset(&addr, 0, sizeof(addr)); addr.sun_family = AF_UNIX; memcpy(&addr.sun_path, ZEBRA_PTM_SOCK_NAME, sizeof(ZEBRA_PTM_SOCK_NAME)); @@ -503,7 +503,7 @@ static int zebra_ptm_handle_bfd_msg(void *arg, void *in_ctxt, return -1; } - memset(&src_prefix, 0, sizeof(struct prefix)); + memset(&src_prefix, 0, sizeof(src_prefix)); if (strcmp(ZEBRA_PTM_INVALID_SRC_IP, src_str)) { if (str2prefix(src_str, &src_prefix) == 0) { flog_err(EC_ZEBRA_PREFIX_PARSE_ERROR, diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index 2732967ee6..e1da92403e 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -381,7 +381,7 @@ struct route_entry *rib_match(afi_t afi, safi_t safi, vrf_id_t vrf_id, if (!table) return 0; - memset(&p, 0, sizeof(struct prefix)); + memset(&p, 0, sizeof(p)); p.family = afi; if (afi == AFI_IP) { p.u.prefix4 = addr->ipv4; diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c index 020ff6f3c0..0d2dbbd18e 100644 --- a/zebra/zebra_vxlan.c +++ b/zebra/zebra_vxlan.c @@ -275,7 +275,7 @@ static void zevpn_print_neigh_hash_all_evpn(struct hash_bucket *bucket, * size, we try to be a bit more elegant in display by first computing * the maximum width. */ - memset(&wctx, 0, sizeof(struct neigh_walk_ctx)); + memset(&wctx, 0, sizeof(wctx)); wctx.zevpn = zevpn; wctx.vty = vty; wctx.addr_width = 15; @@ -341,7 +341,7 @@ static void zevpn_print_neigh_hash_all_evpn_detail(struct hash_bucket *bucket, return; } - memset(&wctx, 0, sizeof(struct neigh_walk_ctx)); + memset(&wctx, 0, sizeof(wctx)); wctx.zevpn = zevpn; wctx.vty = vty; wctx.addr_width = 15; @@ -625,7 +625,7 @@ static void zl3vni_print_nh_hash_all_vni(struct hash_bucket *bucket, } else json_object_int_add(json_evpn, "numNextHops", num_nh); - memset(&wctx, 0, sizeof(struct nh_walk_ctx)); + memset(&wctx, 0, sizeof(wctx)); wctx.vty = vty; wctx.json = json_evpn; hash_iterate(zl3vni->nh_table, zl3vni_print_nh_hash, &wctx); @@ -668,7 +668,7 @@ static void zl3vni_print_rmac_hash_all_vni(struct hash_bucket *bucket, * under the vni. Re-assign primary json object to fill * next vni information. */ - memset(&wctx, 0, sizeof(struct rmac_walk_ctx)); + memset(&wctx, 0, sizeof(wctx)); wctx.vty = vty; wctx.json = json_evpn; hash_iterate(zl3vni->rmac_table, zl3vni_print_rmac_hash, &wctx); @@ -1184,7 +1184,7 @@ static struct zebra_mac *zl3vni_rmac_add(struct zebra_l3vni *zl3vni, struct zebra_mac tmp_rmac; struct zebra_mac *zrmac = NULL; - memset(&tmp_rmac, 0, sizeof(struct zebra_mac)); + memset(&tmp_rmac, 0, sizeof(tmp_rmac)); memcpy(&tmp_rmac.macaddr, rmac, ETH_ALEN); zrmac = hash_get(zl3vni->rmac_table, &tmp_rmac, zl3vni_rmac_alloc); zrmac->nh_list = list_new(); @@ -1367,7 +1367,7 @@ static void zl3vni_remote_rmac_del(struct zebra_l3vni *zl3vni, struct ipaddr ipv4_vtep; if (!zl3vni_nh_lookup(zl3vni, vtep_ip)) { - memset(&ipv4_vtep, 0, sizeof(struct ipaddr)); + memset(&ipv4_vtep, 0, sizeof(ipv4_vtep)); ipv4_vtep.ipa_type = IPADDR_V4; if (vtep_ip->ipa_type == IPADDR_V6) ipv4_mapped_ipv6_to_ipv4(&vtep_ip->ipaddr_v6, @@ -1459,7 +1459,7 @@ static struct zebra_neigh *zl3vni_nh_add(struct zebra_l3vni *zl3vni, struct zebra_neigh tmp_n; struct zebra_neigh *n = NULL; - memset(&tmp_n, 0, sizeof(struct zebra_neigh)); + memset(&tmp_n, 0, sizeof(tmp_n)); memcpy(&tmp_n.ip, ip, sizeof(struct ipaddr)); n = hash_get(zl3vni->nh_table, &tmp_n, zl3vni_nh_alloc); @@ -1672,7 +1672,7 @@ struct zebra_l3vni *zl3vni_lookup(vni_t vni) struct zebra_l3vni tmp_l3vni; struct zebra_l3vni *zl3vni = NULL; - memset(&tmp_l3vni, 0, sizeof(struct zebra_l3vni)); + memset(&tmp_l3vni, 0, sizeof(tmp_l3vni)); tmp_l3vni.vni = vni; zl3vni = hash_lookup(zrouter.l3vni_table, &tmp_l3vni); @@ -1687,7 +1687,7 @@ static struct zebra_l3vni *zl3vni_add(vni_t vni, vrf_id_t vrf_id) struct zebra_l3vni tmp_zl3vni; struct zebra_l3vni *zl3vni = NULL; - memset(&tmp_zl3vni, 0, sizeof(struct zebra_l3vni)); + memset(&tmp_zl3vni, 0, sizeof(tmp_zl3vni)); tmp_zl3vni.vni = vni; zl3vni = hash_get(zrouter.l3vni_table, &tmp_zl3vni, zl3vni_alloc); @@ -1988,7 +1988,7 @@ static int zl3vni_send_add_to_client(struct zebra_l3vni *zl3vni) assert(zvrf); /* get the svi and vrr rmac values */ - memset(&svi_rmac, 0, sizeof(struct ethaddr)); + memset(&svi_rmac, 0, sizeof(svi_rmac)); zl3vni_get_svi_rmac(zl3vni, &svi_rmac); zl3vni_get_vrr_rmac(zl3vni, &vrr_rmac); @@ -2276,7 +2276,7 @@ void zebra_vxlan_evpn_vrf_route_add(vrf_id_t vrf_id, const struct ethaddr *rmac, * address. Rmac is programmed against the ipv4 vtep because we only * support ipv4 tunnels in the h/w right now */ - memset(&ipv4_vtep, 0, sizeof(struct ipaddr)); + memset(&ipv4_vtep, 0, sizeof(ipv4_vtep)); ipv4_vtep.ipa_type = IPADDR_V4; if (vtep_ip->ipa_type == IPADDR_V6) ipv4_mapped_ipv6_to_ipv4(&vtep_ip->ipaddr_v6, @@ -2386,7 +2386,7 @@ void zebra_vxlan_print_rmacs_l3vni(struct vty *vty, vni_t l3vni, bool use_json) if (use_json) json = json_object_new_object(); - memset(&wctx, 0, sizeof(struct rmac_walk_ctx)); + memset(&wctx, 0, sizeof(wctx)); wctx.vty = vty; wctx.json = json; if (!use_json) { @@ -2637,7 +2637,7 @@ void zebra_vxlan_print_neigh_vni(struct vty *vty, struct zebra_vrf *zvrf, * size, we try to be a bit more elegant in display by first computing * the maximum width. */ - memset(&wctx, 0, sizeof(struct neigh_walk_ctx)); + memset(&wctx, 0, sizeof(wctx)); wctx.zevpn = zevpn; wctx.vty = vty; wctx.addr_width = 15; @@ -2781,7 +2781,7 @@ void zebra_vxlan_print_neigh_vni_vtep(struct vty *vty, struct zebra_vrf *zvrf, if (use_json) json = json_object_new_object(); - memset(&wctx, 0, sizeof(struct neigh_walk_ctx)); + memset(&wctx, 0, sizeof(wctx)); wctx.zevpn = zevpn; wctx.vty = vty; wctx.addr_width = 15; @@ -2834,7 +2834,7 @@ void zebra_vxlan_print_neigh_vni_dad(struct vty *vty, * size, we try to be a bit more elegant in display by first computing * the maximum width. */ - memset(&wctx, 0, sizeof(struct neigh_walk_ctx)); + memset(&wctx, 0, sizeof(wctx)); wctx.zevpn = zevpn; wctx.vty = vty; wctx.addr_width = 15; @@ -2890,7 +2890,7 @@ void zebra_vxlan_print_macs_vni(struct vty *vty, struct zebra_vrf *zvrf, json_mac = json_object_new_object(); } - memset(&wctx, 0, sizeof(struct mac_walk_ctx)); + memset(&wctx, 0, sizeof(wctx)); wctx.zevpn = zevpn; wctx.vty = vty; wctx.json = json_mac; @@ -2931,7 +2931,7 @@ void zebra_vxlan_print_macs_all_vni(struct vty *vty, struct zebra_vrf *zvrf, if (use_json) json = json_object_new_object(); - memset(&wctx, 0, sizeof(struct mac_walk_ctx)); + memset(&wctx, 0, sizeof(wctx)); wctx.vty = vty; wctx.json = json; wctx.print_dup = print_dup; @@ -2959,7 +2959,7 @@ void zebra_vxlan_print_macs_all_vni_detail(struct vty *vty, if (use_json) json = json_object_new_object(); - memset(&wctx, 0, sizeof(struct mac_walk_ctx)); + memset(&wctx, 0, sizeof(wctx)); wctx.vty = vty; wctx.json = json; wctx.print_dup = print_dup; @@ -2986,7 +2986,7 @@ void zebra_vxlan_print_macs_all_vni_vtep(struct vty *vty, if (use_json) json = json_object_new_object(); - memset(&wctx, 0, sizeof(struct mac_walk_ctx)); + memset(&wctx, 0, sizeof(wctx)); wctx.vty = vty; wctx.flags = SHOW_REMOTE_MAC_FROM_VTEP; wctx.r_vtep_ip = vtep_ip; @@ -3071,7 +3071,7 @@ void zebra_vxlan_print_macs_vni_dad(struct vty *vty, json_mac = json_object_new_object(); } - memset(&wctx, 0, sizeof(struct mac_walk_ctx)); + memset(&wctx, 0, sizeof(wctx)); wctx.zevpn = zevpn; wctx.vty = vty; wctx.json = json_mac; @@ -3320,7 +3320,7 @@ static void zevpn_clear_dup_detect_hash_vni_all(struct hash_bucket *bucket, zvrf = (struct zebra_vrf *)args[0]; if (hashcount(zevpn->neigh_table)) { - memset(&n_wctx, 0, sizeof(struct neigh_walk_ctx)); + memset(&n_wctx, 0, sizeof(n_wctx)); n_wctx.zevpn = zevpn; n_wctx.zvrf = zvrf; hash_iterate(zevpn->neigh_table, @@ -3328,7 +3328,7 @@ static void zevpn_clear_dup_detect_hash_vni_all(struct hash_bucket *bucket, } if (num_valid_macs(zevpn)) { - memset(&m_wctx, 0, sizeof(struct mac_walk_ctx)); + memset(&m_wctx, 0, sizeof(m_wctx)); m_wctx.zevpn = zevpn; m_wctx.zvrf = zvrf; hash_iterate(zevpn->mac_table, zevpn_clear_dup_mac_hash, &m_wctx); @@ -3368,7 +3368,7 @@ int zebra_vxlan_clear_dup_detect_vni(struct zebra_vrf *zvrf, vni_t vni) } if (hashcount(zevpn->neigh_table)) { - memset(&n_wctx, 0, sizeof(struct neigh_walk_ctx)); + memset(&n_wctx, 0, sizeof(n_wctx)); n_wctx.zevpn = zevpn; n_wctx.zvrf = zvrf; hash_iterate(zevpn->neigh_table, @@ -3376,7 +3376,7 @@ int zebra_vxlan_clear_dup_detect_vni(struct zebra_vrf *zvrf, vni_t vni) } if (num_valid_macs(zevpn)) { - memset(&m_wctx, 0, sizeof(struct mac_walk_ctx)); + memset(&m_wctx, 0, sizeof(m_wctx)); m_wctx.zevpn = zevpn; m_wctx.zvrf = zvrf; hash_iterate(zevpn->mac_table, zevpn_clear_dup_mac_hash, &m_wctx); @@ -3417,7 +3417,7 @@ void zebra_vxlan_print_macs_vni_vtep(struct vty *vty, struct zebra_vrf *zvrf, json_mac = json_object_new_object(); } - memset(&wctx, 0, sizeof(struct mac_walk_ctx)); + memset(&wctx, 0, sizeof(wctx)); wctx.zevpn = zevpn; wctx.vty = vty; wctx.flags = SHOW_REMOTE_MAC_FROM_VTEP; @@ -4467,8 +4467,8 @@ int zebra_vxlan_add_del_gw_macip(struct interface *ifp, const struct prefix *p, struct ethaddr macaddr; struct zebra_evpn *zevpn = NULL; - memset(&ip, 0, sizeof(struct ipaddr)); - memset(&macaddr, 0, sizeof(struct ethaddr)); + memset(&ip, 0, sizeof(ip)); + memset(&macaddr, 0, sizeof(macaddr)); /* Check if EVPN is enabled. */ if (!is_evpn_enabled()) @@ -4683,7 +4683,7 @@ int zebra_vxlan_svi_up(struct interface *ifp, struct interface *link_if) zebra_evpn_send_add_to_client(zevpn); /* Install any remote neighbors for this VNI. */ - memset(&n_wctx, 0, sizeof(struct neigh_walk_ctx)); + memset(&n_wctx, 0, sizeof(n_wctx)); n_wctx.zevpn = zevpn; hash_iterate(zevpn->neigh_table, zebra_evpn_install_neigh_hash, &n_wctx); @@ -5153,12 +5153,12 @@ int zebra_vxlan_if_update(struct interface *ifp, uint16_t chgflags) zebra_evpn_read_mac_neigh(zevpn, ifp); - memset(&m_wctx, 0, sizeof(struct mac_walk_ctx)); + memset(&m_wctx, 0, sizeof(m_wctx)); m_wctx.zevpn = zevpn; hash_iterate(zevpn->mac_table, zebra_evpn_install_mac_hash, &m_wctx); - memset(&n_wctx, 0, sizeof(struct neigh_walk_ctx)); + memset(&n_wctx, 0, sizeof(n_wctx)); n_wctx.zevpn = zevpn; hash_iterate(zevpn->neigh_table, zebra_evpn_install_neigh_hash, &n_wctx); |