X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2Fdatatypes.h;h=cc13fb1dcb4967a515ac74c848e4ad30f4a415de;hb=bd02a5f6be4815d46524d613f727199ca756c971;hp=4e5977d0489896c6d320a964ff70784245c0a56a;hpb=f9ad69dfae6bcec427652b0c4230603e465bd544;p=anytun.git diff --git a/src/datatypes.h b/src/datatypes.h index 4e5977d..cc13fb1 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -11,7 +11,7 @@ * tunneling and relaying of packets of any protocol. * * - * Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl, + * Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl, * Christian Pointner * * This file is part of Anytun. @@ -36,23 +36,24 @@ #include #include -typedef boost::uint8_t u_int8_t; -typedef boost::uint16_t u_int16_t; -typedef boost::uint32_t u_int32_t; -typedef boost::uint64_t u_int64_t; -typedef boost::int8_t int8_t; -typedef boost::int16_t int16_t; -typedef boost::int32_t int32_t; -typedef boost::int64_t int64_t; +// should not be necessary on GCC, #ifdef + #include should do the job; still required on MS VC++9, though. +using boost::int8_t; +using boost::uint8_t; +using boost::int16_t; +using boost::uint16_t; +using boost::int32_t; +using boost::uint32_t; +using boost::int64_t; +using boost::uint64_t; -typedef u_int32_t window_size_t; +typedef uint32_t window_size_t; -typedef u_int32_t seq_nr_t; +typedef uint32_t seq_nr_t; #define SEQ_NR_MAX 0xFFFFFFFF -typedef u_int16_t sender_id_t; -typedef u_int16_t payload_type_t; -typedef u_int16_t mux_t; -typedef u_int32_t satp_prf_label_t; +typedef uint16_t sender_id_t; +typedef uint16_t payload_type_t; +typedef uint16_t mux_t; +typedef uint32_t satp_prf_label_t; typedef enum { ANY, IPV4_ONLY, IPV6_ONLY } ResolvAddrType; @@ -63,6 +64,8 @@ typedef int system_error_t; #include #define ATTR_PACKED typedef DWORD system_error_t; -#endif +#endif + +#define MAX_PACKET_LENGTH 1600 #endif