Changeset 547 for trunk/src/ocattun.c

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/ocattun.c (modified) (10 diffs)

trunk/src/ocattun.c

@@ -23 +23 @@
  */
 
-#ifndef WITHOUT_TUN
 
 
@@ -29 +28 @@
 #include "ocat_netdesc.h"
 
+#ifndef WITHOUT_TUN
 
 char *tun_dev_ = TUN_DEV;
 
 #define IFCBUF 1024
+
+
+void system_w(const char *s)
+{
+   int e;
+
+   log_debug("running command \"%s\"", s);
+   if ((e = system(s)) == -1)
+      log_msg(LOG_ERR, "could not exec \"%s\": \"%s\"", s, strerror(errno));
+   log_debug("exit status = %d", WEXITSTATUS(e));
+}
+
 
 int tun_alloc(char *dev, int dev_s, struct in6_addr addr)
@@ -39 +51 @@
    struct ifreq ifr;
 #endif
+#ifdef __sun__
+   int ppa = -1;
+#endif
    int fd;
    char astr[INET6_ADDRSTRLEN];
    char astr4[INET_ADDRSTRLEN];
    char buf[IFCBUF];
-   struct in_addr netmask = {CNF(ocat_addr4_mask)};
-
+   struct in_addr netmask;// = {CNF(ocat_addr4_mask)};
+
+   memcpy(&netmask, &CNF(ocat_addr4_mask), sizeof(netmask));
    inet_ntop(AF_INET6, &addr, astr, INET6_ADDRSTRLEN);
    inet_ntop(AF_INET, &CNF(ocat_addr4), astr4, INET_ADDRSTRLEN);
@@ -58 +74 @@
 
    snprintf(buf, sizeof(buf), "netsh interface ipv6 add address \"%s\" %s", dev, astr);
-   log_debug("setting IP on tun: \"%s\"", buf);
-   if (system(buf) == -1)
-      log_msg(LOG_ERR, "could not exec \"%s\": \"%s\"", buf, strerror(errno));
+   system_w(buf);
 
    snprintf(buf, sizeof(buf), "netsh interface ipv6 add route %s/%d \"%s\"", astr, NDESC(prefix_len), dev);
-   log_debug("setting IP routing: \"%s\"", buf);
-   if (system(buf) == -1)
-      log_msg(LOG_ERR, "could not exec \"%s\": \"%s\"", buf, strerror(errno));
+   system_w(buf);
 
    return 0;
@@ -94 +106 @@
    {
       snprintf(buf, sizeof(buf), "ifconfig %s add %s/%d up", dev, astr, NDESC(prefix_len));
-      log_msg(LOG_INFO, "configuring tun IP: \"%s\"", buf);
-      if (system(buf) == -1)
-         log_msg(LOG_ERR, "could not exec \"%s\": \"%s\"", buf, strerror(errno));
+      system_w(buf);
    }
 
@@ -105 +115 @@
       */
 
-   // set tun frame header to ethertype IPv6
-   CNF(fhd_key[IPV6_KEY]) = htonl(ETHERTYPE_IPV6);
-   CNF(fhd_key[IPV4_KEY]) = htonl(ETHERTYPE_IP);
-
 #else
-
-   // set tun frame header to address family AF_INET6 (FreeBSD = 0x1c, OpenBSD = 0x18)
-   CNF(fhd_key[IPV6_KEY]) = htonl(AF_INET6);
-   CNF(fhd_key[IPV4_KEY]) = htonl(AF_INET);
 
    // get interface name
@@ -166 +168 @@
 #endif /* __linux__ */
 
+#ifdef __sun__
+   if( (ppa = ioctl(fd, TUNNEWPPA, ppa)) == -1)
+      log_msg(LOG_ERR, "Can't assign new interface");
+   else
+      snprintf(dev, dev_s, "%s%d", dev, ppa);
+
+#endif
 
    if (!CNF(use_tap))
@@ -171 +180 @@
 #ifdef __OpenBSD__
       snprintf(buf, sizeof(buf), "ifconfig %s inet6 %s prefixlen %d up", dev, astr, NDESC(prefix_len));
+#elif __sun__
+      snprintf(buf, sizeof(buf), "ifconfig %s inet6 plumb %s/%d %s up", dev, astr, NDESC(prefix_len), astr);
 #else
       snprintf(buf, sizeof(buf), "ifconfig %s inet6 %s/%d up", dev, astr, NDESC(prefix_len));
 #endif
-      log_debug("setting IP on tun: \"%s\"", buf);
-      if (system(buf) == -1)
-         log_msg(LOG_ERR, "could not exec \"%s\": \"%s\"", buf, strerror(errno));
-
+      system_w(buf);
+
+      // some OSes require routes to be set manually
 #ifdef __APPLE__
-
       // MacOSX requires the route to be set up manually
       // FIXME: the prefix shouldn't be hardcoded here
       snprintf(buf, sizeof(buf), "route add -inet6 -net fd87:d87e:eb43:: -prefixlen %d -gateway %s", NDESC(prefix_len), astr);
-      log_msg(LOG_INFO, "setup routing: \"%s\"", buf);
-      if (system(buf) == -1)
-         log_msg(LOG_ERR, "could not exec \"%s\": \"%s\"", buf, strerror(errno));
- 
+      system_w(buf);
+#elif __sun__
+      // Solaris requires the route to be set up manually
+      // FIXME: the prefix shouldn't be hardcoded here
+      snprintf(buf, sizeof(buf), "route add -inet6 fd87:d87e:eb43::/%d %s -iface", NDESC(prefix_len), astr);
+      system_w(buf);
 #endif
 
@@ -197 +208 @@
    {
       snprintf(buf, sizeof(buf), "ifconfig %s %s netmask %s", dev, astr4, inet_ntoa(netmask));
-      log_msg(LOG_INFO, "configuring tun IP: \"%s\"", buf);
-      if (system(buf) == -1)
-         log_msg(LOG_ERR, "could not exec \"%s\": \"%s\"", buf, strerror(errno));
+      system_w(buf);
    }
 
@@ -206 +215 @@
    {
       snprintf(buf, sizeof(buf), "ifconfig %s up", dev);
-      log_msg(LOG_INFO, "bringing up TAP device \"%s\"", buf);
-      if (system(buf) == -1)
-         log_msg(LOG_ERR, "could not exec \"%s\": \"%s\"", buf, strerror(errno));
+      system_w(buf);
    }