X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/857ec6e800ec772f5a6b9f76268d189d70f000b6..d2777156522f139a858bd6b5b51e364826bc95a7:/print-geneve.c

diff --git a/print-geneve.c b/print-geneve.c
index 40402ab4..0b7ff6e5 100644
--- a/print-geneve.c
+++ b/print-geneve.c
@@ -18,10 +18,10 @@
 /* \summary: Generic Network Virtualization Encapsulation (Geneve) printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "extract.h"
@@ -109,19 +109,19 @@ geneve_opts_print(netdissect_options *ndo, const u_char *bp, u_int len)
         uint8_t opt_type;
         uint8_t opt_len;
 
-        ND_PRINT((ndo, "%s", sep));
+        ND_PRINT("%s", sep);
         sep = ", ";
 
-        opt_class = EXTRACT_16BITS(bp);
-        opt_type = *(bp + 2);
-        opt_len = 4 + ((*(bp + 3) & OPT_LEN_MASK) * 4);
+        opt_class = GET_BE_U_2(bp);
+        opt_type = GET_U_1(bp + 2);
+        opt_len = 4 + ((GET_U_1(bp + 3) & OPT_LEN_MASK) * 4);
 
-        ND_PRINT((ndo, "class %s (0x%x) type 0x%x%s len %u",
+        ND_PRINT("class %s (0x%x) type 0x%x%s len %u",
                   format_opt_class(opt_class), opt_class, opt_type,
-                  opt_type & OPT_TYPE_CRITICAL ? "(C)" : "", opt_len));
+                  opt_type & OPT_TYPE_CRITICAL ? "(C)" : "", opt_len);
 
         if (opt_len > len) {
-            ND_PRINT((ndo, " [bad length]"));
+            ND_PRINT(" [bad length]");
             return;
         }
 
@@ -129,10 +129,10 @@ geneve_opts_print(netdissect_options *ndo, const u_char *bp, u_int len)
             const uint32_t *data = (const uint32_t *)(bp + 4);
             int i;
 
-            ND_PRINT((ndo, " data"));
+            ND_PRINT(" data");
 
             for (i = 4; i < opt_len; i += 4) {
-                ND_PRINT((ndo, " %08x", EXTRACT_32BITS(data)));
+                ND_PRINT(" %08x", GET_BE_U_4(data));
                 data++;
             }
         }
@@ -153,85 +153,92 @@ geneve_print(netdissect_options *ndo, const u_char *bp, u_int len)
     uint8_t reserved;
     u_int opts_len;
 
-    ND_PRINT((ndo, "Geneve"));
+    ndo->ndo_protocol = "geneve";
+    ND_PRINT("Geneve");
 
-    ND_TCHECK2(*bp, 8);
+    if (len < 8) {
+        ND_PRINT(" [length %u < 8]", len);
+        nd_print_invalid(ndo);
+        return;
+    }
+
+    ND_TCHECK_8(bp);
 
-    ver_opt = *bp;
+    ver_opt = GET_U_1(bp);
     bp += 1;
     len -= 1;
 
     version = ver_opt >> VER_SHIFT;
     if (version != 0) {
-        ND_PRINT((ndo, " ERROR: unknown-version %u", version));
+        ND_PRINT(" ERROR: unknown-version %u", version);
         return;
     }
 
-    flags = *bp;
+    flags = GET_U_1(bp);
     bp += 1;
     len -= 1;
 
-    prot = EXTRACT_16BITS(bp);
+    prot = GET_BE_U_2(bp);
     bp += 2;
     len -= 2;
 
-    vni = EXTRACT_24BITS(bp);
+    vni = GET_BE_U_3(bp);
     bp += 3;
     len -= 3;
 
-    reserved = *bp;
+    reserved = GET_U_1(bp);
     bp += 1;
     len -= 1;
 
-    ND_PRINT((ndo, ", Flags [%s]",
-              bittok2str_nosep(geneve_flag_values, "none", flags)));
-    ND_PRINT((ndo, ", vni 0x%x", vni));
+    ND_PRINT(", Flags [%s]",
+              bittok2str_nosep(geneve_flag_values, "none", flags));
+    ND_PRINT(", vni 0x%x", vni);
 
     if (reserved)
-        ND_PRINT((ndo, ", rsvd 0x%x", reserved));
+        ND_PRINT(", rsvd 0x%x", reserved);
 
     if (ndo->ndo_eflag)
-        ND_PRINT((ndo, ", proto %s (0x%04x)",
-                  tok2str(ethertype_values, "unknown", prot), prot));
+        ND_PRINT(", proto %s (0x%04x)",
+                  tok2str(ethertype_values, "unknown", prot), prot);
 
     opts_len = (ver_opt & HDR_OPTS_LEN_MASK) * 4;
 
     if (len < opts_len) {
-        ND_PRINT((ndo, " truncated-geneve - %u bytes missing",
-                  opts_len - len));
+        ND_PRINT(" truncated-geneve - %u bytes missing",
+                  opts_len - len);
         return;
     }
 
-    ND_TCHECK2(*bp, opts_len);
+    ND_TCHECK_LEN(bp, opts_len);
 
     if (opts_len > 0) {
-        ND_PRINT((ndo, ", options ["));
+        ND_PRINT(", options [");
 
         if (ndo->ndo_vflag)
             geneve_opts_print(ndo, bp, opts_len);
         else
-            ND_PRINT((ndo, "%u bytes", opts_len));
+            ND_PRINT("%u bytes", opts_len);
 
-        ND_PRINT((ndo, "]"));
+        ND_PRINT("]");
     }
 
     bp += opts_len;
     len -= opts_len;
 
     if (ndo->ndo_vflag < 1)
-        ND_PRINT((ndo, ": "));
+        ND_PRINT(": ");
     else
-        ND_PRINT((ndo, "\n\t"));
+        ND_PRINT("\n\t");
 
-    if (ethertype_print(ndo, prot, bp, len, ndo->ndo_snapend - bp, NULL, NULL) == 0) {
+    if (ethertype_print(ndo, prot, bp, len, ND_BYTES_AVAILABLE_AFTER(bp), NULL, NULL) == 0) {
         if (prot == ETHERTYPE_TEB)
-            ether_print(ndo, bp, len, ndo->ndo_snapend - bp, NULL, NULL);
+            ether_print(ndo, bp, len, ND_BYTES_AVAILABLE_AFTER(bp), NULL, NULL);
         else
-            ND_PRINT((ndo, "geneve-proto-0x%x", prot));
+            ND_PRINT("geneve-proto-0x%x", prot);
     }
 
     return;
 
 trunc:
-    ND_PRINT((ndo, " [|geneve]"));
+    nd_print_trunc(ndo);
 }