1 files changed, 33 insertions, 84 deletions

diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index b18f0e943c..902c726511 100644
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -389,11 +389,9 @@ static void vty_show_ip_route(struct vty *vty, struct route_node *rn,
 		if (CHECK_FLAG(re->flags, ZEBRA_FLAG_SELECTED))
 			json_object_boolean_true_add(json_route, "selected");
 
-		if (re->type != ZEBRA_ROUTE_CONNECT) {
-			json_object_int_add(json_route, "distance",
-					    re->distance);
-			json_object_int_add(json_route, "metric", re->metric);
-		}
+		json_object_int_add(json_route, "distance",
+				    re->distance);
+		json_object_int_add(json_route, "metric", re->metric);
 
 		if (re->tag)
 			json_object_int_add(json_route, "tag", re->tag);
@@ -602,7 +600,9 @@ static void vty_show_ip_route(struct vty *vty, struct route_node *rn,
 				srcdest_rnode2str(rn, buf, sizeof buf));
 
 			/* Distance and metric display. */
-			if (re->type != ZEBRA_ROUTE_CONNECT)
+			if (((re->type == ZEBRA_ROUTE_CONNECT) &&
+			     (re->distance || re->metric)) ||
+			    (re->type != ZEBRA_ROUTE_CONNECT))
 				len += vty_out(vty, " [%u/%u]", re->distance,
 					       re->metric);
 		} else {
@@ -930,21 +930,35 @@ DEFPY (show_route_table_vrf,
 	return CMD_SUCCESS;
 }
 
-DEFUN (show_ip_nht,
+DEFPY (show_ip_nht,
        show_ip_nht_cmd,
-       "show ip nht [vrf NAME]",
+       "show <ip$ipv4|ipv6$ipv6> nht [vrf NAME$vrf_name|vrf all$vrf_all]",
        SHOW_STR
        IP_STR
+       IP6_STR
        "IP nexthop tracking table\n"
-       VRF_CMD_HELP_STR)
+       VRF_CMD_HELP_STR
+       VRF_ALL_CMD_HELP_STR)
 {
-	int idx_vrf = 4;
+	afi_t afi = ipv4 ? AFI_IP : AFI_IP6;
 	vrf_id_t vrf_id = VRF_DEFAULT;
 
-	if (argc == 5)
-		VRF_GET_ID(vrf_id, argv[idx_vrf]->arg, false);
+	if (vrf_all) {
+		struct vrf *vrf;
+		struct zebra_vrf *zvrf;
 
-	zebra_print_rnh_table(vrf_id, AF_INET, vty, RNH_NEXTHOP_TYPE);
+		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), afi, vty,
+						      RNH_NEXTHOP_TYPE);
+			}
+		return CMD_SUCCESS;
+	}
+	if (vrf_name)
+		VRF_GET_ID(vrf_id, vrf_name, false);
+
+	zebra_print_rnh_table(vrf_id, afi, vty, RNH_NEXTHOP_TYPE);
 	return CMD_SUCCESS;
 }
 
@@ -969,9 +983,8 @@ 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),
-						      afi, vty,
-						      RNH_NEXTHOP_TYPE);
+				zebra_print_rnh_table(zvrf_id(zvrf), afi, vty,
+						      RNH_IMPORT_CHECK_TYPE);
 			}
 		return CMD_SUCCESS;
 	}
@@ -982,67 +995,6 @@ DEFPY (show_ip_import_check,
 	return CMD_SUCCESS;
 }
 
-DEFUN (show_ip_nht_vrf_all,
-       show_ip_nht_vrf_all_cmd,
-       "show ip nht vrf all",
-       SHOW_STR
-       IP_STR
-       "IP nexthop tracking table\n"
-       VRF_ALL_CMD_HELP_STR)
-{
-	struct vrf *vrf;
-	struct zebra_vrf *zvrf;
-
-	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,
-					      RNH_NEXTHOP_TYPE);
-		}
-
-	return CMD_SUCCESS;
-}
-
-DEFUN (show_ipv6_nht,
-       show_ipv6_nht_cmd,
-       "show ipv6 nht [vrf NAME]",
-       SHOW_STR
-       IPV6_STR
-       "IPv6 nexthop tracking table\n"
-       VRF_CMD_HELP_STR)
-{
-	int idx_vrf = 4;
-	vrf_id_t vrf_id = VRF_DEFAULT;
-
-	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);
-	return CMD_SUCCESS;
-}
-
-
-DEFUN (show_ipv6_nht_vrf_all,
-       show_ipv6_nht_vrf_all_cmd,
-       "show ipv6 nht vrf all",
-       SHOW_STR
-       IP_STR
-       "IPv6 nexthop tracking table\n"
-       VRF_ALL_CMD_HELP_STR)
-{
-	struct vrf *vrf;
-	struct zebra_vrf *zvrf;
-
-	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,
-					      RNH_NEXTHOP_TYPE);
-		}
-
-	return CMD_SUCCESS;
-}
-
 DEFUN (ip_nht_default_route,
        ip_nht_default_route_cmd,
        "ip nht resolve-via-default",
@@ -1060,7 +1012,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 +1033,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 +1053,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 +1075,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;
 }
 
@@ -2955,9 +2907,6 @@ void zebra_vty_init(void)
 	install_element(VIEW_NODE, &show_route_summary_cmd);
 	install_element(VIEW_NODE, &show_ip_nht_cmd);
 	install_element(VIEW_NODE, &show_ip_import_check_cmd);
-	install_element(VIEW_NODE, &show_ip_nht_vrf_all_cmd);
-	install_element(VIEW_NODE, &show_ipv6_nht_cmd);
-	install_element(VIEW_NODE, &show_ipv6_nht_vrf_all_cmd);
 
 	install_element(VIEW_NODE, &show_ip_rpf_cmd);
 	install_element(VIEW_NODE, &show_ip_rpf_addr_cmd);