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

Merge pull request #3413 from chiragshah6/evpn_dev1

Browse Source 
zebra: dup addr detect clear cmd non-zero return
This commit is contained in:
David Lamparter 2018-12-04 15:43:15 +01:00 committed by GitHub
commit b59d17baf3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 48 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zebra/zebra_vty.c
View File

@ -2313,6 +2313,7 @@ DEFPY (clear_evpn_dup_addr,
vni_t vni = 0;
struct ipaddr host_ip = {.ipa_type = IPADDR_NONE };
struct ethaddr mac_addr;
int ret = CMD_SUCCESS;
zvrf = vrf_info_lookup(VRF_DEFAULT);
if (vni_val) {
@ -2320,7 +2321,8 @@ DEFPY (clear_evpn_dup_addr,
if (mac_val) {
prefix_str2mac(mac_val, &mac_addr);
zebra_vxlan_clear_dup_detect_vni_mac(vty, zvrf, vni,
ret = zebra_vxlan_clear_dup_detect_vni_mac(vty, zvrf,
vni,
&mac_addr);
} else if (ip) {
if (sockunion_family(ip) == AF_INET) {
@ -2331,16 +2333,17 @@ DEFPY (clear_evpn_dup_addr,
memcpy(&host_ip.ipaddr_v6, &ip->sin6.sin6_addr,
sizeof(struct in6_addr));
}
zebra_vxlan_clear_dup_detect_vni_ip(vty, zvrf, vni,
ret = zebra_vxlan_clear_dup_detect_vni_ip(vty, zvrf,
vni,
&host_ip);
} else
zebra_vxlan_clear_dup_detect_vni(vty, zvrf, vni);
ret = zebra_vxlan_clear_dup_detect_vni(vty, zvrf, vni);
} else {
zebra_vxlan_clear_dup_detect_vni_all(vty, zvrf);
ret = zebra_vxlan_clear_dup_detect_vni_all(vty, zvrf);
}
return CMD_SUCCESS;
return ret;
}
/* Static ip route configuration write function. */

39
zebra/zebra_vxlan.c
View File

@ -6159,7 +6159,7 @@ void zebra_vxlan_print_macs_vni_dad(struct vty *vty,
}
void zebra_vxlan_clear_dup_detect_vni_mac(struct vty *vty,
int zebra_vxlan_clear_dup_detect_vni_mac(struct vty *vty,
struct zebra_vrf *zvrf,
vni_t vni, struct ethaddr *macaddr)
{
@ -6169,23 +6169,24 @@ void zebra_vxlan_clear_dup_detect_vni_mac(struct vty *vty,
zebra_neigh_t *nbr = NULL;
if (!is_evpn_enabled())
return;
return CMD_SUCCESS;
zvni = zvni_lookup(vni);
if (!zvni) {
vty_out(vty, "%% VNI %u does not exist\n", vni);
return;
return CMD_WARNING;
}
mac = zvni_mac_lookup(zvni, macaddr);
if (!mac) {
vty_out(vty, "%% Requested MAC does not exist in VNI %u\n",
vni);
return;
return CMD_WARNING;
}
if (!CHECK_FLAG(mac->flags, ZEBRA_MAC_DUPLICATE)) {
vty_out(vty, "%% Requested MAC is not duplicate detected\n");
return;
return CMD_WARNING;
}
/* Remove all IPs as duplicate associcated with this MAC */
@ -6224,7 +6225,7 @@ void zebra_vxlan_clear_dup_detect_vni_mac(struct vty *vty,
&mac->macaddr,
mac->flags,
mac->loc_seq))
return;
return CMD_SUCCESS;
/* Process all neighbors associated with this MAC. */
zvni_process_neigh_on_local_mac_change(zvni, mac, 0);
@ -6236,9 +6237,10 @@ void zebra_vxlan_clear_dup_detect_vni_mac(struct vty *vty,
zvni_mac_install(zvni, mac);
}
return CMD_SUCCESS;
}
void zebra_vxlan_clear_dup_detect_vni_ip(struct vty *vty,
int zebra_vxlan_clear_dup_detect_vni_ip(struct vty *vty,
struct zebra_vrf *zvrf,
vni_t vni, struct ipaddr *ip)
{
@ -6249,12 +6251,12 @@ void zebra_vxlan_clear_dup_detect_vni_ip(struct vty *vty,
char buf2[ETHER_ADDR_STRLEN];
if (!is_evpn_enabled())
return;
return CMD_SUCCESS;
zvni = zvni_lookup(vni);
if (!zvni) {
vty_out(vty, "%% VNI %u does not exist\n", vni);
return;
return CMD_WARNING;
}
nbr = zvni_neigh_lookup(zvni, ip);
@ -6262,7 +6264,7 @@ void zebra_vxlan_clear_dup_detect_vni_ip(struct vty *vty,
vty_out(vty,
"%% Requested host IP does not exist in VNI %u\n",
vni);
return;
return CMD_WARNING;
}
ipaddr2str(&nbr->ip, buf, sizeof(buf));
@ -6271,7 +6273,7 @@ void zebra_vxlan_clear_dup_detect_vni_ip(struct vty *vty,
vty_out(vty,
"%% Requsted host IP %s is not duplicate detected\n",
buf);
return;
return CMD_WARNING;
}
mac = zvni_mac_lookup(zvni, &nbr->emac);
@ -6280,7 +6282,7 @@ void zebra_vxlan_clear_dup_detect_vni_ip(struct vty *vty,
vty_out(vty,
"%% Requested IP's associated MAC %s is still in duplicate state\n",
prefix_mac2str(&nbr->emac, buf2, sizeof(buf2)));
return;
return CMD_WARNING_CONFIG_FAILED;
}
if (IS_ZEBRA_DEBUG_VXLAN)
@ -6303,6 +6305,7 @@ void zebra_vxlan_clear_dup_detect_vni_ip(struct vty *vty,
zvni_neigh_install(zvni, nbr);
}
return CMD_SUCCESS;
}
static void zvni_clear_dup_mac_hash(struct hash_backet *backet, void *ctxt)
@ -6435,13 +6438,13 @@ static void zvni_clear_dup_detect_hash_vni_all(struct hash_backet *backet,
}
void zebra_vxlan_clear_dup_detect_vni_all(struct vty *vty,
int zebra_vxlan_clear_dup_detect_vni_all(struct vty *vty,
struct zebra_vrf *zvrf)
{
void *args[2];
if (!is_evpn_enabled())
return;
return CMD_SUCCESS;
args[0] = vty;
args[1] = zvrf;
@ -6450,9 +6453,10 @@ void zebra_vxlan_clear_dup_detect_vni_all(struct vty *vty,
(void (*)(struct hash_backet *, void *))
zvni_clear_dup_detect_hash_vni_all, args);
return CMD_SUCCESS;
}
void zebra_vxlan_clear_dup_detect_vni(struct vty *vty,
int zebra_vxlan_clear_dup_detect_vni(struct vty *vty,
struct zebra_vrf *zvrf,
vni_t vni)
{
@ -6461,12 +6465,12 @@ void zebra_vxlan_clear_dup_detect_vni(struct vty *vty,
struct neigh_walk_ctx n_wctx;
if (!is_evpn_enabled())
return;
return CMD_SUCCESS;
zvni = zvni_lookup(vni);
if (!zvni) {
vty_out(vty, "%% VNI %u does not exist\n", vni);
return;
return CMD_WARNING;
}
if (hashcount(zvni->neigh_table)) {
@ -6486,6 +6490,7 @@ void zebra_vxlan_clear_dup_detect_vni(struct vty *vty,
hash_iterate(zvni->mac_table, zvni_clear_dup_mac_hash, &m_wctx);
}
return CMD_SUCCESS;
}
/*

8
zebra/zebra_vxlan.h
View File

@ -185,16 +185,16 @@ extern void zebra_vxlan_evpn_vrf_route_add(vrf_id_t vrf_id,
extern void zebra_vxlan_evpn_vrf_route_del(vrf_id_t vrf_id,
struct ipaddr *vtep_ip,
struct prefix *host_prefix);
extern void zebra_vxlan_clear_dup_detect_vni_mac(struct vty *vty,
extern int zebra_vxlan_clear_dup_detect_vni_mac(struct vty *vty,
struct zebra_vrf *zvrf,
vni_t vni,
struct ethaddr *macaddr);
extern void zebra_vxlan_clear_dup_detect_vni_ip(struct vty *vty,
extern int zebra_vxlan_clear_dup_detect_vni_ip(struct vty *vty,
struct zebra_vrf *zvrf,
vni_t vni, struct ipaddr *ip);
extern void zebra_vxlan_clear_dup_detect_vni_all(struct vty *vty,
extern int zebra_vxlan_clear_dup_detect_vni_all(struct vty *vty,
struct zebra_vrf *zvrf);
extern void zebra_vxlan_clear_dup_detect_vni(struct vty *vty,
extern int zebra_vxlan_clear_dup_detect_vni(struct vty *vty,
struct zebra_vrf *zvrf,
vni_t vni);