Merge pull request #5793 from ton31337/fix/formatting_show_bgp_summary_failed

[mirror_frr.git] / zebra / zebra_vxlan.c

diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c
index 086b13d67096e0d87ad761489fbed78e52d456e0..4b56581ca9ba7282f30c0a3893caf071847bccbb 100644 (file)
--- a/zebra/zebra_vxlan.c
+++ b/zebra/zebra_vxlan.c
@@ -3212,7 +3212,7 @@ static int zvni_local_neigh_update(zebra_vni_t *zvni,
                        vtep_ip = n->r_vtep_ip;
                        /* Mark appropriately */
                        UNSET_FLAG(n->flags, ZEBRA_NEIGH_REMOTE);
-                       n->r_vtep_ip.s_addr = 0;
+                       n->r_vtep_ip.s_addr = INADDR_ANY;
                        SET_FLAG(n->flags, ZEBRA_NEIGH_LOCAL);
                        n->ifindex = ifp->ifindex;
                }
@@ -7682,6 +7682,55 @@ int zebra_vxlan_handle_kernel_neigh_update(struct interface *ifp,
        return zvni_remote_neigh_update(zvni, ifp, ip, macaddr, state);
 }
 
+static int32_t
+zebra_vxlan_remote_macip_helper(bool add, struct stream *s, vni_t *vni,
+                               struct ethaddr *macaddr, uint16_t *ipa_len,
+                               struct ipaddr *ip, struct in_addr *vtep_ip,
+                               uint8_t *flags, uint32_t *seq)
+{
+       uint16_t l = 0;
+
+       /*
+        * Obtain each remote MACIP and process.
+        * Message contains VNI, followed by MAC followed by IP (if any)
+        * followed by remote VTEP IP.
+        */
+       memset(ip, 0, sizeof(*ip));
+       STREAM_GETL(s, *vni);
+       STREAM_GET(macaddr->octet, s, ETH_ALEN);
+       STREAM_GETL(s, *ipa_len);
+
+       if (*ipa_len) {
+               if (*ipa_len == IPV4_MAX_BYTELEN)
+                       ip->ipa_type = IPADDR_V4;
+               else if (*ipa_len == IPV6_MAX_BYTELEN)
+                       ip->ipa_type = IPADDR_V6;
+               else {
+                       if (IS_ZEBRA_DEBUG_VXLAN)
+                               zlog_debug(
+                                       "ipa_len *must* be %d or %d bytes in length not %d",
+                                       IPV4_MAX_BYTELEN, IPV6_MAX_BYTELEN,
+                                       *ipa_len);
+                       goto stream_failure;
+               }
+
+               STREAM_GET(&ip->ip.addr, s, *ipa_len);
+       }
+       l += 4 + ETH_ALEN + 4 + *ipa_len;
+       STREAM_GET(&vtep_ip->s_addr, s, IPV4_MAX_BYTELEN);
+       l += IPV4_MAX_BYTELEN;
+
+       if (add) {
+               STREAM_GETC(s, *flags);
+               STREAM_GETL(s, *seq);
+               l += 5;
+       }
+
+       return l;
+
+stream_failure:
+       return -1;
+}
 
 /*
  * Handle message from client to delete a remote MACIP for a VNI.
@@ -7704,23 +7753,14 @@ void zebra_vxlan_remote_macip_del(ZAPI_HANDLER_ARGS)
        s = msg;
 
        while (l < hdr->length) {
-               /* Obtain each remote MACIP and process. */
-               /* Message contains VNI, followed by MAC followed by IP (if any)
-                * followed by remote VTEP IP.
-                */
-               memset(&ip, 0, sizeof(ip));
-               STREAM_GETL(s, vni);
-               STREAM_GET(&macaddr.octet, s, ETH_ALEN);
-               STREAM_GETL(s, ipa_len);
-               if (ipa_len) {
-                       ip.ipa_type = (ipa_len == IPV4_MAX_BYTELEN) ? IPADDR_V4
-                                                                   : IPADDR_V6;
-                       STREAM_GET(&ip.ip.addr, s, ipa_len);
-               }
-               l += 4 + ETH_ALEN + 4 + ipa_len;
-               STREAM_GET(&vtep_ip.s_addr, s, IPV4_MAX_BYTELEN);
-               l += IPV4_MAX_BYTELEN;
+               int res_length = zebra_vxlan_remote_macip_helper(
+                       false, s, &vni, &macaddr, &ipa_len, &ip, &vtep_ip, NULL,
+                       NULL);
 
+               if (res_length == -1)
+                       goto stream_failure;
+
+               l += res_length;
                if (IS_ZEBRA_DEBUG_VXLAN)
                        zlog_debug(
                                "Recv MACIP DEL VNI %u MAC %s%s%s Remote VTEP %s from %s",
@@ -7769,29 +7809,14 @@ void zebra_vxlan_remote_macip_add(ZAPI_HANDLER_ARGS)
        s = msg;
 
        while (l < hdr->length) {
-               /* Obtain each remote MACIP and process. */
-               /* Message contains VNI, followed by MAC followed by IP (if any)
-                * followed by remote VTEP IP.
-                */
-               memset(&ip, 0, sizeof(ip));
-               STREAM_GETL(s, vni);
-               STREAM_GET(&macaddr.octet, s, ETH_ALEN);
-               STREAM_GETL(s, ipa_len);
-               if (ipa_len) {
-                       ip.ipa_type = (ipa_len == IPV4_MAX_BYTELEN) ? IPADDR_V4
-                                                                   : IPADDR_V6;
-                       STREAM_GET(&ip.ip.addr, s, ipa_len);
-               }
-               l += 4 + ETH_ALEN + 4 + ipa_len;
-               STREAM_GET(&vtep_ip.s_addr, s, IPV4_MAX_BYTELEN);
-               l += IPV4_MAX_BYTELEN;
+               int res_length = zebra_vxlan_remote_macip_helper(
+                       true, s, &vni, &macaddr, &ipa_len, &ip, &vtep_ip,
+                       &flags, &seq);
 
-               /* Get flags - sticky mac and/or gateway mac */
-               STREAM_GETC(s, flags);
-               l++;
-               STREAM_GETL(s, seq);
-               l += 4;
+               if (res_length == -1)
+                       goto stream_failure;
 
+               l += res_length;
                if (IS_ZEBRA_DEBUG_VXLAN)
                        zlog_debug(
                                "Recv MACIP ADD VNI %u MAC %s%s%s flags 0x%x seq %u VTEP %s from %s",
@@ -8599,9 +8624,8 @@ void zebra_vxlan_macvlan_down(struct interface *ifp)
                        struct interface *ifp;
 
                        ifp = if_lookup_by_index_all_vrf(zif->link_ifindex);
-                       zlog_debug("macvlan %s parent link is not found. Parent index %d ifp %s",
-                               ifp->name, zif->link_ifindex,
-                               ifp ? ifp->name : " ");
+                       zlog_debug("macvlan parent link is not found. Parent index %d ifp %s",
+                               zif->link_ifindex, ifp ? ifp->name : " ");
                }
                return;
        }
@@ -9462,7 +9486,7 @@ void zebra_vxlan_advertise_subnet(ZAPI_HANDLER_ARGS)
 
        s = msg;
        STREAM_GETC(s, advertise);
-       vni = stream_get3(s);
+       STREAM_GET(&vni, s, 3);
 
        zvni = zvni_lookup(vni);
        if (!zvni)
@@ -9961,7 +9985,7 @@ static zebra_vxlan_sg_t *zebra_vxlan_sg_add(struct zebra_vrf *zvrf,
         * 2. the XG entry is used by pimd to setup the
         * vxlan-termination-mroute
         */
-       if (sg->src.s_addr) {
+       if (sg->src.s_addr != INADDR_ANY) {
                memset(&sip, 0, sizeof(sip));
                parent = zebra_vxlan_sg_do_ref(zvrf, sip, sg->grp);
                if (!parent)
@@ -9993,7 +10017,7 @@ static void zebra_vxlan_sg_del(zebra_vxlan_sg_t *vxlan_sg)
        /* On SG entry deletion remove the reference to its parent XG
         * entry
         */
-       if (vxlan_sg->sg.src.s_addr) {
+       if (vxlan_sg->sg.src.s_addr != INADDR_ANY) {
                memset(&sip, 0, sizeof(sip));
                zebra_vxlan_sg_do_deref(zvrf, sip, vxlan_sg->sg.grp);
        }
@@ -10052,7 +10076,8 @@ static void zebra_vxlan_sg_deref(struct in_addr local_vtep_ip,
 {
        struct zebra_vrf *zvrf;
 
-       if (!local_vtep_ip.s_addr || !mcast_grp.s_addr)
+       if (local_vtep_ip.s_addr == INADDR_ANY
+           || mcast_grp.s_addr == INADDR_ANY)
                return;
 
        zvrf = vrf_info_lookup(VRF_DEFAULT);
@@ -10067,7 +10092,8 @@ static void zebra_vxlan_sg_ref(struct in_addr local_vtep_ip,
 {
        struct zebra_vrf *zvrf;
 
-       if (!local_vtep_ip.s_addr || !mcast_grp.s_addr)
+       if (local_vtep_ip.s_addr == INADDR_ANY
+           || mcast_grp.s_addr == INADDR_ANY)
                return;
 
        zvrf = vrf_info_lookup(VRF_DEFAULT);