proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-13 22:26:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1044 from donaldsharp/combination

Browse Source 
Coverity Cleanup of Stuff
This commit is contained in:
Jafar Al-Gharaibeh 2017-08-31 10:25:55 -05:00 committed by GitHub
commit 959768e8d0
47 changed files with 400 additions and 336 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bgpd/bgp_evpn.c
View File

@ -2051,7 +2051,7 @@ static void evpn_mpattr_encode_type5(struct stream *s, struct prefix *p,
/* Prefix contains RD, ESI, EthTag, IP length, IP, GWIP and VNI */
stream_putc(s, 8 + 10 + 4 + 1 + len + 3);
stream_put(s, prd->val, 8);
if (attr && attr)
if (attr)
stream_put(s, &(attr->evpn_overlay.eth_s_id), 10);
else
stream_put(s, &temp, 10);
@ -2061,7 +2061,7 @@ static void evpn_mpattr_encode_type5(struct stream *s, struct prefix *p,
stream_put_ipv4(s, p_evpn_p->ip.ipaddr_v4.s_addr);
else
stream_put(s, &p_evpn_p->ip.ipaddr_v6, 16);
if (attr && attr) {
if (attr) {
if (IS_IPADDR_V4(&p_evpn_p->ip))
stream_put_ipv4(s,
attr->evpn_overlay.gw_ip.ipv4.s_addr);

4
bgpd/bgp_route.c
View File

@ -10345,10 +10345,6 @@ static int bgp_show_neighbor_route(struct vty *vty, struct peer *peer,
return CMD_WARNING;
}
/* labeled-unicast routes live in the unicast table */
if (safi == SAFI_LABELED_UNICAST)
safi = SAFI_UNICAST;
return bgp_show(vty, peer->bgp, afi, safi, type, &peer->su, use_json);
}

37
bgpd/bgp_routemap.c
View File

@ -658,8 +658,10 @@ static void *route_match_vni_compile(const char *arg)
return NULL;
*vni = strtoul(arg, &end, 10);
if (*end != '\0')
if (*end != '\0') {
XFREE(MTYPE_ROUTE_MAP_COMPILED, vni);
return NULL;
}
return vni;
}
@ -2669,25 +2671,27 @@ static int bgp_route_match_add(struct vty *vty, const char *command,
const char *arg, route_map_event_t type)
{
VTY_DECLVAR_CONTEXT(route_map_index, index);
int retval = CMD_SUCCESS;
int ret;
ret = route_map_add_match(index, command, arg);
if (ret) {
switch (ret) {
case RMAP_RULE_MISSING:
vty_out(vty, "%% BGP Can't find rule.\n");
return CMD_WARNING_CONFIG_FAILED;
retval = CMD_WARNING_CONFIG_FAILED;
break;
case RMAP_COMPILE_ERROR:
vty_out(vty, "%% BGP Argument is malformed.\n");
return CMD_WARNING_CONFIG_FAILED;
}
}
retval = CMD_WARNING_CONFIG_FAILED;
break;
case RMAP_COMPILE_SUCCESS:
if (type != RMAP_EVENT_MATCH_ADDED) {
route_map_upd8_dependency(type, arg, index->map->name);
}
break;
}
return CMD_SUCCESS;
return retval;
}
/* Delete bgp route map rule. */
@ -2696,6 +2700,7 @@ static int bgp_route_match_delete(struct vty *vty, const char *command,
{
VTY_DECLVAR_CONTEXT(route_map_index, index);
int ret;
int retval = CMD_SUCCESS;
char *dep_name = NULL;
const char *tmpstr;
char *rmap_name = NULL;
@ -2714,31 +2719,27 @@ static int bgp_route_match_delete(struct vty *vty, const char *command,
}
ret = route_map_delete_match(index, command, dep_name);
if (ret) {
switch (ret) {
case RMAP_RULE_MISSING:
vty_out(vty, "%% BGP Can't find rule.\n");
retval = CMD_WARNING_CONFIG_FAILED;
break;
case RMAP_COMPILE_ERROR:
vty_out(vty, "%% BGP Argument is malformed.\n");
retval = CMD_WARNING_CONFIG_FAILED;
break;
}
if (dep_name)
XFREE(MTYPE_ROUTE_MAP_RULE, dep_name);
if (rmap_name)
XFREE(MTYPE_ROUTE_MAP_NAME, rmap_name);
return CMD_WARNING_CONFIG_FAILED;
}
case RMAP_COMPILE_SUCCESS:
if (type != RMAP_EVENT_MATCH_DELETED && dep_name)
route_map_upd8_dependency(type, dep_name, rmap_name);
break;
}
if (dep_name)
XFREE(MTYPE_ROUTE_MAP_RULE, dep_name);
if (rmap_name)
XFREE(MTYPE_ROUTE_MAP_NAME, rmap_name);
return CMD_SUCCESS;
return retval;
}
/*

62
bgpd/rfapi/bgp_rfapi_cfg.c
View File

@ -2977,11 +2977,6 @@ DEFUN_NOSH (vnc_vrf_policy,
struct rfapi_nve_group_cfg *rfg;
VTY_DECLVAR_CONTEXT(bgp, bgp);
if (!bgp) {
vty_out(vty, "No BGP process is configured\n");
return CMD_WARNING_CONFIG_FAILED;
}
/* Search for name */
rfg = bgp_rfapi_cfg_match_byname(bgp, argv[1]->arg,
RFAPI_GROUP_CFG_VRF);
@ -3012,10 +3007,6 @@ DEFUN (vnc_no_vrf_policy,
{
VTY_DECLVAR_CONTEXT(bgp, bgp);
if (!bgp) {
vty_out(vty, "No BGP process is configured\n");
return CMD_WARNING_CONFIG_FAILED;
}
return bgp_rfapi_delete_named_nve_group(vty, bgp, argv[2]->arg,
RFAPI_GROUP_CFG_VRF);
}
@ -3031,11 +3022,6 @@ DEFUN (vnc_vrf_policy_label,
uint32_t label;
VTY_DECLVAR_CONTEXT(bgp, bgp);
if (!bgp) {
vty_out(vty, "No BGP process is configured\n");
return CMD_WARNING_CONFIG_FAILED;
}
/* make sure it's still in list */
if (!listnode_lookup(bgp->rfapi_cfg->nve_groups_sequential, rfg)) {
/* Not in list anymore */
@ -3145,11 +3131,6 @@ DEFUN (vnc_vrf_policy_rt_import,
int is_export_bgp = 0;
int is_export_zebra = 0;
if (!bgp) {
vty_out(vty, "No BGP process is configured\n");
return CMD_WARNING_CONFIG_FAILED;
}
/* make sure it's still in list */
if (!listnode_lookup(bgp->rfapi_cfg->nve_groups_sequential, rfg)) {
/* Not in list anymore */
@ -3213,11 +3194,6 @@ DEFUN (vnc_vrf_policy_rt_export,
VTY_DECLVAR_CONTEXT(bgp, bgp);
int rc;
if (!bgp) {
vty_out(vty, "No BGP process is configured\n");
return CMD_WARNING_CONFIG_FAILED;
}
/* make sure it's still in list */
if (!listnode_lookup(bgp->rfapi_cfg->nve_groups_sequential, rfg)) {
/* Not in list anymore */
@ -3253,11 +3229,6 @@ DEFUN (vnc_vrf_policy_rt_both,
struct listnode *node;
struct rfapi_rfg_name *rfgn;
if (!bgp) {
vty_out(vty, "No BGP process is configured\n");
return CMD_WARNING_CONFIG_FAILED;
}
/* make sure it's still in list */
if (!listnode_lookup(bgp->rfapi_cfg->nve_groups_sequential, rfg)) {
/* Not in list anymore */
@ -3333,11 +3304,6 @@ DEFUN (vnc_vrf_policy_rd,
VTY_DECLVAR_CONTEXT_SUB(rfapi_nve_group_cfg, rfg);
VTY_DECLVAR_CONTEXT(bgp, bgp);
if (!bgp) {
vty_out(vty, "No BGP process is configured\n");
return CMD_WARNING_CONFIG_FAILED;
}
/* make sure it's still in list */
if (!listnode_lookup(bgp->rfapi_cfg->nve_groups_sequential, rfg)) {
/* Not in list anymore */
@ -3420,11 +3386,6 @@ DEFUN_NOSH (vnc_l2_group,
struct rfapi_l2_group_cfg *rfg;
VTY_DECLVAR_CONTEXT(bgp, bgp);
if (!bgp) {
vty_out(vty, "No BGP process is configured\n");
return CMD_WARNING_CONFIG_FAILED;
}
/* Search for name */
rfg = rfapi_l2_group_lookup_byname(bgp, argv[1]->arg);
@ -3505,10 +3466,6 @@ DEFUN (vnc_no_l2_group,
{
VTY_DECLVAR_CONTEXT(bgp, bgp);
if (!bgp) {
vty_out(vty, "No BGP process is configured\n");
return CMD_WARNING_CONFIG_FAILED;
}
return bgp_rfapi_delete_named_l2_group(vty, bgp, argv[3]->arg);
}
@ -3522,11 +3479,6 @@ DEFUN (vnc_l2_group_lni,
VTY_DECLVAR_CONTEXT_SUB(rfapi_l2_group_cfg, rfg);
VTY_DECLVAR_CONTEXT(bgp, bgp);
if (!bgp) {
vty_out(vty, "No BGP process is configured\n");
return CMD_WARNING_CONFIG_FAILED;
}
/* make sure it's still in list */
if (!listnode_lookup(bgp->rfapi_cfg->l2_groups, rfg)) {
/* Not in list anymore */
@ -3549,11 +3501,6 @@ DEFUN (vnc_l2_group_labels,
VTY_DECLVAR_CONTEXT(bgp, bgp);
struct list *ll;
if (!bgp) {
vty_out(vty, "No BGP process is configured\n");
return CMD_WARNING_CONFIG_FAILED;
}
/* make sure it's still in list */
if (!listnode_lookup(bgp->rfapi_cfg->l2_groups, rfg)) {
/* Not in list anymore */
@ -3589,11 +3536,6 @@ DEFUN (vnc_l2_group_no_labels,
VTY_DECLVAR_CONTEXT(bgp, bgp);
struct list *ll;
if (!bgp) {
vty_out(vty, "No BGP process is configured\n");
return CMD_WARNING_CONFIG_FAILED;
}
/* make sure it's still in list */
if (!listnode_lookup(bgp->rfapi_cfg->l2_groups, rfg)) {
/* Not in list anymore */
@ -3646,10 +3588,6 @@ DEFUN (vnc_l2_group_rt,
vty_out(vty, "Unknown option, %s\n", argv[1]->arg);
return CMD_ERR_NO_MATCH;
}
if (!bgp) {
vty_out(vty, "No BGP process is configured\n");
return CMD_WARNING_CONFIG_FAILED;
}
/* make sure it's still in list */
if (!listnode_lookup(bgp->rfapi_cfg->l2_groups, rfg)) {

3
bgpd/rfapi/rfapi_import.c
View File

@ -3875,10 +3875,9 @@ rfapiBgpInfoFilteredImportFunction(safi_t safi)
default:
/* not expected */
return NULL;
}
zlog_err("%s: bad safi %d", __func__, safi);
return NULL;
}
}
void rfapiProcessUpdate(struct peer *peer,

4
eigrpd/eigrp_dump.c
View File

@ -295,10 +295,12 @@ void show_ip_eigrp_prefix_entry(struct vty *vty, struct eigrp_prefix_entry *tn)
vty_out(vty, "%s, ",
prefix2str(tn->destination, buffer, PREFIX_STRLEN));
vty_out(vty, "%u successors, ", successors->count);
vty_out(vty, "%u successors, ",
(successors) ? successors->count : 0);
vty_out(vty, "FD is %u, serno: %" PRIu64 " \n", tn->fdistance,
tn->serno);
if (successors)
list_delete(successors);
}

6
eigrpd/eigrp_hello.c
View File

@ -412,11 +412,15 @@ void eigrp_sw_version_initialize(void)
{
char ver_string[] = VERSION;
char *dash = strstr(ver_string, "-");
int ret;
if (dash)
dash[0] = '\0';
sscanf(ver_string, "%d.%d", &FRR_MAJOR, &FRR_MINOR);
ret = sscanf(ver_string, "%d.%d", &FRR_MAJOR, &FRR_MINOR);
if (ret != 2)
zlog_err("Did not Properly parse %s, please fix VERSION string",
VERSION);
}
/**

7
eigrpd/eigrp_interface.c
View File

@ -249,15 +249,14 @@ int eigrp_if_up(struct eigrp_interface *ei)
struct eigrp_metrics metric;
struct eigrp_interface *ei2;
struct listnode *node, *nnode;
struct eigrp *eigrp = eigrp_lookup();
struct eigrp *eigrp;
if (ei == NULL)
return 0;
if (eigrp != NULL)
eigrp = ei->eigrp;
eigrp_adjust_sndbuflen(eigrp, ei->ifp->mtu);
else
zlog_warn("%s: eigrp_lookup () returned NULL", __func__);
eigrp_if_stream_set(ei);
/* Set multicast memberships appropriately for new state. */

27
eigrpd/eigrp_packet.c
View File

@ -193,6 +193,12 @@ int eigrp_check_md5_digest(struct stream *s,
if (keychain)
key = key_lookup_for_send(keychain);
if (!key) {
zlog_warn("Interface %s: Expected key value not found in config",
nbr->ei->ifp->name);
return 0;
}
memset(&ctx, 0, sizeof(ctx));
MD5Init(&ctx);
@ -229,7 +235,6 @@ int eigrp_check_md5_digest(struct stream *s,
}
/* save neighbor's crypt_seqnum */
if (nbr)
nbr->crypt_seqnum = authTLV->key_sequence;
return 1;
@ -240,10 +245,11 @@ int eigrp_make_sha256_digest(struct eigrp_interface *ei, struct stream *s,
{
struct key *key = NULL;
struct keychain *keychain;
char *source_ip;
char source_ip[PREFIX_STRLEN];
unsigned char digest[EIGRP_AUTH_TYPE_SHA256_LEN];
unsigned char buffer[1 + PLAINTEXT_LENGTH + 45 + 1] = {0};
HMAC_SHA256_CTX ctx;
void *ibuf;
size_t backup_get, backup_end;
@ -263,11 +269,13 @@ int eigrp_make_sha256_digest(struct eigrp_interface *ei, struct stream *s,
if (keychain)
key = key_lookup_for_send(keychain);
// saved_len[index] = strnzcpyn(saved_key[index], key,
// PLAINTEXT_LENGTH + 1);
if (!key) {
zlog_warn("Interface %s: Expected key value not found in config",
ei->ifp->name);
return 0;
}
source_ip = calloc(16, sizeof(char));
inet_ntop(AF_INET, &ei->address->u.prefix4, source_ip, 16);
inet_ntop(AF_INET, &ei->address->u.prefix4, source_ip, PREFIX_STRLEN);
memset(&ctx, 0, sizeof(ctx));
buffer[0] = '\n';
@ -287,7 +295,6 @@ int eigrp_make_sha256_digest(struct eigrp_interface *ei, struct stream *s,
stream_set_endp(s, backup_end);
eigrp_authTLV_SHA256_free(auth_TLV);
free(source_ip);
return EIGRP_AUTH_TYPE_SHA256_LEN;
}
@ -613,10 +620,10 @@ int eigrp_read(struct thread *thread)
opcode = eigrph->opcode;
if (IS_DEBUG_EIGRP_TRANSMIT(0, RECV)) {
char src[100], dst[100];
char src[PREFIX_STRLEN], dst[PREFIX_STRLEN];
strcpy(src, inet_ntoa(iph->ip_src));
strcpy(dst, inet_ntoa(iph->ip_dst));
strncpy(src, inet_ntoa(iph->ip_src), PREFIX_STRLEN);
strncpy(dst, inet_ntoa(iph->ip_dst), PREFIX_STRLEN);
zlog_debug("Received [%s][%d/%d] length [%u] via [%s] src [%s] dst [%s]",
lookup_msg(eigrp_packet_type_str, opcode, NULL),
ntohl(eigrph->sequence), ntohl(eigrph->ack), length,

41
eigrpd/eigrp_routemap.c
View File

@ -137,16 +137,19 @@ static int eigrp_route_match_add(struct vty *vty, struct route_map_index *index,
{
int ret;
ret = route_map_add_match(index, command, arg);
if (ret) {
switch (ret) {
case RMAP_RULE_MISSING:
vty_out(vty, "%% Can't find rule.\n");
return CMD_WARNING_CONFIG_FAILED;
break;
case RMAP_COMPILE_ERROR:
vty_out(vty, "%% Argument is malformed.\n");
return CMD_WARNING_CONFIG_FAILED;
break;
case RMAP_COMPILE_SUCCESS:
break;
}
}
return CMD_SUCCESS;
}
@ -157,16 +160,19 @@ static int eigrp_route_match_delete(struct vty *vty,
{
int ret;
ret = route_map_delete_match(index, command, arg);
if (ret) {
switch (ret) {
case RMAP_RULE_MISSING:
vty_out(vty, "%% Can't find rule.\n");
return CMD_WARNING_CONFIG_FAILED;
break;
case RMAP_COMPILE_ERROR:
vty_out(vty, "%% Argument is malformed.\n");
return CMD_WARNING_CONFIG_FAILED;
break;
case RMAP_COMPILE_SUCCESS:
break;
}
}
return CMD_SUCCESS;
}
@ -177,25 +183,27 @@ static int eigrp_route_set_add(struct vty *vty, struct route_map_index *index,
int ret;
ret = route_map_add_set(index, command, arg);
if (ret) {
switch (ret) {
case RMAP_RULE_MISSING:
vty_out(vty, "%% Can't find rule.\n");
return CMD_WARNING_CONFIG_FAILED;
break;
case RMAP_COMPILE_ERROR:
/* rip, ripng and other protocols share the set metric
command
but only values from 0 to 16 are valid for rip and
ripng
if metric is out of range for rip and ripng, it is
not for
other protocols. Do not return an error */
/*
* rip, ripng and other protocols share the set metric command
* but only values from 0 to 16 are valid for rip and ripng
* if metric is out of range for rip and ripng, it is
* not for other protocols. Do not return an error
*/
if (strcmp(command, "metric")) {
vty_out(vty, "%% Argument is malformed.\n");
return CMD_WARNING_CONFIG_FAILED;
}
break;
case RMAP_COMPILE_SUCCESS:
break;
}
}
return CMD_SUCCESS;
}
@ -207,16 +215,19 @@ static int eigrp_route_set_delete(struct vty *vty,
int ret;
ret = route_map_delete_set(index, command, arg);
if (ret) {
switch (ret) {
case RMAP_RULE_MISSING:
vty_out(vty, "%% Can't find rule.\n");
return CMD_WARNING_CONFIG_FAILED;
break;
case RMAP_COMPILE_ERROR:
vty_out(vty, "%% Argument is malformed.\n");
return CMD_WARNING_CONFIG_FAILED;
break;
case RMAP_COMPILE_SUCCESS:
break;
}
}
return CMD_SUCCESS;
}

2
eigrpd/eigrp_topology.c
View File

@ -444,7 +444,7 @@ void eigrp_topology_update_node_flags(struct eigrp_prefix_entry *dest)
for (ALL_LIST_ELEMENTS_RO(dest->entries, node, entry)) {
if (((uint64_t)entry->distance
<= (uint64_t)(dest->distance * eigrp->variance))
<= (uint64_t)dest->distance * (uint64_t)eigrp->variance)
&& entry->distance != EIGRP_MAX_METRIC) // is successor
{
entry->flags |= EIGRP_NEIGHBOR_ENTRY_SUCCESSOR_FLAG;

3
eigrpd/eigrp_update.c
View File

@ -443,6 +443,9 @@ void eigrp_update_receive(struct eigrp *eigrp, struct ip *iph,
eigrp_query_send_all(eigrp);
eigrp_update_send_all(eigrp, ei);
if (nbr_prefixes)
list_delete(nbr_prefixes);
}
/*send EIGRP Update packet*/

12
eigrpd/eigrp_vty.c
View File

@ -1267,7 +1267,11 @@ DEFUN (clear_ip_eigrp_neighbors_IP,
struct eigrp_neighbor *nbr;
struct in_addr nbr_addr;
inet_aton(argv[4]->arg, &nbr_addr);
if (!inet_aton(argv[4]->arg, &nbr_addr)) {
vty_out(vty, "Unable to parse %s",
argv[4]->arg);
return CMD_WARNING;
}
/* Check if eigrp process is enabled */
eigrp = eigrp_lookup();
@ -1370,7 +1374,11 @@ DEFUN (clear_ip_eigrp_neighbors_IP_soft,
struct eigrp_neighbor *nbr;
struct in_addr nbr_addr;
inet_aton(argv[4]->arg, &nbr_addr);
if (!inet_aton(argv[4]->arg, &nbr_addr)) {
vty_out(vty, "Unable to parse: %s",
argv[4]->arg);
return CMD_WARNING;
}
/* Check if eigrp process is enabled */
eigrp = eigrp_lookup();

49
lib/routemap.c
View File

@ -416,23 +416,25 @@ int generic_match_add(struct vty *vty, struct route_map_index *index,
int ret;
ret = route_map_add_match(index, command, arg);
if (ret) {
switch (ret) {
case RMAP_COMPILE_SUCCESS:
if (type != RMAP_EVENT_MATCH_ADDED) {
route_map_upd8_dependency(type, arg, index->map->name);
}
break;
case RMAP_RULE_MISSING:
vty_out(vty, "%% [%s] Can't find rule.\n",
frr_protonameinst);
return CMD_WARNING_CONFIG_FAILED;
break;
case RMAP_COMPILE_ERROR:
vty_out(vty,
"%% [%s] Argument form is unsupported or malformed.\n",
frr_protonameinst);
return CMD_WARNING_CONFIG_FAILED;
}
break;
}
if (type != RMAP_EVENT_MATCH_ADDED) {
route_map_upd8_dependency(type, arg, index->map->name);
}
return CMD_SUCCESS;
}
@ -441,6 +443,7 @@ int generic_match_delete(struct vty *vty, struct route_map_index *index,
route_map_event_t type)
{
int ret;
int retval = CMD_SUCCESS;
char *dep_name = NULL;
const char *tmpstr;
char *rmap_name = NULL;
@ -459,34 +462,30 @@ int generic_match_delete(struct vty *vty, struct route_map_index *index,
}
ret = route_map_delete_match(index, command, dep_name);
if (ret) {
switch (ret) {
case RMAP_RULE_MISSING:
vty_out(vty, "%% [%s] Can't find rule.\n",
frr_protonameinst);
retval = CMD_WARNING_CONFIG_FAILED;
break;
case RMAP_COMPILE_ERROR:
vty_out(vty,
"%% [%s] Argument form is unsupported or malformed.\n",
frr_protonameinst);
retval = CMD_WARNING_CONFIG_FAILED;
break;
}
if (dep_name)
XFREE(MTYPE_ROUTE_MAP_RULE, dep_name);
if (rmap_name)
XFREE(MTYPE_ROUTE_MAP_NAME, rmap_name);
return CMD_WARNING_CONFIG_FAILED;
}
case RMAP_COMPILE_SUCCESS:
if (type != RMAP_EVENT_MATCH_DELETED && dep_name)
route_map_upd8_dependency(type, dep_name, rmap_name);
break;
}
if (dep_name)
XFREE(MTYPE_ROUTE_MAP_RULE, dep_name);
if (rmap_name)
XFREE(MTYPE_ROUTE_MAP_NAME, rmap_name);
return CMD_SUCCESS;
return retval;
}
int generic_set_add(struct vty *vty, struct route_map_index *index,
@ -495,19 +494,22 @@ int generic_set_add(struct vty *vty, struct route_map_index *index,
int ret;
ret = route_map_add_set(index, command, arg);
if (ret) {
switch (ret) {
case RMAP_RULE_MISSING:
vty_out(vty, "%% [%s] Can't find rule.\n",
frr_protonameinst);
return CMD_WARNING_CONFIG_FAILED;
break;
case RMAP_COMPILE_ERROR:
vty_out(vty,
"%% [%s] Argument form is unsupported or malformed.\n",
frr_protonameinst);
return CMD_WARNING_CONFIG_FAILED;
break;
case RMAP_COMPILE_SUCCESS:
break;
}
}
return CMD_SUCCESS;
}
@ -517,19 +519,22 @@ int generic_set_delete(struct vty *vty, struct route_map_index *index,
int ret;
ret = route_map_delete_set(index, command, arg);
if (ret) {
switch (ret) {
case RMAP_RULE_MISSING:
vty_out(vty, "%% [%s] Can't find rule.\n",
frr_protonameinst);
return CMD_WARNING_CONFIG_FAILED;
break;
case RMAP_COMPILE_ERROR:
vty_out(vty,
"%% [%s] Argument form is unsupported or malformed.\n",
frr_protonameinst);
return CMD_WARNING_CONFIG_FAILED;
break;
case RMAP_COMPILE_SUCCESS:
break;
}
}
return CMD_SUCCESS;
}
@ -1217,7 +1222,7 @@ int route_map_add_match(struct route_map_index *index, const char *match_name,
RMAP_EVENT_CALL_ADDED);
}
return 0;
return RMAP_COMPILE_SUCCESS;
}
/* Delete specified route match rule. */
@ -1304,7 +1309,7 @@ int route_map_add_set(struct route_map_index *index, const char *set_name,
route_map_notify_dependencies(index->map->name,
RMAP_EVENT_CALL_ADDED);
}
return 0;
return RMAP_COMPILE_SUCCESS;
}
/* Delete route map set rule. */
@ -2201,7 +2206,7 @@ DEFUN (no_set_ip_nexthop,
"Next hop address\n"
"IP address of next hop\n")
{
int idx;
int idx = 0;
VTY_DECLVAR_CONTEXT(route_map_index, index);
const char *arg = NULL;

4
lib/routemap.h
View File

@ -99,8 +99,10 @@ struct route_map_rule_cmd {
/* Route map apply error. */
enum {
RMAP_COMPILE_SUCCESS,
/* Route map rule is missing. */
RMAP_RULE_MISSING = 1,
RMAP_RULE_MISSING,
/* Route map rule can't compile */
RMAP_COMPILE_ERROR

11
ospf6d/ospf6_asbr.c
View File

@ -985,21 +985,20 @@ static struct route_map_rule_cmd ospf6_routemap_rule_set_tag_cmd = {
static int route_map_command_status(struct vty *vty, int ret)
{
if (!ret)
return CMD_SUCCESS;
switch (ret) {
case RMAP_RULE_MISSING:
vty_out(vty, "OSPF6 Can't find rule.\n");
return CMD_WARNING_CONFIG_FAILED;
break;
case RMAP_COMPILE_ERROR:
vty_out(vty, "OSPF6 Argument is malformed.\n");
return CMD_WARNING_CONFIG_FAILED;
break;
default:
vty_out(vty, "OSPF6 route-map add set failed.\n");
case RMAP_COMPILE_SUCCESS:
break;
}
return CMD_WARNING_CONFIG_FAILED;
return CMD_SUCCESS;
}
/* add "set metric-type" */

6
ospf6d/ospf6_zebra.c
View File

@ -231,11 +231,7 @@ static int ospf6_zebra_read_route(int command, struct zclient *zclient,
char prefixstr[PREFIX2STR_BUFFER], nexthopstr[128];
prefix2str((struct prefix *)&api.prefix, prefixstr,
sizeof(prefixstr));
if (nexthop)
inet_ntop(AF_INET6, nexthop, nexthopstr,
sizeof(nexthopstr));
else
snprintf(nexthopstr, sizeof(nexthopstr), "::");
inet_ntop(AF_INET6, nexthop, nexthopstr, sizeof(nexthopstr));
zlog_debug(
"Zebra Receive route %s: %s %s nexthop %s ifindex %ld tag %" ROUTE_TAG_PRI,

2
ospfd/ospf_te.c
View File

@ -2425,7 +2425,7 @@ DEFUN (show_ip_ospf_mpls_te_router,
if (ntohs(OspfMplsTE.router_addr.header.type) != 0)
show_vty_router_addr(vty,
&OspfMplsTE.router_addr.header);
else if (vty != NULL)
else
vty_out(vty, " N/A\n");
}
return CMD_SUCCESS;

30
ospfd/ospf_vty.c
View File

@ -2310,7 +2310,10 @@ DEFUN (ospf_neighbor,
unsigned int priority = OSPF_NEIGHBOR_PRIORITY_DEFAULT;
unsigned int interval = OSPF_POLL_INTERVAL_DEFAULT;
inet_aton(argv[idx_ipv4]->arg, &nbr_addr);
if (!inet_aton(argv[idx_ipv4]->arg, &nbr_addr)) {
vty_out(vty, "Please specify Neighbor ID by A.B.C.D\n");
return CMD_WARNING_CONFIG_FAILED;
}
if (argc > 2)
priority = strtoul(argv[idx_pri]->arg, NULL, 10);
@ -2347,7 +2350,10 @@ DEFUN (ospf_neighbor_poll_interval,
unsigned int priority = OSPF_NEIGHBOR_PRIORITY_DEFAULT;
unsigned int interval = OSPF_POLL_INTERVAL_DEFAULT;
inet_aton(argv[idx_ipv4]->arg, &nbr_addr);
if (!inet_aton(argv[idx_ipv4]->arg, &nbr_addr)) {
vty_out(vty, "Please specify Neighbor ID by A.B.C.D\n");
return CMD_WARNING_CONFIG_FAILED;
}
interval = strtoul(argv[idx_poll]->arg, NULL, 10);
@ -2378,7 +2384,10 @@ DEFUN (no_ospf_neighbor,
int idx_ipv4 = 2;
struct in_addr nbr_addr;
inet_aton(argv[idx_ipv4]->arg, &nbr_addr);
if (!inet_aton(argv[idx_ipv4]->arg, &nbr_addr)) {
vty_out(vty, "Please specify Neighbor ID by A.B.C.D\n");
return CMD_WARNING_CONFIG_FAILED;
}
(void)ospf_nbr_nbma_unset(ospf, nbr_addr);
@ -2400,7 +2409,10 @@ DEFUN (no_ospf_neighbor_poll,
int idx_ipv4 = 2;
struct in_addr nbr_addr;
inet_aton(argv[idx_ipv4]->arg, &nbr_addr);
if (!inet_aton(argv[idx_ipv4]->arg, &nbr_addr)) {
vty_out(vty, "Please specify Neighbor ID by A.B.C.D\n");
return CMD_WARNING_CONFIG_FAILED;
}
(void)ospf_nbr_nbma_unset(ospf, nbr_addr);
@ -6962,7 +6974,10 @@ DEFUN (ip_ospf_area,
// Check if we have an address arg and proccess it
if (argc == idx + 3) {
inet_aton(argv[idx + 2]->arg, &addr);
if (!inet_aton(argv[idx + 2]->arg, &addr)) {
vty_out(vty, "Please specify Intf Address by A.B.C.D\n");
return CMD_WARNING_CONFIG_FAILED;
}
// update/create address-level params
params = ospf_get_if_params((ifp), (addr));
if (OSPF_IF_PARAM_CONFIGURED(params, if_area)) {
@ -7021,7 +7036,10 @@ DEFUN (no_ip_ospf_area,
// Check if we have an address arg and proccess it
if (argc == idx + 3) {
inet_aton(argv[idx + 2]->arg, &addr);
if (!inet_aton(argv[idx + 2]->arg, &addr)) {
vty_out(vty, "Please specify Intf Address by A.B.C.D\n");
return CMD_WARNING_CONFIG_FAILED;
}
params = ospf_lookup_if_params(ifp, addr);
if ((params) == NULL)
return CMD_SUCCESS;

3
pimd/pim_cmd.c
View File

@ -4895,6 +4895,9 @@ DEFUN (show_ip_mroute_count,
int idx = 2;
struct vrf *vrf = pim_cmd_lookup_vrf(vty, argv, argc, &idx);
if (!vrf)
return CMD_WARNING;
show_mroute_count(vrf->info, vty);
return CMD_SUCCESS;
}

9
pimd/pim_instance.c
View File

@ -195,12 +195,17 @@ static int pim_vrf_config_write(struct vty *vty)
RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
{
pim = vrf->info;
if (!pim || vrf->vrf_id != VRF_DEFAULT) {
if (!pim)
continue;
if (vrf->vrf_id == VRF_DEFAULT)
continue;
vty_out(vty, "vrf %s\n", vrf->name);
pim_global_config_write_worker(pim, vty);
vty_out(vty, "!\n");
}
}
return 0;
}

23
pimd/pim_mroute.c
View File

@ -713,21 +713,26 @@ int pim_mroute_socket_enable(struct pim_instance *pim)
fd = socket(AF_INET, SOCK_RAW, IPPROTO_IGMP);
#ifdef SO_BINDTODEVICE
setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, pim->vrf->name,
strlen(pim->vrf->name));
#endif
if (pimd_privs.change(ZPRIVS_LOWER))
zlog_err("pim_mroute_socket_enable: could not lower privs, %s",
safe_strerror(errno));
if (fd < 0) {
zlog_warn("Could not create mroute socket: errno=%d: %s", errno,
safe_strerror(errno));
return -2;
}
#ifdef SO_BINDTODEVICE
if (setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, pim->vrf->name,
strlen(pim->vrf->name))) {
zlog_warn("Could not setsockopt SO_BINDTODEVICE: %s",
safe_strerror(errno));
close(fd);
return -3;
}
#endif
if (pimd_privs.change(ZPRIVS_LOWER))
zlog_err("pim_mroute_socket_enable: could not lower privs, %s",
safe_strerror(errno));
pim->mroute_socket = fd;
if (pim_mroute_set(pim, 1)) {
zlog_warn(

16
pimd/pim_msdp_socket.c
View File

@ -156,9 +156,15 @@ int pim_msdp_sock_listen(struct pim_instance *pim)
if (!ifp) {
zlog_err("%s: Unable to lookup vrf interface: %s",
__PRETTY_FUNCTION__, pim->vrf->name);
close(sock);
return -1;
}
if (pim_socket_bind(sock, ifp)) {
zlog_err("%s: Unable to bind to socket: %s",
__PRETTY_FUNCTION__, safe_strerror(errno));
close(sock);
return -1;
}
pim_socket_bind(sock, ifp);
}
if (pimd_privs.change(ZPRIVS_RAISE)) {
@ -236,7 +242,13 @@ int pim_msdp_sock_connect(struct pim_msdp_peer *mp)
__PRETTY_FUNCTION__, mp->pim->vrf->name);
return -1;
}
pim_socket_bind(mp->fd, ifp);
if (pim_socket_bind(mp->fd, ifp)) {
zlog_err("%s: Unable to bind to socket: %s",
__PRETTY_FUNCTION__, safe_strerror(errno));
close(mp->fd);
mp->fd = -1;
return -1;
}
}
set_nonblocking(mp->fd);

4
pimd/pim_rp.c
View File

@ -542,7 +542,9 @@ int pim_rp_del(struct pim_instance *pim, const char *rp,
}
pim_delete_tracked_nexthop(pim, &nht_p, NULL, rp_info);
str2prefix("224.0.0.0/4", &g_all);
if (!str2prefix("224.0.0.0/4", &g_all))
return PIM_RP_BAD_ADDRESS;
rp_all = pim_rp_find_match_group(pim, &g_all);
if (rp_all == rp_info) {

9
pimd/pim_sock.c
View File

@ -65,22 +65,21 @@ int pim_socket_raw(int protocol)
return fd;
}
int pim_socket_ip_hdr(int fd)
void pim_socket_ip_hdr(int fd)
{
const int on = 1;
int ret;
if (pimd_privs.change(ZPRIVS_RAISE))
zlog_err("%s: could not raise privs, %s", __PRETTY_FUNCTION__,
safe_strerror(errno));
ret = setsockopt(fd, IPPROTO_IP, IP_HDRINCL, &on, sizeof(on));
if (setsockopt(fd, IPPROTO_IP, IP_HDRINCL, &on, sizeof(on)))
zlog_err("%s: Could not turn on IP_HDRINCL option: %s",
__PRETTY_FUNCTION__, safe_strerror(errno));
if (pimd_privs.change(ZPRIVS_LOWER))
zlog_err("%s: could not lower privs, %s", __PRETTY_FUNCTION__,
safe_strerror(errno));
return ret;
}
/*

2
pimd/pim_sock.h
View File

@ -36,7 +36,7 @@
#define PIM_SOCK_ERR_BIND (-11) /* Can't bind to interface */
int pim_socket_bind(int fd, struct interface *ifp);
int pim_socket_ip_hdr(int fd);
void pim_socket_ip_hdr(int fd);
int pim_socket_raw(int protocol);
int pim_socket_mcast(int protocol, struct in_addr ifaddr, struct interface *ifp,
u_char loop);

5
pimd/pim_ssm.c
View File

@ -71,7 +71,10 @@ static int pim_is_grp_standard_ssm(struct prefix *group)
static struct prefix group_ssm;
if (first) {
str2prefix(PIM_SSM_STANDARD_RANGE, &group_ssm);
if (!str2prefix(PIM_SSM_STANDARD_RANGE, &group_ssm))
zlog_err("%s: Failure to Read Group Address: %s",
__PRETTY_FUNCTION__, PIM_SSM_STANDARD_RANGE);
first = 0;
}

7
pimd/pim_zebra.c
View File

@ -184,6 +184,13 @@ static int pim_zebra_if_state_up(int command, struct zclient *zclient,
&& (ifp->vrf_id != vrf->vrf_id)) {
struct interface *master = if_lookup_by_name(
vrf->name, vrf->vrf_id);
if (!master) {
zlog_debug("%s: Unable to find Master interface for %s",
__PRETTY_FUNCTION__,
vrf->name);
return 0;
}
zclient_interface_set_master(zclient, master,
ifp);
}

1
ripd/ripd.c
View File

@ -1685,6 +1685,7 @@ int rip_recvmsg(int sock, u_char *buf, int size, struct sockaddr_in *from,
struct cmsghdr *ptr;
char adata[1024];
memset(&msg, 0, sizeof(msg));
msg.msg_name = (void *)from;
msg.msg_namelen = sizeof(struct sockaddr_in);
msg.msg_iov = &iov;

2
ripngd/ripngd.c
View File

@ -176,6 +176,7 @@ int ripng_send_packet(caddr_t buf, int bufsize, struct sockaddr_in6 *to,
addr.sin6_port = htons(RIPNG_PORT_DEFAULT);
}
memset(&msg, 0, sizeof(msg));
msg.msg_name = (void *)&addr;
msg.msg_namelen = sizeof(struct sockaddr_in6);
msg.msg_iov = &iov;
@ -228,6 +229,7 @@ static int ripng_recv_packet(int sock, u_char *buf, int bufsize,
char adata[1024];
/* Fill in message and iovec. */
memset(&msg, 0, sizeof(msg));
msg.msg_name = (void *)from;
msg.msg_namelen = sizeof(struct sockaddr_in6);
msg.msg_iov = &iov;

2
zebra/if_netlink.c
View File

@ -393,7 +393,7 @@ static int get_iflink_speed(const char *ifname)
memset(&ifdata, 0, sizeof(ifdata));
/* set interface name */
strcpy(ifdata.ifr_name, ifname);
strlcpy(ifdata.ifr_name, ifname, sizeof(ifdata.ifr_name));
/* initialize ethtool interface */
memset(&ecmd, 0, sizeof(ecmd));

2
zebra/interface.c
View File

@ -497,7 +497,7 @@ void if_add_update(struct interface *ifp)
if (!CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_ACTIVE)) {
SET_FLAG(ifp->status, ZEBRA_INTERFACE_ACTIVE);
if (if_data && if_data->shutdown == IF_ZEBRA_SHUTDOWN_ON) {
if (if_data->shutdown == IF_ZEBRA_SHUTDOWN_ON) {
if (IS_ZEBRA_DEBUG_KERNEL)
zlog_debug(
"interface %s vrf %u index %d is shutdown. "

2
zebra/ioctl.c
View File

@ -44,7 +44,7 @@ extern struct zebra_privs_t zserv_privs;
/* clear and set interface name string */
void ifreq_set_name(struct ifreq *ifreq, struct interface *ifp)
{
strncpy(ifreq->ifr_name, ifp->name, IFNAMSIZ);
strlcpy(ifreq->ifr_name, ifp->name, sizeof(ifreq->ifr_name));
}
/* call ioctl system call */

1
zebra/irdp_packet.c
View File

@ -182,6 +182,7 @@ static int irdp_recvmsg(int sock, u_char *buf, int size, int *ifindex)
char adata[CMSG_SPACE(SOPT_SIZE_CMSG_PKTINFO_IPV4())];
int ret;
memset(&msg, 0, sizeof(msg));
msg.msg_name = (void *)0;
msg.msg_namelen = 0;
msg.msg_iov = &iov;

6
zebra/redistribute.c
View File

@ -52,6 +52,12 @@ static u_int32_t zebra_import_table_distance[AFI_MAX][ZEBRA_KERNEL_TABLE_MAX];
int is_zebra_import_table_enabled(afi_t afi, u_int32_t table_id)
{
/*
* Make sure that what we are called with actualy makes sense
*/
if (afi == AFI_MAX)
return 0;
if (is_zebra_valid_kernel_table(table_id))
return zebra_import_table_used[afi][table_id];
return 0;

6
zebra/rt_netlink.c
View File

@ -588,8 +588,8 @@ static int netlink_route_change_read_multicast(struct sockaddr_nl *snl,
if (IS_ZEBRA_DEBUG_KERNEL) {
struct interface *ifp;
strcpy(sbuf, inet_ntoa(m->sg.src));
strcpy(gbuf, inet_ntoa(m->sg.grp));
strlcpy(sbuf, inet_ntoa(m->sg.src), sizeof(sbuf));
strlcpy(gbuf, inet_ntoa(m->sg.grp), sizeof(gbuf));
for (count = 0; count < oif_count; count++) {
ifp = if_lookup_by_index(oif[count], vrf);
char temp[256];
@ -1562,6 +1562,8 @@ int kernel_get_ipmr_sg_stats(struct zebra_vrf *zvrf, void *in)
int kernel_route_rib(struct prefix *p, struct prefix *src_p,
struct route_entry *old, struct route_entry *new)
{
assert(old || new);
if (!old && new)
return netlink_route_multipath(RTM_NEWROUTE, p, src_p, new, 0);
if (old && !new)

2
zebra/rtadv.c
View File

@ -107,6 +107,7 @@ static int rtadv_recv_packet(struct zebra_ns *zns, int sock, u_char *buf,
char adata[1024];
/* Fill in message and iovec. */
memset(&msg, 0, sizeof(msg));
msg.msg_name = (void *)from;
msg.msg_namelen = sizeof(struct sockaddr_in6);
msg.msg_iov = &iov;
@ -629,7 +630,6 @@ static int rtadv_make_socket(void)
safe_strerror(errno));
if (sock < 0) {
close(sock);
return -1;
}

6
zebra/zebra_mpls.c
View File

@ -840,7 +840,7 @@ static void lsp_schedule(struct hash_backet *backet, void *ctxt)
zebra_lsp_t *lsp;
lsp = (zebra_lsp_t *)backet->data;
lsp_processq_add(lsp);
(void)lsp_processq_add(lsp);
}
/*
@ -2718,10 +2718,10 @@ int zebra_mpls_write_lsp_config(struct vty *vty, struct zebra_vrf *zvrf)
for (ALL_LIST_ELEMENTS_RO(slsp_list, node, slsp)) {
for (snhlfe = slsp->snhlfe_list; snhlfe;
snhlfe = snhlfe->next) {
char buf[INET6_ADDRSTRLEN];
char buf[BUFSIZ];
char lstr[30];
snhlfe2str(snhlfe, buf, BUFSIZ);
snhlfe2str(snhlfe, buf, sizeof(buf));
switch (snhlfe->out_label) {
case MPLS_V4_EXP_NULL_LABEL:
case MPLS_V6_EXP_NULL_LABEL:

4
zebra/zebra_mroute.c
View File

@ -48,8 +48,8 @@ int zebra_ipmr_route_stats(struct zserv *client, int fd, u_short length,
char sbuf[40];
char gbuf[40];
strcpy(sbuf, inet_ntoa(mroute.sg.src));
strcpy(gbuf, inet_ntoa(mroute.sg.grp));
strlcpy(sbuf, inet_ntoa(mroute.sg.src), sizeof(sbuf));
strlcpy(gbuf, inet_ntoa(mroute.sg.grp), sizeof(gbuf));
zlog_debug("Asking for (%s,%s) mroute information", sbuf, gbuf);
}

2
zebra/zebra_ptm.c
View File

@ -156,7 +156,7 @@ void zebra_ptm_finish(void)
if (ptm_cb.wb)
buffer_free(ptm_cb.wb);
if (ptm_cb.ptm_sock != -1)
if (ptm_cb.ptm_sock >= 0)
close(ptm_cb.ptm_sock);
}

1
zebra/zebra_pw.c
View File

@ -328,6 +328,7 @@ DEFUN_NOSH (pseudowire_if,
if (!pw)
return CMD_SUCCESS;
zebra_pw_del(zvrf, pw);
return CMD_SUCCESS;
}
if (!pw)

8
zebra/zebra_rib.c
View File

@ -2726,10 +2726,14 @@ unsigned long rib_score_proto(u_char proto, u_short instance)
void rib_close_table(struct route_table *table)
{
struct route_node *rn;
rib_table_info_t *info = table->info;
rib_table_info_t *info;
struct route_entry *re;
if (table)
if (!table)
return;
info = table->info;
for (rn = route_top(table); rn; rn = srcdest_route_next(rn))
RNODE_FOREACH_RE(rn, re)
{

33
zebra/zebra_routemap.c
View File

@ -62,23 +62,26 @@ static int zebra_route_match_add(struct vty *vty, const char *command,
{
VTY_DECLVAR_CONTEXT(route_map_index, index);
int ret;
int retval = CMD_SUCCESS;
ret = route_map_add_match(index, command, arg);
if (ret) {
switch (ret) {
case RMAP_RULE_MISSING:
vty_out(vty, "%% Zebra Can't find rule.\n");
return CMD_WARNING_CONFIG_FAILED;
retval = CMD_WARNING_CONFIG_FAILED;
break;
case RMAP_COMPILE_ERROR:
vty_out(vty, "%% Zebra Argument is malformed.\n");
return CMD_WARNING_CONFIG_FAILED;
}
}
retval = CMD_WARNING_CONFIG_FAILED;
break;
case RMAP_COMPILE_SUCCESS:
if (type != RMAP_EVENT_MATCH_ADDED) {
route_map_upd8_dependency(type, arg, index->map->name);
}
return CMD_SUCCESS;
break;
}
return retval;
}
/* Delete zebra route map rule. */
@ -87,6 +90,7 @@ static int zebra_route_match_delete(struct vty *vty, const char *command,
{
VTY_DECLVAR_CONTEXT(route_map_index, index);
int ret;
int retval = CMD_SUCCESS;
char *dep_name = NULL;
const char *tmpstr;
char *rmap_name = NULL;
@ -105,26 +109,27 @@ static int zebra_route_match_delete(struct vty *vty, const char *command,
}
ret = route_map_delete_match(index, command, arg);
if (ret) {
switch (ret) {
case RMAP_RULE_MISSING:
vty_out(vty, "%% Zebra Can't find rule.\n");
return CMD_WARNING_CONFIG_FAILED;
retval = CMD_WARNING_CONFIG_FAILED;
break;
case RMAP_COMPILE_ERROR:
vty_out(vty, "%% Zebra Argument is malformed.\n");
return CMD_WARNING_CONFIG_FAILED;
}
}
retval = CMD_WARNING_CONFIG_FAILED;
break;
case RMAP_COMPILE_SUCCESS:
if (type != RMAP_EVENT_MATCH_DELETED && dep_name)
route_map_upd8_dependency(type, dep_name, rmap_name);
break;
}
if (dep_name)
XFREE(MTYPE_ROUTE_MAP_RULE, dep_name);
if (rmap_name)
XFREE(MTYPE_ROUTE_MAP_NAME, rmap_name);
return CMD_SUCCESS;
return retval;
}
/* 'match tag TAG'

6
zebra/zebra_vrf.c
View File

@ -470,7 +470,11 @@ static int vrf_config_write(struct vty *vty)
RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
{
zvrf = vrf->info;
if (!zvrf || strcmp(zvrf_name(zvrf), VRF_DEFAULT_NAME)) {
if (!zvrf)
continue;
if (strcmp(zvrf_name(zvrf), VRF_DEFAULT_NAME)) {
vty_out(vty, "vrf %s\n", zvrf_name(zvrf));
vty_out(vty, "!\n");
}

14
zebra/zebra_vty.c
View File

@ -1200,7 +1200,10 @@ DEFUN (show_ip_route,
tag = strtoul(argv[idx + 1]->arg, NULL, 10);
else if (argv_find(argv, argc, "A.B.C.D/M", &idx)) {
str2prefix(argv[idx]->arg, &p);
if (str2prefix(argv[idx]->arg, &p) <= 0) {
vty_out(vty, "%% Malformed prefix\n");
return CMD_WARNING;
}
longer_prefixes = true;
}
@ -1842,7 +1845,10 @@ DEFUN (show_ipv6_route,
tag = strtoul(argv[idx + 1]->arg, NULL, 10);
else if (argv_find(argv, argc, "X:X::X:X/M", &idx)) {
str2prefix(argv[idx]->arg, &p);
if (str2prefix(argv[idx]->arg, &p) <= 0) {
vty_out(vty, "%% Malformed prefix\n");
return CMD_WARNING;
}
longer_prefixes = true;
}
@ -2580,6 +2586,8 @@ DEFUN (ip_zebra_import_table_distance,
vty_out(vty,
"Invalid routing table ID, %d. Must be in range 1-252\n",
table_id);
if (rmap)
XFREE(MTYPE_ROUTE_MAP_NAME, rmap);
return CMD_WARNING;
}
@ -2587,6 +2595,8 @@ DEFUN (ip_zebra_import_table_distance,
vty_out(vty,
"Invalid routing table ID, %d. Must be non-default table\n",
table_id);
if (rmap)
XFREE(MTYPE_ROUTE_MAP_NAME, rmap);
return CMD_WARNING;
}

22
zebra/zebra_vxlan.c
View File

@ -1160,14 +1160,15 @@ static int zvni_neigh_uninstall(zebra_vni_t *zvni, zebra_neigh_t *n)
if (!(n->flags & ZEBRA_NEIGH_REMOTE))
return 0;
zvrf = vrf_info_lookup(zvni->vxlan_if->vrf_id);
assert(zvrf);
if (!zvni->vxlan_if) {
zlog_err("VNI %u hash %p couldn't be uninstalled - no intf",
zvni->vni, zvni);
return -1;
}
zvrf = vrf_info_lookup(zvni->vxlan_if->vrf_id);
assert(zvrf);
zif = zvni->vxlan_if->info;
if (!zif)
return -1;
@ -1348,8 +1349,7 @@ static int zvni_gw_macip_add(struct interface *ifp, zebra_vni_t *zvni,
zlog_err(
"%u:Failed to add neighbor %s MAC %s intf %s(%u) -> VNI %u",
ifp->vrf_id, ipaddr2str(ip, buf2, sizeof(buf2)),
prefix_mac2str(macaddr, NULL,
ETHER_ADDR_STRLEN),
prefix_mac2str(macaddr, buf, sizeof(buf)),
ifp->name, ifp->ifindex, zvni->vni);
return -1;
}
@ -1364,7 +1364,7 @@ static int zvni_gw_macip_add(struct interface *ifp, zebra_vni_t *zvni,
zlog_debug(
"%u:SVI %s(%u) VNI %u, sending GW MAC %s IP %s add to BGP",
ifp->vrf_id, ifp->name, ifp->ifindex, zvni->vni,
prefix_mac2str(macaddr, NULL, ETHER_ADDR_STRLEN),
prefix_mac2str(macaddr, buf, sizeof(buf)),
ipaddr2str(ip, buf2, sizeof(buf2)));
zvni_neigh_send_add_to_client(zvrf, zvni->vni, ip, macaddr,
@ -1382,6 +1382,7 @@ static int zvni_gw_macip_del(struct interface *ifp, zebra_vni_t *zvni,
struct zebra_vrf *zvrf = NULL;
zebra_neigh_t *n = NULL;
zebra_mac_t *mac = NULL;
char buf1[ETHER_ADDR_STRLEN];
char buf2[INET6_ADDRSTRLEN];
zvrf = vrf_info_lookup(zvni->vxlan_if->vrf_id);
@ -1395,11 +1396,13 @@ static int zvni_gw_macip_del(struct interface *ifp, zebra_vni_t *zvni,
/* mac entry should be present */
mac = zvni_mac_lookup(zvni, &n->emac);
if (!mac)
zlog_err("%u: MAC %s doesnt exsists for neigh %s on VNI %u",
if (!mac) {
zlog_err("%u: MAC %s doesnt exists for neigh %s on VNI %u",
ifp->vrf_id,
prefix_mac2str(&n->emac, NULL, ETHER_ADDR_STRLEN),
prefix_mac2str(&n->emac, buf1, sizeof(buf1)),
ipaddr2str(ip, buf2, sizeof(buf2)), zvni->vni);
return -1;
}
/* If the entry is not local nothing to do*/
if (!CHECK_FLAG(n->flags, ZEBRA_NEIGH_LOCAL))
@ -1409,7 +1412,7 @@ static int zvni_gw_macip_del(struct interface *ifp, zebra_vni_t *zvni,
zlog_debug(
"%u:SVI %s(%u) VNI %u, sending GW MAC %s IP %s del to BGP",
ifp->vrf_id, ifp->name, ifp->ifindex, zvni->vni,
prefix_mac2str(&(n->emac), NULL, ETHER_ADDR_STRLEN),
prefix_mac2str(&(n->emac), buf1, sizeof(buf1)),
ipaddr2str(ip, buf2, sizeof(buf2)));
/* Remove neighbor from BGP. */
@ -1420,6 +1423,7 @@ static int zvni_gw_macip_del(struct interface *ifp, zebra_vni_t *zvni,
zvni_neigh_del(zvni, n);
/* see if the mac needs to be deleted as well*/
if (mac)
zvni_deref_ip2mac(zvni, mac, 0);
return 0;

2
zebra/zserv.c
View File

@ -1679,7 +1679,7 @@ static int zread_ipv6_delete(struct zserv *client, u_short length,
api.safi = stream_getw(s);
/* IPv4 prefix. */
memset(&p, 0, sizeof(struct prefix_ipv6));
memset(&p, 0, sizeof(struct prefix));
p.family = AF_INET6;
p.prefixlen = stream_getc(s);
stream_get(&p.u.prefix6, s, PSIZE(p.prefixlen));