Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-04-30 13:37:17 +02:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

lib: remove VRF_BACKEND_UNKNOWN

Browse source 
The backend type cannot be unknown. It is configured to VRF_LITE by
default in zebra anyway, so just init to VRF_LITE in the lib and remove
the UNKNOWN type.

Signed-off-by: Igor Ryzhov <idryzhov@gmail.com>
This commit is contained in:
Igor Ryzhov 2024-12-26 23:08:21 +02:00
parent 0bc373c573
commit 4877f2f685
4 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/if.c
View file

@ -416,7 +416,6 @@ static struct interface *if_lookup_by_ifindex(ifindex_t ifindex,
struct interface *if_lookup_by_index(ifindex_t ifindex, vrf_id_t vrf_id) struct interface *if_lookup_by_index(ifindex_t ifindex, vrf_id_t vrf_id)
{ {
switch (vrf_get_backend()) { switch (vrf_get_backend()) {
case VRF_BACKEND_UNKNOWN:
case VRF_BACKEND_NETNS: case VRF_BACKEND_NETNS:
return(if_lookup_by_ifindex(ifindex, vrf_id)); return(if_lookup_by_ifindex(ifindex, vrf_id));
case VRF_BACKEND_VRF_LITE: case VRF_BACKEND_VRF_LITE:
@ -686,7 +685,6 @@ struct interface *if_get_by_name(const char *name, vrf_id_t vrf_id,
struct vrf *vrf; struct vrf *vrf;
switch (vrf_get_backend()) { switch (vrf_get_backend()) {
case VRF_BACKEND_UNKNOWN:
case VRF_BACKEND_NETNS: case VRF_BACKEND_NETNS:
vrf = vrf_get(vrf_id, vrf_name); vrf = vrf_get(vrf_id, vrf_name);
assert(vrf); assert(vrf);

7
lib/vrf.c
View file

@ -42,8 +42,7 @@ RB_GENERATE(vrf_name_head, vrf, name_entry, vrf_name_compare);
struct vrf_id_head vrfs_by_id = RB_INITIALIZER(&vrfs_by_id); struct vrf_id_head vrfs_by_id = RB_INITIALIZER(&vrfs_by_id);
struct vrf_name_head vrfs_by_name = RB_INITIALIZER(&vrfs_by_name); struct vrf_name_head vrfs_by_name = RB_INITIALIZER(&vrfs_by_name);
static int vrf_backend; static int vrf_backend = VRF_BACKEND_VRF_LITE;
static int vrf_backend_configured;
static char vrf_default_name[VRF_NAMSIZ] = VRF_DEFAULT_NAME_INTERNAL; static char vrf_default_name[VRF_NAMSIZ] = VRF_DEFAULT_NAME_INTERNAL;
/* /*
@ -654,8 +653,6 @@ int vrf_is_backend_netns(void)
int vrf_get_backend(void) int vrf_get_backend(void)
{ {
if (!vrf_backend_configured)
return VRF_BACKEND_UNKNOWN;
return vrf_backend; return vrf_backend;
} }
@ -663,7 +660,6 @@ int vrf_configure_backend(enum vrf_backend_type backend)
{ {
/* Work around issue in old gcc */ /* Work around issue in old gcc */
switch (backend) { switch (backend) {
case VRF_BACKEND_UNKNOWN:
case VRF_BACKEND_NETNS: case VRF_BACKEND_NETNS:
case VRF_BACKEND_VRF_LITE: case VRF_BACKEND_VRF_LITE:
break; break;
@ -672,7 +668,6 @@ int vrf_configure_backend(enum vrf_backend_type backend)
} }
vrf_backend = backend; vrf_backend = backend;
vrf_backend_configured = 1;
return 0; return 0;
} }

1
lib/vrf.h
View file

@ -94,7 +94,6 @@ DECLARE_QOBJ_TYPE(vrf);
enum vrf_backend_type { enum vrf_backend_type {
VRF_BACKEND_VRF_LITE, VRF_BACKEND_VRF_LITE,
VRF_BACKEND_NETNS, VRF_BACKEND_NETNS,
VRF_BACKEND_UNKNOWN,
VRF_BACKEND_MAX, VRF_BACKEND_MAX,
}; };

2
zebra/main.c
View file

@ -360,8 +360,6 @@ int main(int argc, char **argv)
if_notify_oper_changes = true; if_notify_oper_changes = true;
vrf_notify_oper_changes = true; vrf_notify_oper_changes = true;
vrf_configure_backend(VRF_BACKEND_VRF_LITE);
frr_preinit(&zebra_di, argc, argv); frr_preinit(&zebra_di, argc, argv);
frr_opt_add("baz:e:rK:s:R:" frr_opt_add("baz:e:rK:s:R:"