Do the dump file Capsicum stuff in a common routine.

[tcpdump] / print-vjc.c

diff --git a/print-vjc.c b/print-vjc.c
index bc3a4520802461a313f811380261e2917181af7b..24f8a122c09b92a2b4cf82f5fae8f75037d3bc95 100644 (file)
--- a/print-vjc.c
+++ b/print-vjc.c
@@ -19,17 +19,14 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include <pcap.h>
-#include <stdio.h>
-
 #include "interface.h"
-
 #include "slcompress.h"
 #include "ppp.h"
 
@@ -76,38 +73,38 @@
  * unused argument remind us that we should fix this some day.
  */
 int
-vjc_print(register const char *bp, u_short proto _U_)
+vjc_print(netdissect_options *ndo, register const char *bp, u_short proto _U_)
 {
        int i;
 
        switch (bp[0] & 0xf0) {
        case TYPE_IP:
-               if (eflag)
-                       printf("(vjc type=IP) ");
+               if (ndo->ndo_eflag)
+                       ND_PRINT((ndo, "(vjc type=IP) "));
                return PPP_IP;
        case TYPE_UNCOMPRESSED_TCP:
-               if (eflag)
-                       printf("(vjc type=raw TCP) ");
+               if (ndo->ndo_eflag)
+                       ND_PRINT((ndo, "(vjc type=raw TCP) "));
                return PPP_IP;
        case TYPE_COMPRESSED_TCP:
-               if (eflag)
-                       printf("(vjc type=compressed TCP) ");
+               if (ndo->ndo_eflag)
+                       ND_PRINT((ndo, "(vjc type=compressed TCP) "));
                for (i = 0; i < 8; i++) {
                        if (bp[1] & (0x80 >> i))
-                               printf("%c", "?CI?SAWU"[i]);
+                               ND_PRINT((ndo, "%c", "?CI?SAWU"[i]));
                }
                if (bp[1])
-                       printf(" ");
-               printf("C=0x%02x ", bp[2]);
-               printf("sum=0x%04x ", *(u_short *)&bp[3]);
+                       ND_PRINT((ndo, " "));
+               ND_PRINT((ndo, "C=0x%02x ", bp[2]));
+               ND_PRINT((ndo, "sum=0x%04x ", *(u_short *)&bp[3]));
                return -1;
        case TYPE_ERROR:
-               if (eflag)
-                       printf("(vjc type=error) ");
+               if (ndo->ndo_eflag)
+                       ND_PRINT((ndo, "(vjc type=error) "));
                return -1;
        default:
-               if (eflag)
-                       printf("(vjc type=0x%02x) ", bp[0] & 0xf0);
+               if (ndo->ndo_eflag)
+                       ND_PRINT((ndo, "(vjc type=0x%02x) ", bp[0] & 0xf0));
                return -1;
        }
 }