Changeset 534 for trunk/src

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/Makefile.am (modified) (1 diff)
• src/Makefile.in (modified) (6 diffs)
• src/cygwin/Makefile.in (modified) (1 diff)
• src/ocat.c (modified) (11 diffs)
• src/ocat.h (modified) (8 diffs)
• src/ocat_netdesc.c (copied) (copied from branches/garlicat/src/ocat_netdesc.c)
• src/ocat_netdesc.h (copied) (copied from branches/garlicat/src/ocat_netdesc.h)
• src/ocatctrl.c (modified) (2 diffs)
• src/ocatlibe.c (modified) (2 diffs)
• src/ocatsetup.c (modified) (11 diffs)
• src/ocatsocks.c (modified) (5 diffs)
• src/ocattun.c (modified) (5 diffs)
• src/ocatv6conv.c (modified) (3 diffs)

trunk/src/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = ocat
-ocat_SOURCES = ocat.c ocatlog.c ocatroute.c ocatthread.c ocattun.c ocatv6conv.c ocatcompat.c ocatpeer.c ocatsetup.c ocatipv4route.c ocateth.c ocatsocks.c ocatlibe.c ocatctrl.c ocatipv6route.c ocaticmp.c ocat_wintuntap.c
-include_HEADERS = ocat.h strlcpy.c strlcat.c
+ocat_SOURCES = ocat.c ocatlog.c ocatroute.c ocatthread.c ocattun.c ocatv6conv.c ocatcompat.c ocatpeer.c ocatsetup.c ocatipv4route.c ocateth.c ocatsocks.c ocatlibe.c ocatctrl.c ocatipv6route.c ocaticmp.c ocat_wintuntap.c ocat_netdesc.c
+include_HEADERS = ocat.h ocat_netdesc.h strlcpy.c strlcat.c
 
+install-exec-hook:
+        $(LN_S) -f $(DESTDIR)$(bindir)/ocat$(EXEEXT) \
+        $(DESTDIR)$(bindir)/gcat$(EXEEXT)
+

trunk/src/Makefile.in

@@ -58 +58 @@
         ocatipv4route.$(OBJEXT) ocateth.$(OBJEXT) ocatsocks.$(OBJEXT) \
         ocatlibe.$(OBJEXT) ocatctrl.$(OBJEXT) ocatipv6route.$(OBJEXT) \
-        ocaticmp.$(OBJEXT) ocat_wintuntap.$(OBJEXT)
+        ocaticmp.$(OBJEXT) ocat_wintuntap.$(OBJEXT) \
+        ocat_netdesc.$(OBJEXT)
 ocat_OBJECTS = $(am_ocat_OBJECTS)
 ocat_LDADD = $(LDADD)
@@ -107 +108 @@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
@@ -168 +170 @@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-ocat_SOURCES = ocat.c ocatlog.c ocatroute.c ocatthread.c ocattun.c ocatv6conv.c ocatcompat.c ocatpeer.c ocatsetup.c ocatipv4route.c ocateth.c ocatsocks.c ocatlibe.c ocatctrl.c ocatipv6route.c ocaticmp.c ocat_wintuntap.c
-include_HEADERS = ocat.h strlcpy.c strlcat.c
+ocat_SOURCES = ocat.c ocatlog.c ocatroute.c ocatthread.c ocattun.c ocatv6conv.c ocatcompat.c ocatpeer.c ocatsetup.c ocatipv4route.c ocateth.c ocatsocks.c ocatlibe.c ocatctrl.c ocatipv6route.c ocaticmp.c ocat_wintuntap.c ocat_netdesc.c
+include_HEADERS = ocat.h ocat_netdesc.h strlcpy.c strlcat.c
 all: all-am
 
@@ -237 +239 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ocat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ocat_netdesc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ocat_wintuntap.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ocatcompat.Po@am__quote@
@@ -415 +418 @@
 
 install-exec-am: install-binPROGRAMS
+        @$(NORMAL_INSTALL)
+        $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 
 install-info: install-info-am
@@ -447 +452 @@
         html-am info info-am install install-am install-binPROGRAMS \
         install-data install-data-am install-exec install-exec-am \
-        install-includeHEADERS install-info install-info-am \
-        install-man install-strip installcheck installcheck-am \
-        installdirs maintainer-clean maintainer-clean-generic \
-        mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
-        ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS \
-        uninstall-includeHEADERS uninstall-info-am
-
+        install-exec-hook install-includeHEADERS install-info \
+        install-info-am install-man install-strip installcheck \
+        installcheck-am installdirs maintainer-clean \
+        maintainer-clean-generic mostlyclean mostlyclean-compile \
+        mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+        uninstall-am uninstall-binPROGRAMS uninstall-includeHEADERS \
+        uninstall-info-am
+
+
+install-exec-hook:
+        $(LN_S) -f $(DESTDIR)$(bindir)/ocat$(EXEEXT) \
+        $(DESTDIR)$(bindir)/gcat$(EXEEXT)
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

trunk/src/cygwin/Makefile.in

@@ -88 +88 @@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@

trunk/src/ocat.c

@@ -18 +18 @@
 
 #include "ocat.h"
+#include "ocat_netdesc.h"
 
 
@@ -33 +34 @@
          "   -f <config_file>      read config from config_file\n"
          "   -i                    convert onion hostname to IPv6 and exit\n"
+         "   -I                    GarliCat mode, use I2P instead of Tor\n"
          "   -l [<ip>:]<port>      set ocat listen address and port, default = 127.0.0.1:%d\n"
          "   -L <log_file>         log output to <log_file> (default = stderr)\n"
@@ -51 +53 @@
          OCAT_DIR, OCAT_CONNECT_LOG, CNF(create_clog), 
          CNF(daemon), CNF(daemon) ^ 1,
-         CNF(debug_level), OCAT_LISTEN_PORT,
+         CNF(debug_level), NDESC(listen_port),
          CNF(pid_file),
          CNF(ocat_dest_port), ntohs(CNF(socks_dst)->sin_port), 
@@ -237 +239 @@
    int urlconv = 0;
 
-   snprintf(def, 100, "127.0.0.1:%d", OCAT_LISTEN_PORT);
-
    init_setup();
 
-   if (argc < 2)
-      usage(argv[0]), exit(1);
-
-   while ((c = getopt(argc, argv, "abBCd:f:hrRiopl:t:T:s:u:4L:P:")) != -1)
+   while ((c = getopt(argc, argv, "abBCd:f:hrRiIopl:t:T:s:u:4L:P:")) != -1)
       switch (c)
       {
@@ -276 +273 @@
             break;
 
+         case 'I':
+            CNF(net_type) = NTYPE_I2P;
+            break;
+
          case 'l':
-            add_listener(optarg, def);
+            add_listener(optarg);
             break;
 
@@ -340 +341 @@
             exit(1);
       }
+
+   // detect network type by command file name
+   // FIXME: this should be not hardcoded in that way
+   if (!strcmp(argv[0], "gcat") || !strcmp(argv[0], "garlicat"))
+      CNF(net_type) = NTYPE_I2P;
+
+   snprintf(def, 100, "127.0.0.1:%d", NDESC(listen_port));
+   post_init_setup();
+
+   // usage output must be after mode detection (Tor/I2P)
+   if (argc < 2)
+      usage(argv[0]), exit(1);
 
    if (!CNF(rand_addr) && !argv[optind])
@@ -367 +380 @@
          log_msg(LOG_ERR, "address does not have TOR prefix"), exit(1);
       ipv6tonion(&CNF(ocat_addr), CNF(onion_url));
-      printf("%s.onion\n", CNF(onion_url));
+      printf("%s%s\n", CNF(onion_url), NDESC(domain));
       exit(0);
    }
@@ -373 +386 @@
    // copy onion-URL from command line
    if (!CNF(rand_addr))
-      strncpy(CNF(onion_url), argv[optind], ONION_NAME_SIZE);
+      strncpy(CNF(onion_url), argv[optind], NDESC(name_size));
    // ...or generate a random one
    else
@@ -437 +450 @@
 
    if (!CNF(oc_listen))
-      add_listener(def, def);
+      add_listener(def);
 
    // start socket receiver thread
@@ -494 +507 @@
       run_ocat_thread("controller", ocat_controller, NULL);
 
+#ifdef CONNECT_ROOT_PEERS
    // initiate connections to permanent root peers
    log_debug("connecting root peers");
@@ -499 +513 @@
       if (!IN6_ARE_ADDR_EQUAL(&CNF(root_peer[c]), &CNF(ocat_addr)))
          socks_queue(CNF(root_peer[c]), 1);
+#endif
 
    // reading config file

trunk/src/ocat.h

@@ -102 +102 @@
 
 #define IP6HLEN sizeof(struct ip6_hdr)
-//! TOR prefix: FD87:D87E:EB43::/48
-#define TOR_PREFIX {{{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0,0,0,0,0,0,0,0,0,0}}}
-#define TOR_PREFIX_LEN 48
-#if BYTE_ORDER == LITTLE_ENDIAN
-#define TOR_PREFIX4 {0x0000000a}
-#define TOR_PREFIX4_MASK 0x000000ff
-#else
-#define TOR_PREFIX4 {0x0a000000}
-#define TOR_PREFIX4_MASK 0xff000000
-#endif
 //! Length of an .onion-URL (without ".onion" and '\0')
 #define ONION_URL_LEN 16
-//! Total length of .onion-URL
-#define ONION_NAME_SIZE (ONION_URL_LEN + 7)
-//! Total length of .onion-URL (equal to ONION_NAME_SIZE)
-#define ONION_NAME_LEN ONION_NAME_SIZE
 
 #define MAXPEERS 1024
-//! Local listening port for incoming connections from TOR.
-#define OCAT_LISTEN_PORT 8060
-//! Local control port for querying status information.
-#define OCAT_CTRL_PORT 8066
-//! Virtual destination port for hidden services
-#define OCAT_DEST_PORT 8060
-//! SOCKS port of TOR proxy
-#define TOR_SOCKS_PORT 9050
 #ifdef __OpenBSD__
 #define OCAT_UNAME "_tor"
@@ -235 +213 @@
 #define VERSION_STRING_LEN 256
 
-typedef enum PeerType {PT_TOR, PT_I2P} PeerType_t;
+
+#define NTYPE_TOR 0
+#define NTYPE_I2P 1
+
 
 struct OcatSetup
@@ -256 +237 @@
    //! user name to change uid to
    char *usrname;
-   char onion_url[ONION_NAME_SIZE];
+   char onion_url[SIZE_256];
    struct in6_addr ocat_addr;
    //! flag to create connection log
@@ -282 +263 @@
    int use_syslog;
    int daemon;
+#ifdef CONNECT_ROOT_PEERS
    //! hardcoded permanent peers
 #define ROOT_PEERS 1
    struct in6_addr root_peer[ROOT_PEERS];
+#endif
    time_t uptime;
    char *frandn;
@@ -308 +291 @@
    //! communication pipe for socks "selected" connector
    int socksfd[2];
+   int net_type;
 };
 
@@ -359 +343 @@
    unsigned inm;
    unsigned outm;
-   PeerType_t type;
 } OcatPeer_t;
 
@@ -566 +549 @@
 void print_setup_struct(FILE *);
 void init_setup(void);
+void post_init_setup(void);
 void lock_setup(void);
 void unlock_setup(void);
@@ -599 +583 @@
 int strsockaddr(const char *, struct sockaddr *);
 void add_local_listeners(void);
-void add_listener(const char *, const char *);
+void add_listener(const char *);
 void delete_listeners(struct sockaddr **, int *, int);
 int fdprintf(int, const char *, va_list);

trunk/src/ocatctrl.c

@@ -25 +25 @@
 
 #include "ocat.h"
+#include "ocat_netdesc.h"
 
 
@@ -37 +38 @@
    int fd, c;
    FILE *ff, *fo;
-   char buf[FRAME_SIZE], addrstr[INET6_ADDRSTRLEN], onionstr[ONION_NAME_SIZE], timestr[32], *s, *tokbuf;
+   char buf[FRAME_SIZE], addrstr[INET6_ADDRSTRLEN], onionstr[NDESC(name_size)], timestr[32], *s, *tokbuf;
    int rlen, cfd;
    struct tm *tm;

trunk/src/ocatlibe.c

@@ -138 +138 @@
 
 
-void add_listener(const char *buf, const char *def)
-{
+void add_listener(const char *buf)
+{
+   struct sockaddr_in6 saddr;
+
+   if (strsockaddr(buf, &saddr) == -1)
+      log_msg(LOG_EMERG, "could not convert address string '%s'", buf), exit(1);
+
    CNF(oc_listen_cnt)++;
    log_debug("reallocating sockaddr list to %d elements", CNF(oc_listen_cnt));
@@ -147 +152 @@
       log_msg(LOG_ERR, "could not get memory for listener fds: \"%s\"", strerror(errno)), exit(1);
 
-   log_debug("allocating sockaddr mem for \"%s\"", def);
+   log_debug("allocating sockaddr mem for \"%s\"", buf);
    if (!(CNF(oc_listen)[CNF(oc_listen_cnt) - 1] = calloc(1, sizeof(struct sockaddr_in6))))
       log_msg(LOG_ERR, "could not get memory for listener : \"%s\"", strerror(errno)), exit(1);
 
    CNF(oc_listen_fd)[CNF(oc_listen_cnt) - 1] = -1;
-
-   if (def)
-      if (strsockaddr(def, CNF(oc_listen)[CNF(oc_listen_cnt) - 1]) == -1)
-         log_msg(LOG_EMERG, "illegal default string '%s'", def), exit(1);
-
-   if (strsockaddr(buf, CNF(oc_listen)[CNF(oc_listen_cnt) - 1]) == -1)
-      log_msg(LOG_EMERG, "could not convert address string '%s'", buf), exit(1);
+   memcpy(CNF(oc_listen)[CNF(oc_listen_cnt) - 1], &saddr, sizeof(saddr));
 }
 

trunk/src/ocatsetup.c

@@ -25 +25 @@
 
 #include "ocat.h"
+#include "ocat_netdesc.h"
 
 
@@ -46 +47 @@
    //TOR_SOCKS_PORT, 
    //OCAT_LISTEN_PORT, 
-   OCAT_DEST_PORT, OCAT_CTRL_PORT, 
+   0, 0,
    //! default tunfd is stdin/stdout
    {0, 1},
@@ -53 +54 @@
    OCAT_UNAME, {0}, {{{0}}}, 0, 0, 1, OCAT_DIR, TUN_DEV,
    {'\0'},                                // tunname
-   0, TOR_PREFIX4, TOR_PREFIX4_MASK,
+   0, 
+   //ADDR4_PREFIX, ADDR4_MASK
+   {0}, 0,
    NULL, 1,
 #ifdef __CYGWIN__
@@ -70 +73 @@
    1,                                      // daemon
 #endif
+#ifdef CONNECT_ROOT_PEERS
    {
       /*
@@ -78 +82 @@
            0xf6, 0x83, 0x64, 0xac, 0x73, 0xf9, 0x61, 0xac, 0x9a, 0x00}}}  // initial permanent peer "62bwjldt7fq2zgqa" (dot.cat)
    },
+#endif
    0,
    "/dev/urandom",
@@ -106 +111 @@
    ,
    // socksfd
-   {-1, -1}
+   {-1, -1},
+   // net_type
+   NTYPE_TOR
 };
 
@@ -124 +131 @@
    //setup_.logf = stderr;
    setup_.uptime = time(NULL);
+}
+
+
+void post_init_setup(void)
+{
+   setup_.ocat_addr4 = NDESC(prefix4);
+   setup_.ocat_addr4_mask = NDESC(addr4_mask);
+   setup_.ocat_dest_port = NDESC(vdest_port);
+   setup_.ocat_ctrl_port = NDESC(ctrl_port);
 
    setup_.socks_dst->sin_family = AF_INET;
-   setup_.socks_dst->sin_port = htons(TOR_SOCKS_PORT);
+   setup_.socks_dst->sin_port = htons(NDESC(socks_port));
    setup_.socks_dst->sin_addr.s_addr = htonl(INADDR_LOOPBACK);
 #ifdef HAVE_SIN_LEN
    setup_.socks_dst->sin_len = SOCKADDR_SIZE(setup_.socks_dst);
-#endif
-
-#ifdef DEBUG
-   snprintf(setup_.version, VERSION_STRING_LEN, "%s (c) %s -- compiled %s %s", PACKAGE_STRING, OCAT_AUTHOR, __DATE__, __TIME__);
-#else
-   snprintf(setup_.version, VERSION_STRING_LEN, "%s (c) %s", PACKAGE_STRING, OCAT_AUTHOR);
 #endif
 
@@ -152 +162 @@
 #endif
 
+   snprintf(setup_.version, VERSION_STRING_LEN, "%s (c) %s (%s mode)", PACKAGE_STRING, OCAT_AUTHOR, setup_.net_type == NTYPE_TOR ? "OnionCat" : setup_.net_type == NTYPE_I2P ? "GarliCat" : "unknown");
+#ifdef DEBUG
+   snprintf(&setup_.version[strlen(setup_.version)], VERSION_STRING_LEN - strlen(setup_.version), " -- compiled %s %s", __DATE__, __TIME__);
+#endif
 }
 
@@ -160 +174 @@
 void print_setup_struct(FILE *f)
 {
-   char *c, ip[SBUF], nm[SBUF], ip6[SBUF], logf[SBUF], hw[SBUF], rp[SBUF];
+   char *c, ip[SBUF], nm[SBUF], ip6[SBUF], logf[SBUF], hw[SBUF];
    int i, t;
    struct sockaddr_str sas;
@@ -212 +226 @@
          "sizeof_setup           = %d\n"
          "term_req               = %d\n"
+         "net_type               = %d (%s)\n"
          ,
          IPV4_KEY, ntohl(setup_.fhd_key[IPV4_KEY]), IPV6_KEY, ntohl(setup_.fhd_key[IPV6_KEY]),
@@ -244 +259 @@
          (int) strlen(setup_.version), VERSION_STRING_LEN, setup_.version,
          setup_.sizeof_setup,
-         setup_.term_req
+         setup_.term_req,
+         setup_.net_type, setup_.net_type == NTYPE_TOR ? "NTYPE_TOR" : setup_.net_type == NTYPE_I2P ? "NTYPE_I2P" : "unknown"
          );
 
+#ifdef CONNECT_ROOT_PEERS
    for (i = 0; i < ROOT_PEERS; i++)
-      if (inet_ntop(AF_INET6, &setup_.root_peer[i], rp, SBUF))
-         fprintf(f, "root_peer[%d]           = %s\n", i, rp);
+      if (inet_ntop(AF_INET6, &setup_.root_peer[i], ip6, SBUF))
+         fprintf(f, "root_peer[%d]           = %s\n", i, ip6);
+#endif
 
    if (inet_ntops((struct sockaddr*) setup_.socks_dst, &sas))

trunk/src/ocatsocks.c

@@ -26 +26 @@
 
 #include "ocat.h"
+#include "ocat_netdesc.h"
 
 
@@ -31 +32 @@
 static SocksQueue_t *socks_queue_ = NULL;
 
-#define SOCKS_BUFLEN (sizeof(SocksHdr_t) + ONION_NAME_SIZE + strlen(CNF(usrname)) + 2)
+#define SOCKS_BUFLEN (sizeof(SocksHdr_t) + NDESC(name_size) + strlen(CNF(usrname)) + 2)
 
 
@@ -37 +38 @@
 {
    int len, ret;
-   char buf[SOCKS_BUFLEN], onion[ONION_NAME_SIZE];
+   char buf[SOCKS_BUFLEN], onion[NDESC(name_size)];
    SocksHdr_t *shdr = (SocksHdr_t*) buf;
 
    ipv6tonion(&sq->addr, onion);
-   strlcat(onion, ".onion", sizeof(onion));
+   strlcat(onion, NDESC(domain), sizeof(onion));
    log_msg(LOG_INFO, "trying to connect to \"%s\" [%s]", onion, inet_ntop(AF_INET6, &sq->addr, buf, SOCKS_BUFLEN));
 
@@ -246 +247 @@
 {
    int i;
-   char addrstr[INET6_ADDRSTRLEN], onstr[ONION_NAME_LEN], buf[SIZE_1K];
+   char addrstr[INET6_ADDRSTRLEN], onstr[NDESC(name_size)], buf[SIZE_1K];
    SocksQueue_t *squeue;
 
@@ -257 +258 @@
       }
 
-      snprintf(buf, SIZE_1K, "%d: %39s, %s.onion, state = %d, %s(%d), retry = %d, connect_time = %d, restart_time = %d",
+      snprintf(buf, SIZE_1K, "%d: %39s, %s%s, state = %d, %s(%d), retry = %d, connect_time = %d, restart_time = %d",
             i, 
             addrstr, 
             ipv6tonion(&squeue->addr, onstr),
+            NDESC(domain),
             squeue->state,
             squeue->perm ? "PERMANENT" : "TEMPORARY",

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)

trunk/src/ocatv6conv.c

@@ -27 +27 @@
 
 #include "ocat.h"
+#include "ocat_netdesc.h"
 
 static const char BASE32[] = "abcdefghijklmnopqrstuvwxyz234567";
@@ -40 +41 @@
       50  51  52  53  54  55  56  57  58  59  5a */
       15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25 };  
-static const struct in6_addr tor_prefix_ = TOR_PREFIX;
 
 
 int has_tor_prefix(const struct in6_addr *addr)
 {
-   return memcmp(addr, &tor_prefix_, 6) == 0;
+   return memcmp(addr, &NDESC(prefix), 6) == 0;
 }
 
@@ -51 +51 @@
 void set_tor_prefix(struct in6_addr *addr)
 {
-   memcpy(addr, &tor_prefix_, 6);
+   memcpy(addr, &NDESC(prefix), 6);
 }