Revert partially the commit 21b1273

[tcpdump] / netdissect.h

diff --git a/netdissect.h b/netdissect.h
index 0eb573710eb83dd7eb7e037a809daaf741d04307..b774ae63ef01ea6bc48b4be3d9bdb1903d9e42d5 100644 (file)
--- a/netdissect.h
+++ b/netdissect.h
@@ -166,15 +166,7 @@ typedef struct netdissect_options netdissect_options;
 
 #define IF_PRINTER_ARGS (netdissect_options *, const struct pcap_pkthdr *, const u_char *)
 
 
 #define IF_PRINTER_ARGS (netdissect_options *, const struct pcap_pkthdr *, const u_char *)
 

-typedef u_int (*uint_if_printer) IF_PRINTER_ARGS;
-typedef void  (*void_if_printer) IF_PRINTER_ARGS;
-
-/* pointer to the uint_if_printer or the void_if_printer function */
-typedef union {
-       uint_if_printer uint_printer;
-       void_if_printer void_printer;
-       void* printer;          /* generic when testing if NULL or not */
-} if_printer_t;
+typedef void (*if_printer) IF_PRINTER_ARGS;

 
 /*
  * In case the data in a buffer needs to be processed by being decrypted,
 
 /*
  * In case the data in a buffer needs to be processed by being decrypted,


@@ -246,9 +238,8 @@ struct netdissect_options {
   /* stack of saved packet boundary and buffer information */
   struct netdissect_saved_packet_info *ndo_packet_info_stack;
 
   /* stack of saved packet boundary and buffer information */
   struct netdissect_saved_packet_info *ndo_packet_info_stack;
 

-  /* pointer to the uint_if_printer or the void_if_printer function */
-  if_printer_t ndo_if_printer;
-  int ndo_void_printer; /* void_if_printer ? (FALSE/TRUE) */
+  /* pointer to the if_printer function */
+  if_printer ndo_if_printer;

 
   /* pointer to void function to output stuff */
   void (*ndo_default_print)(netdissect_options *,
 
   /* pointer to void function to output stuff */
   void (*ndo_default_print)(netdissect_options *,


@@ -297,12 +288,8 @@ extern void nd_pop_all_packet_info(netdissect_options *);
 #define PT_SOMEIP      19      /* Autosar SOME/IP Protocol */
 #define PT_DOMAIN      20      /* Domain Name System (DNS) */
 
 #define PT_SOMEIP      19      /* Autosar SOME/IP Protocol */
 #define PT_DOMAIN      20      /* Domain Name System (DNS) */
 

-#ifndef min
-#define min(a,b) ((a)>(b)?(b):(a))
-#endif
-#ifndef max
-#define max(a,b) ((b)>(a)?(b):(a))
-#endif
+#define ND_MIN(a,b) ((a)>(b)?(b):(a))
+#define ND_MAX(a,b) ((b)>(a)?(b):(a))

 
 /* For source or destination ports tests (UDP, TCP, ...) */
 #define IS_SRC_OR_DST_PORT(p) (sport == (p) || dport == (p))
 
 /* For source or destination ports tests (UDP, TCP, ...) */
 #define IS_SRC_OR_DST_PORT(p) (sport == (p) || dport == (p))


@@ -457,9 +444,7 @@ extern int unaligned_memcmp(const void *, const void *, size_t);
 extern const char *tok2strary_internal(const char **, int, const char *, int);
 #define        tok2strary(a,f,i) tok2strary_internal(a, sizeof(a)/sizeof(a[0]),f,i)
 
 extern const char *tok2strary_internal(const char **, int, const char *, int);
 #define        tok2strary(a,f,i) tok2strary_internal(a, sizeof(a)/sizeof(a[0]),f,i)
 

-extern uint_if_printer lookup_uint_printer(int);
-extern void_if_printer lookup_void_printer(int);
-extern if_printer_t lookup_printer(netdissect_options *, int);
+extern if_printer lookup_printer(int);

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


@@ -503,13 +488,13 @@ extern void juniper_ppp_if_print IF_PRINTER_ARGS;
 extern void juniper_pppoe_atm_if_print IF_PRINTER_ARGS;
 extern void juniper_pppoe_if_print IF_PRINTER_ARGS;
 extern void juniper_services_if_print IF_PRINTER_ARGS;
 extern void juniper_pppoe_atm_if_print IF_PRINTER_ARGS;
 extern void juniper_pppoe_if_print IF_PRINTER_ARGS;
 extern void juniper_services_if_print IF_PRINTER_ARGS;

-extern u_int ltalk_if_print IF_PRINTER_ARGS;
+extern void ltalk_if_print IF_PRINTER_ARGS;

 extern void mfr_if_print IF_PRINTER_ARGS;
 extern void netanalyzer_if_print IF_PRINTER_ARGS;
 extern void netanalyzer_transparent_if_print IF_PRINTER_ARGS;
 extern void nflog_if_print IF_PRINTER_ARGS;
 extern void null_if_print IF_PRINTER_ARGS;
 extern void mfr_if_print IF_PRINTER_ARGS;
 extern void netanalyzer_if_print IF_PRINTER_ARGS;
 extern void netanalyzer_transparent_if_print IF_PRINTER_ARGS;
 extern void nflog_if_print IF_PRINTER_ARGS;
 extern void null_if_print IF_PRINTER_ARGS;

-extern u_int pflog_if_print IF_PRINTER_ARGS;
+extern void pflog_if_print IF_PRINTER_ARGS;

 extern void pktap_if_print IF_PRINTER_ARGS;
 extern void ppi_if_print IF_PRINTER_ARGS;
 extern void ppp_bsdos_if_print IF_PRINTER_ARGS;
 extern void pktap_if_print IF_PRINTER_ARGS;
 extern void ppi_if_print IF_PRINTER_ARGS;
 extern void ppp_bsdos_if_print IF_PRINTER_ARGS;


@@ -582,8 +567,8 @@ extern void eapol_print(netdissect_options *, const u_char *);
 extern void egp_print(netdissect_options *, const u_char *, u_int);
 extern void eigrp_print(netdissect_options *, const u_char *, u_int);
 extern void esp_print(netdissect_options *, const u_char *, u_int, const u_char *, u_int, int, u_int);
 extern void egp_print(netdissect_options *, const u_char *, u_int);
 extern void eigrp_print(netdissect_options *, const u_char *, u_int);
 extern void esp_print(netdissect_options *, const u_char *, u_int, const u_char *, u_int, int, u_int);

-extern void ether_print(netdissect_options *, const u_char *, u_int, u_int, void (*)(netdissect_options *, const u_char *), const u_char *, u_int);
-extern void ether_switch_tag_print(netdissect_options *, const u_char *, u_int, u_int, void (*)(netdissect_options *, const u_char *), u_int, u_int);
+extern u_int ether_print(netdissect_options *, const u_char *, u_int, u_int, void (*)(netdissect_options *, const u_char *), const u_char *);
+extern u_int ether_switch_tag_print(netdissect_options *, const u_char *, u_int, u_int, void (*)(netdissect_options *, const u_char *), u_int);

 extern int ethertype_print(netdissect_options *, u_short, const u_char *, u_int, u_int, const struct lladdr_info *, const struct lladdr_info *);
 extern u_int fddi_print(netdissect_options *, const u_char *, u_int, u_int);
 extern void forces_print(netdissect_options *, const u_char *, u_int);
 extern int ethertype_print(netdissect_options *, u_short, const u_char *, u_int, u_int, const struct lladdr_info *, const struct lladdr_info *);
 extern u_int fddi_print(netdissect_options *, const u_char *, u_int, u_int);
 extern void forces_print(netdissect_options *, const u_char *, u_int);


@@ -679,7 +664,7 @@ extern void rrcp_print(netdissect_options *, const u_char *, u_int, const struct
 extern void rsvp_print(netdissect_options *, const u_char *, u_int);
 extern int rt6_print(netdissect_options *, const u_char *, const u_char *);
 extern void rtsp_print(netdissect_options *, const u_char *, u_int);
 extern void rsvp_print(netdissect_options *, const u_char *, u_int);
 extern int rt6_print(netdissect_options *, const u_char *, const u_char *);
 extern void rtsp_print(netdissect_options *, const u_char *, u_int);

-extern void rx_print(netdissect_options *, const u_char *, u_int, u_int, u_int, const u_char *);
+extern void rx_print(netdissect_options *, const u_char *, u_int, uint16_t, uint16_t, const u_char *);

 extern void sctp_print(netdissect_options *, const u_char *, const u_char *, u_int);
 extern void sflow_print(netdissect_options *, const u_char *, u_int);
 extern void ssh_print(netdissect_options *, const u_char *, u_int);
 extern void sctp_print(netdissect_options *, const u_char *, const u_char *, u_int);
 extern void sflow_print(netdissect_options *, const u_char *, u_int);
 extern void ssh_print(netdissect_options *, const u_char *, u_int);