|
|
@@ -21,65 +21,253 @@
|
|
|
* History:
|
|
|
* --------
|
|
|
* 2007-11-28 created by andrei
|
|
|
+ * 2009-03-05 use cfg framework (andrei)
|
|
|
*/
|
|
|
|
|
|
#include "tcp_options.h"
|
|
|
#include "dprint.h"
|
|
|
#include "globals.h"
|
|
|
#include "timer_ticks.h"
|
|
|
+#include "cfg/cfg.h"
|
|
|
+#include "tcp_init.h" /* DEFAULT* */
|
|
|
|
|
|
|
|
|
-struct tcp_cfg_options tcp_options;
|
|
|
+
|
|
|
+/* default/initial values for tcp config options
|
|
|
+ NOTE: all the options are initialized in init_tcp_options()
|
|
|
+ depending on compile time defines */
|
|
|
+struct cfg_group_tcp tcp_default_cfg;
|
|
|
+#if 0
|
|
|
+{
|
|
|
+ 1, /* fd_cache, default on */
|
|
|
+ /* tcp async options */
|
|
|
+ 0, /* async / tcp_async, default off */
|
|
|
+ 1, /* tcp_connect_wait - depends on tcp_async */
|
|
|
+ 32*1024, /* tcpconn_wq_max - max. write queue len per connection (32k) */
|
|
|
+ 10*1024*1024, /* tcp_wq_max - max. overall queued bytes (10MB)*/
|
|
|
+ S_TO_TICKS(tcp_send_timeout), /* tcp_wq_timeout - timeout for queued
|
|
|
+ writes, depends on tcp_send_timeout */
|
|
|
+ /* tcp socket options */
|
|
|
+ 0, /* defer_accept - on/off*/
|
|
|
+ 1, /* delayed_ack - delay ack on connect (on/off)*/
|
|
|
+ 0, /* syncnt - numbers of SYNs retrs. before giving up (0 = OS default) */
|
|
|
+ 0, /* linger2 - lifetime of orphaned FIN_WAIT2 sockets (0 = OS default)*/
|
|
|
+ 1, /* keepalive - on/off */
|
|
|
+ 0, /* keepidle - idle time (s) before tcp starts sending keepalives */
|
|
|
+ 0, /* keepintvl - interval between keep alives (0 = OS default) */
|
|
|
+ 0, /* keepcnt - maximum no. of keepalives (0 = OS default)*/
|
|
|
+
|
|
|
+ /* other options */
|
|
|
+ 1 /* crlf_ping - respond to double CRLF ping/keepalive (on/off) */
|
|
|
+
|
|
|
+};
|
|
|
+#endif
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+static int fix_connect_to(void* cfg_h, str* name, void** val);
|
|
|
+static int fix_send_to(void* cfg_h, str* name, void** val);
|
|
|
+static int fix_con_lt(void* cfg_h, str* name, void** val);
|
|
|
+static int fix_max_conns(void* cfg_h, str* name, void** val);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+/* cfg_group_tcp description (for the config framework)*/
|
|
|
+static cfg_def_t tcp_cfg_def[] = {
|
|
|
+ /* name , type |input type| chg type, min, max, fixup, proc. cbk
|
|
|
+ description */
|
|
|
+ { "connect_timeout", CFG_VAR_INT | CFG_ATOMIC, -1,
|
|
|
+ TICKS_TO_S(MAX_TCP_CON_LIFETIME), fix_connect_to, 0,
|
|
|
+ "used only in non-async mode, in seconds"},
|
|
|
+ { "send_timeout", CFG_VAR_INT | CFG_ATOMIC, -1,
|
|
|
+ TICKS_TO_S(MAX_TCP_CON_LIFETIME), fix_send_to, 0,
|
|
|
+ "in seconds"},
|
|
|
+ { "connection_lifetime", CFG_VAR_INT | CFG_ATOMIC, -1,
|
|
|
+ TICKS_TO_S(MAX_TCP_CON_LIFETIME), fix_con_lt, 0,
|
|
|
+ "connection lifetime (in seconds)"},
|
|
|
+ { "max_connections", CFG_VAR_INT | CFG_ATOMIC, 0, (1U<<31)-1,
|
|
|
+ fix_max_conns, 0,
|
|
|
+ "maximum connection number, soft limit"},
|
|
|
+ { "no_connect", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0,
|
|
|
+ "if set only accept new connections, never actively open new ones"},
|
|
|
+ { "fd_cache", CFG_VAR_INT | CFG_READONLY, 0, 1, 0, 0,
|
|
|
+ "file descriptor cache for tcp_send"},
|
|
|
+ /* tcp async options */
|
|
|
+ { "async", CFG_VAR_INT | CFG_READONLY, 0, 1, 0, 0,
|
|
|
+ "async mode for writes and connects"},
|
|
|
+ { "connect_wait", CFG_VAR_INT | CFG_READONLY, 0, 1, 0, 0,
|
|
|
+ "parallel simultaneous connects to the same dst. (0) or one connect"},
|
|
|
+ { "conn_wq_max", CFG_VAR_INT | CFG_ATOMIC, 0, 1024*1024, 0, 0,
|
|
|
+ "maximum bytes queued for write per connection (depends on async)"},
|
|
|
+ { "wq_max", CFG_VAR_INT | CFG_ATOMIC, 0, 1<<30, 0, 0,
|
|
|
+ "maximum bytes queued for write allowed globally (depends on async)"},
|
|
|
+ /* see also wq_timeout below */
|
|
|
+ /* tcp socket options */
|
|
|
+ { "defer_accept", CFG_VAR_INT | CFG_READONLY, 0, 3600, 0, 0,
|
|
|
+ "0/1 on linux, seconds on freebsd (see docs)"},
|
|
|
+ { "delayed_ack", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0,
|
|
|
+ "initial ack will be delayed and sent with the first data segment"},
|
|
|
+ { "syncnt", CFG_VAR_INT | CFG_ATOMIC, 0, 1024, 0, 0,
|
|
|
+ "number of syn retransmissions before aborting a connect (0=not set)"},
|
|
|
+ { "linger2", CFG_VAR_INT | CFG_ATOMIC, 0, 3600, 0, 0,
|
|
|
+ "lifetime of orphaned sockets in FIN_WAIT2 state in s (0=not set)"},
|
|
|
+ { "keepalive", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0,
|
|
|
+ "enables/disables keepalives for tcp"},
|
|
|
+ { "keepidle", CFG_VAR_INT | CFG_ATOMIC, 0, 24*3600, 0, 0,
|
|
|
+ "time before sending a keepalive if the connection is idle (linux)"},
|
|
|
+ { "keepintvl", CFG_VAR_INT | CFG_ATOMIC, 0, 24*3600, 0, 0,
|
|
|
+ "time interval between keepalive probes on failure (linux)"},
|
|
|
+ { "keepcnt", CFG_VAR_INT | CFG_ATOMIC, 0, 1<<10, 0, 0,
|
|
|
+ "number of failed keepalives before dropping the connection (linux)"},
|
|
|
+ /* other options */
|
|
|
+ { "crlf_ping", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0,
|
|
|
+ "enable responding to CRLF SIP-level keepalives "},
|
|
|
+ { "accept_aliases", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0,
|
|
|
+ "turn on/off tcp aliases (see tcp_accept_aliases) "},
|
|
|
+ { "alias_flags", CFG_VAR_INT | CFG_ATOMIC, 0, 2, 0, 0,
|
|
|
+ "flags used for adding new aliases (FORCE_ADD:1 , REPLACE:2) "},
|
|
|
+ { "new_conn_alias_flags", CFG_VAR_INT | CFG_ATOMIC, 0, 2, 0, 0,
|
|
|
+ "flags for the def. aliases for a new conn. (FORCE_ADD:1, REPLACE:2 "},
|
|
|
+ /* internal and/or "fixed" versions of some vars
|
|
|
+ (not supposed to be writeable, read will provide only debugging value*/
|
|
|
+ { "wq_timeout_ticks", CFG_VAR_INT | CFG_READONLY, 0,
|
|
|
+ MAX_TCP_CON_LIFETIME, 0, 0,
|
|
|
+ "internal send_timeout value in ticks, used in async. mode"},
|
|
|
+ { "con_lifetime_ticks", CFG_VAR_INT | CFG_READONLY, 0,
|
|
|
+ MAX_TCP_CON_LIFETIME, 0, 0,
|
|
|
+ "internal connection_lifetime value, converted to ticks"},
|
|
|
+ {0, 0, 0, 0, 0, 0, 0}
|
|
|
+};
|
|
|
|
|
|
|
|
|
+void* tcp_cfg; /* tcp config handle */
|
|
|
+
|
|
|
/* set defaults */
|
|
|
void init_tcp_options()
|
|
|
{
|
|
|
-#ifdef TCP_BUF_WRITE
|
|
|
- tcp_options.tcp_buf_write=0;
|
|
|
- tcp_options.tcpconn_wq_max=32*1024; /* 32 k */
|
|
|
- tcp_options.tcp_wq_max=10*1024*1024; /* 10 MB */
|
|
|
- tcp_options.tcp_wq_timeout=S_TO_TICKS(tcp_send_timeout);
|
|
|
+ tcp_default_cfg.connect_timeout_s=DEFAULT_TCP_CONNECT_TIMEOUT;
|
|
|
+ tcp_default_cfg.send_timeout_s=DEFAULT_TCP_SEND_TIMEOUT;
|
|
|
+ tcp_default_cfg.con_lifetime_s=DEFAULT_TCP_CONNECTION_LIFETIME_S;
|
|
|
+ tcp_default_cfg.max_connections=tcp_max_connections;
|
|
|
+#ifdef TCP_ASYNC
|
|
|
+ tcp_default_cfg.async=1;
|
|
|
+ tcp_default_cfg.tcpconn_wq_max=32*1024; /* 32 k */
|
|
|
+ tcp_default_cfg.tcp_wq_max=10*1024*1024; /* 10 MB */
|
|
|
+ tcp_default_cfg.tcp_wq_timeout=S_TO_TICKS(tcp_default_cfg.send_timeout_s);
|
|
|
#ifdef TCP_CONNECT_WAIT
|
|
|
- tcp_options.tcp_connect_wait=1;
|
|
|
+ tcp_default_cfg.tcp_connect_wait=1;
|
|
|
#endif /* TCP_CONNECT_WAIT */
|
|
|
-#endif /* TCP_BUF_WRITE */
|
|
|
+#endif /* TCP_ASYNC */
|
|
|
#ifdef TCP_FD_CACHE
|
|
|
- tcp_options.fd_cache=1;
|
|
|
+ tcp_default_cfg.fd_cache=1;
|
|
|
#endif
|
|
|
#ifdef HAVE_SO_KEEPALIVE
|
|
|
- tcp_options.keepalive=1;
|
|
|
+ tcp_default_cfg.keepalive=1;
|
|
|
#endif
|
|
|
/*
|
|
|
#if defined HAVE_TCP_DEFER_ACCEPT || defined HAVE_TCP_ACCEPT_FILTER
|
|
|
- tcp_options.defer_accept=1;
|
|
|
+ tcp_default_cfg.defer_accept=1;
|
|
|
#endif
|
|
|
*/
|
|
|
#ifdef HAVE_TCP_QUICKACK
|
|
|
- tcp_options.delayed_ack=1;
|
|
|
+ tcp_default_cfg.delayed_ack=1;
|
|
|
#endif
|
|
|
- tcp_options.crlf_ping=1;
|
|
|
+ tcp_default_cfg.crlf_ping=1;
|
|
|
+ tcp_default_cfg.accept_aliases=0; /* don't accept aliases by default */
|
|
|
+ /* flags used for adding new aliases */
|
|
|
+ tcp_default_cfg.alias_flags=TCP_ALIAS_FORCE_ADD;
|
|
|
+ /* flags used for adding the default aliases of a new tcp connection */
|
|
|
+ tcp_default_cfg.new_conn_alias_flags=TCP_ALIAS_REPLACE;
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#define W_OPT_NC(option) \
|
|
|
- if (tcp_options.option){\
|
|
|
+ if (tcp_default_cfg.option){\
|
|
|
WARN("tcp_options: tcp_" #option \
|
|
|
" cannot be enabled (recompile needed)\n"); \
|
|
|
- tcp_options.option=0; \
|
|
|
+ tcp_default_cfg.option=0; \
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#define W_OPT_NS(option) \
|
|
|
- if (tcp_options.option){\
|
|
|
+ if (tcp_default_cfg.option){\
|
|
|
WARN("tcp_options: tcp_" #option \
|
|
|
" cannot be enabled (no OS support)\n"); \
|
|
|
- tcp_options.option=0; \
|
|
|
+ tcp_default_cfg.option=0; \
|
|
|
}
|
|
|
|
|
|
|
|
|
+
|
|
|
+/* if *to<0 to=default_val, else if to>max_val to=max_val */
|
|
|
+static void fix_timeout(char* name, int* to, int default_val, unsigned max_val)
|
|
|
+{
|
|
|
+ if (*to < 0) *to=default_val;
|
|
|
+ else if ((unsigned)*to > max_val){
|
|
|
+ WARN("%s: timeout too big (%u), the maximum value is %u\n",
|
|
|
+ name, *to, max_val);
|
|
|
+ *to=max_val;
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+static int fix_connect_to(void* cfg_h, str* name, void** val)
|
|
|
+{
|
|
|
+ int v;
|
|
|
+ v=(int)(long)*val;
|
|
|
+ fix_timeout("tcp_connect_timeout", &v, DEFAULT_TCP_CONNECT_TIMEOUT,
|
|
|
+ TICKS_TO_S(MAX_TCP_CON_LIFETIME));
|
|
|
+ *val=(void*)(long)v;
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
+
|
|
|
+static int fix_send_to(void* cfg_h, str* name, void** val)
|
|
|
+{
|
|
|
+ int v;
|
|
|
+ v=(int)(long)*val;
|
|
|
+ fix_timeout("tcp_send_timeout", &v, DEFAULT_TCP_SEND_TIMEOUT,
|
|
|
+ TICKS_TO_S(MAX_TCP_CON_LIFETIME));
|
|
|
+ *val=(void*)(long)v;
|
|
|
+#ifdef TCP_ASYNC
|
|
|
+ ((struct cfg_group_tcp*)cfg_h)->tcp_wq_timeout=S_TO_TICKS(v);
|
|
|
+#endif /* TCP_ASYNC */
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
+
|
|
|
+static int fix_con_lt(void* cfg_h, str* name, void** val)
|
|
|
+{
|
|
|
+ int v;
|
|
|
+ v=(int)(long)*val;
|
|
|
+ fix_timeout("tcp_connection_lifetime", &v,
|
|
|
+ TICKS_TO_S(MAX_TCP_CON_LIFETIME),
|
|
|
+ TICKS_TO_S(MAX_TCP_CON_LIFETIME));
|
|
|
+ *val=(void*)(long)v;
|
|
|
+#ifdef TCP_ASYNC
|
|
|
+ ((struct cfg_group_tcp*)cfg_h)->con_lifetime=S_TO_TICKS(v);
|
|
|
+#endif /* TCP_ASYNC */
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
+
|
|
|
+static int fix_max_conns(void* cfg_h, str* name, void** val)
|
|
|
+{
|
|
|
+ int v;
|
|
|
+ v=(int)(long)*val;
|
|
|
+ if (v>tcp_max_connections){
|
|
|
+ INFO("cannot override hard tcp_max_connections limit, please"
|
|
|
+ " restart and increase tcp_max_connections in the cfg.\n");
|
|
|
+ v=tcp_max_connections;
|
|
|
+ }
|
|
|
+ *val=(void*)(long)v;
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
/* checks & warns if some tcp_option cannot be enabled */
|
|
|
void tcp_options_check()
|
|
|
{
|
|
|
@@ -87,20 +275,18 @@ void tcp_options_check()
|
|
|
W_OPT_NC(defer_accept);
|
|
|
#endif
|
|
|
|
|
|
-#ifndef TCP_BUF_WRITE
|
|
|
- W_OPT_NC(tcp_buf_write);
|
|
|
+#ifndef TCP_ASYNC
|
|
|
+ W_OPT_NC(async);
|
|
|
W_OPT_NC(tcpconn_wq_max);
|
|
|
W_OPT_NC(tcp_wq_max);
|
|
|
W_OPT_NC(tcp_wq_timeout);
|
|
|
-#endif /* TCP_BUF_WRITE */
|
|
|
+#endif /* TCP_ASYNC */
|
|
|
#ifndef TCP_CONNECT_WAIT
|
|
|
W_OPT_NC(tcp_connect_wait);
|
|
|
#endif /* TCP_CONNECT_WAIT */
|
|
|
|
|
|
- if (tcp_options.tcp_connect_wait && !tcp_options.tcp_buf_write){
|
|
|
- WARN("tcp_options: tcp_connect_wait depends on tcp_buf_write, "
|
|
|
- " disabling...\n");
|
|
|
- tcp_options.tcp_connect_wait=0;
|
|
|
+ if (tcp_default_cfg.tcp_connect_wait && !tcp_default_cfg.async){
|
|
|
+ tcp_default_cfg.tcp_connect_wait=0;
|
|
|
}
|
|
|
|
|
|
#if ! defined HAVE_TCP_DEFER_ACCEPT && ! defined HAVE_TCP_ACCEPT_FILTER
|
|
|
@@ -121,8 +307,9 @@ void tcp_options_check()
|
|
|
#ifndef HAVE_TCP_KEEPCNT
|
|
|
W_OPT_NS(keepcnt);
|
|
|
#endif
|
|
|
- if (tcp_options.keepintvl || tcp_options.keepidle || tcp_options.keepcnt){
|
|
|
- tcp_options.keepalive=1; /* force on */
|
|
|
+ if (tcp_default_cfg.keepintvl || tcp_default_cfg.keepidle ||
|
|
|
+ tcp_default_cfg.keepcnt){
|
|
|
+ tcp_default_cfg.keepalive=1; /* force on */
|
|
|
}
|
|
|
#ifndef HAVE_SO_KEEPALIVE
|
|
|
W_OPT_NS(keepalive);
|
|
|
@@ -130,11 +317,43 @@ void tcp_options_check()
|
|
|
#ifndef HAVE_TCP_QUICKACK
|
|
|
W_OPT_NS(delayed_ack);
|
|
|
#endif
|
|
|
+ /* fix various timeouts */
|
|
|
+ fix_timeout("tcp_connect_timeout", &tcp_default_cfg.connect_timeout_s,
|
|
|
+ DEFAULT_TCP_CONNECT_TIMEOUT,
|
|
|
+ TICKS_TO_S(MAX_TCP_CON_LIFETIME));
|
|
|
+ fix_timeout("tcp_send_timeout", &tcp_default_cfg.send_timeout_s,
|
|
|
+ DEFAULT_TCP_SEND_TIMEOUT,
|
|
|
+ TICKS_TO_S(MAX_TCP_CON_LIFETIME));
|
|
|
+ fix_timeout("tcp_connection_lifetime", &tcp_default_cfg.con_lifetime_s,
|
|
|
+ TICKS_TO_S(MAX_TCP_CON_LIFETIME),
|
|
|
+ TICKS_TO_S(MAX_TCP_CON_LIFETIME));
|
|
|
+ /* compute timeout in ticks */
|
|
|
+#ifdef TCP_ASYNC
|
|
|
+ tcp_default_cfg.tcp_wq_timeout=S_TO_TICKS(tcp_default_cfg.send_timeout_s);
|
|
|
+#endif /* TCP_ASYNC */
|
|
|
+ tcp_default_cfg.con_lifetime=S_TO_TICKS(tcp_default_cfg.con_lifetime_s);
|
|
|
+ tcp_default_cfg.max_connections=tcp_max_connections;
|
|
|
+}
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+void tcp_options_get(struct cfg_group_tcp* t)
|
|
|
+{
|
|
|
+ *t=*(struct cfg_group_tcp*)tcp_cfg;
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
-void tcp_options_get(struct tcp_cfg_options* t)
|
|
|
+/** register tcp config into the configuration framework.
|
|
|
+ * @return 0 on succes, -1 on error*/
|
|
|
+int tcp_register_cfg()
|
|
|
{
|
|
|
- *t=tcp_options;
|
|
|
+ if (cfg_declare("tcp", tcp_cfg_def, &tcp_default_cfg, cfg_sizeof(tcp),
|
|
|
+ &tcp_cfg))
|
|
|
+ return -1;
|
|
|
+ if (tcp_cfg==0){
|
|
|
+ BUG("null tcp cfg");
|
|
|
+ return -1;
|
|
|
+ }
|
|
|
+ return 0;
|
|
|
}
|
Jan Janak