From 9711ae55ce808cbe781db1bc7a11c5083ba1a705 Mon Sep 17 00:00:00 2001
From: otti <otti@2edecd69-f0ce-4815-94af-351a89d40aaa>
Date: Mon, 29 Dec 2008 21:44:27 +0000
Subject: [PATCH] added endian.h

git-svn-id: https://anytun.org/svn/anytun@659 2edecd69-f0ce-4815-94af-351a89d40aaa
---
 src/datatypes.h               | 15 ---------------
 src/encryptedPacket.cpp       |  2 +-
 src/{datatypes.h => endian.h} | 26 +++++---------------------
 src/plainPacket.cpp           | 11 +----------
 4 files changed, 7 insertions(+), 47 deletions(-)
 copy src/{datatypes.h => endian.h} (75%)

diff --git a/src/datatypes.h b/src/datatypes.h
index 0fc9ae2..f4c661a 100644
--- a/src/datatypes.h
+++ b/src/datatypes.h
@@ -46,25 +46,10 @@ typedef boost::int64_t int64_t;
 typedef u_int32_t window_size_t;
 
 typedef u_int32_t seq_nr_t;
-#define SEQ_NR_T_NTOH(a) ntohl(a)
-#define SEQ_NR_T_HTON(a) htonl(a)
-
 typedef u_int16_t sender_id_t;
-#define SENDER_ID_T_NTOH(a) ntohs(a)
-#define SENDER_ID_T_HTON(a) htons(a)
-
 typedef u_int16_t payload_type_t;
-#define PAYLOAD_TYPE_T_NTOH(a) ntohs(a)
-#define PAYLOAD_TYPE_T_HTON(a) htons(a)
-
 typedef u_int16_t mux_t;
-#define MUX_T_NTOH(a) ntohs(a)
-#define MUX_T_HTON(a) htons(a)
-
 //typedef u_int32_t auth_tag_t;
-//#define AUTH_TAG_T_NTOH(a) ntohl(a)
-//#define AUTH_TAG_T_HTON(a) htonl(a)
-//
 #define STERROR_TEXT_MAX 100
 
 #endif
diff --git a/src/encryptedPacket.cpp b/src/encryptedPacket.cpp
index 1562f71..b580a8a 100644
--- a/src/encryptedPacket.cpp
+++ b/src/encryptedPacket.cpp
@@ -31,10 +31,10 @@
 
 #include <stdexcept>
 #include <iostream>
-#include <arpa/inet.h>
 #include <cstdio>       // for std::memcpy
 
 #include "encryptedPacket.h"
+#include "endian.h"
 #include "datatypes.h"
 #include "log.h"
 
diff --git a/src/datatypes.h b/src/endian.h
similarity index 75%
copy from src/datatypes.h
copy to src/endian.h
index 0fc9ae2..a5ad2f9 100644
--- a/src/datatypes.h
+++ b/src/endian.h
@@ -29,42 +29,26 @@
  *  along with anytun.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _DATATYPES_H_
-#define _DATATYPES_H_
+#ifndef _ENDIAN_HPP_
+#define _ENDIAN_HPP_
 
-#include<boost/cstdint.hpp>
-
-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;
-
-typedef u_int32_t window_size_t;
+#ifndef _WIN32
+#include <arpa/inet.h>
+#endif
 
-typedef u_int32_t seq_nr_t;
 #define SEQ_NR_T_NTOH(a) ntohl(a)
 #define SEQ_NR_T_HTON(a) htonl(a)
 
-typedef u_int16_t sender_id_t;
 #define SENDER_ID_T_NTOH(a) ntohs(a)
 #define SENDER_ID_T_HTON(a) htons(a)
 
-typedef u_int16_t payload_type_t;
 #define PAYLOAD_TYPE_T_NTOH(a) ntohs(a)
 #define PAYLOAD_TYPE_T_HTON(a) htons(a)
 
-typedef u_int16_t mux_t;
 #define MUX_T_NTOH(a) ntohs(a)
 #define MUX_T_HTON(a) htons(a)
 
-//typedef u_int32_t auth_tag_t;
 //#define AUTH_TAG_T_NTOH(a) ntohl(a)
 //#define AUTH_TAG_T_HTON(a) htonl(a)
-//
-#define STERROR_TEXT_MAX 100
 
 #endif
diff --git a/src/plainPacket.cpp b/src/plainPacket.cpp
index 5ada650..a12a7c8 100644
--- a/src/plainPacket.cpp
+++ b/src/plainPacket.cpp
@@ -31,17 +31,8 @@
 
 #include <stdexcept>
 #include <iostream>
-//#include <arpa/inet.h>
-//#include <sys/socket.h>
-//#include <netinet/in_systm.h>
-//#include <netinet/in.h>
-//#include <netinet/ip.h>
-//#include <netinet/ip6.h>
-//#include <net/if.h>
-//#include <net/if_arp.h>
-//#include <netinet/if_ether.h>
-
 #include "datatypes.h"
+#include "endian.h"
 #include "plainPacket.h"
 
 PlainPacket::PlainPacket(u_int32_t payload_length, bool allow_realloc) : Buffer(payload_length + sizeof(payload_type_t), allow_realloc)
-- 
2.11.4.GIT