Upgrade to tcpdump 4.7.4.
Bug: http://b/24902618
Change-Id: I7c3605015d90453b0a8c339b1774e285796f8775
diff --git a/print-calm-fast.c b/print-calm-fast.c
index 9824072..5cc39f4 100644
--- a/print-calm-fast.c
+++ b/print-calm-fast.c
@@ -15,18 +15,14 @@
* Original code by Ola Martin Lykkja (ola.lykkja@q-free.com)
*/
+#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <tcpdump-stdinc.h>
-#include <pcap.h>
-#include <stdio.h>
-#include <string.h>
-
#include "interface.h"
-#include "extract.h"
#include "addrtoname.h"
/*
@@ -47,12 +43,12 @@
length -= 2;
bp += 2;
- printf("CALM FAST src:%s; ", etheraddr_string(eth+6));
- printf("SrcNwref:%d; ", srcNwref);
- printf("DstNwref:%d; ", dstNwref);
+ ND_PRINT((ndo, "CALM FAST src:%s; ", etheraddr_string(ndo, eth+6)));
+ ND_PRINT((ndo, "SrcNwref:%d; ", srcNwref));
+ ND_PRINT((ndo, "DstNwref:%d; ", dstNwref));
if (ndo->ndo_vflag)
- default_print(bp, length);
+ ND_DEFAULTPRINT(bp, length);
}