diff options
Diffstat (limited to 'contrib/tcpdump/print-otv.c')
-rw-r--r-- | contrib/tcpdump/print-otv.c | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/contrib/tcpdump/print-otv.c b/contrib/tcpdump/print-otv.c index 53a79de..5a82752 100644 --- a/contrib/tcpdump/print-otv.c +++ b/contrib/tcpdump/print-otv.c @@ -13,14 +13,17 @@ * Original code by Francesco Fondelli (francesco dot fondelli, gmail dot com) */ -#define NETDISSECT_REWORKED +/* \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 "interface.h" +#include "netdissect.h" #include "extract.h" /* @@ -39,27 +42,31 @@ void otv_print(netdissect_options *ndo, const u_char *bp, u_int len) { uint8_t flags; - uint32_t overlay_id; - uint32_t instance_id; - if (len < 8) { - ND_PRINT((ndo, "[|OTV]")); - return; - } + ND_PRINT((ndo, "OTV, ")); + if (len < 8) + 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_TCHECK2(*bp, 3); + ND_PRINT((ndo, "overlay %u, ", EXTRACT_24BITS(bp))); bp += 3; - instance_id = EXTRACT_24BITS(bp); - bp += 4; + ND_TCHECK2(*bp, 3); + ND_PRINT((ndo, "instance %u\n", EXTRACT_24BITS(bp))); + bp += 3; - ND_PRINT((ndo, "OTV, ")); - ND_PRINT((ndo, "flags [%s] (0x%02x), ", flags & 0x08 ? "I" : ".", flags)); - ND_PRINT((ndo, "overlay %u, ", overlay_id)); - ND_PRINT((ndo, "instance %u\n", instance_id)); + /* Reserved */ + ND_TCHECK(*bp); + bp += 1; + + ether_print(ndo, bp, len - 8, ndo->ndo_snapend - bp, NULL, NULL); + return; - ether_print(ndo, bp, len - 8, len - 8, NULL, NULL); +trunc: + ND_PRINT((ndo, " [|OTV]")); } |