Add program_name field in the netdissect_options structure

[tcpdump] / print-calm-fast.c

diff --git a/print-calm-fast.c b/print-calm-fast.c
index ba9776ca4f46f5cfd200adabf8920dc7e545e085..0b502499fb4b9cd22d90d38b67de732a1163f821 100644 (file)
--- a/print-calm-fast.c
+++ b/print-calm-fast.c
@@ -21,12 +21,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include <pcap.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "interface.h"
-#include "extract.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 
 /*
@@ -42,18 +37,17 @@
 void
 calm_fast_print(netdissect_options *ndo, const u_char *eth, const u_char *bp, u_int length)
 {
-       printf("CALM FAST src:%s; ", etheraddr_string(eth+6));
-
        int srcNwref = bp[0];
        int dstNwref = bp[1];
        length -= 2;
        bp += 2;
 
-       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);
 }