Use more the EXTRACT_U_1() macro (40/n)

[tcpdump] / print-otv.c

diff --git a/print-otv.c b/print-otv.c
index 5a82752c19a2b933b5818b7a6a7d43d36bda0313..f4daacfa63086a45a8ef0065a0c83cb88224afae 100644 (file)
--- a/print-otv.c
+++ b/print-otv.c
@@ -26,6 +26,8 @@
 #include "netdissect.h"
 #include "extract.h"
 
+#define OTV_HDR_LEN 8
+
 /*
  * OTV header, draft-hasmit-otv-04
  *
@@ -44,7 +46,7 @@ otv_print(netdissect_options *ndo, const u_char *bp, u_int len)
     uint8_t flags;
 
     ND_PRINT((ndo, "OTV, "));
-    if (len < 8)
+    if (len < OTV_HDR_LEN)
         goto trunc;
 
     ND_TCHECK(*bp);
@@ -52,19 +54,19 @@ otv_print(netdissect_options *ndo, const u_char *bp, u_int len)
     ND_PRINT((ndo, "flags [%s] (0x%02x), ", flags & 0x08 ? "I" : ".", flags));
     bp += 1;
 
-    ND_TCHECK2(*bp, 3);
-    ND_PRINT((ndo, "overlay %u, ", EXTRACT_24BITS(bp)));
+    ND_TCHECK_3(bp);
+    ND_PRINT((ndo, "overlay %u, ", EXTRACT_BE_U_3(bp)));
     bp += 3;
 
-    ND_TCHECK2(*bp, 3);
-    ND_PRINT((ndo, "instance %u\n", EXTRACT_24BITS(bp)));
+    ND_TCHECK_3(bp);
+    ND_PRINT((ndo, "instance %u\n", EXTRACT_BE_U_3(bp)));
     bp += 3;
 
     /* Reserved */
     ND_TCHECK(*bp);
     bp += 1;
 
-    ether_print(ndo, bp, len - 8, ndo->ndo_snapend - bp, NULL, NULL);
+    ether_print(ndo, bp, len - OTV_HDR_LEN, ndo->ndo_snapend - bp, NULL, NULL);
     return;
 
 trunc: