]> git.puffer.fish Git - matthieu/frr.git/commitdiff
bgpd: remove old/duplicate, and now out of order prefixlen test
authorLou Berger <lberger@labn.net>
Tue, 27 Sep 2016 11:54:56 +0000 (07:54 -0400)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 30 Sep 2016 16:56:54 +0000 (12:56 -0400)
bgpd/bgp_mplsvpn.c

index 91f0e91b3973db33dea376851ef04148a0154028..36ba65af1a426c9d05c385828b87320060df866f 100644 (file)
@@ -146,17 +146,17 @@ bgp_nlri_parse_vpn (struct peer *peer, struct attr *attr,
           pnt += BGP_ADDPATH_ID_LEN;
         }
 
+      /* Fetch prefix length. */
+      prefixlen = *pnt++;
+      p.family = afi2family (packet->afi);
+      psize = PSIZE (prefixlen);
+
       if (prefixlen < 88)
        {
          zlog_err ("prefix length is less than 88: %d", prefixlen);
          return -1;
        }
 
-      /* Fetch prefix length. */
-      prefixlen = *pnt++;
-      p.family = afi2family (packet->afi);
-      psize = PSIZE (prefixlen);
-      
       /* sanity check against packet data */
       if (prefixlen < VPN_PREFIXLEN_MIN_BYTES*8 || (pnt + psize) > lim)
         {