Fixed some warnings, added print-zep.c to CMakeLists

[tcpdump] / netdissect.h

diff --git a/netdissect.h b/netdissect.h
index 93fa8be6514405333709df7b6bf5e814181ba5e3..6b3592cbc383f674044077755be1591916becc14 100644 (file)
--- a/netdissect.h
+++ b/netdissect.h
@@ -119,10 +119,6 @@ typedef unsigned char nd_byte;
 #include "ip.h" /* struct ip for nextproto4_cksum() */
 #include "ip6.h" /* struct ip6 for nextproto6_cksum() */
 
 #include "ip.h" /* struct ip for nextproto4_cksum() */
 #include "ip6.h" /* struct ip6 for nextproto6_cksum() */
 

-extern int32_t thiszone;       /* seconds offset from gmt to local time */
-/* invalid string to print '(invalid)' for malformed or corrupted packets */
-extern const char istr[];
-

 #ifndef HAVE_STRLCAT
 extern size_t strlcat (char *, const char *, size_t);
 #endif
 #ifndef HAVE_STRLCAT
 extern size_t strlcat (char *, const char *, size_t);
 #endif


@@ -290,7 +286,7 @@ struct netdissect_options {
 #define MAXIMUM_SNAPLEN        262144
 
 /*
 #define MAXIMUM_SNAPLEN        262144
 
 /*

- * True if "l" bytes of "var" were captured.
+ * True if "l" bytes from "p" were captured.

  *
  * The "ndo->ndo_snapend - (l) <= ndo->ndo_snapend" checks to make sure
  * "l" isn't so large that "ndo->ndo_snapend - (l)" underflows.
  *
  * The "ndo->ndo_snapend - (l) <= ndo->ndo_snapend" checks to make sure
  * "l" isn't so large that "ndo->ndo_snapend - (l)" underflows.


@@ -412,6 +408,8 @@ extern const char *tok2strary_internal(const char **, int, const char *, int);
 
 extern if_printer lookup_printer(int);
 
 
 extern if_printer lookup_printer(int);
 

+#define ND_DEBUG {printf(" [%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__); fflush(stdout);}
+

 /* The DLT printer routines */
 
 extern u_int ap1394_if_print IF_PRINTER_ARGS;
 /* The DLT printer routines */
 
 extern u_int ap1394_if_print IF_PRINTER_ARGS;


@@ -540,6 +538,8 @@ extern void hsrp_print(netdissect_options *, const u_char *, u_int);
 extern void http_print(netdissect_options *, const u_char *, u_int);
 extern void icmp6_print(netdissect_options *, const u_char *, u_int, const u_char *, int);
 extern void icmp_print(netdissect_options *, const u_char *, u_int, const u_char *, int);
 extern void http_print(netdissect_options *, const u_char *, u_int);
 extern void icmp6_print(netdissect_options *, const u_char *, u_int, const u_char *, int);
 extern void icmp_print(netdissect_options *, const u_char *, u_int, const u_char *, int);

+extern u_int ieee802_15_4_print(netdissect_options *ndo, const u_char *p, u_int caplen);
+extern u_int ieee802_11_radio_print(netdissect_options *, const u_char *, u_int, u_int);

 extern void igmp_print(netdissect_options *, const u_char *, u_int);
 extern void igrp_print(netdissect_options *, const u_char *, u_int);
 extern void ip6_print(netdissect_options *, const u_char *, u_int);
 extern void igmp_print(netdissect_options *, const u_char *, u_int);
 extern void igrp_print(netdissect_options *, const u_char *, u_int);
 extern void ip6_print(netdissect_options *, const u_char *, u_int);


@@ -641,6 +641,7 @@ extern void vtp_print(netdissect_options *, const u_char *, u_int);
 extern void vxlan_gpe_print(netdissect_options *ndo, const u_char *bp, u_int len);
 extern void vxlan_print(netdissect_options *, const u_char *, u_int);
 extern void wb_print(netdissect_options *, const u_char *, u_int);
 extern void vxlan_gpe_print(netdissect_options *ndo, const u_char *bp, u_int len);
 extern void vxlan_print(netdissect_options *, const u_char *, u_int);
 extern void wb_print(netdissect_options *, const u_char *, u_int);

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

 extern void zephyr_print(netdissect_options *, const u_char *, int);
 extern void zmtp1_print(netdissect_options *, const u_char *, u_int);
 extern void zmtp1_datagram_print(netdissect_options *, const u_char *, const u_int);
 extern void zephyr_print(netdissect_options *, const u_char *, int);
 extern void zmtp1_print(netdissect_options *, const u_char *, u_int);
 extern void zmtp1_datagram_print(netdissect_options *, const u_char *, const u_int);


@@ -664,6 +665,7 @@ extern int nextproto6_cksum(netdissect_options *, const struct ip6_hdr *, const
 
 /* Utilities */
 extern void nd_print_trunc(netdissect_options *);
 
 /* Utilities */
 extern void nd_print_trunc(netdissect_options *);

+extern void nd_print_invalid(netdissect_options *);

 
 extern int mask2plen(uint32_t);
 extern int mask62plen(const u_char *);
 
 extern int mask2plen(uint32_t);
 extern int mask62plen(const u_char *);