Changeset 536

Timestamp:

01/06/10 13:08:22 (2 years ago)

Author:

eagle

Message:

• separate name for connect log and pid file for OC/GC.
• mode detection (OC/GC) improved

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• configure (modified) (10 diffs)
• src/ocat.c (modified) (3 diffs)
• src/ocat.h (modified) (1 diff)
• src/ocat_netdesc.c (modified) (2 diffs)
• src/ocat_netdesc.h (modified) (3 diffs)
• src/ocatlog.c (modified) (2 diffs)
• src/ocatsetup.c (modified) (1 diff)

trunk/ChangeLog

@@ -1 +1 @@
 * version 0.2.2
+ - separate name for connect log and pid file for OC/GC.
+ - mode detection (OC/GC) improved
  - GarliCat branch merged back into trunk
  - added onioncat-privatehosts.pl to trunk (written by zzz)

trunk/configure

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

trunk/src/ocat.c

@@ -51 +51 @@
          , CNF(version), s,
          // option defaults start here
-         OCAT_DIR, OCAT_CONNECT_LOG, CNF(create_clog), 
+         OCAT_DIR, NDESC(clog_file), CNF(create_clog), 
          CNF(daemon), CNF(daemon) ^ 1,
          CNF(debug_level), NDESC(listen_port),
@@ -276 +276 @@
    int c, runasroot = 0;
    struct passwd *pwd, pwdm;
-   int urlconv = 0;
+   int urlconv = 0, mode_detect = 0;
 
    init_setup();
+   // detect network type by command file name
+   // FIXME: this should be not hardcoded in that way
+   // FIXME: basename() should better be used instead of strstr()
+   if (strstr(argv[0], "gcat"))
+   {
+      CNF(net_type) = NTYPE_I2P;
+      snprintf(def, 100, "127.0.0.1:%d", NDESC(listen_port));
+      post_init_setup();
+      mode_detect = 1;
+   }
 
    while ((c = getopt(argc, argv, "abBCd:f:hrRiIopl:t:T:s:u:4L:P:")) != -1)
@@ -381 +391 @@
       }
 
-   // 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();
+   if (!mode_detect)
+   {
+      snprintf(def, 100, "127.0.0.1:%d", NDESC(listen_port));
+      post_init_setup();
+   }
 
    // usage output must be after mode detection (Tor/I2P)

trunk/src/ocat.h

@@ -117 +117 @@
 #define OCAT_URL "http://www.abenteuerland.at/onioncat/"
 #define OCAT_DIR ".ocat"
-#define OCAT_CONNECT_LOG "connect_log"
+//#define OCAT_CONNECT_LOG "connect_log"
 #define PID_FILE "/var/run/ocat.pid"
 #define OCAT_AUTHOR "Bernhard R. Fischer"

trunk/src/ocat_netdesc.c

@@ -31 +31 @@
       TOR_OCAT_DEST_PORT,
       TOR_SOCKS_PORT,
+      TOR_OCAT_CONNECT_LOG,
+      TOR_PID_FILE,
    },
    {
@@ -41 +43 @@
       I2P_OCAT_DEST_PORT,
       I2P_SOCKS_PORT,
+      I2P_OCAT_CONNECT_LOG,
+      I2P_PID_FILE,
    },
 };

trunk/src/ocat_netdesc.h

@@ -37 +37 @@
    short vdest_port;
    short socks_port;
+   char *clog_file;
+   char *pid_file;
 };
 
@@ -68 +70 @@
 //! SOCKS port of TOR proxy
 #define TOR_SOCKS_PORT 9050
+#define TOR_OCAT_CONNECT_LOG "ocat_connect_log"
+#define TOR_PID_FILE "/var/run/ocat.pid"
 
 
@@ -89 +93 @@
 //! SOCKS port of TOR proxy
 #define I2P_SOCKS_PORT 9051
+#define I2P_OCAT_CONNECT_LOG "gcat_connect_log"
+#define I2P_PID_FILE "/var/run/gcat.pid"
 
 

trunk/src/ocatlog.c

@@ -23 +23 @@
 
 #include "ocat.h"
+#include "ocat_netdesc.h"
 
 #define TIMESTRLEN 64
@@ -68 +69 @@
 
    strlcat(buf, "/", CBUFLEN);
-   strlcat(buf, OCAT_CONNECT_LOG, CBUFLEN);
+   strlcat(buf, NDESC(clog_file), CBUFLEN);
 
    log_debug("opening connect log \"%s\"", buf);

trunk/src/ocatsetup.c

@@ -174 +174 @@
    snprintf(&setup_.version[strlen(setup_.version)], VERSION_STRING_LEN - strlen(setup_.version), " -- compiled %s %s", __DATE__, __TIME__);
 #endif
+   setup_.pid_file = NDESC(pid_file);
 }