From 0b08cf5378648279efb96ecf03ea2e3f75bc4eff Mon Sep 17 00:00:00 2001 From: Denis Ovsienko Date: Sat, 8 Mar 2014 15:28:13 +0400 Subject: NDOize AHCP, OTV and VXLAN decoders --- print-vxlan.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) (limited to 'print-vxlan.c') diff --git a/print-vxlan.c b/print-vxlan.c index 3ef9cf6a..6f60d92a 100644 --- a/print-vxlan.c +++ b/print-vxlan.c @@ -19,10 +19,7 @@ #include -#include -#include - -#include "interface.h" +#include "netdissect.h" #include "extract.h" /* @@ -38,13 +35,13 @@ */ void -vxlan_print(const u_char *bp, u_int len) +vxlan_print(netdissect_options *ndo, const u_char *bp, u_int len) { u_int8_t flags; u_int32_t vni; if (len < 8) { - printf("[|VXLAN]"); + ND_PRINT((ndo, "[|VXLAN]")); return; } @@ -54,18 +51,9 @@ vxlan_print(const u_char *bp, u_int len) vni = EXTRACT_24BITS(bp); bp += 4; - printf("VXLAN, "); - - fputs("flags [", stdout); - if (flags & 0x08) - fputs("I", stdout); - else - fputs(".", stdout); - fputs("] ", stdout); - - printf("(0x%02x), ", flags); - printf("vni %u\n", vni); + ND_PRINT((ndo, "VXLAN, ")); + ND_PRINT((ndo, "flags [%s] (0x%02x), ", flags & 0x08 ? "I" : ".", flags)); + ND_PRINT((ndo, "vni %u\n", vni)); - ether_print(gndo, bp, len - 8, len - 8, NULL, NULL); - return; + ether_print(ndo, bp, len - 8, len - 8, NULL, NULL); } -- cgit v1.2.1