NDOize OpenFlow, IEEE slow and telnet decoders

[tcpdump] / print-arp.c

diff --git a/print-arp.c b/print-arp.c
index fbc8411ef817fe9e114b25343091153f05cef71b..d9a6535af07618b8666898d16482799e01395a18 100644 (file)
--- a/print-arp.c
+++ b/print-arp.c
@@ -19,16 +19,16 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include <stdio.h>
 #include <string.h>
 
-#include "netdissect.h"
+#include "interface.h"
 #include "addrtoname.h"
 #include "ether.h"
 #include "ethertype.h"
@@ -234,9 +234,9 @@ atmarp_print(netdissect_options *ndo,
        }
 
         /* print operation */
-        printf("%s%s ",
+        ND_PRINT((ndo, "%s%s ",
                ndo->ndo_vflag ? ", " : "",
-               tok2str(arpop_values, "Unknown (%u)", op));
+               tok2str(arpop_values, "Unknown (%u)", op)));
 
        switch (op) {
 
@@ -349,9 +349,9 @@ arp_print(netdissect_options *ndo,
        }
 
         /* print operation */
-        printf("%s%s ",
+        ND_PRINT((ndo, "%s%s ",
                ndo->ndo_vflag ? ", " : "",
-               tok2str(arpop_values, "Unknown (%u)", op));
+               tok2str(arpop_values, "Unknown (%u)", op)));
 
        switch (op) {