Changeset 525

Timestamp:

11/13/09 13:11:06 (2 years ago)

Author:

eagle

Message:

Garlicat, 1st try

Location:

branches/garlicat

Files:

• configure (modified) (10 diffs)
• src/Makefile.am (modified) (1 diff)
• src/Makefile.in (modified) (3 diffs)
• src/ocat.c (modified) (9 diffs)
• src/ocat.h (modified) (8 diffs)
• src/ocat_netdesc.c (added)
• src/ocat_netdesc.h (added)
• src/ocatctrl.c (modified) (2 diffs)
• src/ocatsetup.c (modified) (8 diffs)
• src/ocatsocks.c (modified) (4 diffs)
• src/ocattun.c (modified) (5 diffs)
• src/ocatv6conv.c (modified) (3 diffs)

branches/garlicat/configure

@@ -1 +1 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62 for onioncat 0.2.0.r514.
+# Generated by GNU Autoconf 2.62 for onioncat 0.2.0.r525.
 #
 # Report bugs to <rahra@cypherpunk.at>.
@@ -597 +597 @@
 PACKAGE_NAME='onioncat'
 PACKAGE_TARNAME='onioncat'
-PACKAGE_VERSION='0.2.0.r514'
-PACKAGE_STRING='onioncat 0.2.0.r514'
+PACKAGE_VERSION='0.2.0.r525'
+PACKAGE_STRING='onioncat 0.2.0.r525'
 PACKAGE_BUGREPORT='rahra@cypherpunk.at'
 
@@ -1260 +1260 @@
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures onioncat 0.2.0.r514 to adapt to many kinds of systems.
+\`configure' configures onioncat 0.2.0.r525 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1330 +1330 @@
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of onioncat 0.2.0.r514:";;
+     short | recursive ) echo "Configuration of onioncat 0.2.0.r525:";;
    esac
   cat <<\_ACEOF
@@ -1422 +1422 @@
 if $ac_init_version; then
   cat <<\_ACEOF
-onioncat configure 0.2.0.r514
+onioncat configure 0.2.0.r525
 generated by GNU Autoconf 2.62
 
@@ -1436 +1436 @@
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by onioncat $as_me 0.2.0.r514, which was
+It was created by onioncat $as_me 0.2.0.r525, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
@@ -2085 +2085 @@
 # Define the identity of the package.
  PACKAGE='onioncat'
- VERSION='0.2.0.r514'
+ VERSION='0.2.0.r525'
 
 
@@ -2236 +2236 @@
 
 cat >>confdefs.h <<\_ACEOF
-#define SVN_REVISION "514"
+#define SVN_REVISION "525"
 _ACEOF
 
@@ -5209 +5209 @@
 # values after options handling.
 ac_log="
-This file was extended by onioncat $as_me 0.2.0.r514, which was
+This file was extended by onioncat $as_me 0.2.0.r525, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
@@ -5262 +5262 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-onioncat config.status 0.2.0.r514
+onioncat config.status 0.2.0.r525
 configured by $0, generated by GNU Autoconf 2.62,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

branches/garlicat/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
 

branches/garlicat/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)
@@ -168 +169 @@
 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 +238 @@
 
 @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@

branches/garlicat/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);
+   snprintf(def, 100, "127.0.0.1:%d", NDESC(listen_port));
 
    init_setup();
@@ -244 +246 @@
       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)
       {
@@ -274 +276 @@
          case 'i':
             urlconv = 1;
+            break;
+
+         case 'I':
+            CNF(net_type) = NTYPE_I2P;
             break;
 
@@ -340 +346 @@
             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;
+
+   post_init_setup();
 
    if (!CNF(rand_addr) && !argv[optind])
@@ -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
@@ -401 +414 @@
 
    log_msg(LOG_INFO, "%s", CNF(version));
+   log_msg(LOG_INFO, "OC is running in %s mode", CNF(net_type) == NTYPE_I2P ? "GarliCat (I2P)" : "OnionCat (Tor)");
 
 #if 0

branches/garlicat/src/ocat.h

@@ -102 +102 @@
 
 #define IP6HLEN sizeof(struct ip6_hdr)
-//! TOR prefix: FD87:D87E:EB43::/48
+/*//! 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
@@ -111 +111 @@
 #define TOR_PREFIX4 {0x0a000000}
 #define TOR_PREFIX4_MASK 0xff000000
-#endif
+#endif*/
 //! Length of an .onion-URL (without ".onion" and '\0')
 #define ONION_URL_LEN 16
-//! Total length of .onion-URL
+/*//! 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 ONION_NAME_LEN ONION_NAME_SIZE*/
 
 #define MAXPEERS 1024
-//! Local listening port for incoming connections from TOR.
+/*//! Local listening port for incoming connections from TOR.
 #define OCAT_LISTEN_PORT 8060
 //! Local control port for querying status information.
@@ -127 +127 @@
 #define OCAT_DEST_PORT 8060
 //! SOCKS port of TOR proxy
-#define TOR_SOCKS_PORT 9050
+#define TOR_SOCKS_PORT 9050*/
 #ifdef __OpenBSD__
 #define OCAT_UNAME "_tor"
@@ -235 +235 @@
 #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 +259 @@
    //! 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
@@ -308 +311 @@
    //! communication pipe for socks "selected" connector
    int socksfd[2];
+   int net_type;
 };
 
@@ -359 +363 @@
    unsigned inm;
    unsigned outm;
-   PeerType_t type;
 } OcatPeer_t;
 
@@ -566 +569 @@
 void print_setup_struct(FILE *);
 void init_setup(void);
+void post_init_setup(void);
 void lock_setup(void);
 void unlock_setup(void);

branches/garlicat/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;

branches/garlicat/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__
@@ -106 +109 @@
    ,
    // socksfd
-   {-1, -1}
+   {-1, -1},
+   // net_type
+   NTYPE_TOR
 };
 
@@ -137 +142 @@
    snprintf(setup_.version, VERSION_STRING_LEN, "%s (c) %s", PACKAGE_STRING, OCAT_AUTHOR);
 #endif
+}
+
+
+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);
 
    ctrl_listen_.sin_family = AF_INET;
@@ -151 +165 @@
    ctrl_listen6_.sin6_len = sizeof(ctrl_listen6_);
 #endif
-
 }
 
@@ -212 +225 @@
          "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 +258 @@
          (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"
          );
 

branches/garlicat/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;
 
@@ -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;
 

branches/garlicat/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)

branches/garlicat/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);
 }