Changeset 526

Timestamp:

11/14/09 21:00:31 (3 years ago)

Author:

eagle

Message:

port settings corrected

Location:

branches/garlicat

Files:

• configure (modified) (10 diffs)
• src/ocat.c (modified) (4 diffs)
• src/ocat.h (modified) (1 diff)
• src/ocat_netdesc.h (modified) (1 diff)
• src/ocatlibe.c (modified) (2 diffs)
• src/ocatsetup.c (modified) (2 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.r525.
+# Generated by GNU Autoconf 2.62 for onioncat 0.2.0.r526.
 #
 # Report bugs to <rahra@cypherpunk.at>.
@@ -597 +597 @@
 PACKAGE_NAME='onioncat'
 PACKAGE_TARNAME='onioncat'
-PACKAGE_VERSION='0.2.0.r525'
-PACKAGE_STRING='onioncat 0.2.0.r525'
+PACKAGE_VERSION='0.2.0.r526'
+PACKAGE_STRING='onioncat 0.2.0.r526'
 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.r525 to adapt to many kinds of systems.
+\`configure' configures onioncat 0.2.0.r526 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.r525:";;
+     short | recursive ) echo "Configuration of onioncat 0.2.0.r526:";;
    esac
   cat <<\_ACEOF
@@ -1422 +1422 @@
 if $ac_init_version; then
   cat <<\_ACEOF
-onioncat configure 0.2.0.r525
+onioncat configure 0.2.0.r526
 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.r525, which was
+It was created by onioncat $as_me 0.2.0.r526, 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.r525'
+ VERSION='0.2.0.r526'
 
 
@@ -2236 +2236 @@
 
 cat >>confdefs.h <<\_ACEOF
-#define SVN_REVISION "525"
+#define SVN_REVISION "526"
 _ACEOF
 
@@ -5209 +5209 @@
 # values after options handling.
 ac_log="
-This file was extended by onioncat $as_me 0.2.0.r525, which was
+This file was extended by onioncat $as_me 0.2.0.r526, 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.r525
+onioncat config.status 0.2.0.r526
 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

@@ -239 +239 @@
    int urlconv = 0;
 
-   snprintf(def, 100, "127.0.0.1:%d", NDESC(listen_port));
-
    init_setup();
 
@@ -283 +281 @@
 
          case 'l':
-            add_listener(optarg, def);
+            add_listener(optarg);
             break;
 
@@ -352 +350 @@
       CNF(net_type) = NTYPE_I2P;
 
+   snprintf(def, 100, "127.0.0.1:%d", NDESC(listen_port));
    post_init_setup();
 
@@ -451 +450 @@
 
    if (!CNF(oc_listen))
-      add_listener(def, def);
+      add_listener(def);
 
    // start socket receiver thread

branches/garlicat/src/ocat.h

@@ -603 +603 @@
 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);

branches/garlicat/src/ocat_netdesc.h

@@ -86 +86 @@
 #define I2P_OCAT_CTRL_PORT 8067
 //! Virtual destination port for hidden services
-#define I2P_OCAT_DEST_PORT 8060
+#define I2P_OCAT_DEST_PORT I2P_OCAT_LISTEN_PORT
 //! SOCKS port of TOR proxy
 #define I2P_SOCKS_PORT 9051

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

branches/garlicat/src/ocatsetup.c

@@ -130 +130 @@
    setup_.uptime = time(NULL);
 
-   setup_.socks_dst->sin_family = AF_INET;
-   setup_.socks_dst->sin_port = htons(TOR_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__);
@@ -151 +144 @@
    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(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
 
    ctrl_listen_.sin_family = AF_INET;