X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/610f938c11e6abfe3a710ce0f4684ecedc264aef..refs/pull/433/head:/tcpdump-stdinc.h diff --git a/tcpdump-stdinc.h b/tcpdump-stdinc.h index 5aba8fdc..32f8fc92 100644 --- a/tcpdump-stdinc.h +++ b/tcpdump-stdinc.h @@ -27,27 +27,27 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * - * @(#) $Header: /tcpdump/master/tcpdump/tcpdump-stdinc.h,v 1.18 2007-11-24 18:13:33 mcr Exp $ (LBL) */ /* * Include the appropriate OS header files on Windows and various flavors - * of UNIX, and also define some additional items and include various - * non-OS header files on Windows, and; this isolates most of the platform + * of UNIX, include various non-OS header files on Windows, and define + * various items as needed, to isolate most of tcpdump's platform * differences to this one file. */ #ifndef tcpdump_stdinc_h #define tcpdump_stdinc_h +#include + #ifdef WIN32 +#include #include #include -#include -#include "bittypes.h" +#include +#include "bittypes.h" /* in wpcap's Win32/include */ #include #include #include @@ -55,27 +55,92 @@ #include #include /* in wpcap's Win32/include */ -#ifndef NBBY -#define NBBY 8 +#ifndef uint8_t +#define uint8_t unsigned char +#endif + +#ifndef int8_t +#define int8_t signed char +#endif + +#ifndef uint16_t +#define uint16_t unsigned short +#endif + +#ifndef int16_t +#define int16_t signed short +#endif + +#ifndef uint32_t +#define uint32_t unsigned int +#endif + +#ifndef int32_t +#define int32_t signed int +#endif + +#ifdef _MSC_EXTENSIONS + +#ifndef uint64_t +#define uint64_t unsigned _int64 #endif -#if !defined(__MINGW32__) && !defined(__WATCOMC__) -#undef toascii -#define isascii __isascii -#define toascii __toascii +#ifndef int64_t +#define int64_t _int64 +#endif + +#ifndef PRId64 +#define PRId64 "I64d" +#endif + +#ifndef PRIo64 +#define PRIo64 "I64o" +#endif + +#ifndef PRIu64 +#define PRIu64 "I64u" +#endif + +#ifndef PRIx64 +#define PRIx64 "I64x" +#endif + +#else /* _MSC_EXTENSIONS */ + +#ifndef uint64_t +#define uint64_t unsigned long long +#endif + +#ifndef int64_t +#define int64_t long long +#endif + +#ifndef PRId64 +#define PRId64 "lld" +#endif + +#ifndef PRIo64 +#define PRIo64 "llo" +#endif + +#ifndef PRIu64 +#define PRIu64 "llu" +#endif + +#ifndef PRIx64 +#define PRIx64 "llx" +#endif + +#endif /* _MSC_EXTENSIONS */ + +#ifdef _MSC_VER #define stat _stat #define open _open #define fstat _fstat #define read _read #define close _close #define O_RDONLY _O_RDONLY - -typedef short ino_t; -#endif /* __MINGW32__ */ - -#ifdef __MINGW32__ -#include -#endif +#endif /* _MSC_VER */ /* Protos for missing/x.c functions (ideally * should be used, but it clashes with ). @@ -84,12 +149,21 @@ 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); +/* + * With MSVC, for C, __inline is used to make a function an inline. + */ +#ifdef _MSC_VER +#define inline __inline +#endif + #ifndef INET6_ADDRSTRLEN #define INET6_ADDRSTRLEN 46 #endif -#ifndef toascii -#define toascii(c) ((c) & 0x7f) +/* It is in MSVC's , but not defined in MingW+Watcom. + */ +#ifndef EAFNOSUPPORT +#define EAFNOSUPPORT WSAEAFNOSUPPORT #endif #ifndef caddr_t @@ -109,14 +183,9 @@ typedef char* caddr_t; #include #if HAVE_INTTYPES_H #include -#else -#if HAVE_STDINT_H +#elif HAVE_STDINT_H #include #endif -#endif -#ifdef HAVE_SYS_BITYPES_H -#include -#endif #include #include /* concession to AIX */ #include @@ -131,8 +200,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. */ +#undef UNALIGNED +#define UNALIGNED __attribute__((packed)) #endif #if defined(WIN32) || defined(MSDOS) @@ -147,7 +253,7 @@ typedef char* caddr_t; #define FOPEN_WRITE_BIN FOPEN_WRITE_TXT #endif -#if defined(__GNUC__) && defined(__i386__) && !defined(__APPLE__) && !defined(__ntohl) +#if defined(__GNUC__) && defined(__i386__) && !defined(__APPLE__) && !defined(__ntohl) #undef ntohl #undef ntohs #undef htonl @@ -190,4 +296,57 @@ typedef char* caddr_t; #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 + */ + +#ifndef min +#define min(a,b) ((a)>(b)?(b):(a)) +#endif +#ifndef max +#define max(a,b) ((b)>(a)?(b):(a)) +#endif + #endif /* tcpdump_stdinc_h */