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

[tcpdump] / print-otv.c

diff --git a/print-otv.c b/print-otv.c
index 25c21f09038bd0ba907223f00d53de5d7eda9b1f..f4daacfa63086a45a8ef0065a0c83cb88224afae 100644 (file)
--- a/print-otv.c
+++ b/print-otv.c
@@ -13,20 +13,20 @@
  * Original code by Francesco Fondelli (francesco dot fondelli, gmail dot com)
  */
 
+/* \summary: Overlay Transport Virtualization (OTV) printer */
+
+/* specification: draft-hasmit-otv-04 */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
-#include "addrtoname.h"
 
-#include "udp.h"
+#define OTV_HDR_LEN 8
 
 /*
  * OTV header, draft-hasmit-otv-04
@@ -41,39 +41,34 @@
  */
 
 void
-otv_print(const u_char *bp, u_int len)
+otv_print(netdissect_options *ndo, const u_char *bp, u_int len)
 {
-    u_int8_t flags;
-    u_int32_t overlay_id;
-    u_int32_t instance_id;
+    uint8_t flags;
 
-    if (len < 8) {
-        printf("[|OTV]");
-        return;
-    }
+    ND_PRINT((ndo, "OTV, "));
+    if (len < OTV_HDR_LEN)
+        goto trunc;
 
+    ND_TCHECK(*bp);
     flags = *bp;
+    ND_PRINT((ndo, "flags [%s] (0x%02x), ", flags & 0x08 ? "I" : ".", flags));
     bp += 1;
 
-    overlay_id = EXTRACT_24BITS(bp);
+    ND_TCHECK_3(bp);
+    ND_PRINT((ndo, "overlay %u, ", EXTRACT_BE_U_3(bp)));
     bp += 3;
 
-    instance_id = EXTRACT_24BITS(bp);
-    bp += 4;
-
-    printf("OTV, ");
-
-    fputs("flags [", stdout);
-    if (flags & 0x08)
-        fputs("I", stdout);
-    else
-        fputs(".", stdout);
-    fputs("] ", stdout);
+    ND_TCHECK_3(bp);
+    ND_PRINT((ndo, "instance %u\n", EXTRACT_BE_U_3(bp)));
+    bp += 3;
 
-    printf("(0x%02x), ", flags);
-    printf("overlay %u, ", overlay_id);
-    printf("instance %u\n", instance_id);
+    /* Reserved */
+    ND_TCHECK(*bp);
+    bp += 1;
 
-    ether_print(gndo, bp, len - 8, len - 8, NULL, NULL);
+    ether_print(ndo, bp, len - OTV_HDR_LEN, ndo->ndo_snapend - bp, NULL, NULL);
     return;
+
+trunc:
+    ND_PRINT((ndo, " [|OTV]"));
 }