zebra: consolidate how we indentify address-families in the NHT code

Favor usage of the afi_t enumeration to identify address-families
over using the classic AF_INET[6] constants for that. The choice to
use either of the two seems to be mostly arbitrary throughout our
code base, which leads to confusion and bugs like the one fixed by
commit 6f95d11a1. To address this problem, favor usage of the afi_t
enumeration whenever possible, since 1) it's an enumeration (helps
the compilers to catch some bugs), 2) has a safi_t sibling and 3)
can be used to index static arrays. AF_INET[6] should then be used
only when interfacing with the kernel or external libraries like
libc. The family2afi() and afi2family() functions can be used to
convert between the two different representations back and forth.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>

1 files changed, 11 insertions, 12 deletions

diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index b62ff81bf6..83c12e2bdc 100644
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -944,7 +944,7 @@ DEFUN (show_ip_nht,
 	if (argc == 5)
 		VRF_GET_ID(vrf_id, argv[idx_vrf]->arg, false);
 
-	zebra_print_rnh_table(vrf_id, AF_INET, vty, RNH_NEXTHOP_TYPE);
+	zebra_print_rnh_table(vrf_id, AFI_IP, vty, RNH_NEXTHOP_TYPE);
 	return CMD_SUCCESS;
 }
 
@@ -958,7 +958,7 @@ DEFPY (show_ip_import_check,
        VRF_CMD_HELP_STR
        VRF_ALL_CMD_HELP_STR)
 {
-	int family = ipv4 ? AF_INET : AF_INET6;
+	afi_t afi = ipv4 ? AFI_IP : AFI_IP6;
 	vrf_id_t vrf_id = VRF_DEFAULT;
 
 	if (vrf_all) {
@@ -969,8 +969,7 @@ DEFPY (show_ip_import_check,
 			if ((zvrf = vrf->info) != NULL) {
 				vty_out(vty, "\nVRF %s:\n",
 					zvrf_name(zvrf));
-				zebra_print_rnh_table(zvrf_id(zvrf),
-						      family, vty,
+				zebra_print_rnh_table(zvrf_id(zvrf), afi, vty,
 						      RNH_IMPORT_CHECK_TYPE);
 			}
 		return CMD_SUCCESS;
@@ -978,7 +977,7 @@ DEFPY (show_ip_import_check,
 	if (vrf_name)
 		VRF_GET_ID(vrf_id, vrf_name, false);
 
-	zebra_print_rnh_table(vrf_id, family, vty, RNH_IMPORT_CHECK_TYPE);
+	zebra_print_rnh_table(vrf_id, afi, vty, RNH_IMPORT_CHECK_TYPE);
 	return CMD_SUCCESS;
 }
 
@@ -996,7 +995,7 @@ DEFUN (show_ip_nht_vrf_all,
 	RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name)
 		if ((zvrf = vrf->info) != NULL) {
 			vty_out(vty, "\nVRF %s:\n", zvrf_name(zvrf));
-			zebra_print_rnh_table(zvrf_id(zvrf), AF_INET, vty,
+			zebra_print_rnh_table(zvrf_id(zvrf), AFI_IP, vty,
 					      RNH_NEXTHOP_TYPE);
 		}
 
@@ -1017,7 +1016,7 @@ DEFUN (show_ipv6_nht,
 	if (argc == 5)
 		VRF_GET_ID(vrf_id, argv[idx_vrf]->arg, false);
 
-	zebra_print_rnh_table(vrf_id, AF_INET6, vty, RNH_NEXTHOP_TYPE);
+	zebra_print_rnh_table(vrf_id, AFI_IP6, vty, RNH_NEXTHOP_TYPE);
 	return CMD_SUCCESS;
 }
 
@@ -1036,7 +1035,7 @@ DEFUN (show_ipv6_nht_vrf_all,
 	RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name)
 		if ((zvrf = vrf->info) != NULL) {
 			vty_out(vty, "\nVRF %s:\n", zvrf_name(zvrf));
-			zebra_print_rnh_table(zvrf_id(zvrf), AF_INET6, vty,
+			zebra_print_rnh_table(zvrf_id(zvrf), AFI_IP6, vty,
 					      RNH_NEXTHOP_TYPE);
 		}
 
@@ -1060,7 +1059,7 @@ DEFUN (ip_nht_default_route,
 
 	zebra_rnh_ip_default_route = 1;
 
-	zebra_evaluate_rnh(zvrf, AF_INET, 1, RNH_NEXTHOP_TYPE, NULL);
+	zebra_evaluate_rnh(zvrf, AFI_IP, 1, RNH_NEXTHOP_TYPE, NULL);
 	return CMD_SUCCESS;
 }
 
@@ -1081,7 +1080,7 @@ DEFUN (no_ip_nht_default_route,
 		return CMD_SUCCESS;
 
 	zebra_rnh_ip_default_route = 0;
-	zebra_evaluate_rnh(zvrf, AF_INET, 1, RNH_NEXTHOP_TYPE, NULL);
+	zebra_evaluate_rnh(zvrf, AFI_IP, 1, RNH_NEXTHOP_TYPE, NULL);
 	return CMD_SUCCESS;
 }
 
@@ -1101,7 +1100,7 @@ DEFUN (ipv6_nht_default_route,
 		return CMD_SUCCESS;
 
 	zebra_rnh_ipv6_default_route = 1;
-	zebra_evaluate_rnh(zvrf, AF_INET6, 1, RNH_NEXTHOP_TYPE, NULL);
+	zebra_evaluate_rnh(zvrf, AFI_IP6, 1, RNH_NEXTHOP_TYPE, NULL);
 	return CMD_SUCCESS;
 }
 
@@ -1123,7 +1122,7 @@ DEFUN (no_ipv6_nht_default_route,
 		return CMD_SUCCESS;
 
 	zebra_rnh_ipv6_default_route = 0;
-	zebra_evaluate_rnh(zvrf, AF_INET6, 1, RNH_NEXTHOP_TYPE, NULL);
+	zebra_evaluate_rnh(zvrf, AFI_IP6, 1, RNH_NEXTHOP_TYPE, NULL);
 	return CMD_SUCCESS;
 }