Changeset 534 for trunk/src/ocattun.c

Timestamp:

11/29/09 22:37:56 (2 years ago)

Author:

eagle

Message:

merged GarliCat branch back into trunk
onioncat-privatehosts.pl added (code by zzz)

Location:

trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/ocattun.c (modified) (5 diffs)

trunk/src/ocattun.c

@@ -27 +27 @@
 
 #include "ocat.h"
+#include "ocat_netdesc.h"
 
 
@@ -61 +62 @@
       log_msg(LOG_ERR, "could not exec \"%s\": \"%s\"", buf, strerror(errno));
 
-   snprintf(buf, sizeof(buf), "netsh interface ipv6 add route %s/%d \"%s\"", astr, TOR_PREFIX_LEN, dev);
+   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)
@@ -92 +93 @@
    if (!CNF(use_tap))
    {
-      snprintf(buf, sizeof(buf), "ifconfig %s add %s/%d up", dev, astr, TOR_PREFIX_LEN);
+      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)
@@ -169 +170 @@
    {
 #ifdef __OpenBSD__
-      snprintf(buf, sizeof(buf), "ifconfig %s inet6 %s prefixlen %d up", dev, astr, TOR_PREFIX_LEN);
+      snprintf(buf, sizeof(buf), "ifconfig %s inet6 %s prefixlen %d up", dev, astr, NDESC(prefix_len));
 #else
-      snprintf(buf, sizeof(buf), "ifconfig %s inet6 %s/%d up", dev, astr, TOR_PREFIX_LEN);
+      snprintf(buf, sizeof(buf), "ifconfig %s inet6 %s/%d up", dev, astr, NDESC(prefix_len));
 #endif
       log_debug("setting IP on tun: \"%s\"", buf);
@@ -181 +182 @@
       // 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", TOR_PREFIX_LEN, astr);
+      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)