More UNALIGNED_MEM{CPY,CMP} on IP addresses.

[tcpdump] / netdissect.h

diff --git a/netdissect.h b/netdissect.h
index d396fc724bc7518fd10a50971e8716c13157ac40..b4c24e64b7fec6597fec2e72eb2d219d167ba237 100644 (file)
--- a/netdissect.h
+++ b/netdissect.h
@@ -20,8 +20,6 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

- *
- * @(#) $Header: /tcpdump/master/tcpdump/netdissect.h,v 1.27 2008-08-16 11:36:20 hannes Exp $ (LBL)

  */
 
 #ifndef netdissect_h
  */
 
 #ifndef netdissect_h


@@ -42,13 +40,19 @@
 
 #if !defined(HAVE_SNPRINTF)
 int snprintf (char *str, size_t sz, const char *format, ...)
 
 #if !defined(HAVE_SNPRINTF)
 int snprintf (char *str, size_t sz, const char *format, ...)

-     __attribute__ ((format (printf, 3, 4)));
-#endif
+#ifdef __ATTRIBUTE___FORMAT_OK
+     __attribute__((format (printf, 3, 4)))
+#endif /* __ATTRIBUTE___FORMAT_OK */
+     ;
+#endif /* !defined(HAVE_SNPRINTF) */

 
 #if !defined(HAVE_VSNPRINTF)
 int vsnprintf (char *str, size_t sz, const char *format, va_list ap)
 
 #if !defined(HAVE_VSNPRINTF)
 int vsnprintf (char *str, size_t sz, const char *format, va_list ap)

-     __attribute__((format (printf, 3, 0)));
-#endif
+#ifdef __ATTRIBUTE___FORMAT_OK
+     __attribute__((format (printf, 3, 0)))
+#endif /* __ATTRIBUTE___FORMAT_OK */
+     ;
+#endif /* !defined(HAVE_SNPRINTF) */

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


@@ -158,9 +162,12 @@ struct netdissect_options {
                     ;
   void (*ndo_error)(netdissect_options *,
                    const char *fmt, ...)
                     ;
   void (*ndo_error)(netdissect_options *,
                    const char *fmt, ...)

+#ifdef __ATTRIBUTE___NORETURN_OK_FOR_FUNCTION_POINTERS
+                    __attribute__ ((noreturn))
+#endif /* __ATTRIBUTE___NORETURN_OK_FOR_FUNCTION_POINTERS */

 #ifdef __ATTRIBUTE___FORMAT_OK_FOR_FUNCTION_POINTERS
 #ifdef __ATTRIBUTE___FORMAT_OK_FOR_FUNCTION_POINTERS

-                    __attribute__ ((noreturn, format (printf, 2, 3)))
-#endif
+                    __attribute__ ((format (printf, 2, 3)))
+#endif /* __ATTRIBUTE___FORMAT_OK_FOR_FUNCTION_POINTERS */

                     ;
   void (*ndo_warning)(netdissect_options *,
                      const char *fmt, ...)
                     ;
   void (*ndo_warning)(netdissect_options *,
                      const char *fmt, ...)


@@ -177,6 +184,15 @@ struct netdissect_options {
 #define PT_RTCP                5       /* Real-Time Applications control protocol */
 #define PT_SNMP                6       /* Simple Network Management Protocol */
 #define PT_CNFP                7       /* Cisco NetFlow protocol */
 #define PT_RTCP                5       /* Real-Time Applications control protocol */
 #define PT_SNMP                6       /* Simple Network Management Protocol */
 #define PT_CNFP                7       /* Cisco NetFlow protocol */

+#define PT_TFTP                8       /* trivial file transfer protocol */
+#define PT_AODV                9       /* Ad-hoc On-demand Distance Vector Protocol */
+#define PT_CARP                10      /* Common Address Redundancy Protocol */
+#define PT_RADIUS      11      /* RADIUS authentication Protocol */
+#define PT_ZMTP1       12      /* ZeroMQ Message Transport Protocol 1.0 */
+#define PT_VXLAN       13      /* Virtual eXtensible Local Area Network */
+#define PT_PGM         14      /* [UDP-encapsulated] Pragmatic General Multicast */
+#define PT_PGM_ZMTP1   15      /* ZMTP/1.0 inside PGM (native or UDP-encapsulated) */
+#define PT_LMP         16      /* Link Management Protocol */

 
 #ifndef min
 #define min(a,b) ((a)>(b)?(b):(a))
 
 #ifndef min
 #define min(a,b) ((a)>(b)?(b):(a))


@@ -254,6 +270,31 @@ extern char *copy_argv(netdissect_options *, char **);
 extern void safeputchar(int);
 extern void safeputs(const char *, int);
 
 extern void safeputchar(int);
 extern void safeputs(const char *, int);
 

+#ifdef LBL_ALIGN
+/*
+ * The processor doesn't natively handle unaligned loads,
+ * and the compiler might "helpfully" optimize memcpy()
+ * and memcmp(), when handed pointers that would normally
+ * be properly aligned, into sequences that assume proper
+ * alignment.
+ *
+ * Do copies and compares of possibly-unaligned data by
+ * calling routines that wrap memcpy() and memcmp(), to
+ * prevent that optimization.
+ */
+extern void unaligned_memcpy(void *, const void *, size_t);
+extern int unaligned_memcmp(const void *, const void *, size_t);
+#define UNALIGNED_MEMCPY(p, q, l)      unaligned_memcpy((p), (q), (l))
+#define UNALIGNED_MEMCMP(p, q, l)      unaligned_memcmp((p), (q), (l))
+#else
+/*
+ * The procesor natively handles unaligned loads, so just use memcpy()
+ * and memcmp(), to enable those optimizations.
+ */
+#define UNALIGNED_MEMCPY(p, q, l)      memcpy((p), (q), (l))
+#define UNALIGNED_MEMCMP(p, q, l)      memcmp((p), (q), (l))
+#endif
+

 #define PLURAL_SUFFIX(n) \
        (((n) != 1) ? "s" : "")
 
 #define PLURAL_SUFFIX(n) \
        (((n) != 1) ? "s" : "")
 


@@ -277,10 +318,11 @@ extern if_printer lookup_printer(int);
 
 extern void eap_print(netdissect_options *,const u_char *, u_int);
 extern int esp_print(netdissect_options *,
 
 extern void eap_print(netdissect_options *,const u_char *, u_int);
 extern int esp_print(netdissect_options *,

-                    register const u_char *bp, int len, register const u_char *bp2,
+                    const u_char *bp, const int length, const u_char *bp2,

                     int *nhdr, int *padlen);
 extern void arp_print(netdissect_options *,const u_char *, u_int, u_int);
 extern void tipc_print(netdissect_options *, const u_char *, u_int, u_int);
                     int *nhdr, int *padlen);
 extern void arp_print(netdissect_options *,const u_char *, u_int, u_int);
 extern void tipc_print(netdissect_options *, const u_char *, u_int, u_int);

+extern void msnlb_print(netdissect_options *, const u_char *);

 extern void icmp6_print(netdissect_options *ndo, const u_char *,
                         u_int, const u_char *, int);
 extern void isakmp_print(netdissect_options *,const u_char *,
 extern void icmp6_print(netdissect_options *ndo, const u_char *,
                         u_int, const u_char *, int);
 extern void isakmp_print(netdissect_options *,const u_char *,


@@ -292,6 +334,7 @@ extern void ip_print_inner(netdissect_options *ndo,
                           const u_char *bp, u_int length, u_int nh,
                           const u_char *bp2);
 extern void rrcp_print(netdissect_options *,const u_char *, u_int);
                           const u_char *bp, u_int length, u_int nh,
                           const u_char *bp2);
 extern void rrcp_print(netdissect_options *,const u_char *, u_int);

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

 
 extern void ether_print(netdissect_options *,
                         const u_char *, u_int, u_int,
 
 extern void ether_print(netdissect_options *,
                         const u_char *, u_int, u_int,


@@ -309,15 +352,19 @@ extern u_int netanalyzer_transparent_if_print(netdissect_options *,
 extern int ethertype_print(netdissect_options *,u_short, const u_char *,
                             u_int, u_int);
 
 extern int ethertype_print(netdissect_options *,u_short, const u_char *,
                             u_int, u_int);
 

+extern int print_unknown_data(netdissect_options *,const u_char *, const char *,int);
+extern void hex_print_with_offset(netdissect_options *, const char *ident, const u_char *cp,
+                                 u_int, u_int);
+extern void hex_print(netdissect_options *,const char *ident, const u_char *cp,u_int);
+

 /* stuff that has not yet been rototiled */
 /* stuff that has not yet been rototiled */

+extern const u_char * ns_nprint (register const u_char *, register const u_char *);
+

 #if 0
 extern void ascii_print(netdissect_options *,u_int);
 extern void hex_and_ascii_print_with_offset(netdissect_options *,const char *,
                                    u_int, u_int);
 extern void hex_and_ascii_print(netdissect_options *,const char *, u_int);
 #if 0
 extern void ascii_print(netdissect_options *,u_int);
 extern void hex_and_ascii_print_with_offset(netdissect_options *,const char *,
                                    u_int, u_int);
 extern void hex_and_ascii_print(netdissect_options *,const char *, u_int);

-extern void hex_print_with_offset(netdissect_options *,const char *,
-                                 u_int, u_int);
-extern void hex_print(netdissect_options *,const char *, u_int);

 extern void telnet_print(netdissect_options *,const u_char *, u_int);
 extern int llc_print(netdissect_options *,
                     const u_char *, u_int, u_int, const u_char *,
 extern void telnet_print(netdissect_options *,const u_char *, u_int);
 extern int llc_print(netdissect_options *,
                     const u_char *, u_int, u_int, const u_char *,


@@ -463,7 +510,7 @@ extern void pptp_print(netdissect_options *,const u_char *, u_int);
 
 extern u_int ipnet_if_print(netdissect_options *,const struct pcap_pkthdr *, const u_char *);
 extern u_int ppi_if_print(netdissect_options *,const struct pcap_pkthdr *, const u_char *);
 
 extern u_int ipnet_if_print(netdissect_options *,const struct pcap_pkthdr *, const u_char *);
 extern u_int ppi_if_print(netdissect_options *,const struct pcap_pkthdr *, const u_char *);

-
+extern u_int nflog_if_print(netdissect_options *,const struct pcap_pkthdr *, const u_char *);

 extern u_int ieee802_15_4_if_print(netdissect_options *,const struct pcap_pkthdr *, const u_char *);
 
 #ifdef INET6
 extern u_int ieee802_15_4_if_print(netdissect_options *,const struct pcap_pkthdr *, const u_char *);
 
 #ifdef INET6


@@ -505,4 +552,7 @@ extern int esp_print_decrypt_buffer_by_ikev2(netdissect_options *ndo,
                                             u_char *buf, u_char *end);
 
 
                                             u_char *buf, u_char *end);
 
 

+extern void geonet_print(netdissect_options *ndo,const u_char *eth_hdr,const u_char *geo_pck, u_int len);
+extern void calm_fast_print(netdissect_options *ndo,const u_char *eth_hdr,const u_char *calm_pck, u_int len);
+

 #endif  /* netdissect_h */
 #endif  /* netdissect_h */