Changeset 535

Timestamp:

12/27/09 20:37:46 (2 years ago)

Author:

eagle

Message:

• option -t did not work correctly
• (optional) pid file is removed at exit
• SIGUSR1 is handled in preparation for statistics output
• controller sessions limited to MAX_DEF_CTRL_SESS (= 5 by default)

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• configure (modified) (10 diffs)
• src/ocat.c (modified) (6 diffs)
• src/ocat.h (modified) (3 diffs)
• src/ocatctrl.c (modified) (3 diffs)
• src/ocatlibe.c (modified) (1 diff)
• src/ocatroute.c (modified) (4 diffs)
• src/ocatsetup.c (modified) (5 diffs)

trunk/ChangeLog

@@ -2 +2 @@
  - GarliCat branch merged back into trunk
  - added onioncat-privatehosts.pl to trunk (written by zzz)
+ - option -t did not work correctly
+ - (optional) pid file is removed at exit
+ - SIGUSR1 is handled in preparation for statistics output
+ - controller sessions limited to MAX_DEF_CTRL_SESS (= 5 by default)
  
 * version 0.2.1

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.r534.
+# Generated by GNU Autoconf 2.62 for onioncat 0.2.2.r535.
 #
 # Report bugs to <rahra@cypherpunk.at>.
@@ -597 +597 @@
 PACKAGE_NAME='onioncat'
 PACKAGE_TARNAME='onioncat'
-PACKAGE_VERSION='0.2.2.r534'
-PACKAGE_STRING='onioncat 0.2.2.r534'
+PACKAGE_VERSION='0.2.2.r535'
+PACKAGE_STRING='onioncat 0.2.2.r535'
 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.r534 to adapt to many kinds of systems.
+\`configure' configures onioncat 0.2.2.r535 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.r534:";;
+     short | recursive ) echo "Configuration of onioncat 0.2.2.r535:";;
    esac
   cat <<\_ACEOF
@@ -1423 +1423 @@
 if $ac_init_version; then
   cat <<\_ACEOF
-onioncat configure 0.2.2.r534
+onioncat configure 0.2.2.r535
 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.r534, which was
+It was created by onioncat $as_me 0.2.2.r535, 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.r534'
+ VERSION='0.2.2.r535'
 
 
@@ -2237 +2237 @@
 
 cat >>confdefs.h <<\_ACEOF
-#define SVN_REVISION "534"
+#define SVN_REVISION "535"
 _ACEOF
 
@@ -5221 +5221 @@
 # values after options handling.
 ac_log="
-This file was extended by onioncat $as_me 0.2.2.r534, which was
+This file was extended by onioncat $as_me 0.2.2.r535, 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.r534
+onioncat config.status 0.2.2.r535
 configured by $0, generated by GNU Autoconf 2.62,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

trunk/src/ocat.c

@@ -94 +94 @@
 {
    FILE *f;
+   char c;
 
    if (!(f = fopen(CNF(pid_file), "w")))
@@ -105 +106 @@
    log_debug("pid_file %s created, pid = %d", CNF(pid_file), getpid());
 
-   if (chown(CNF(pid_file), uid, 0) == -1)
-      log_msg(LOG_ERR, "could not change owner of pid_file \"%s\" to %d: %s", CNF(pid_file), uid, strerror(errno));
-
-   return 0;
+   if (pipe(CNF(pid_fd)) == -1)
+   {
+      log_msg(LOG_WARNING, "could not open pid pipe: \"%s\"", strerror(errno));
+      return -1;
+   }
+
+   switch (fork())
+   {
+      case -1:
+         oe_close(CNF(pid_fd[0]));
+         oe_close(CNF(pid_fd[1]));
+         return -1;
+
+      // child
+      case 0:
+         oe_close(CNF(pid_fd[1]));
+         if (read(CNF(pid_fd[0]), &c, 1) == -1)
+            log_msg(LOG_ERR, "error reading from pid_fd %d: \"%s\"",
+                  CNF(pid_fd[0]), strerror(errno)), exit(1);
+
+         if (unlink(CNF(pid_file)) == -1)
+            log_msg(LOG_WARNING, "error deleting pid ]ile \"%s\": \"%s\"",
+                  CNF(pid_file), strerror(errno)), exit(1);
+         exit(0);
+
+      // parent
+      default:
+         oe_close(CNF(pid_fd[0]));
+
+   }
+
+   return CNF(pid_fd[1]);
 }
 
@@ -164 +193 @@
          CNF(sig_term) = 1;
          break;
+
+      case SIGUSR1:
+         CNF(sig_usr1) = 1;
+         break;
    }
 }
@@ -181 +214 @@
    if (sigaction(SIGHUP, &sa, NULL) == -1)
       log_msg(LOG_ERR, "could not install SIGHUP handler: \"%s\"", strerror(errno)), exit(1);
+   if (sigaction(SIGUSR1, &sa, NULL) == -1)
+      log_msg(LOG_ERR, "could not install SIGUSR1 handler: \"%s\"", strerror(errno)), exit(1);
 }
 
@@ -187 +222 @@
 {
    OcatPeer_t *peer, *next;
+   char c;
 
    log_msg(LOG_NOTICE, "waiting for system cleanup...");
@@ -227 +263 @@
    delete_listeners(CNF(oc_listen), CNF(oc_listen_fd), CNF(oc_listen_cnt));
 
-   if (CNF(create_pid_file) && (unlink(CNF(pid_file)) == -1))
-      log_msg(LOG_ERR, "could not remove pid file \"%s\": %s", CNF(pid_file), strerror(errno));
+   if (CNF(create_pid_file) && (CNF(pid_fd[1]) != -1))
+   {
+      if (write(CNF(pid_fd[1]), &c, 1) == -1)
+         log_msg(LOG_ERR, "cout not write to pid fd %d: \"%s\"", CNF(pid_fd[1]), strerror(errno));
+   }
 }
 

trunk/src/ocat.h

@@ -200 +200 @@
 //! RECONN_ATTEMPTS must not be faster than MIN_RECONNECT_TIME
 #define MIN_RECONNECT_TIME 30
+//! define default maximum number of concurrent controller sessions
+#define MAX_DEF_CTRL_SESS 5
 
 #define MFD_SET(f,s,m) {FD_SET(f, s); m = f > m ? f : m;}
@@ -213 +215 @@
 #define VERSION_STRING_LEN 256
 
+#define MAX_DEF_CTRL 6
 
 #define NTYPE_TOR 0
@@ -292 +295 @@
    int socksfd[2];
    int net_type;
+   int max_ctrl, ctrl_active;
+   //! pipe filedescriptors for pid deletion process
+   int pid_fd[2];
+   int sig_usr1, clear_stats;
 };
 

trunk/src/ocatctrl.c

@@ -75 +75 @@
       //CNF(config_read) = 1;
    }
+
+   lock_setup();
+   CNF(ctrl_active)++;
+   unlock_setup();
 
    fprintf(fo, "%s\n", CNF(version));
@@ -303 +307 @@
    oe_close(pfd[1]);
 
+   lock_setup();
+   CNF(ctrl_active)--;
+   unlock_setup();
+
    return NULL;
 }
@@ -309 +317 @@
 int run_ctrl_handler(int fd)
 {
+   // check number of controller sessions
+   // FIXME: listener should be closed or acceptor delayed instead of
+   // counting after session acceptance.
+   lock_setup();
+   if (CNF(ctrl_active) >= CNF(max_ctrl))
+   {
+      log_msg(LOG_WARNING, "maximum number of controller sessions reached");
+      oe_close(fd);
+      fd = -1;
+   }
+   unlock_setup();
+   if (fd == -1)
+      return -1;
+
    return (int) run_ocat_thread("ctrl_handler", ctrl_handler, (void*) (long) fd);
 }

trunk/src/ocatlibe.c

@@ -142 +142 @@
    struct sockaddr_in6 saddr;
 
-   if (strsockaddr(buf, &saddr) == -1)
+   if (strsockaddr(buf, (struct sockaddr*) &saddr) == -1)
       log_msg(LOG_EMERG, "could not convert address string '%s'", buf), exit(1);
 

trunk/src/ocatroute.c

@@ -631 +631 @@
 {
    int family;
-   int fd;
+   int fd, so;
 
    switch (addr->sa_family)
@@ -652 +652 @@
    }
 
+   so = 1;  
+   if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &so, sizeof(so)) == -1)
+      log_msg(LOG_WARNING, "could not set socket %d to SO_REUSEADDR: \"%s\"", fd, strerror(errno));
    if (bind(fd, addr, sock_len) == -1)
    {
@@ -822 +825 @@
                set_term_req();
             }
+            if (CNF(sig_usr1))
+            {
+               lock_setup();
+               CNF(clear_stats) = 1;
+               unlock_setup();
+               log_msg(LOG_NOTICE, "stats will be cleared after next stats output");
+            }
          }
          log_debug("restarting");
@@ -965 +975 @@
          stat_wup = act_time;
          log_msg(LOG_INFO, "stats: ... (not implemented yet)");
+
+         lock_setup();
+         if (CNF(clear_stats))
+         {
+            CNF(clear_stats) = 0;
+            // FIXME: implement stats clearing here
+            log_debug("stats cleared");
+         }
+         unlock_setup();
       }
 

trunk/src/ocatsetup.c

@@ -113 +113 @@
    {-1, -1},
    // net_type
-   NTYPE_TOR
+   NTYPE_TOR,
+   // max_ctrl, ctrl_active
+   MAX_DEF_CTRL_SESS, 0,
+   // pid_fd
+   {-1, -1},
+   // sig_usr1, clear_stats
+   0, 0
 };
 
@@ -131 +137 @@
    //setup_.logf = stderr;
    setup_.uptime = time(NULL);
+   memset(&socks_dst6_, 0, sizeof(socks_dst6_));
+   setup_.socks_dst->sin_family = AF_INET;
+   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
 }
 
@@ -141 +153 @@
    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
+   if (!setup_.socks_dst->sin_port)
+      setup_.socks_dst->sin_port = htons(NDESC(socks_port));
 
    ctrl_listen_.sin_family = AF_INET;
@@ -227 +235 @@
          "term_req               = %d\n"
          "net_type               = %d (%s)\n"
+         "max_ctrl               = %d\n"
+         "ctrl_active            = %d\n"
+         "pid_fd[2]              = {%d, %d}\n"
+         "clear_stats            = %d\n"
          ,
          IPV4_KEY, ntohl(setup_.fhd_key[IPV4_KEY]), IPV6_KEY, ntohl(setup_.fhd_key[IPV6_KEY]),
@@ -260 +272 @@
          setup_.sizeof_setup,
          setup_.term_req,
-         setup_.net_type, setup_.net_type == NTYPE_TOR ? "NTYPE_TOR" : setup_.net_type == NTYPE_I2P ? "NTYPE_I2P" : "unknown"
+         setup_.net_type, setup_.net_type == NTYPE_TOR ? "NTYPE_TOR" : setup_.net_type == NTYPE_I2P ? "NTYPE_I2P" : "unknown",
+         setup_.max_ctrl, setup_.ctrl_active,
+         setup_.pid_fd[0], setup_.pid_fd[1],
+         setup_.clear_stats
          );