Merge pull request #3614 from donaldsharp/connected_route_cost_fixes

Asundry EVPN fixes

9 files changed, 58 insertions, 40 deletions

diff --git a/zebra/connected.c b/zebra/connected.c
index ab66eb332..c449855f6 100644
--- a/zebra/connected.c
+++ b/zebra/connected.c
@@ -209,6 +209,7 @@ void connected_up(struct interface *ifp, struct connected *ifc)
 		.ifindex = ifp->ifindex,
 		.vrf_id = ifp->vrf_id,
 	};
+	uint32_t metric;
 
 	if (!CHECK_FLAG(ifc->conf, ZEBRA_IFC_REAL))
 		return;
@@ -243,11 +244,13 @@ void connected_up(struct interface *ifp, struct connected *ifc)
 		break;
 	}
 
+	metric = (ifc->metric < (uint32_t)METRIC_MAX) ?
+				ifc->metric : ifp->metric;
 	rib_add(afi, SAFI_UNICAST, ifp->vrf_id, ZEBRA_ROUTE_CONNECT, 0, 0, &p,
-		NULL, &nh, RT_TABLE_MAIN, ifp->metric, 0, 0, 0);
+		NULL, &nh, RT_TABLE_MAIN, metric, 0, 0, 0);
 
 	rib_add(afi, SAFI_MULTICAST, ifp->vrf_id, ZEBRA_ROUTE_CONNECT, 0, 0, &p,
-		NULL, &nh, RT_TABLE_MAIN, ifp->metric, 0, 0, 0);
+		NULL, &nh, RT_TABLE_MAIN, metric, 0, 0, 0);
 
 	if (IS_ZEBRA_DEBUG_RIB_DETAILED) {
 		char buf[PREFIX_STRLEN];
@@ -276,7 +279,7 @@ void connected_up(struct interface *ifp, struct connected *ifc)
 /* Add connected IPv4 route to the interface. */
 void connected_add_ipv4(struct interface *ifp, int flags, struct in_addr *addr,
 			uint16_t prefixlen, struct in_addr *broad,
-			const char *label)
+			const char *label, uint32_t metric)
 {
 	struct prefix_ipv4 *p;
 	struct connected *ifc;
@@ -288,6 +291,7 @@ void connected_add_ipv4(struct interface *ifp, int flags, struct in_addr *addr,
 	ifc = connected_new();
 	ifc->ifp = ifp;
 	ifc->flags = flags;
+	ifc->metric = metric;
 	/* If we get a notification from the kernel,
 	 * we can safely assume the address is known to the kernel */
 	SET_FLAG(ifc->conf, ZEBRA_IFC_QUEUED);
@@ -500,7 +504,7 @@ void connected_delete_ipv4(struct interface *ifp, int flags,
 /* Add connected IPv6 route to the interface. */
 void connected_add_ipv6(struct interface *ifp, int flags, struct in6_addr *addr,
 			struct in6_addr *broad, uint16_t prefixlen,
-			const char *label)
+			const char *label, uint32_t metric)
 {
 	struct prefix_ipv6 *p;
 	struct connected *ifc;
@@ -512,6 +516,7 @@ void connected_add_ipv6(struct interface *ifp, int flags, struct in6_addr *addr,
 	ifc = connected_new();
 	ifc->ifp = ifp;
 	ifc->flags = flags;
+	ifc->metric = metric;
 	/* If we get a notification from the kernel,
 	 * we can safely assume the address is known to the kernel */
 	SET_FLAG(ifc->conf, ZEBRA_IFC_QUEUED);
diff --git a/zebra/connected.h b/zebra/connected.h
index 415ecfd96..faba30b0d 100644
--- a/zebra/connected.h
+++ b/zebra/connected.h
@@ -36,7 +36,8 @@ extern struct connected *connected_check_ptp(struct interface *ifp,
 
 extern void connected_add_ipv4(struct interface *ifp, int flags,
 			       struct in_addr *addr, uint16_t prefixlen,
-			       struct in_addr *broad, const char *label);
+			       struct in_addr *broad, const char *label,
+			       uint32_t metric);
 
 extern void connected_delete_ipv4(struct interface *ifp, int flags,
 				  struct in_addr *addr, uint16_t prefixlen,
@@ -49,7 +50,8 @@ extern void connected_down(struct interface *ifp, struct connected *ifc);
 
 extern void connected_add_ipv6(struct interface *ifp, int flags,
 			       struct in6_addr *address, struct in6_addr *broad,
-			       uint16_t prefixlen, const char *label);
+			       uint16_t prefixlen, const char *label,
+			       uint32_t metric);
 extern void connected_delete_ipv6(struct interface *ifp,
 				  struct in6_addr *address,
 				  struct in6_addr *broad, uint16_t prefixlen);
diff --git a/zebra/if_ioctl.c b/zebra/if_ioctl.c
index df79d285a..debc151d7 100644
--- a/zebra/if_ioctl.c
+++ b/zebra/if_ioctl.c
@@ -236,7 +236,8 @@ static int if_getaddrs(void)
 			}
 
 			connected_add_ipv4(ifp, flags, &addr->sin_addr,
-					   prefixlen, dest_pnt, NULL);
+					   prefixlen, dest_pnt, NULL,
+					   METRIC_MAX);
 		}
 		if (ifap->ifa_addr->sa_family == AF_INET6) {
 			struct sockaddr_in6 *addr;
@@ -258,7 +259,7 @@ static int if_getaddrs(void)
 #endif
 
 			connected_add_ipv6(ifp, flags, &addr->sin6_addr, NULL,
-					   prefixlen, NULL);
+					   prefixlen, NULL, METRIC_MAX);
 		}
 	}
 
diff --git a/zebra/if_ioctl_solaris.c b/zebra/if_ioctl_solaris.c
index 0206d4938..2c29930c3 100644
--- a/zebra/if_ioctl_solaris.c
+++ b/zebra/if_ioctl_solaris.c
@@ -302,10 +302,11 @@ static int if_get_addr(struct interface *ifp, struct sockaddr *addr,
 	/* Set address to the interface. */
 	if (af == AF_INET)
 		connected_add_ipv4(ifp, flags, &SIN(addr)->sin_addr, prefixlen,
-				   (struct in_addr *)dest_pnt, label);
+				   (struct in_addr *)dest_pnt, label,
+				   METRIC_MAX);
 	else if (af == AF_INET6)
 		connected_add_ipv6(ifp, flags, &SIN6(addr)->sin6_addr, NULL,
-				   prefixlen, label);
+				   prefixlen, label, METRIC_MAX);
 
 	return 0;
 }
diff --git a/zebra/if_netlink.c b/zebra/if_netlink.c
index 0cecce5e7..47087d4ce 100644
--- a/zebra/if_netlink.c
+++ b/zebra/if_netlink.c
@@ -924,6 +924,7 @@ int netlink_interface_addr(struct nlmsghdr *h, ns_id_t ns_id, int startup)
 	uint8_t flags = 0;
 	char *label = NULL;
 	struct zebra_ns *zns;
+	uint32_t metric = METRIC_MAX;
 
 	zns = zebra_ns_lookup(ns_id);
 	ifa = NLMSG_DATA(h);
@@ -1032,6 +1033,9 @@ int netlink_interface_addr(struct nlmsghdr *h, ns_id_t ns_id, int startup)
 	if (label && strcmp(ifp->name, label) == 0)
 		label = NULL;
 
+	if (tb[IFA_RT_PRIORITY])
+		metric = *(uint32_t *)RTA_DATA(tb[IFA_RT_PRIORITY]);
+
 	/* Register interface address to the interface. */
 	if (ifa->ifa_family == AF_INET) {
 		if (ifa->ifa_prefixlen > IPV4_MAX_BITLEN) {
@@ -1044,7 +1048,8 @@ int netlink_interface_addr(struct nlmsghdr *h, ns_id_t ns_id, int startup)
 		if (h->nlmsg_type == RTM_NEWADDR)
 			connected_add_ipv4(ifp, flags, (struct in_addr *)addr,
 					   ifa->ifa_prefixlen,
-					   (struct in_addr *)broad, label);
+					   (struct in_addr *)broad, label,
+					   metric);
 		else
 			connected_delete_ipv4(
 				ifp, flags, (struct in_addr *)addr,
@@ -1070,7 +1075,8 @@ int netlink_interface_addr(struct nlmsghdr *h, ns_id_t ns_id, int startup)
 				connected_add_ipv6(ifp, flags,
 						   (struct in6_addr *)addr,
 						   (struct in6_addr *)broad,
-						   ifa->ifa_prefixlen, label);
+						   ifa->ifa_prefixlen, label,
+						   metric);
 		} else
 			connected_delete_ipv6(ifp, (struct in6_addr *)addr,
 					      (struct in6_addr *)broad,
diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c
index f3561cc19..acd7f911d 100644
--- a/zebra/kernel_socket.c
+++ b/zebra/kernel_socket.c
@@ -906,7 +906,8 @@ int ifam_read(struct ifa_msghdr *ifam)
 			connected_add_ipv4(ifp, flags, &addr.sin.sin_addr,
 					   ip_masklen(mask.sin.sin_addr),
 					   &brd.sin.sin_addr,
-					   (isalias ? ifname : NULL));
+					   (isalias ? ifname : NULL),
+					   METRIC_MAX);
 		else
 			connected_delete_ipv4(ifp, flags, &addr.sin.sin_addr,
 					      ip_masklen(mask.sin.sin_addr),
@@ -923,7 +924,8 @@ int ifam_read(struct ifa_msghdr *ifam)
 			connected_add_ipv6(ifp, flags, &addr.sin6.sin6_addr,
 					   NULL,
 					   ip6_masklen(mask.sin6.sin6_addr),
-					   (isalias ? ifname : NULL));
+					   (isalias ? ifname : NULL),
+					   METRIC_MAX);
 		else
 			connected_delete_ipv6(ifp, &addr.sin6.sin6_addr, NULL,
 					      ip6_masklen(mask.sin6.sin6_addr));
diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index 87b279b1e..902c72651 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 {
diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c
index 280361df6..45e6caebb 100644
--- a/zebra/zebra_vxlan.c
+++ b/zebra/zebra_vxlan.c
@@ -81,7 +81,7 @@ static void zvni_print_hash(struct hash_backet *backet, void *ctxt[]);
 
 static int zvni_macip_send_msg_to_client(vni_t vni, struct ethaddr *macaddr,
 					 struct ipaddr *ip, uint8_t flags,
-					 uint32_t seq, uint16_t cmd);
+					 uint32_t seq, int state, uint16_t cmd);
 static unsigned int neigh_hash_keymake(void *p);
 static void *zvni_neigh_alloc(void *p);
 static zebra_neigh_t *zvni_neigh_add(zebra_vni_t *zvni, struct ipaddr *ip,
@@ -97,7 +97,7 @@ static int zvni_neigh_send_add_to_client(vni_t vni, struct ipaddr *ip,
 					 uint8_t flags, uint32_t seq);
 static int zvni_neigh_send_del_to_client(vni_t vni, struct ipaddr *ip,
 					 struct ethaddr *macaddr,
-					 uint8_t flags);
+					 uint8_t flags, int state);
 static int zvni_neigh_install(zebra_vni_t *zvni, zebra_neigh_t *n);
 static int zvni_neigh_uninstall(zebra_vni_t *zvni, zebra_neigh_t *n);
 static zebra_vni_t *zvni_from_svi(struct interface *ifp,
@@ -2046,7 +2046,7 @@ static void zvni_print_hash_detail(struct hash_backet *backet, void *data)
  */
 static int zvni_macip_send_msg_to_client(vni_t vni, struct ethaddr *macaddr,
 					 struct ipaddr *ip, uint8_t flags,
-					 uint32_t seq, uint16_t cmd)
+					 uint32_t seq, int state, uint16_t cmd)
 {
 	char buf[ETHER_ADDR_STRLEN];
 	char buf2[INET6_ADDRSTRLEN];
@@ -2080,6 +2080,8 @@ static int zvni_macip_send_msg_to_client(vni_t vni, struct ethaddr *macaddr,
 	if (cmd == ZEBRA_MACIP_ADD) {
 		stream_putc(s, flags); /* sticky mac/gateway mac */
 		stream_putl(s, seq); /* sequence number */
+	} else {
+		stream_putl(s, state); /* state - active/inactive */
 	}
 
 
@@ -2218,7 +2220,7 @@ static void zvni_neigh_del_hash_entry(struct hash_backet *backet, void *arg)
 		&& IPV4_ADDR_SAME(&n->r_vtep_ip, &wctx->r_vtep_ip))) {
 		if (wctx->upd_client && (n->flags & ZEBRA_NEIGH_LOCAL))
 			zvni_neigh_send_del_to_client(wctx->zvni->vni, &n->ip,
-						      &n->emac, 0);
+						      &n->emac, 0, n->state);
 
 		if (wctx->uninstall)
 			zvni_neigh_uninstall(wctx->zvni, n);
@@ -2354,7 +2356,7 @@ static void zvni_process_neigh_on_local_mac_del(zebra_vni_t *zvni,
 				ZEBRA_NEIGH_SET_INACTIVE(n);
 				n->loc_seq = 0;
 				zvni_neigh_send_del_to_client(zvni->vni, &n->ip,
-							      &n->emac, 0);
+				      &n->emac, 0, ZEBRA_NEIGH_ACTIVE);
 			}
 		}
 	}
@@ -2385,7 +2387,7 @@ static void zvni_process_neigh_on_remote_mac_add(zebra_vni_t *zvni,
 				ZEBRA_NEIGH_SET_INACTIVE(n);
 				n->loc_seq = 0;
 				zvni_neigh_send_del_to_client(zvni->vni, &n->ip,
-							      &n->emac, 0);
+					      &n->emac, 0, ZEBRA_NEIGH_ACTIVE);
 			}
 		}
 	}
@@ -2418,17 +2420,18 @@ static int zvni_neigh_send_add_to_client(vni_t vni, struct ipaddr *ip,
 		SET_FLAG(flags, ZEBRA_MACIP_TYPE_ROUTER_FLAG);
 
 	return zvni_macip_send_msg_to_client(vni, macaddr, ip, flags,
-					     seq, ZEBRA_MACIP_ADD);
+			     seq, ZEBRA_NEIGH_ACTIVE, ZEBRA_MACIP_ADD);
 }
 
 /*
  * Inform BGP about local neighbor deletion.
  */
 static int zvni_neigh_send_del_to_client(vni_t vni, struct ipaddr *ip,
-					 struct ethaddr *macaddr, uint8_t flags)
+					 struct ethaddr *macaddr, uint8_t flags,
+					 int state)
 {
 	return zvni_macip_send_msg_to_client(vni, macaddr, ip, flags,
-					     0, ZEBRA_MACIP_DEL);
+					     0, state, ZEBRA_MACIP_DEL);
 }
 
 /*
@@ -2749,7 +2752,7 @@ static int zvni_gw_macip_del(struct interface *ifp, zebra_vni_t *zvni,
 
 	/* Remove neighbor from BGP. */
 	zvni_neigh_send_del_to_client(zvni->vni, &n->ip, &n->emac,
-				      ZEBRA_MACIP_TYPE_GW);
+				      ZEBRA_MACIP_TYPE_GW, ZEBRA_NEIGH_ACTIVE);
 
 	/* Delete this neighbor entry. */
 	zvni_neigh_del(zvni, n);
@@ -2963,7 +2966,7 @@ static int zvni_local_neigh_update(zebra_vni_t *zvni,
 			 */
 			if (IS_ZEBRA_NEIGH_ACTIVE(n))
 				zvni_neigh_send_del_to_client(zvni->vni, &n->ip,
-							      &n->emac, 0);
+					      &n->emac, 0, n->state);
 			old_zmac = zvni_mac_lookup(zvni, &n->emac);
 			if (old_zmac) {
 				old_mac_seq = CHECK_FLAG(old_zmac->flags,
@@ -3319,7 +3322,7 @@ static int zvni_mac_send_add_to_client(vni_t vni, struct ethaddr *macaddr,
 		SET_FLAG(flags, ZEBRA_MACIP_TYPE_GW);
 
 	return zvni_macip_send_msg_to_client(vni, macaddr, NULL, flags,
-					     seq, ZEBRA_MACIP_ADD);
+			     seq, ZEBRA_NEIGH_ACTIVE, ZEBRA_MACIP_ADD);
 }
 
 /*
@@ -3328,7 +3331,7 @@ static int zvni_mac_send_add_to_client(vni_t vni, struct ethaddr *macaddr,
 static int zvni_mac_send_del_to_client(vni_t vni, struct ethaddr *macaddr)
 {
 	return zvni_macip_send_msg_to_client(vni, macaddr, NULL, 0 /* flags */,
-					     0 /* seq */, ZEBRA_MACIP_DEL);
+			     0 /* seq */, ZEBRA_NEIGH_ACTIVE, ZEBRA_MACIP_DEL);
 }
 
 /*
@@ -5255,7 +5258,7 @@ static void process_remote_macip_add(vni_t vni,
 				    IS_ZEBRA_NEIGH_ACTIVE(n))
 					zvni_neigh_send_del_to_client(
 						zvni->vni, &n->ip,
-						&n->emac, 0);
+						&n->emac, 0, n->state);
 
 				/* update neigh list for macs */
 				old_mac = zvni_mac_lookup(zvni, &n->emac);
@@ -7074,8 +7077,8 @@ int zebra_vxlan_handle_kernel_neigh_del(struct interface *ifp,
 	}
 
 	/* Remove neighbor from BGP. */
-	if (IS_ZEBRA_NEIGH_ACTIVE(n))
-		zvni_neigh_send_del_to_client(zvni->vni, &n->ip, &n->emac, 0);
+	zvni_neigh_send_del_to_client(zvni->vni, &n->ip, &n->emac,
+			0, n->state);
 
 	/* Delete this neighbor entry. */
 	zvni_neigh_del(zvni, n);
diff --git a/zebra/zebra_vxlan_private.h b/zebra/zebra_vxlan_private.h
index 3be7dc012..cae0d62bb 100644
--- a/zebra/zebra_vxlan_private.h
+++ b/zebra/zebra_vxlan_private.h
@@ -313,11 +313,9 @@ struct rmac_walk_ctx {
 	struct json_object *json;
 };
 
-enum zebra_neigh_state { ZEBRA_NEIGH_INACTIVE = 0, ZEBRA_NEIGH_ACTIVE = 1 };
+#define IS_ZEBRA_NEIGH_ACTIVE(n) (n->state == ZEBRA_NEIGH_ACTIVE)
 
-#define IS_ZEBRA_NEIGH_ACTIVE(n) n->state == ZEBRA_NEIGH_ACTIVE
-
-#define IS_ZEBRA_NEIGH_INACTIVE(n) n->state == ZEBRA_NEIGH_INACTIVE
+#define IS_ZEBRA_NEIGH_INACTIVE(n) (n->state == ZEBRA_NEIGH_INACTIVE)
 
 #define ZEBRA_NEIGH_SET_ACTIVE(n) n->state = ZEBRA_NEIGH_ACTIVE