lib: remove VRF_BACKEND_UNKNOWN

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>
FRRouting · Dec 26, 2024 · 59eefe5 · 59eefe5
1 parent 3f6c106
commit 59eefe5
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 11 deletions.
diff --git a/lib/if.c b/lib/if.c
@@ -303,7 +303,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)
 {
 	switch (vrf_get_backend()) {
-	case VRF_BACKEND_UNKNOWN:
 	case VRF_BACKEND_NETNS:
 		return(if_lookup_by_ifindex(ifindex, vrf_id));
 	case VRF_BACKEND_VRF_LITE:
@@ -573,7 +572,6 @@ struct interface *if_get_by_name(const char *name, vrf_id_t vrf_id,
 	struct vrf *vrf;
 
 	switch (vrf_get_backend()) {
-	case VRF_BACKEND_UNKNOWN:
 	case VRF_BACKEND_NETNS:
 		vrf = vrf_get(vrf_id, vrf_name);
 		assert(vrf);

diff --git a/lib/vrf.c b/lib/vrf.c
@@ -39,8 +39,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_name_head vrfs_by_name = RB_INITIALIZER(&vrfs_by_name);
 
-static int vrf_backend;
-static int vrf_backend_configured;
+static int vrf_backend = VRF_BACKEND_VRF_LITE;
 static char vrf_default_name[VRF_NAMSIZ] = VRF_DEFAULT_NAME_INTERNAL;
 
 /*
@@ -612,16 +611,13 @@ int vrf_is_backend_netns(void)
 
 int vrf_get_backend(void)
 {
-	if (!vrf_backend_configured)
-		return VRF_BACKEND_UNKNOWN;
 	return vrf_backend;
 }
 
 int vrf_configure_backend(enum vrf_backend_type backend)
 {
 	/* Work around issue in old gcc */
 	switch (backend) {
-	case VRF_BACKEND_UNKNOWN:
 	case VRF_BACKEND_NETNS:
 	case VRF_BACKEND_VRF_LITE:
 		break;
@@ -630,7 +626,6 @@ int vrf_configure_backend(enum vrf_backend_type backend)
 	}
 
 	vrf_backend = backend;
-	vrf_backend_configured = 1;
 
 	return 0;
 }

diff --git a/lib/vrf.h b/lib/vrf.h
@@ -92,7 +92,6 @@ DECLARE_QOBJ_TYPE(vrf);
 enum vrf_backend_type {
 	VRF_BACKEND_VRF_LITE,
 	VRF_BACKEND_NETNS,
-	VRF_BACKEND_UNKNOWN,
 	VRF_BACKEND_MAX,
 };
 

diff --git a/zebra/main.c b/zebra/main.c
@@ -356,8 +356,6 @@ int main(int argc, char **argv)
 
 	zserv_path = NULL;
 
-	vrf_configure_backend(VRF_BACKEND_VRF_LITE);
-
 	frr_preinit(&zebra_di, argc, argv);
 
 	frr_opt_add("baz:e:rK:s:R:"