Use more the ND_TTEST_1() macro

[tcpdump] / print-vxlan.c

diff --git a/print-vxlan.c b/print-vxlan.c
index 052cbe3d45f7cd6b527e8dd9328b266a7dd9881a..82aec20cca2669517f86628d1c22e9e221f1f724 100644 (file)
--- a/print-vxlan.c
+++ b/print-vxlan.c
@@ -53,19 +53,19 @@ vxlan_print(netdissect_options *ndo, const u_char *bp, u_int len)
     if (len < VXLAN_HDR_LEN)
         goto trunc;
 
     if (len < VXLAN_HDR_LEN)
         goto trunc;
 

-    ND_TCHECK2(*bp, VXLAN_HDR_LEN);
+    ND_TCHECK_LEN(bp, VXLAN_HDR_LEN);

 
 

-    flags = *bp;
+    flags = EXTRACT_U_1(bp);

     bp += 4;
 
     bp += 4;
 

-    vni = EXTRACT_24BITS(bp);
+    vni = EXTRACT_BE_U_3(bp);

     bp += 4;
 
     ND_PRINT((ndo, "VXLAN, "));
     ND_PRINT((ndo, "flags [%s] (0x%02x), ", flags & 0x08 ? "I" : ".", flags));
     ND_PRINT((ndo, "vni %u\n", vni));
 
     bp += 4;
 
     ND_PRINT((ndo, "VXLAN, "));
     ND_PRINT((ndo, "flags [%s] (0x%02x), ", flags & 0x08 ? "I" : ".", flags));
     ND_PRINT((ndo, "vni %u\n", vni));
 

-    ether_print(ndo, bp, len - VXLAN_HDR_LEN, len - VXLAN_HDR_LEN, NULL, NULL);
+    ether_print(ndo, bp, len - VXLAN_HDR_LEN, ndo->ndo_snapend - bp, NULL, NULL);

 
     return;
 
 
     return;