1 files changed, 63 insertions, 0 deletions
diff --git a/zebra/zebra_evpn_neigh.c b/zebra/zebra_evpn_neigh.c
index 858f0b99f6..d00115c9b0 100644
--- a/zebra/zebra_evpn_neigh.c
+++ b/zebra/zebra_evpn_neigh.c
@@ -2285,3 +2285,66 @@ void process_neigh_remote_macip_add(zebra_evpn_t *zevpn, struct zebra_vrf *zvrf,
 	/* Update seq number. */
 	n->rem_seq = seq;
 }
+
+int zebra_evpn_neigh_gw_macip_add(struct interface *ifp, zebra_evpn_t *zevpn,
+				  struct ipaddr *ip, zebra_mac_t *mac)
+{
+	zebra_neigh_t *n;
+	char buf[ETHER_ADDR_STRLEN];
+	char buf2[INET6_ADDRSTRLEN];
+
+
+	n = zebra_evpn_neigh_lookup(zevpn, ip);
+	if (!n) {
+		n = zebra_evpn_neigh_add(zevpn, ip, &mac->macaddr, mac, 0);
+		if (!n) {
+			flog_err(
+				EC_ZEBRA_MAC_ADD_FAILED,
+				"Failed to add neighbor %s MAC %s intf %s(%u) -> VNI %u",
+				ipaddr2str(ip, buf2, sizeof(buf2)),
+				prefix_mac2str(&mac->macaddr, buf, sizeof(buf)),
+				ifp->name, ifp->ifindex, zevpn->vni);
+			return -1;
+		}
+	}
+
+	/* Set "local" forwarding info. */
+	SET_FLAG(n->flags, ZEBRA_NEIGH_LOCAL);
+	ZEBRA_NEIGH_SET_ACTIVE(n);
+	memcpy(&n->emac, &mac->macaddr, ETH_ALEN);
+	n->ifindex = ifp->ifindex;
+
+	/* Only advertise in BGP if the knob is enabled */
+	if (advertise_gw_macip_enabled(zevpn)) {
+
+		SET_FLAG(mac->flags, ZEBRA_MAC_DEF_GW);
+		SET_FLAG(n->flags, ZEBRA_NEIGH_DEF_GW);
+		/* Set Router flag (R-bit) */
+		if (ip->ipa_type == IPADDR_V6)
+			SET_FLAG(n->flags, ZEBRA_NEIGH_ROUTER_FLAG);
+
+		if (IS_ZEBRA_DEBUG_VXLAN)
+			zlog_debug(
+				"SVI %s(%u) L2-VNI %u, sending GW MAC %s IP %s add to BGP with flags 0x%x",
+				ifp->name, ifp->ifindex, zevpn->vni,
+				prefix_mac2str(&mac->macaddr, buf, sizeof(buf)),
+				ipaddr2str(ip, buf2, sizeof(buf2)), n->flags);
+
+		zebra_evpn_neigh_send_add_to_client(
+			zevpn->vni, ip, &n->emac, n->mac, n->flags, n->loc_seq);
+	} else if (advertise_svi_macip_enabled(zevpn)) {
+
+		SET_FLAG(n->flags, ZEBRA_NEIGH_SVI_IP);
+		if (IS_ZEBRA_DEBUG_VXLAN)
+			zlog_debug(
+				"SVI %s(%u) L2-VNI %u, sending SVI MAC %s IP %s add to BGP with flags 0x%x",
+				ifp->name, ifp->ifindex, zevpn->vni,
+				prefix_mac2str(&mac->macaddr, buf, sizeof(buf)),
+				ipaddr2str(ip, buf2, sizeof(buf2)), n->flags);
+
+		zebra_evpn_neigh_send_add_to_client(
+			zevpn->vni, ip, &n->emac, n->mac, n->flags, n->loc_seq);
+	}
+
+	return 0;
+}