When checking for pcap_if_t, add $V_INCLS to CFLAGS, so we look at the

[tcpdump] / netdissect.h

diff --git a/netdissect.h b/netdissect.h
index bc3fac0dd40ef2d3853ec373828ea6af84859100..e471ace44b4603b2b67ca8e12efc10af61aaa717 100644 (file)
--- a/netdissect.h
+++ b/netdissect.h
@@ -21,7 +21,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- * @(#) $Header: /tcpdump/master/tcpdump/netdissect.h,v 1.6 2004-04-23 19:03:39 mcr Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/tcpdump/netdissect.h,v 1.8 2004-04-30 16:42:14 mcr Exp $ (LBL)

  */
 
 #ifndef netdissect_h
  */
 
 #ifndef netdissect_h


@@ -67,6 +67,11 @@ struct tok {
        const char *s;          /* string */
 };
 
        const char *s;          /* string */
 };
 

+#define TOKBUFSIZE 128
+extern const char *tok2strbuf(const struct tok *, const char *, int,
+                             char *buf, size_t bufsize);
+
+/* tok2str is deprecated */

 extern const char *tok2str(const struct tok *, const char *, int);
 extern char *bittok2str(const struct tok *, const char *, int);
 
 extern const char *tok2str(const struct tok *, const char *, int);
 extern char *bittok2str(const struct tok *, const char *, int);
 


@@ -197,6 +202,7 @@ struct netdissect_options {
 #define ND_TCHECK(var) ND_TCHECK2(var, sizeof(var))
 
 #define ND_PRINT(STUFF) (*ndo->ndo_printf)STUFF
 #define ND_TCHECK(var) ND_TCHECK2(var, sizeof(var))
 
 #define ND_PRINT(STUFF) (*ndo->ndo_printf)STUFF

+#define ND_DEFAULTPRINT(ap, length) (*ndo->ndo_default_print)(ndo, ap, length)

 
 #if 0  
 extern void ts_print(netdissect_options *ipdo,
 
 #if 0  
 extern void ts_print(netdissect_options *ipdo,


@@ -235,6 +241,7 @@ extern void eap_print(netdissect_options *,const u_char *, u_int);
 extern int esp_print(netdissect_options *,
                     register const u_char *bp, register const u_char *bp2,
                     int *nhdr, int *padlen);
 extern int esp_print(netdissect_options *,
                     register const u_char *bp, register const u_char *bp2,
                     int *nhdr, int *padlen);

+extern void arp_print(netdissect_options *,const u_char *, u_int, u_int);

 
 #if 0
 extern void ascii_print_with_offset(netdissect_options *, const u_char *,
 
 #if 0
 extern void ascii_print_with_offset(netdissect_options *, const u_char *,


@@ -250,7 +257,6 @@ extern int llc_print(netdissect_options *,
                     const u_char *, u_int, u_int, const u_char *,
                     const u_char *, u_short *);
 extern void aarp_print(netdissect_options *,const u_char *, u_int);
                     const u_char *, u_int, u_int, const u_char *,
                     const u_char *, u_short *);
 extern void aarp_print(netdissect_options *,const u_char *, u_int);

-extern void arp_print(netdissect_options *,const u_char *, u_int, u_int);

 extern void atalk_print(netdissect_options *,const u_char *, u_int);
 extern void atm_if_print(u_char *,const struct pcap_pkthdr *, const u_char *);
 extern void bootp_print(netdissect_options *,const u_char *,
 extern void atalk_print(netdissect_options *,const u_char *, u_int);
 extern void atm_if_print(u_char *,const struct pcap_pkthdr *, const u_char *);
 extern void bootp_print(netdissect_options *,const u_char *,