sr-dev March 2009

sr-dev@lists.kamailio.org

14 participants
188 discussions

git:ser_core_cvs: sctp: connection reuse & connection tracking

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 31fd952ba8af48122876ded631446e210f1634f8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=31fd952… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Mar 4 20:56:00 2009 +0000 sctp: connection reuse & connection tracking - support for sctp connection tracking and true sctp connection reuse for replies. We need this to support reply connection reuse with asymmetric sctp peers (while there is no reason not to use the same port on sctp for sending and receiving messages and it should be strongly discouraged to do so, we never now with what implementation we'll have to deal). What makes this particularly complex is the not-yet-complete sctp API, the slight but important behaviour differences between its linux, freebsd and solaris implementations and the fact that is more geared towards serial single threaded application rather then parallel-processing multi-process or multi-threaded ones. - keep track of the number of active and tracked sctp connections - blacklist moved into sctp_handles_assoc_change() --- forward.c | 11 +- main.c | 8 + msg_translator.c | 20 +- sctp_server.c | 1274 +++++++++++++++++++++++++++++++++++++++++++++++++++--- sctp_server.h | 11 + 5 files changed, 1266 insertions(+), 58 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=31f…

15 years, 1 month

git:ser_core_cvs: tcp: enable runtime changing for most of the cfg vars

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: c0c298d54baae3143a0113a0838fe05dcee7695d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c0c298d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Mar 5 17:20:53 2009 +0000 tcp: enable runtime changing for most of the cfg vars - following tcp config variables can now be changes at runtime: connect_timeout, send_timeout, connection_lifetime, max_connections (can be decreased, it cannot be increased more then the startup value), conn_wq_max, wq_max, crlf_ping, accept_aliases, alias_flags, new_conn_alias_flags. - the following variables can be changes but they will affect only new connections opened by ser: delayed_ack, syncnt, linger2, keepalive, keepidle, keepintvl, keepcnt (for the ser.cfg equivalent, just add tcp_ in front of the variable name; for help and grep NEWS) - updated core.tcp_options to dump all the tcp config options --- core_cmd.c | 22 ++++++++---- tcp_options.c | 105 +++++++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 98 insertions(+), 29 deletions(-) diff --git a/core_cmd.c b/core_cmd.c index fdb66a0..ccac004 100644 --- a/core_cmd.c +++ b/core_cmd.c @@ -565,14 +565,17 @@ static void core_tcp_options(rpc_t* rpc, void* c) if (!tcp_disable){ tcp_options_get(&t); rpc->add(c, "{", &handle); - rpc->struct_add(handle, "ddddddddddddddd", + rpc->struct_add(handle, "dddddddddddddddddddddd", + "connect_timeout", t.connect_timeout_s, + "send_timeout", t.send_timeout_s, + "connection_lifetime", t.con_lifetime_s, + "max_connections(soft)", t.max_connections, "fd_cache", t.fd_cache, - "tcp_buf_write", t.tcp_buf_write, - "tcp_connect_wait", t.tcp_connect_wait, - "tcpconn_wq_max", t.tcpconn_wq_max, - "tcp_wq_max", t.tcp_wq_max, - "tcp_wq_timeout", TICKS_TO_S(t.tcp_wq_timeout), - + "async", t.tcp_buf_write, + "connect_wait", t.tcp_connect_wait, + "conn_wq_max", t.tcpconn_wq_max, + "wq_max", t.tcp_wq_max, + "wq_timeout", TICKS_TO_S(t.tcp_wq_timeout), "defer_accept", t.defer_accept, "delayed_ack", t.delayed_ack, "syncnt", t.syncnt, @@ -581,7 +584,10 @@ static void core_tcp_options(rpc_t* rpc, void* c) "keepidle", t.keepidle, "keepintvl", t.keepintvl, "keepcnt", t.keepcnt, - "crlf_ping", t.crlf_ping + "crlf_ping", t.crlf_ping, + "accept_aliases", t.accept_aliases, + "alias_flags", t.alias_flags, + "new_conn_alias_flags", t.new_conn_alias_flags ); }else{ rpc->fault(c, 500, "tcp support disabled"); diff --git a/tcp_options.c b/tcp_options.c index fa522a1..a292b01 100644 --- a/tcp_options.c +++ b/tcp_options.c @@ -65,20 +65,28 @@ struct cfg_group_tcp tcp_default_cfg; +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_READONLY, -1, - TICKS_TO_S(MAX_TCP_CON_LIFETIME), 0, 0, + { "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_READONLY, -1, - TICKS_TO_S(MAX_TCP_CON_LIFETIME), 0, 0, + { "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_READONLY, -1, - TICKS_TO_S(MAX_TCP_CON_LIFETIME), 0, 0, + { "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_READONLY, 0, (1U<<31)-1, 0, 0, + { "max_connections", CFG_VAR_INT | CFG_ATOMIC, 0, (1U<<31)-1, + fix_max_conns, 0, "maximum connection number, soft limit"}, { "fd_cache", CFG_VAR_INT | CFG_READONLY, 0, 1, 0, 0, "file descriptor cache for tcp_send"}, @@ -87,36 +95,36 @@ static cfg_def_t tcp_cfg_def[] = { "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_READONLY, 0, 1024*1024, 0, 0, + { "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_READONLY, 0, 1<<30, 0, 0, + { "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_READONLY, 0, 1, 0, 0, + { "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_READONLY, 0, 1, 0, 0, + { "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_READONLY, 0, 3600, 0, 0, + { "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_READONLY, 0, 1, 0, 0, + { "keepalive", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0, "enables/disables keepalives for tcp"}, - { "keepidle", CFG_VAR_INT | CFG_READONLY, 0, 24*3600, 0, 0, + { "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_READONLY, 0, 24*3600, 0, 0, + { "keepintvl", CFG_VAR_INT | CFG_ATOMIC, 0, 24*3600, 0, 0, "time interval between keepalive probes on failure (linux)"}, - { "keepcnt", CFG_VAR_INT | CFG_READONLY, 0, 1<<10, 0, 0, + { "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_READONLY, 0, 1, 0, 0, + { "crlf_ping", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0, "enable responding to CRLF SIP-level keepalives "}, - { "accept_aliases", CFG_VAR_INT | CFG_READONLY, 0, 1, 0, 0, + { "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_READONLY, 0, 0, 0, 0, + { "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_READONLY, 0, 0, 0, 0, + { "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*/ @@ -203,6 +211,61 @@ static void fix_timeout(char* name, int* to, int default_val, unsigned 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_BUF_WRITE + ((struct cfg_group_tcp*)cfg_h)->tcp_wq_timeout=S_TO_TICKS(v); +#endif /* TCP_BUF_WRITE */ + 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_BUF_WRITE + ((struct cfg_group_tcp*)cfg_h)->con_lifetime=S_TO_TICKS(v); +#endif /* TCP_BUF_WRITE */ + 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() { @@ -276,7 +339,7 @@ void tcp_options_check() void tcp_options_get(struct cfg_group_tcp* t) { - *t=tcp_default_cfg; + *t=*(struct cfg_group_tcp*)tcp_cfg; }

15 years, 1 month

git:ser_core_cvs: tcp: use dynamic config framework, part 2

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 3dc4f620d8313beee6192feada38bb72faab69fd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3dc4f62… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Mar 5 17:20:42 2009 +0000 tcp: use dynamic config framework, part 2 - added tcp_connect_timeout, tcp_send_timeout, tcp_connection_lifetime, tcp_max_connections, tcp_accept_aliases to the config framework. - added 2 new tcp related variables: tcp alias_flags and tcp new_conn_alias_flags --- cfg.y | 8 ++-- globals.h | 6 +-- receive.c | 5 +- tcp_conn.h | 7 +--- tcp_info.h | 2 +- tcp_init.h | 10 +++++ tcp_main.c | 117 ++++++++++++++++++++++++++------------------------------ tcp_options.c | 74 +++++++++++++++++++++++++++++++++-- tcp_options.h | 13 +++++- 9 files changed, 154 insertions(+), 88 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=3dc…

15 years, 1 month

git:ser_core_cvs: tcp: config option to disable active connects

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: de223f0173f640973cfda1f3b4ffc4dde5b6b5d4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=de223f0… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Mar 5 17:21:30 2009 +0000 tcp: config option to disable active connects - added new config option to disable active connects. If set ser will only accept new connection, it will not actively open new ones. The option can be set both in ser.cfg (tcp_no_connect=yes) or at runtime (sercmd cfg.set_now_int tcp no_connect 1). --- NEWS | 8 +++++++- cfg.lex | 3 +++ cfg.y | 9 +++++++++ core_cmd.c | 3 ++- tcp_main.c | 3 +++ tcp_options.c | 2 ++ tcp_options.h | 1 + 7 files changed, 27 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index ad12ca4..e889550 100644 --- a/NEWS +++ b/NEWS @@ -209,12 +209,15 @@ modules: - t_set_retr(t1, t2) - changes the retransmissions intervals on the fly, on a per transaction basis. core: + - most tcp config vars migrated to the dynamic config framework + (can be changed at runtime, e.g. + sercmd cfg.set_now_int tcp connection_lifetime 180 ) - fallback to tcp or other congestion controlled transport protocol if a forwarded udp sip request is greater then udp_mtu (config). Default off. See udp_mtu and udp_mtu_try_proto. - sctp support (one-to-many, work in progress, for now linux - only with no fallback to one-to-one on full send buffers) + and freebsd only) - partial cygwin (windows) support revived: core+static modules, no ipv6, no tcp, no dynamic modules - most of the config variables can now be changed on the fly, @@ -233,6 +236,9 @@ core: between the short name and long name in cache as CNAME record new config variables: + tcp_no_connect = yes/no - disable connects, ser will only accept new + connections, it will never try to open new ones. + Default: no, can be changed at runtime. udp_mtu = number - fallback to another protocol (udp_mtu_try_proto must be set also either globally or per packet) if the constructed request size is greater then udp_mtu. diff --git a/cfg.lex b/cfg.lex index e36a625..b8d2877 100644 --- a/cfg.lex +++ b/cfg.lex @@ -298,6 +298,7 @@ TCP_CONNECT_TIMEOUT "tcp_connect_timeout" TCP_CON_LIFETIME "tcp_connection_lifetime" TCP_POLL_METHOD "tcp_poll_method" TCP_MAX_CONNECTIONS "tcp_max_connections" +TCP_NO_CONNECT "tcp_no_connect" TCP_SOURCE_IPV4 "tcp_source_ipv4" TCP_SOURCE_IPV6 "tcp_source_ipv6" TCP_OPT_FD_CACHE "tcp_fd_cache" @@ -592,6 +593,8 @@ EAT_ABLE [\ \t\b\r] return TCP_POLL_METHOD; } <INITIAL>{TCP_MAX_CONNECTIONS} { count(); yylval.strval=yytext; return TCP_MAX_CONNECTIONS; } +<INITIAL>{TCP_NO_CONNECT} { count(); yylval.strval=yytext; + return TCP_NO_CONNECT; } <INITIAL>{TCP_SOURCE_IPV4} { count(); yylval.strval=yytext; return TCP_SOURCE_IPV4; } <INITIAL>{TCP_SOURCE_IPV6} { count(); yylval.strval=yytext; diff --git a/cfg.y b/cfg.y index 1523af1..04d5d3e 100644 --- a/cfg.y +++ b/cfg.y @@ -351,6 +351,7 @@ static void free_socket_id_lst(struct socket_id* i); %token TCP_CON_LIFETIME %token TCP_POLL_METHOD %token TCP_MAX_CONNECTIONS +%token TCP_NO_CONNECT %token TCP_SOURCE_IPV4 %token TCP_SOURCE_IPV6 %token TCP_OPT_FD_CACHE @@ -839,6 +840,14 @@ assign_stm: #endif } | TCP_MAX_CONNECTIONS EQUAL error { yyerror("number expected"); } + | TCP_NO_CONNECT EQUAL NUMBER { + #ifdef USE_TCP + tcp_default_cfg.no_connect=$3; + #else + warn("tcp support not compiled in"); + #endif + } + | TCP_NO_CONNECT EQUAL error { yyerror("boolean value expected"); } | TCP_SOURCE_IPV4 EQUAL ipv4 { #ifdef USE_TCP if (tcp_set_src_addr($3)<0) diff --git a/core_cmd.c b/core_cmd.c index d2d7aed..c22e59e 100644 --- a/core_cmd.c +++ b/core_cmd.c @@ -565,11 +565,12 @@ static void core_tcp_options(rpc_t* rpc, void* c) if (!tcp_disable){ tcp_options_get(&t); rpc->add(c, "{", &handle); - rpc->struct_add(handle, "dddddddddddddddddddddd", + rpc->struct_add(handle, "ddddddddddddddddddddddd", "connect_timeout", t.connect_timeout_s, "send_timeout", t.send_timeout_s, "connection_lifetime", t.con_lifetime_s, "max_connections(soft)", t.max_connections, + "no_connect", t.no_connect, "fd_cache", t.fd_cache, "async", t.async, "connect_wait", t.tcp_connect_wait, diff --git a/tcp_main.c b/tcp_main.c index 86fedb7..ecf9ebf 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -1659,6 +1659,9 @@ int tcp_send(struct dest_info* dst, union sockaddr_union* from, } no_id: if (unlikely(c==0)){ + /* check if connect() is disabled */ + if (cfg_get(tcp, tcp_cfg, no_connect)) + return -1; DBG("tcp_send: no open tcp connection found, opening new one\n"); /* create tcp connection */ if (likely(from==0)){ diff --git a/tcp_options.c b/tcp_options.c index f66a7ae..21591d1 100644 --- a/tcp_options.c +++ b/tcp_options.c @@ -88,6 +88,8 @@ static cfg_def_t tcp_cfg_def[] = { { "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 */ diff --git a/tcp_options.h b/tcp_options.h index 7a05e59..24df41e 100644 --- a/tcp_options.h +++ b/tcp_options.h @@ -115,6 +115,7 @@ struct cfg_group_tcp{ int send_timeout_s; /* in s */ int con_lifetime_s; /* in s */ int max_connections; + int no_connect; /* do not open any new tcp connection (but accept them) */ int fd_cache; /* on /off */ /* tcp async options */ int async; /* on / off */

15 years, 1 month

git:ser_core_cvs: tcp: async mode on by default

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 76cb799e3b3eadc3ae4f3d2e8b28547913ccbc12 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=76cb799… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Mar 5 17:21:11 2009 +0000 tcp: async mode on by default - async mode is now on by default (use tcp_async=no in the config to disable it) - renamed tcp_buf_write/TCP_BUF_WRITE into tcp_async/TCP_ASYNC in the code --- NEWS | 4 +- cfg.y | 2 +- core_cmd.c | 2 +- tcp_conn.h | 4 +- tcp_main.c | 144 ++++++++++++++++++++++++++++---------------------------- tcp_options.c | 30 ++++++------ tcp_options.h | 18 ++++---- 7 files changed, 101 insertions(+), 103 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=76c…

15 years, 1 month

git:ser_core_cvs: tcp: use dynamic config framework, part 1

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 22db42e4efe8cd4a85e05a54cf513b3d1fd0ee53 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=22db42e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Mar 5 17:20:22 2009 +0000 tcp: use dynamic config framework, part 1 - all tcp config variables from tcp_options.h migrated to the dynamic configuration framework. For now all are read only, but write support will come soon where it makes sense. E.g.: (with the cfg_rpc module loaded) $ sercmd cfg.help tcp async async mode for writes and connects (parameter type is integer) $ sercmd cfg.get tcp async 0 --- cfg.y | 26 ++++++------ core_cmd.c | 2 +- main.c | 46 +++++++++++--------- tcp_main.c | 86 ++++++++++++++++++------------------ tcp_options.c | 134 ++++++++++++++++++++++++++++++++++++++++++++++++--------- tcp_options.h | 16 +++++-- tcp_read.c | 2 +- 7 files changed, 207 insertions(+), 105 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=22d…

15 years, 1 month

git:ser_core_cvs: sctp: rpc info command

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: b9c28270c750f3678788590d92ea6c2cbe6f7b52 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b9c2827… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Mar 4 20:56:11 2009 +0000 sctp: rpc info command - added core.sctp_info which returns some very general sctp information (opened associations, tracked ones, total associations opened from startup). E.g.: $ sercmd core.sctp_info { opened_connections: 0 tracked_connections: 0 total_connections: 50007 } --- core_cmd.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/core_cmd.c b/core_cmd.c index 0f3c812..988a774 100644 --- a/core_cmd.c +++ b/core_cmd.c @@ -41,6 +41,7 @@ #include "core_cmd.h" #ifdef USE_SCTP #include "sctp_options.h" +#include "sctp_server.h" #endif #ifdef USE_DNS_CACHE @@ -622,6 +623,35 @@ static void core_sctp_options(rpc_t* rpc, void* c) +static const char* core_sctpinfo_doc[] = { + "Returns sctp related info.", /* Documentation string */ + 0 /* Method signature(s) */ +}; + +static void core_sctpinfo(rpc_t* rpc, void* c) +{ +#ifdef USE_SCTP + void *handle; + struct sctp_gen_info i; + + if (!sctp_disable){ + sctp_get_info(&i); + rpc->add(c, "{", &handle); + rpc->struct_add(handle, "ddd", + "opened_connections", i.sctp_connections_no, + "tracked_connections", i.sctp_tracked_no, + "total_connections", i.sctp_total_connections + ); + }else{ + rpc->fault(c, 500, "sctp support disabled"); + } +#else + rpc->fault(c, 500, "sctp support not compiled"); +#endif +} + + + /* * RPC Methods exported by this module */ @@ -644,6 +674,7 @@ rpc_export_t core_rpc_methods[] = { {"core.tcp_options", core_tcp_options, core_tcp_options_doc,0}, {"core.sctp_options", core_sctp_options, core_sctp_options_doc, 0}, + {"core.sctp_info", core_sctpinfo, core_sctpinfo_doc, 0}, #ifdef USE_DNS_CACHE {"dns.mem_info", dns_cache_mem_info, dns_cache_mem_info_doc, 0 }, {"dns.debug", dns_cache_debug, dns_cache_debug_doc, 0 },

15 years, 1 month

git:ser_core_cvs: test: updated parse uri test program

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: cdfae3a1c011e4880769bace80ace6b5bc0e7203 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cdfae3a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Mar 4 20:56:21 2009 +0000 test: updated parse uri test program --- test/p_uri.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 68 insertions(+), 4 deletions(-) diff --git a/test/p_uri.c b/test/p_uri.c index 2667656..1f2cc99 100644 --- a/test/p_uri.c +++ b/test/p_uri.c @@ -1,21 +1,85 @@ - +/** uri parser test program. */ +/* compile with: + gcc -Wall p_uri.c -o p_uri -DFAST_LOCK -D__CPU_i386 -DSHM_MEM */ #include <stdio.h> #include <stdlib.h> /* exit() */ #include <string.h> +#include <stdarg.h> #include "../str.h" /* ser compat defs */ #define EXTRA_DEBUG #include "../parser/parse_uri.c" -#include "../dprint.c" int ser_error=0; -int debug=L_DBG; int log_stderr=1; -int log_facility=LOG_DAEMON; int process_no=0; struct process_table* pt=0; +int phone2tel=1; +volatile int dprint_crit=0; +int my_pid() {return 0; }; + +struct cfg_group_core default_core_cfg = { + L_DBG, /* print only msg. < L_WARN */ + LOG_DAEMON, /* log_facility -- see syslog(3) */ +#ifdef USE_DST_BLACKLIST + /* blacklist */ + 0, /* dst blacklist is disabled by default */ + DEFAULT_BLST_TIMEOUT, + DEFAULT_BLST_MAX_MEM, +#endif + /* resolver */ +#ifdef USE_IPV6 + 1, /* dns_try_ipv6 -- on by default */ +#else + 0, /* dns_try_ipv6 -- off, if no ipv6 support */ +#endif + 0, /* dns_try_naptr -- off by default */ + 30, /* udp transport preference (for naptr) */ + 20, /* tcp transport preference (for naptr) */ + 10, /* tls transport preference (for naptr) */ + 20, /* sctp transport preference (for naptr) */ + -1, /* dns_retr_time */ + -1, /* dns_retr_no */ + -1, /* dns_servers_no */ + 1, /* dns_search_list */ + 1, /* dns_search_fmatch */ + 0, /* dns_reinit */ + /* DNS cache */ +#ifdef USE_DNS_CACHE + 1, /* use_dns_cache -- on by default */ + 0, /* dns_cache_flags */ + 0, /* use_dns_failover -- off by default */ + 0, /* dns_srv_lb -- off by default */ + DEFAULT_DNS_NEG_CACHE_TTL, /* neg. cache ttl */ + DEFAULT_DNS_CACHE_MIN_TTL, /* minimum ttl */ + DEFAULT_DNS_CACHE_MAX_TTL, /* maximum ttl */ + DEFAULT_DNS_MAX_MEM, /* dns_cache_max_mem */ + 0, /* dns_cache_del_nonexp -- delete only expired entries by default */ +#endif +#ifdef PKG_MALLOC + 0, /* mem_dump_pkg */ +#endif +#ifdef SHM_MEM + 0, /* mem_dump_shm */ +#endif +}; + +void *core_cfg = &default_core_cfg; + + +void dprint(char * format, ...) +{ + va_list ap; + + fprintf(stderr, "%2d(%d) ", process_no, my_pid()); + va_start(ap, format); + vfprintf(stderr,format,ap); + fflush(stderr); + va_end(ap); +} +

15 years, 1 month

git:ser_core_cvs: sctp: empty sctp_handle_assoc_change added

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 7a6f43c829df5d3d2febe828581a0902fc4c10f1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7a6f43c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Mar 4 20:55:44 2009 +0000 sctp: empty sctp_handle_assoc_change added --- sctp_server.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/sctp_server.c b/sctp_server.c index 9b8688f..2a7a85d 100644 --- a/sctp_server.c +++ b/sctp_server.c @@ -663,6 +663,24 @@ static int sctp_handle_send_failed(struct socket_info* si, +/* handle SCTP_ASOC_CHANGE notifications: map ser global sctp ids + * to kernel asoc_ids. The global ids are needed because the kernel ones + * might get reused after a close and so they are not unique for ser's + * lifetime. We need a unique id to match replies to the association on + * which we received the corresponding request (so that we can send them + * back on the same asoc & socket if still opened). + * returns 0 on success, -1 on failure + */ +static int sctp_handle_assoc_change(struct socket_info* si, + union sockaddr_union* su, + int state, + int assoc_id) +{ + return -1; /* failure, not implemented */ +} + + + static int sctp_handle_notification(struct socket_info* si, union sockaddr_union* su, char* buf, unsigned len) @@ -764,6 +782,8 @@ static int sctp_handle_notification(struct socket_info* si, } } #endif /* USE_DST_BLACKLIST */ + sctp_handle_assoc_change(si, su, snp->sn_assoc_change.sac_state, + snp->sn_assoc_change.sac_assoc_id); break; #ifdef SCTP_ADAPTION_INDICATION case SCTP_ADAPTION_INDICATION:

15 years, 1 month

git:ser_core_cvs: regfree() function call is added to free the memory allocated by regcomp().

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 61c7aeed70e34cb952d76472acef0dbf76cec1ce URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=61c7aee… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Tue Mar 3 12:46:40 2009 +0000 regfree() function call is added to free the memory allocated by regcomp(). --- usr_avp.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/usr_avp.c b/usr_avp.c index 70dae5c..c7910ff 100644 --- a/usr_avp.c +++ b/usr_avp.c @@ -991,6 +991,7 @@ void free_avp_ident(avp_ident_t* attr) abort(); #endif } else { + regfree(attr->name.re); pkg_free(attr->name.re); } } @@ -1019,8 +1020,10 @@ int parse_avp_spec( str *name, int *type, int_str *avp_name, int *index) void free_avp_name( int *type, int_str *avp_name) { - if ((*type & AVP_NAME_RE) && (avp_name->re)) + if ((*type & AVP_NAME_RE) && (avp_name->re)) { + regfree(avp_name->re); pkg_free(avp_name->re); + } } int add_avp_galias_str(char *alias_definition)

15 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2009