Changeset 528

Timestamp:

11/14/09 22:58:47 (3 years ago)

Author:

eagle

Message:

do not connect root peers

Location:

branches/garlicat

Files:

• configure (modified) (10 diffs)
• src/ocat.c (modified) (2 diffs)
• src/ocat.h (modified) (2 diffs)
• src/ocatsetup.c (modified) (4 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.r527.
+# Generated by GNU Autoconf 2.62 for onioncat 0.2.0.r528.
 #
 # Report bugs to <rahra@cypherpunk.at>.
@@ -597 +597 @@
 PACKAGE_NAME='onioncat'
 PACKAGE_TARNAME='onioncat'
-PACKAGE_VERSION='0.2.0.r527'
-PACKAGE_STRING='onioncat 0.2.0.r527'
+PACKAGE_VERSION='0.2.0.r528'
+PACKAGE_STRING='onioncat 0.2.0.r528'
 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.r527 to adapt to many kinds of systems.
+\`configure' configures onioncat 0.2.0.r528 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.r527:";;
+     short | recursive ) echo "Configuration of onioncat 0.2.0.r528:";;
    esac
   cat <<\_ACEOF
@@ -1422 +1422 @@
 if $ac_init_version; then
   cat <<\_ACEOF
-onioncat configure 0.2.0.r527
+onioncat configure 0.2.0.r528
 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.r527, which was
+It was created by onioncat $as_me 0.2.0.r528, 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.r527'
+ VERSION='0.2.0.r528'
 
 
@@ -2236 +2236 @@
 
 cat >>confdefs.h <<\_ACEOF
-#define SVN_REVISION "527"
+#define SVN_REVISION "528"
 _ACEOF
 
@@ -5209 +5209 @@
 # values after options handling.
 ac_log="
-This file was extended by onioncat $as_me 0.2.0.r527, which was
+This file was extended by onioncat $as_me 0.2.0.r528, 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.r527
+onioncat config.status 0.2.0.r528
 configured by $0, generated by GNU Autoconf 2.62,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

branches/garlicat/src/ocat.c

@@ -507 +507 @@
       run_ocat_thread("controller", ocat_controller, NULL);
 
+#ifdef CONNECT_ROOT_PEERS
    // initiate connections to permanent root peers
    log_debug("connecting root peers");
@@ -512 +513 @@
       if (!IN6_ARE_ADDR_EQUAL(&CNF(root_peer[c]), &CNF(ocat_addr)))
          socks_queue(CNF(root_peer[c]), 1);
+#endif
 
    // reading config file

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

branches/garlicat/src/ocatsetup.c

@@ -73 +73 @@
    1,                                      // daemon
 #endif
+#ifdef CONNECT_ROOT_PEERS
    {
       /*
@@ -81 +82 @@
            0xf6, 0x83, 0x64, 0xac, 0x73, 0xf9, 0x61, 0xac, 0x9a, 0x00}}}  // initial permanent peer "62bwjldt7fq2zgqa" (dot.cat)
    },
+#endif
    0,
    "/dev/urandom",
@@ -173 +175 @@
 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;
@@ -262 +264 @@
          );
 
+#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))