HevSocks5Tunnel: Use dynamic configs.

README.md

@@ -54,6 +54,12 @@ socks5:
  address: 127.0.0.1
 
 #misc:
+ # task stack size (bytes)
+# task-stack-size: 20480
+ # connect timeout (ms)
+# connect-timeout: 5000
+ # read-write timeout (ms)
+# read-write-timeout: 60000
  # stdout, stderr or file-path
 # log-file: stderr
  # debug, info, warn or error

conf/main.yml

@@ -23,6 +23,12 @@ socks5:
  address: 127.0.0.1
 
 #misc:
+ # task stack size (bytes)
+# task-stack-size: 20480
+ # connect timeout (ms)
+# connect-timeout: 5000
+ # read-write timeout (ms)
+# read-write-timeout: 60000
  # stdout, stderr or file-path
 # log-file: stderr
  # debug, info, warn or error

src/hev-config-const.h

@@ -18,9 +18,4 @@ static const int TCP_BUF_SIZE = 8192;
 static const int UDP_BUF_SIZE = 1500;
 static const int UDP_POOL_SIZE = 512;
 
-static const int IO_TIMEOUT = 60000;
-static const int CONNECT_TIMEOUT = 3000;
-
-static const int TASK_STACK_SIZE = 20480;
-
 #endif /* __HEV_CONFIG_CONST_H__ */

src/hev-config.c

@@ -30,6 +30,9 @@ static char srv_port[8];
 
 static char log_file[1024];
 static char pid_file[1024];
+static int task_stack_size = 20480;
+static int connect_timeout = 5000;
+static int read_write_timeout = 60000;
 static int limit_nofile = -2;
 static int log_level = HEV_LOGGER_WARN;
 
@@ -254,7 +257,13 @@ hev_config_parse_misc (yaml_document_t *doc, yaml_node_t *base)
  break;
  value = (const char *)node->data.scalar.value;
 
- if (0 == strcmp (key, "pid-file"))
+ if (0 == strcmp (key, "task-stack-size"))
+ task_stack_size = strtoul (value, NULL, 10);
+ else if (0 == strcmp (key, "connect-timeout"))
+ connect_timeout = strtoul (value, NULL, 10);
+ else if (0 == strcmp (key, "read-write-timeout"))
+ read_write_timeout = strtoul (value, NULL, 10);
+ else if (0 == strcmp (key, "pid-file"))
  strncpy (pid_file, value, 1024 - 1);
  else if (0 == strcmp (key, "log-file"))
  strncpy (log_file, value, 1024 - 1);
@@ -417,6 +426,24 @@ hev_config_get_socks5_address (int *port)
  return srv_address;
 }
 
+int
+hev_config_get_misc_task_stack_size (void)
+{
+ return task_stack_size;
+}
+
+int
+hev_config_get_misc_connect_timeout (void)
+{
+ return connect_timeout;
+}
+
+int
+hev_config_get_misc_read_write_timeout (void)
+{
+ return read_write_timeout;
+}
+
 int
 hev_config_get_misc_limit_nofile (void)
 {

src/hev-config.h

@@ -26,6 +26,9 @@ unsigned int hev_config_get_tunnel_ipv6_prefix (void);
 
 const char *hev_config_get_socks5_address (int *port);
 
+int hev_config_get_misc_task_stack_size (void);
+int hev_config_get_misc_connect_timeout (void);
+int hev_config_get_misc_read_write_timeout (void);
 int hev_config_get_misc_limit_nofile (void);
 const char *hev_config_get_misc_pid_file (void);
 const char *hev_config_get_misc_log_file (void);

src/hev-socks5-session.c

@@ -11,7 +11,6 @@
 
 #include "hev-logger.h"
 #include "hev-config.h"
-#include "hev-config-const.h"
 
 #include "hev-socks5-session.h"
 
@@ -53,23 +52,27 @@ void
 hev_socks5_session_run (HevSocks5Session *self)
 {
  HevSocks5SessionClass *klass;
+ int read_write_timeout;
+ int connect_timeout;
  const char *addr;
  int port;
  int res;
 
  LOG_D ("%p socks5 session run", self);
 
  addr = hev_config_get_socks5_address (&port);
+ connect_timeout = hev_config_get_misc_connect_timeout ();
+ read_write_timeout = hev_config_get_misc_read_write_timeout ();
 
- hev_socks5_set_timeout (HEV_SOCKS5 (self->client), CONNECT_TIMEOUT);
+ hev_socks5_set_timeout (HEV_SOCKS5 (self->client), connect_timeout);
 
  res = hev_socks5_client_connect (self->client, addr, port);
  if (res < 0) {
  LOG_E ("%p socks5 session connect", self);
  return;
  }
 
- hev_socks5_set_timeout (HEV_SOCKS5 (self->client), IO_TIMEOUT);
+ hev_socks5_set_timeout (HEV_SOCKS5 (self->client), read_write_timeout);
 
  res = hev_socks5_client_handshake (self->client);
  if (res < 0) {

src/hev-socks5-tunnel.c

@@ -31,7 +31,6 @@
 #include "hev-config.h"
 #include "hev-logger.h"
 #include "hev-compiler.h"
-#include "hev-config-const.h"
 #include "hev-tunnel-linux.h"
 #include "hev-socks5-session-tcp.h"
 #include "hev-socks5-session-udp.h"
@@ -533,6 +532,7 @@ tcp_accept_handler (void *arg, struct tcp_pcb *pcb, err_t err)
 {
  HevSocks5SessionTCP *tcp;
  HevSocks5Session *s;
+ int stack_size;
  HevTask *task;
 
  if (err != ERR_OK)
@@ -543,7 +543,8 @@ tcp_accept_handler (void *arg, struct tcp_pcb *pcb, err_t err)
  return ERR_MEM;
 
  s = HEV_SOCKS5_SESSION (tcp);
- task = hev_task_new (TASK_STACK_SIZE);
+ stack_size = hev_config_get_misc_task_stack_size ();
+ task = hev_task_new (stack_size);
  if (!task) {
  hev_socks5_session_destroy (s);
  return ERR_ABRT;
@@ -562,6 +563,7 @@ udp_recv_handler (void *arg, struct udp_pcb *pcb, struct pbuf *p,
 {
  HevSocks5SessionUDP *udp;
  HevSocks5Session *s;
+ int stack_size;
  HevTask *task;
 
  udp = hev_socks5_session_udp_new (pcb, &mutex);
@@ -571,7 +573,8 @@ udp_recv_handler (void *arg, struct udp_pcb *pcb, struct pbuf *p,
  }
 
  s = HEV_SOCKS5_SESSION (udp);
- task = hev_task_new (TASK_STACK_SIZE);
+ stack_size = hev_config_get_misc_task_stack_size ();
+ task = hev_task_new (stack_size);
  if (!task) {
  hev_socks5_session_destroy (s);
  return;