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 #12959 from leonshaw/fix/zif-link-nsid

Browse Source 
zebra: Add link_nsid to zebra interface
This commit is contained in:
Jafar Al-Gharaibeh 2023-04-11 16:38:33 -05:00 committed by GitHub
commit bd2711d251
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
zebra/interface.c
View File

@ -137,6 +137,8 @@ static int if_zebra_new_hook(struct interface *ifp)
zebra_if->multicast = IF_ZEBRA_DATA_UNSPEC; zebra_if->multicast = IF_ZEBRA_DATA_UNSPEC;
zebra_if->shutdown = IF_ZEBRA_DATA_OFF; zebra_if->shutdown = IF_ZEBRA_DATA_OFF;
zebra_if->link_nsid = NS_UNKNOWN;
zebra_if_nhg_dependents_init(zebra_if); zebra_if_nhg_dependents_init(zebra_if);
zebra_ptm_if_init(zebra_if); zebra_ptm_if_init(zebra_if);
@ -305,6 +307,14 @@ struct interface *if_lookup_by_name_per_ns(struct zebra_ns *ns,
return NULL; return NULL;
} }
struct interface *if_lookup_by_index_per_nsid(ns_id_t ns_id, uint32_t ifindex)
{
struct zebra_ns *zns;
zns = zebra_ns_lookup(ns_id);
return zns ? if_lookup_by_index_per_ns(zns, ifindex) : NULL;
}
const char *ifindex2ifname_per_ns(struct zebra_ns *zns, unsigned int ifindex) const char *ifindex2ifname_per_ns(struct zebra_ns *zns, unsigned int ifindex)
{ {
struct interface *ifp; struct interface *ifp;
@ -991,7 +1001,6 @@ void if_up(struct interface *ifp, bool install_connected)
{ {
struct zebra_if *zif; struct zebra_if *zif;
struct interface *link_if; struct interface *link_if;
struct zebra_vrf *zvrf = ifp->vrf->info;
zif = ifp->info; zif = ifp->info;
zif->up_count++; zif->up_count++;
@ -1024,8 +1033,7 @@ void if_up(struct interface *ifp, bool install_connected)
link_if = ifp; link_if = ifp;
zebra_vxlan_svi_up(ifp, link_if); zebra_vxlan_svi_up(ifp, link_if);
} else if (IS_ZEBRA_IF_VLAN(ifp)) { } else if (IS_ZEBRA_IF_VLAN(ifp)) {
link_if = if_lookup_by_index_per_ns(zvrf->zns, link_if = zif->link;
zif->link_ifindex);
if (link_if) if (link_if)
zebra_vxlan_svi_up(ifp, link_if); zebra_vxlan_svi_up(ifp, link_if);
} else if (IS_ZEBRA_IF_MACVLAN(ifp)) { } else if (IS_ZEBRA_IF_MACVLAN(ifp)) {
@ -1049,7 +1057,6 @@ void if_down(struct interface *ifp)
{ {
struct zebra_if *zif; struct zebra_if *zif;
struct interface *link_if; struct interface *link_if;
struct zebra_vrf *zvrf = ifp->vrf->info;
zif = ifp->info; zif = ifp->info;
zif->down_count++; zif->down_count++;
@ -1068,8 +1075,7 @@ void if_down(struct interface *ifp)
link_if = ifp; link_if = ifp;
zebra_vxlan_svi_down(ifp, link_if); zebra_vxlan_svi_down(ifp, link_if);
} else if (IS_ZEBRA_IF_VLAN(ifp)) { } else if (IS_ZEBRA_IF_VLAN(ifp)) {
link_if = if_lookup_by_index_per_ns(zvrf->zns, link_if = zif->link;
zif->link_ifindex);
if (link_if) if (link_if)
zebra_vxlan_svi_down(ifp, link_if); zebra_vxlan_svi_down(ifp, link_if);
} else if (IS_ZEBRA_IF_MACVLAN(ifp)) { } else if (IS_ZEBRA_IF_MACVLAN(ifp)) {
@ -1109,6 +1115,7 @@ void zebra_if_update_link(struct interface *ifp, ifindex_t link_ifindex,
if (IS_ZEBRA_IF_VETH(ifp)) if (IS_ZEBRA_IF_VETH(ifp))
return; return;
zif = (struct zebra_if *)ifp->info; zif = (struct zebra_if *)ifp->info;
zif->link_nsid = ns_id;
zif->link_ifindex = link_ifindex; zif->link_ifindex = link_ifindex;
zif->link = if_lookup_by_index_per_ns(zebra_ns_lookup(ns_id), zif->link = if_lookup_by_index_per_ns(zebra_ns_lookup(ns_id),
link_ifindex); link_ifindex);
@ -1145,8 +1152,8 @@ void zebra_if_update_all_links(struct zebra_ns *zns)
/* update SVI linkages */ /* update SVI linkages */
if ((zif->link_ifindex != IFINDEX_INTERNAL) && !zif->link) { if ((zif->link_ifindex != IFINDEX_INTERNAL) && !zif->link) {
zif->link = if_lookup_by_index_per_ns( zif->link = if_lookup_by_index_per_nsid(
zns, zif->link_ifindex); zif->link_nsid, zif->link_ifindex);
if (IS_ZEBRA_DEBUG_KERNEL) if (IS_ZEBRA_DEBUG_KERNEL)
zlog_debug("interface %s/%d's lower fixup to %s/%d", zlog_debug("interface %s/%d's lower fixup to %s/%d",
ifp->name, ifp->ifindex, ifp->name, ifp->ifindex,

3
zebra/interface.h
View File

@ -195,6 +195,7 @@ struct zebra_if {
struct list *mac_list; struct list *mac_list;
/* Link fields - for sub-interfaces. */ /* Link fields - for sub-interfaces. */
ns_id_t link_nsid;
ifindex_t link_ifindex; ifindex_t link_ifindex;
struct interface *link; struct interface *link;
@ -259,6 +260,8 @@ extern struct interface *if_lookup_by_index_per_ns(struct zebra_ns *, uint32_t);
extern struct interface *if_lookup_by_name_per_ns(struct zebra_ns *, extern struct interface *if_lookup_by_name_per_ns(struct zebra_ns *,
const char *); const char *);
extern struct interface *if_link_per_ns(struct zebra_ns *, struct interface *); extern struct interface *if_link_per_ns(struct zebra_ns *, struct interface *);
extern struct interface *if_lookup_by_index_per_nsid(ns_id_t nsid,
uint32_t ifindex);
extern const char *ifindex2ifname_per_ns(struct zebra_ns *, unsigned int); extern const char *ifindex2ifname_per_ns(struct zebra_ns *, unsigned int);
extern void if_unlink_per_ns(struct interface *); extern void if_unlink_per_ns(struct interface *);