X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/8377fb0a944aa2c14c2699662c5b837ecc9abb76..f53e36817312f87f7f41463b70fe320aeb21e02e:/tcpdump-stdinc.h diff --git a/tcpdump-stdinc.h b/tcpdump-stdinc.h index 66366dac..91f3361b 100644 --- a/tcpdump-stdinc.h +++ b/tcpdump-stdinc.h @@ -29,7 +29,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * - * @(#) $Header: /tcpdump/master/tcpdump/tcpdump-stdinc.h,v 1.11 2005-03-27 01:26:54 guy Exp $ (LBL) + * @(#) $Header: /tcpdump/master/tcpdump/tcpdump-stdinc.h,v 1.18 2007-11-24 18:13:33 mcr Exp $ (LBL) */ /* @@ -46,15 +46,31 @@ #include #include +#include #include "bittypes.h" #include #include #include -#include "IP6_misc.h" #include #include #include /* in wpcap's Win32/include */ +#ifndef NBBY +#define NBBY 8 +#endif + +#if !defined(__MINGW32__) && !defined(__WATCOMC__) +#undef toascii +#define isascii __isascii +#define toascii __toascii +#define stat _stat +#define open _open +#define fstat _fstat +#define read _read +#define close _close +#define O_RDONLY _O_RDONLY +#endif /* __MINGW32__ */ + #ifdef __MINGW32__ #include #endif @@ -66,8 +82,11 @@ extern const char *inet_ntop (int, const void *, char *, size_t); extern int inet_pton (int, const char *, void *); extern int inet_aton (const char *cp, struct in_addr *addr); -#ifndef INET_ADDRSTRLEN -#define INET_ADDRSTRLEN 16 +/* + * With MSVC, for C, __inline is used to make a function an inline. + */ +#ifdef _MSC_VER +#define inline __inline #endif #ifndef INET6_ADDRSTRLEN @@ -93,8 +112,15 @@ typedef char* caddr_t; #include #include #include -#ifdef INTTYPES_H_DEFINES_FORMATS +#if HAVE_INTTYPES_H #include +#else +#if HAVE_STDINT_H +#include +#endif +#endif +#ifdef HAVE_SYS_BITYPES_H +#include #endif #include #include /* concession to AIX */ @@ -110,8 +136,45 @@ typedef char* caddr_t; #endif /* WIN32 */ -#ifdef INET6 -#include "ip6.h" +#ifndef HAVE___ATTRIBUTE__ +#define __attribute__(x) +#endif + +/* + * Used to declare a structure unaligned, so that the C compiler, + * if necessary, generates code that doesn't assume alignment. + * This is required because there is no guarantee that the packet + * data we get from libpcap/WinPcap is properly aligned. + * + * This assumes that, for all compilers that support __attribute__: + * + * 1) they support __attribute__((packed)); + * + * 2) for all instruction set architectures requiring strict + * alignment, declaring a structure with that attribute + * causes the compiler to generate code that handles + * misaligned 2-byte, 4-byte, and 8-byte integral + * quantities. + * + * It does not (yet) handle compilers where you can get the compiler + * to generate code of that sort by some other means. + * + * This is required in order to, for example, keep the compiler from + * generating, for + * + * if (bp->bp_htype == 1 && bp->bp_hlen == 6 && bp->bp_op == BOOTPREQUEST) { + * + * in print-bootp.c, code that loads the first 4-byte word of a + * "struct bootp", masking out the bp_hops field, and comparing the result + * against 0x01010600. + * + * Note: this also requires that padding be put into the structure, + * at least for compilers where it's implemented as __attribute__((packed)). + */ +#if defined(_MSC_VER) && defined(UNALIGNED) +/* MSVC may have its own macro defined with the same name and purpose. */ +#else +#define UNALIGNED __attribute__((packed)) #endif #if defined(WIN32) || defined(MSDOS) @@ -126,21 +189,21 @@ typedef char* caddr_t; #define FOPEN_WRITE_BIN FOPEN_WRITE_TXT #endif -#if defined(__GNUC__) && defined(__i386__) +#if defined(__GNUC__) && defined(__i386__) && !defined(__APPLE__) && !defined(__ntohl) #undef ntohl #undef ntohs #undef htonl #undef htons - extern __inline__ unsigned long __ntohl (unsigned long x); - extern __inline__ unsigned short __ntohs (unsigned short x); + static __inline__ unsigned long __ntohl (unsigned long x); + static __inline__ unsigned short __ntohs (unsigned short x); #define ntohl(x) __ntohl(x) #define ntohs(x) __ntohs(x) #define htonl(x) __ntohl(x) #define htons(x) __ntohs(x) - extern __inline__ unsigned long __ntohl (unsigned long x) + static __inline__ unsigned long __ntohl (unsigned long x) { __asm__ ("xchgb %b0, %h0\n\t" /* swap lower bytes */ "rorl $16, %0\n\t" /* swap words */ @@ -149,7 +212,7 @@ typedef char* caddr_t; return (x); } - extern __inline__ unsigned short __ntohs (unsigned short x) + static __inline__ unsigned short __ntohs (unsigned short x) { __asm__ ("xchgb %b0, %h0" /* swap bytes */ : "=q" (x) : "0" (x)); @@ -157,4 +220,62 @@ typedef char* caddr_t; } #endif +#ifndef INET_ADDRSTRLEN +#define INET_ADDRSTRLEN 16 +#endif + +#ifndef TRUE +#define TRUE 1 +#endif + +#ifndef FALSE +#define FALSE 0 +#endif + +/* + * The Apple deprecation workaround macros below were adopted from the + * FreeRADIUS server code under permission of Alan DeKok and Arran Cudbard-Bell. + */ + +#define XSTRINGIFY(x) #x + +/* + * Macros for controlling warnings in GCC >= 4.2 and clang >= 2.8 + */ +#define DIAG_JOINSTR(x,y) XSTRINGIFY(x ## y) +#define DIAG_DO_PRAGMA(x) _Pragma (#x) + +#if defined(__GNUC__) && ((__GNUC__ * 100) + __GNUC_MINOR__) >= 402 +# define DIAG_PRAGMA(x) DIAG_DO_PRAGMA(GCC diagnostic x) +# if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406 +# define DIAG_OFF(x) DIAG_PRAGMA(push) DIAG_PRAGMA(ignored DIAG_JOINSTR(-W,x)) +# define DIAG_ON(x) DIAG_PRAGMA(pop) +# else +# define DIAG_OFF(x) DIAG_PRAGMA(ignored DIAG_JOINSTR(-W,x)) +# define DIAG_ON(x) DIAG_PRAGMA(warning DIAG_JOINSTR(-W,x)) +# endif +#elif defined(__clang__) && ((__clang_major__ * 100) + __clang_minor__ >= 208) +# define DIAG_PRAGMA(x) DIAG_DO_PRAGMA(clang diagnostic x) +# define DIAG_OFF(x) DIAG_PRAGMA(push) DIAG_PRAGMA(ignored DIAG_JOINSTR(-W,x)) +# define DIAG_ON(x) DIAG_PRAGMA(pop) +#else +# define DIAG_OFF(x) +# define DIAG_ON(x) +#endif + +/* + * For dealing with APIs which are only deprecated in OSX (like the OpenSSL API) + */ +#ifdef __APPLE__ +# define USES_APPLE_DEPRECATED_API DIAG_OFF(deprecated-declarations) +# define USES_APPLE_RST DIAG_ON(deprecated-declarations) +#else +# define USES_APPLE_DEPRECATED_API +# define USES_APPLE_RST +#endif + +/* + * end of Apple deprecation workaround macros + */ + #endif /* tcpdump_stdinc_h */