proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-29 06:29:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2923 from pguibert6WIND/fix_veth_namespace

Browse Source 
zebra: when veth link is used across vrf, the link may not be good
This commit is contained in:
David Lamparter 2018-08-31 08:51:01 +02:00 committed by GitHub
commit 5c724747c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zebra/if_netlink.c
View File

@ -259,6 +259,8 @@ static void netlink_determine_zebra_iftype(char *kind, zebra_iftype_t *zif_type)
*zif_type = ZEBRA_IF_VXLAN; *zif_type = ZEBRA_IF_VXLAN;
else if (strcmp(kind, "macvlan") == 0) else if (strcmp(kind, "macvlan") == 0)
*zif_type = ZEBRA_IF_MACVLAN; *zif_type = ZEBRA_IF_MACVLAN;
else if (strcmp(kind, "veth") == 0)
*zif_type = ZEBRA_IF_VETH;
} }
#define parse_rtattr_nested(tb, max, rta) \ #define parse_rtattr_nested(tb, max, rta) \
@ -675,7 +677,7 @@ static int netlink_interface(struct nlmsghdr *h, ns_id_t ns_id, int startup)
SET_FLAG(ifp->status, ZEBRA_INTERFACE_VRF_LOOPBACK); SET_FLAG(ifp->status, ZEBRA_INTERFACE_VRF_LOOPBACK);
/* Update link. */ /* Update link. */
zebra_if_update_link(ifp, link_ifindex); zebra_if_update_link(ifp, link_ifindex, ns_id);
/* Hardware type and address. */ /* Hardware type and address. */
ifp->ll_type = netlink_to_zebra_link_type(ifi->ifi_type); ifp->ll_type = netlink_to_zebra_link_type(ifi->ifi_type);
@ -1262,7 +1264,7 @@ int netlink_link_change(struct nlmsghdr *h, ns_id_t ns_id, int startup)
ZEBRA_INTERFACE_VRF_LOOPBACK); ZEBRA_INTERFACE_VRF_LOOPBACK);
/* Update link. */ /* Update link. */
zebra_if_update_link(ifp, link_ifindex); zebra_if_update_link(ifp, link_ifindex, ns_id);
netlink_interface_update_hw_addr(tb, ifp); netlink_interface_update_hw_addr(tb, ifp);

11
zebra/interface.c
View File

@ -1002,13 +1002,16 @@ void if_refresh(struct interface *ifp)
if_get_flags(ifp); if_get_flags(ifp);
} }
void zebra_if_update_link(struct interface *ifp, ifindex_t link_ifindex) void zebra_if_update_link(struct interface *ifp, ifindex_t link_ifindex,
ns_id_t ns_id)
{ {
struct zebra_if *zif; struct zebra_if *zif;
if (IS_ZEBRA_IF_VETH(ifp))
return;
zif = (struct zebra_if *)ifp->info; zif = (struct zebra_if *)ifp->info;
zif->link_ifindex = link_ifindex; zif->link_ifindex = link_ifindex;
zif->link = if_lookup_by_index_per_ns(zebra_ns_lookup(NS_DEFAULT), zif->link = if_lookup_by_index_per_ns(zebra_ns_lookup(ns_id),
link_ifindex); link_ifindex);
} }
@ -1093,6 +1096,10 @@ static const char *zebra_ziftype_2str(zebra_iftype_t zif_type)
return "VRF"; return "VRF";
break; break;
case ZEBRA_IF_VETH:
return "VETH";
break;
default: default:
return "Unknown"; return "Unknown";
break; break;

9
zebra/interface.h
View File

@ -191,6 +191,7 @@ typedef enum {
ZEBRA_IF_BRIDGE, /* bridge device */ ZEBRA_IF_BRIDGE, /* bridge device */
ZEBRA_IF_VLAN, /* VLAN sub-interface */ ZEBRA_IF_VLAN, /* VLAN sub-interface */
ZEBRA_IF_MACVLAN, /* MAC VLAN interface*/ ZEBRA_IF_MACVLAN, /* MAC VLAN interface*/
ZEBRA_IF_VETH, /* VETH interface*/
} zebra_iftype_t; } zebra_iftype_t;
/* Zebra "slave" interface type */ /* Zebra "slave" interface type */
@ -312,7 +313,10 @@ static inline void zebra_if_set_ziftype(struct interface *ifp,
#define IS_ZEBRA_IF_MACVLAN(ifp) \ #define IS_ZEBRA_IF_MACVLAN(ifp) \
(((struct zebra_if *)(ifp->info))->zif_type == ZEBRA_IF_MACVLAN) (((struct zebra_if *)(ifp->info))->zif_type == ZEBRA_IF_MACVLAN)
#define IS_ZEBRA_IF_BRIDGE_SLAVE(ifp) \ #define IS_ZEBRA_IF_VETH(ifp) \
(((struct zebra_if *)(ifp->info))->zif_type == ZEBRA_IF_VETH)
#define IS_ZEBRA_IF_BRIDGE_SLAVE(ifp) \
(((struct zebra_if *)(ifp->info))->zif_slave_type \ (((struct zebra_if *)(ifp->info))->zif_slave_type \
== ZEBRA_IF_SLAVE_BRIDGE) == ZEBRA_IF_SLAVE_BRIDGE)
@ -344,7 +348,8 @@ extern int if_subnet_add(struct interface *, struct connected *);
extern int if_subnet_delete(struct interface *, struct connected *); extern int if_subnet_delete(struct interface *, struct connected *);
extern int ipv6_address_configured(struct interface *ifp); extern int ipv6_address_configured(struct interface *ifp);
extern void if_handle_vrf_change(struct interface *ifp, vrf_id_t vrf_id); extern void if_handle_vrf_change(struct interface *ifp, vrf_id_t vrf_id);
extern void zebra_if_update_link(struct interface *ifp, ifindex_t link_ifindex); extern void zebra_if_update_link(struct interface *ifp, ifindex_t link_ifindex,
ns_id_t ns_id);
extern void vrf_add_update(struct vrf *vrfp); extern void vrf_add_update(struct vrf *vrfp);