added datatypes.h

6 files changed, 75 insertions, 5 deletions

diff --git a/src/datatypes.h b/src/datatypes.h
new file mode 100644
index 0000000..3f7d358
--- /dev/null
+++ b/src/datatypes.h
@@ -0,0 +1,67 @@
+/*
+ *  ľAnytun
+ *
+ *  ľAnytun is a tiny implementation of SATP. Unlike Anytun which is a full
+ *  featured implementation ľAnytun has no support for multiple connections
+ *  or synchronisation. It is a small single threaded implementation intended
+ *  to act as a client on small platforms.
+ *  The secure anycast tunneling protocol (satp) defines a protocol used
+ *  for communication between any combination of unicast and anycast
+ *  tunnel endpoints.  It has less protocol overhead than IPSec in Tunnel
+ *  mode and allows tunneling of every ETHER TYPE protocol (e.g.
+ *  ethernet, ip, arp ...). satp directly includes cryptography and
+ *  message authentication based on the methodes used by SRTP.  It is
+ *  intended to deliver a generic, scaleable and secure solution for
+ *  tunneling and relaying of packets of any protocol.
+ *  
+ *
+ *  Copyright (C) 2007-2008 Christian Pointner <equinox@anytun.org>
+ *
+ *  This file is part of ľAnytun.
+ *
+ *  ľAnytun is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
+ *
+ *  ľAnytun is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with ľAnytun. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _DATATYPES_H_
+#define _DATATYPES_H_
+
+#include <stdint.h>
+
+typedef uint8_t u_int8_t;
+typedef uint16_t u_int16_t;
+typedef uint32_t u_int32_t;
+typedef uint64_t u_int64_t;
+typedef int8_t int8_t;
+typedef int16_t int16_t;
+typedef int32_t int32_t;
+typedef 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)
+
+#endif
diff --git a/src/linux/tun.c b/src/linux/tun.c
index 7f3b60c..66485fb 100644
--- a/src/linux/tun.c
+++ b/src/linux/tun.c
@@ -32,6 +32,8 @@
  *  along with ľAnytun. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "datatypes.h"
+
 #include "tun.h"
 
 #include "tun_helper.h"
diff --git a/src/log.c b/src/log.c
index f9bda33..2786cbb 100644
--- a/src/log.c
+++ b/src/log.c
@@ -32,6 +32,8 @@
  *  along with ľAnytun. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "datatypes.h"
+
 #include <stdarg.h>
 #include "log.h"
 
diff --git a/src/signal.c b/src/signal.c
index bb42331..a34091f 100644
--- a/src/signal.c
+++ b/src/signal.c
@@ -32,6 +32,8 @@
  *  along with ľAnytun. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "datatypes.h"
+
 #include "log.h"
 #include "signal.h"
 #include <signal.h>
diff --git a/src/tun.h b/src/tun.h
index 5b42f61..f967054 100644
--- a/src/tun.h
+++ b/src/tun.h
@@ -37,11 +37,6 @@
 
 #include <stdlib.h>
 
-typedef unsigned char u_int8_t;
-typedef unsigned short int u_int16_t;
-typedef unsigned int u_int32_t;
-
-
 enum device_type_enum { TYPE_UNDEF, TYPE_TUN, TYPE_TAP };
 typedef enum device_type_enum device_type_t;
 
diff --git a/src/uanytun.c b/src/uanytun.c
index ffdfdf3..009325e 100644
--- a/src/uanytun.c
+++ b/src/uanytun.c
@@ -32,6 +32,8 @@
  *  along with ľAnytun. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "datatypes.h"
+
 #include <stdlib.h>
 #include <stdio.h>