Changeset 535 for trunk/src/ocatsetup.c

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)

File:

• trunk/src/ocatsetup.c (modified) (5 diffs)

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
          );