diff options
| -rw-r--r-- | bgpd/bgp_network.c | 3 | ||||
| -rw-r--r-- | lib/vrf.c | 9 | ||||
| -rw-r--r-- | lib/vrf.h | 3 | ||||
| -rw-r--r-- | lib/zclient.c | 4 | ||||
| -rw-r--r-- | staticd/static_vty.c | 24 | ||||
| -rw-r--r-- | zebra/zapi_msg.c | 2 | ||||
| -rw-r--r-- | zebra/zserv.c | 2 |
7 files changed, 20 insertions, 27 deletions
diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c index e15b8f4ec3..4153da5a64 100644 --- a/bgpd/bgp_network.c +++ b/bgpd/bgp_network.c @@ -670,8 +670,7 @@ static int bgp_listener(int sock, struct sockaddr *sa, socklen_t salen, listener->fd = sock; /* this socket needs a change of ns. record bgp back pointer */ - if (bgp->vrf_id != VRF_DEFAULT && vrf_is_mapped_on_netns( - vrf_lookup_by_id(bgp->vrf_id))) + if (bgp->vrf_id != VRF_DEFAULT && vrf_is_backend_netns()) listener->bgp = bgp; memcpy(&listener->su, sa, salen); @@ -716,13 +716,6 @@ int vrf_netns_handler_create(struct vty *vty, struct vrf *vrf, char *pathname, return CMD_SUCCESS; } -int vrf_is_mapped_on_netns(struct vrf *vrf) -{ - if (!vrf || vrf->data.l.netns_name[0] == '\0') - return 0; - return 1; -} - /* vrf CLI commands */ DEFUN_NOSH(vrf_exit, vrf_exit_cmd, @@ -953,7 +946,7 @@ int vrf_bind(vrf_id_t vrf_id, int fd, char *name) if (fd < 0 || name == NULL) return fd; - if (vrf_is_mapped_on_netns(vrf_lookup_by_id(vrf_id))) + if (vrf_is_backend_netns()) return fd; #ifdef SO_BINDTODEVICE ret = setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, name, strlen(name)+1); @@ -240,9 +240,6 @@ extern void vrf_set_default_name(const char *default_name, bool force); extern const char *vrf_get_default_name(void); #define VRF_DEFAULT_NAME vrf_get_default_name() -/* VRF is mapped on netns or not ? */ -int vrf_is_mapped_on_netns(struct vrf *vrf); - /* VRF switch from NETNS */ extern int vrf_switch_to_netns(vrf_id_t vrf_id); extern int vrf_switchback_to_initial(void); diff --git a/lib/zclient.c b/lib/zclient.c index 187a4b20b0..4f39774e38 100644 --- a/lib/zclient.c +++ b/lib/zclient.c @@ -2371,8 +2371,12 @@ static void zclient_capability_decode(int command, struct zclient *zclient, { struct zclient_capabilities cap; struct stream *s = zclient->ibuf; + int vrf_backend; uint8_t mpls_enabled; + STREAM_GETL(s, vrf_backend); + vrf_configure_backend(vrf_backend); + memset(&cap, 0, sizeof(cap)); STREAM_GETC(s, mpls_enabled); cap.mpls_enabled = !!mpls_enabled; diff --git a/staticd/static_vty.c b/staticd/static_vty.c index ae0026cc97..f09c304359 100644 --- a/staticd/static_vty.c +++ b/staticd/static_vty.c @@ -775,7 +775,7 @@ DEFPY(ip_route_blackhole, "Table to configure\n" "The table number to configure\n") { - if (table_str && vrf && !vrf_is_mapped_on_netns(vrf_lookup_by_name(vrf))) { + if (table_str && vrf && !vrf_is_backend_netns()) { vty_out(vty, "%% table param only available when running on netns-based vrfs\n"); return CMD_WARNING_CONFIG_FAILED; @@ -814,7 +814,7 @@ DEFPY(ip_route_blackhole_vrf, VTY_DECLVAR_CONTEXT(vrf, vrf); struct static_vrf *svrf = vrf->info; - if (table_str && !vrf_is_mapped_on_netns(vrf)) { + if (table_str && !vrf_is_backend_netns()) { vty_out(vty, "%% table param only available when running on netns-based vrfs\n"); return CMD_WARNING_CONFIG_FAILED; @@ -880,7 +880,7 @@ DEFPY(ip_route_address_interface, return CMD_WARNING_CONFIG_FAILED; } - if (table_str && vrf && !vrf_is_mapped_on_netns(vrf_lookup_by_name(vrf))) { + if (table_str && vrf && !vrf_is_backend_netns()) { vty_out(vty, "%% table param only available when running on netns-based vrfs\n"); return CMD_WARNING_CONFIG_FAILED; @@ -938,7 +938,7 @@ DEFPY(ip_route_address_interface_vrf, struct static_vrf *svrf = vrf->info; struct static_vrf *nh_svrf; - if (table_str && !vrf_is_mapped_on_netns(vrf)) { + if (table_str && !vrf_is_backend_netns()) { vty_out(vty, "%% table param only available when running on netns-based vrfs\n"); return CMD_WARNING_CONFIG_FAILED; @@ -999,7 +999,7 @@ DEFPY(ip_route, struct static_vrf *nh_svrf; const char *flag = NULL; - if (table_str && vrf && !vrf_is_mapped_on_netns(vrf_lookup_by_name(vrf))) { + if (table_str && vrf && !vrf_is_backend_netns()) { vty_out(vty, "%% table param only available when running on netns-based vrfs\n"); return CMD_WARNING_CONFIG_FAILED; @@ -1065,7 +1065,7 @@ DEFPY(ip_route_vrf, struct static_vrf *nh_svrf; const char *flag = NULL; - if (table_str && !vrf_is_mapped_on_netns(vrf)) { + if (table_str && !vrf_is_backend_netns()) { vty_out(vty, "%% table param only available when running on netns-based vrfs\n"); return CMD_WARNING_CONFIG_FAILED; @@ -1119,7 +1119,7 @@ DEFPY(ipv6_route_blackhole, "Table to configure\n" "The table number to configure\n") { - if (table_str && vrf && !vrf_is_mapped_on_netns(vrf_lookup_by_name(vrf))) { + if (table_str && vrf && !vrf_is_backend_netns()) { vty_out(vty, "%% table param only available when running on netns-based vrfs\n"); return CMD_WARNING_CONFIG_FAILED; @@ -1158,7 +1158,7 @@ DEFPY(ipv6_route_blackhole_vrf, VTY_DECLVAR_CONTEXT(vrf, vrf); struct static_vrf *svrf = vrf->info; - if (table_str && !vrf_is_mapped_on_netns(vrf)) { + if (table_str && !vrf_is_backend_netns()) { vty_out(vty, "%% table param only available when running on netns-based vrfs\n"); return CMD_WARNING_CONFIG_FAILED; @@ -1213,7 +1213,7 @@ DEFPY(ipv6_route_address_interface, struct static_vrf *nh_svrf; const char *flag = NULL; - if (table_str && vrf && !vrf_is_mapped_on_netns(vrf_lookup_by_name(vrf))) { + if (table_str && vrf && !vrf_is_backend_netns()) { vty_out(vty, "%% table param only available when running on netns-based vrfs\n"); return CMD_WARNING_CONFIG_FAILED; @@ -1282,7 +1282,7 @@ DEFPY(ipv6_route_address_interface_vrf, struct static_vrf *nh_svrf; const char *flag = NULL; - if (table_str && !vrf_is_mapped_on_netns(vrf)) { + if (table_str && !vrf_is_backend_netns()) { vty_out(vty, "%% table param only available when running on netns-based vrfs\n"); return CMD_WARNING_CONFIG_FAILED; @@ -1343,7 +1343,7 @@ DEFPY(ipv6_route, struct static_vrf *nh_svrf; const char *flag = NULL; - if (table_str && vrf && !vrf_is_mapped_on_netns(vrf_lookup_by_name(vrf))) { + if (table_str && vrf && !vrf_is_backend_netns()) { vty_out(vty, "%% table param only available when running on netns-based vrfs\n"); return CMD_WARNING_CONFIG_FAILED; @@ -1409,7 +1409,7 @@ DEFPY(ipv6_route_vrf, struct static_vrf *nh_svrf; const char *flag = NULL; - if (table_str && !vrf_is_mapped_on_netns(vrf)) { + if (table_str && !vrf_is_backend_netns()) { vty_out(vty, "%% table param only available when running on netns-based vrfs\n"); return CMD_WARNING_CONFIG_FAILED; diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c index d3994fd4a8..bc358e59a6 100644 --- a/zebra/zapi_msg.c +++ b/zebra/zapi_msg.c @@ -1657,6 +1657,7 @@ static void zsend_capabilities(struct zserv *client, struct zebra_vrf *zvrf) struct stream *s = stream_new(ZEBRA_MAX_PACKET_SIZ); zclient_create_header(s, ZEBRA_CAPABILITIES, zvrf->vrf->vrf_id); + stream_putl(s, vrf_get_backend()); stream_putc(s, mpls_enabled); stream_putl(s, multipath_num); stream_putc(s, zebra_mlag_get_role()); @@ -1693,6 +1694,7 @@ static void zread_hello(ZAPI_HANDLER_ARGS) } zsend_capabilities(client, zvrf); + zebra_vrf_update_all(client); stream_failure: return; } diff --git a/zebra/zserv.c b/zebra/zserv.c index 502186d226..766dd54fb3 100644 --- a/zebra/zserv.c +++ b/zebra/zserv.c @@ -723,8 +723,6 @@ static struct zserv *zserv_client_create(int sock) frr_pthread_new(&zclient_pthr_attrs, "Zebra API client thread", "zebra_apic"); - zebra_vrf_update_all(client); - /* start read loop */ zserv_client_event(client, ZSERV_CLIENT_READ); |