Add initial bounds check, get rid of union aodv.

[tcpdump] / interface.h

diff --git a/interface.h b/interface.h
index 6e04b058c21c83579071d983f1cf7f376a6fc7ad..be027ed34c99d328cf6b4b9f21689a94ab68be6f 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -28,10 +28,6 @@
 #include "os-proto.h"
 #endif
 
 #include "os-proto.h"
 #endif
 

-#ifndef HAVE___ATTRIBUTE__
-#define __attribute__(x)
-#endif
-

 /* snprintf et al */
 
 #include <stdarg.h>
 /* snprintf et al */
 
 #include <stdarg.h>


@@ -325,7 +321,6 @@ extern u_int usb_linux_64_byte_print(const struct pcap_pkthdr *, const u_char *)
 #ifdef INET6
 extern void ip6_print(const u_char *, u_int);
 extern void ip6_opt_print(const u_char *, int);
 #ifdef INET6
 extern void ip6_print(const u_char *, u_int);
 extern void ip6_opt_print(const u_char *, int);

-extern int nextproto6_cksum(const struct ip6_hdr *, const u_short *, u_int, u_int);

 extern int hbhopt_print(const u_char *);
 extern int dstopt_print(const u_char *);
 extern int frag6_print(const u_char *, const u_char *);
 extern int hbhopt_print(const u_char *);
 extern int dstopt_print(const u_char *);
 extern int frag6_print(const u_char *, const u_char *);


@@ -356,6 +351,7 @@ extern netdissect_options *gndo;
 #define bflag gndo->ndo_bflag 
 #define eflag gndo->ndo_eflag 
 #define fflag gndo->ndo_fflag 
 #define bflag gndo->ndo_bflag 
 #define eflag gndo->ndo_eflag 
 #define fflag gndo->ndo_fflag 

+#define jflag gndo->ndo_jflag

 #define Kflag gndo->ndo_Kflag 
 #define nflag gndo->ndo_nflag 
 #define Nflag gndo->ndo_Nflag 
 #define Kflag gndo->ndo_Kflag 
 #define nflag gndo->ndo_nflag 
 #define Nflag gndo->ndo_Nflag 


@@ -384,6 +380,7 @@ extern netdissect_options *gndo;
 #define Cflag_count gndo->ndo_Cflag_count
 #define Gflag_count gndo->ndo_Gflag_count
 #define Gflag_time gndo->ndo_Gflag_time 
 #define Cflag_count gndo->ndo_Cflag_count
 #define Gflag_count gndo->ndo_Gflag_count
 #define Gflag_time gndo->ndo_Gflag_time 

+#define hflag gndo->ndo_hflag

 #define snaplen     gndo->ndo_snaplen
 #define snapend     gndo->ndo_snapend
 
 #define snaplen     gndo->ndo_snaplen
 #define snapend     gndo->ndo_snapend