VJC: NDOize

diff --git a/interface.h b/interface.h
index bf29936df48f407acbd488df47491ccd38dfffb5..6ac6ab4648955f43639af86950e5fd8137f92d7c 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -249,7 +249,6 @@ extern u_int ppp_bsdos_if_print(const struct pcap_pkthdr *, const u_char *);
 extern u_int pppoe_if_print(const struct pcap_pkthdr *, const u_char *);
 extern u_int prism_if_print(const struct pcap_pkthdr *, const u_char *);
 extern void q933_print(const u_char *, u_int);
 extern u_int pppoe_if_print(const struct pcap_pkthdr *, const u_char *);
 extern u_int prism_if_print(const struct pcap_pkthdr *, const u_char *);
 extern void q933_print(const u_char *, u_int);

-extern int vjc_print(register const char *, u_short);

 extern void vqp_print(register const u_char *, register u_int);
 extern u_int raw_if_print(const struct pcap_pkthdr *, const u_char *);
 extern void rip_print(const u_char *, u_int);
 extern void vqp_print(register const u_char *, register u_int);
 extern u_int raw_if_print(const struct pcap_pkthdr *, const u_char *);
 extern void rip_print(const u_char *, u_int);

diff --git a/netdissect.h b/netdissect.h
index e04b6ebe07a4e12376394a967cfd06c35e5a5a3d..9cbf6aa0f1834c9c63a89f6b6e844c9d5eb8bece 100644 (file)
--- a/netdissect.h
+++ b/netdissect.h
@@ -391,6 +391,7 @@ extern u_int arcnet_if_print(netdissect_options *, const struct pcap_pkthdr *, c
 extern u_int arcnet_linux_if_print(netdissect_options *, const struct pcap_pkthdr *, const u_char *);
 extern void bfd_print(netdissect_options *, const u_char *, u_int, u_int);
 extern void gre_print(netdissect_options *, const u_char *, u_int);
 extern u_int arcnet_linux_if_print(netdissect_options *, const struct pcap_pkthdr *, const u_char *);
 extern void bfd_print(netdissect_options *, const u_char *, u_int, u_int);
 extern void gre_print(netdissect_options *, const u_char *, u_int);

+extern int vjc_print(netdissect_options *, register const char *, u_short);

 
 /* stuff that has not yet been rototiled */
 extern const u_char * ns_nprint (register const u_char *, register const u_char *);
 
 /* stuff that has not yet been rototiled */
 extern const u_char * ns_nprint (register const u_char *, register const u_char *);


@@ -476,9 +477,6 @@ extern void ppp_hdlc_if_print(u_char *,
 extern void ppp_bsdos_if_print(u_char *,
                               const struct pcap_pkthdr *, const u_char *);
 
 extern void ppp_bsdos_if_print(u_char *,
                               const struct pcap_pkthdr *, const u_char *);
 

-extern int vjc_print(netdissect_options *,register const char *,
-                    register u_int, u_short);
-

 extern void raw_if_print(u_char *,
                         const struct pcap_pkthdr *, const u_char *);
 
 extern void raw_if_print(u_char *,
                         const struct pcap_pkthdr *, const u_char *);
 

diff --git a/print-ppp.c b/print-ppp.c
index 82e0fc47600acbc09e85f7cde7573d0fe45c8364..b22439871d85b5b046fdb842e8a709dc8a43169d 100644 (file)
--- a/print-ppp.c
+++ b/print-ppp.c
@@ -1767,7 +1767,7 @@ ppp_bsdos_if_print(const struct pcap_pkthdr *h _U_, register const u_char *p _U_
 
                switch (ptype) {
                case PPP_VJC:
 
                switch (ptype) {
                case PPP_VJC:

-                       ptype = vjc_print(q, ptype);
+                       ptype = vjc_print(gndo, q, ptype);

                        hdrlength = PPP_BSDI_HDRLEN;
                        p += hdrlength;
                        switch (ptype) {
                        hdrlength = PPP_BSDI_HDRLEN;
                        p += hdrlength;
                        switch (ptype) {


@@ -1786,7 +1786,7 @@ ppp_bsdos_if_print(const struct pcap_pkthdr *h _U_, register const u_char *p _U_
                        }
                        goto printx;
                case PPP_VJNC:
                        }
                        goto printx;
                case PPP_VJNC:

-                       ptype = vjc_print(q, ptype);
+                       ptype = vjc_print(gndo, q, ptype);

                        hdrlength = PPP_BSDI_HDRLEN;
                        p += hdrlength;
                        switch (ptype) {
                        hdrlength = PPP_BSDI_HDRLEN;
                        p += hdrlength;
                        switch (ptype) {

diff --git a/print-vjc.c b/print-vjc.c
index a489776bc561d452a9b67adb3f75a11921716b18..14f35dad085b8d03e0cee69d82ae3725cecb384e 100644 (file)
--- a/print-vjc.c
+++ b/print-vjc.c
@@ -25,10 +25,7 @@
 
 #include <tcpdump-stdinc.h>
 
 
 #include <tcpdump-stdinc.h>
 

-#include <stdio.h>
-
-#include "interface.h"
-
+#include "netdissect.h"

 #include "slcompress.h"
 #include "ppp.h"
 
 #include "slcompress.h"
 #include "ppp.h"
 


@@ -75,38 +72,38 @@
  * unused argument remind us that we should fix this some day.
  */
 int
  * 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:
 {
        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:
                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:
                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))
                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])
                }
                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:
                return -1;
        case TYPE_ERROR:

-               if (eflag)
-                       printf("(vjc type=error) ");
+               if (ndo->ndo_eflag)
+                       ND_PRINT((ndo, "(vjc type=error) "));

                return -1;
        default:
                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;
        }
 }
                return -1;
        }
 }