diff options
Diffstat (limited to 'contrib/tcpdump/print-vxlan.c')
-rw-r--r-- | contrib/tcpdump/print-vxlan.c | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/contrib/tcpdump/print-vxlan.c b/contrib/tcpdump/print-vxlan.c index c4de68d..0c2a82e 100644 --- a/contrib/tcpdump/print-vxlan.c +++ b/contrib/tcpdump/print-vxlan.c @@ -13,16 +13,23 @@ * Original code by Francesco Fondelli (francesco dot fondelli, gmail dot com) */ -#define NETDISSECT_REWORKED +/* \summary: Virtual eXtensible Local Area Network (VXLAN) printer */ + +/* specification: RFC 7348 */ + #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" +static const char tstr[] = " [|VXLAN]"; + +#define VXLAN_HDR_LEN 8 + /* * VXLAN header, RFC7348 * Virtual eXtensible Local Area Network (VXLAN): A Framework @@ -43,10 +50,10 @@ vxlan_print(netdissect_options *ndo, const u_char *bp, u_int len) uint8_t flags; uint32_t vni; - if (len < 8) { - ND_PRINT((ndo, "[|VXLAN]")); - return; - } + if (len < VXLAN_HDR_LEN) + goto trunc; + + ND_TCHECK2(*bp, VXLAN_HDR_LEN); flags = *bp; bp += 4; @@ -58,5 +65,10 @@ vxlan_print(netdissect_options *ndo, const u_char *bp, u_int len) ND_PRINT((ndo, "flags [%s] (0x%02x), ", flags & 0x08 ? "I" : ".", flags)); ND_PRINT((ndo, "vni %u\n", vni)); - ether_print(ndo, bp, len - 8, len - 8, NULL, NULL); + ether_print(ndo, bp, len - VXLAN_HDR_LEN, ndo->ndo_snapend - bp, NULL, NULL); + + return; + +trunc: + ND_PRINT((ndo, "%s", tstr)); } |