Changeset 547 for trunk/src/ocat.h

Timestamp:

04/26/10 13:29:15 (2 years ago)

Author:

eagle

Message:

• configure.ac refined
• OC now compiles and runs on Solaris 10 using the Universal TUN/TAP driver version 1.1 (​http://vtun.sourceforge.net/tun/index.html)
• ocathosts.[ch] added. It reads IPv6 addresses from /etc/hosts
• /etc/hosts reverse lookup for I2P .b32 names added

File:

• trunk/src/ocat.h (modified) (7 diffs)

trunk/src/ocat.h

@@ -19 +19 @@
 #define OCAT_H
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include <stdio.h>
@@ -56 +58 @@
 #include <sys/wait.h>
 #endif
+#ifdef HAVE_SYS_ETHERNET_H
+#include <sys/ethernet.h>
+#endif
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
@@ -102 +107 @@
 #ifndef ETHERTYPE_IPV6
 #define ETHERTYPE_IPV6 0x86dd
+#endif
+
+#ifndef ETHER_ADDR_LEN
+#ifdef ETHERADDRL
+#define ETHER_ADDR_LEN ETHERADDRL
+#endif
+#endif
+
+// At least on Solaris the Ethernet addresses are defined as struct containing
+// an array of bytes.  This is different from most other OSes which define the
+// addresses directly as array.
+#ifdef HAVE_ETHER_ADDR_OCTET
+#define ether_dst ether_dhost.ether_addr_octet
+#define ether_src ether_shost.ether_addr_octet
+#else
+#define ether_dst ether_dhost
+#define ether_src ether_shost
 #endif
 
@@ -226 +248 @@
 #define SYSCONFDIR "/etc"
 #endif
+
+// this macro returns a constains string if a buffer points to NULL.
+#define SSTR(x) (x != NULL ? x : "(nil)")
+
+// Solaris and the Windows OpenVPN tunnel driver do not send a 4 byte tunnel
+// header thus we adjust reads and writes.
+#if defined(__sun__) || defined(__CYGWIN__)
+#define BUF_OFF 4
+#else
+#define BUF_OFF 0
+#endif
+
 
 struct OcatSetup
@@ -306 +340 @@
    int pid_fd[2];
    int sig_usr1, clear_stats;
+   int hosts_lookup;
 };
 
@@ -468 +503 @@
 
 #ifndef WITHOUT_TUN
-#ifdef __FreeBSD__
+#ifdef __sun__
+#define TUN_DEV "/dev/tun"
+#elif __linux__
+#define TUN_DEV "/dev/net/tun"
+#else
 #define TUN_DEV "/dev/tun0"
-#elif __OpenBSD__
-#define TUN_DEV "/dev/tun0"
+#endif
+extern char *tun_dev_;
 #else
-#define TUN_DEV "/dev/net/tun"
-#endif
-extern char *tun_dev_;
+#define TUN_DEV "STDIO"
 #endif
 
@@ -614 +651 @@
 int win_read_tun(char *, int);
 int win_write_tun(const char *, int);
-#endif
-
-#endif
-
+#define tun_read(x,y,z) win_read_tun(y,z)
+#define tun_write(x,y,z) win_write_tun(y,z)
+#else
+#define tun_read(x,y,z) read(x,y,z)
+#define tun_write(x,y,z) write(x,y,z)
+#endif
+
+
+#endif
+