sr-dev

sr-dev@lists.kamailio.org

13 participants
44200 discussions

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, 10 months

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, 10 months

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, 10 months

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, 10 months

git:master: fix compiler warning about uninitialized variable

by Henning Westerholt

Module: sip-router Branch: master Commit: 2891fdcfebf2b9c8313502478136e891be285341 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2891fdc… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Mar 3 19:12:41 2009 +0100 fix compiler warning about uninitialized variable --- lvalue.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lvalue.c b/lvalue.c index 77a9a86..3c409ff 100644 --- a/lvalue.c +++ b/lvalue.c @@ -52,11 +52,10 @@ inline static int lval_avp_assign(struct run_act_ctx* h, struct sip_msg* msg, int_str value; unsigned short flags; struct search_state st; - int ret; - int v; - int destroy_pval; + int ret, v, destroy_pval; destroy_pval=0; + flags = 0; avp=&lv->lv.avps; ret=0; /* If the left attr was specified without indexing brackets delete

15 years, 10 months

kamailio at FFG 2009

by Henning Westerholt

Hi all, i'll present in the next week the Kamailio project at the FFG 2009 conference. Topics of my talk are: - overview about Kamailio - applications and usage scenarios - new and interesting stuff in the 1.5.0 release - future developments, the sip-router project Date: Thursday, 12.03.2009 Place: Karlsruhe, Germany Link to the abstract (in german as the talk will be also held in german): http://www.guug.de/veranstaltungen/ffg2009/abstracts.html#3_2_1 More information about the event: http://www.guug.de/veranstaltungen/ffg2009/ I'll provide the slides and eventual some notes after the talk as usual. Cheers, Henning

15 years, 10 months

git:master: integrate sip-router compatiblity patches from Jan Janak

by Henning Westerholt

Module: sip-router Branch: master Commit: d1930021c4c72ab8876c734ed634fe97d858abf4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d193002… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Mar 3 12:56:29 2009 +0100 integrate sip-router compatiblity patches from Jan Janak - define OPENSER_MOD_INTERFACE in Makefile - link with shared libraries libtrie, libsrdb1, and libkmi - fix paths to dtrie.h and mi.h header files - various fixes to make the module compatible with libsrdb1 - rename sval and ival attributes in gparam structure - use sip-router style of calling do_action - link with libkcore - include lib/kcore/km_crc.h which contains crc32_uint --- modules/carrierroute/Makefile | 5 +++++ modules/carrierroute/cr_db.c | 12 ++++++------ modules/carrierroute/cr_db.h | 2 +- modules/carrierroute/cr_domain.h | 2 +- modules/carrierroute/cr_fifo.h | 2 +- modules/carrierroute/cr_fixup.c | 12 ++++++------ modules/carrierroute/cr_func.c | 13 +++++++------ modules/carrierroute/db_carrierroute.c | 2 +- modules/carrierroute/db_carrierroute.h | 4 ++-- modules/carrierroute/prime_hash.c | 2 +- 10 files changed, 31 insertions(+), 25 deletions(-) diff --git a/modules/carrierroute/Makefile b/modules/carrierroute/Makefile index 9407069..64d364c 100644 --- a/modules/carrierroute/Makefile +++ b/modules/carrierroute/Makefile @@ -24,4 +24,9 @@ endif DEFS+=$(CONFUSEDEFS) LIBS=$(CONFUSELIBS) +DEFS+=-DOPENSER_MOD_INTERFACE + +SERLIBPATH=../../lib +SER_LIBS+=$(SERLIBPATH)/trie/trie $(SERLIBPATH)/srdb1/srdb1 $(SERLIBPATH)/kmi/kmi $(SERLIBPATH)/kcore/kcore + include ../../Makefile.modules diff --git a/modules/carrierroute/cr_db.c b/modules/carrierroute/cr_db.c index bb4d646..3d967c2 100644 --- a/modules/carrierroute/cr_db.c +++ b/modules/carrierroute/cr_db.c @@ -78,7 +78,7 @@ str * failure_columns[FAILURE_COLUMN_NUM] = { static int load_carrier_map(struct route_data_t *rd) { - db_res_t * res = NULL; + db1_res_t * res = NULL; int i, count; if(!rd){ LM_ERR("invalid parameter\n"); @@ -134,7 +134,7 @@ static int load_carrier_map(struct route_data_t *rd) { static int load_domain_map(struct route_data_t *rd) { - db_res_t * res = NULL; + db1_res_t * res = NULL; int i, count; if(!rd){ LM_ERR("invalid parameter\n"); @@ -190,7 +190,7 @@ static int load_domain_map(struct route_data_t *rd) { int load_user_carrier(str * user, str * domain) { - db_res_t * res; + db1_res_t * res; db_key_t cols[1]; db_key_t keys[2]; db_val_t vals[2]; @@ -205,13 +205,13 @@ int load_user_carrier(str * user, str * domain) { keys[0] = subscriber_columns[SUBSCRIBER_USERNAME_COL]; op[0] = OP_EQ; - VAL_TYPE(vals) = DB_STR; + VAL_TYPE(vals) = DB1_STR; VAL_NULL(vals) = 0; VAL_STR(vals) = *user; keys[1] = subscriber_columns[SUBSCRIBER_DOMAIN_COL]; op[1] = OP_EQ; - VAL_TYPE(vals+1) = DB_STR; + VAL_TYPE(vals+1) = DB1_STR; VAL_NULL(vals+1) = 0; VAL_STR(vals+1) = *domain; @@ -254,7 +254,7 @@ int load_user_carrier(str * user, str * domain) { * */ int load_route_data_db(struct route_data_t * rd) { - db_res_t * res = NULL; + db1_res_t * res = NULL; db_row_t * row = NULL; int i, ret; struct carrier_data_t * tmp_carrier_data; diff --git a/modules/carrierroute/cr_db.h b/modules/carrierroute/cr_db.h index 709babc..097bed7 100644 --- a/modules/carrierroute/cr_db.h +++ b/modules/carrierroute/cr_db.h @@ -30,7 +30,7 @@ #ifndef CR_DB_H #define CR_DB_H -#include "../../db/db.h" +#include "../../lib/srdb1/db.h" #include "db_carrierroute.h" #include "cr_data.h" diff --git a/modules/carrierroute/cr_domain.h b/modules/carrierroute/cr_domain.h index 816a9cb..406af0e 100644 --- a/modules/carrierroute/cr_domain.h +++ b/modules/carrierroute/cr_domain.h @@ -32,7 +32,7 @@ #include "../../str.h" #include "../../flags.h" -#include "../../trie/dtrie.h" +#include "../../lib/trie/dtrie.h" /** diff --git a/modules/carrierroute/cr_fifo.h b/modules/carrierroute/cr_fifo.h index 9c6d073..2976645 100644 --- a/modules/carrierroute/cr_fifo.h +++ b/modules/carrierroute/cr_fifo.h @@ -30,7 +30,7 @@ #ifndef CR_FIFO_H #define CR_FIFO_H -#include "../../mi/mi.h" +#include "../../lib/kmi/mi.h" extern int fifo_err; diff --git a/modules/carrierroute/cr_fixup.c b/modules/carrierroute/cr_fixup.c index eeda611..f832af4 100644 --- a/modules/carrierroute/cr_fixup.c +++ b/modules/carrierroute/cr_fixup.c @@ -129,12 +129,12 @@ static int carrier_fixup(void ** param) { /* This is a name string, convert to a int */ ((gparam_p)(*param))->type=GPARAM_TYPE_INT; /* get carrier id */ - if ((id = carrier_name_2_id(&((gparam_p)(*param))->v.sval)) < 0) { - LM_ERR("could not find carrier name '%.*s' in map\n", ((gparam_p)(*param))->v.sval.len, ((gparam_p)(*param))->v.sval.s); + if ((id = carrier_name_2_id(&((gparam_p)(*param))->v.str)) < 0) { + LM_ERR("could not find carrier name '%.*s' in map\n", ((gparam_p)(*param))->v.str.len, ((gparam_p)(*param))->v.str.s); pkg_free(*param); return -1; } - ((gparam_p)(*param))->v.ival = id; + ((gparam_p)(*param))->v.i = id; } return 0; } @@ -160,12 +160,12 @@ static int domain_fixup(void ** param) { /* This is a name string, convert to a int */ ((gparam_p)(*param))->type=GPARAM_TYPE_INT; /* get domain id */ - if ((id = domain_name_2_id(&(((gparam_p)(*param))->v.sval))) < 0) { - LM_ERR("could not find domain name '%.*s' in map\n", ((gparam_p)(*param))->v.sval.len, ((gparam_p)(*param))->v.sval.s); + if ((id = domain_name_2_id(&(((gparam_p)(*param))->v.str))) < 0) { + LM_ERR("could not find domain name '%.*s' in map\n", ((gparam_p)(*param))->v.str.len, ((gparam_p)(*param))->v.str.s); pkg_free(*param); return -1; } - ((gparam_p)(*param))->v.ival = id; + ((gparam_p)(*param))->v.i = id; } return 0; } diff --git a/modules/carrierroute/cr_func.c b/modules/carrierroute/cr_func.c index d6406c9..325c20b 100644 --- a/modules/carrierroute/cr_func.c +++ b/modules/carrierroute/cr_func.c @@ -80,7 +80,7 @@ static inline int cr_gp2id(struct sip_msg *_msg, gparam_t *gp, struct name_map_t switch (gp->type) { case GPARAM_TYPE_INT: - return gp->v.ival; + return gp->v.i; break; case GPARAM_TYPE_PVE: /* does this PV hold an AVP? */ @@ -496,6 +496,7 @@ int cr_do_route(struct sip_msg * _msg, gparam_t *_carrier, struct carrier_data_t * carrier_data; struct domain_data_t * domain_data; struct action act; + struct run_act_ctx ra_ctx; if (fixup_get_svalue(_msg, _rewrite_user, &rewrite_user)<0) { LM_ERR("cannot print the rewrite_user\n"); @@ -565,12 +566,12 @@ int cr_do_route(struct sip_msg * _msg, gparam_t *_carrier, LM_INFO("uri %.*s was rewritten to %.*s, carrier %d, domain %d\n", rewrite_user.len, rewrite_user.s, dest.len, dest.s, carrier_id, domain_id); + memset(&act, 0, sizeof(act)); act.type = SET_URI_T; - act.elem[0].type= STRING_ST; - act.elem[0].u.string = dest.s; - act.next = NULL; - - ret = do_action(&act, _msg); + act.val[0].type = STRING_ST; + act.val[0].u.string = dest.s; + init_run_actions_ctx(&ra_ctx); + ret = do_action(&ra_ctx, &act, _msg); if (ret < 0) { LM_ERR("Error in do_action()\n"); } diff --git a/modules/carrierroute/db_carrierroute.c b/modules/carrierroute/db_carrierroute.c index 4d19f35..cfe206f 100644 --- a/modules/carrierroute/db_carrierroute.c +++ b/modules/carrierroute/db_carrierroute.c @@ -23,7 +23,7 @@ /* TODO assign read-write or read-only URI, introduce a parameter in XML */ //extern str carrierroute_db_url; -db_con_t * carrierroute_dbh = NULL; +db1_con_t * carrierroute_dbh = NULL; db_func_t carrierroute_dbf; str carrierroute_table = str_init("carrierroute"); diff --git a/modules/carrierroute/db_carrierroute.h b/modules/carrierroute/db_carrierroute.h index 3be17de..cebc30e 100644 --- a/modules/carrierroute/db_carrierroute.h +++ b/modules/carrierroute/db_carrierroute.h @@ -22,7 +22,7 @@ /* necessary includes */ -#include "../../db/db.h" +#include "../../lib/srdb1/db.h" #include "../../str.h" #include "../../ut.h" @@ -32,7 +32,7 @@ /* database variables */ extern str carrierroute_db_url; -extern db_con_t * carrierroute_dbh; +extern db1_con_t * carrierroute_dbh; extern db_func_t carrierroute_dbf; #define carrierroute_DB_URL { "db_url", STR_PARAM, &carrierroute_db_url.s }, diff --git a/modules/carrierroute/prime_hash.c b/modules/carrierroute/prime_hash.c index 7a3400e..8bb9579 100644 --- a/modules/carrierroute/prime_hash.c +++ b/modules/carrierroute/prime_hash.c @@ -31,7 +31,7 @@ #include "../../parser/parse_uri.h" #include "../../parser/parse_to.h" #include "../../parser/parse_from.h" -#include "../../crc.h" +#include "../../lib/kcore/km_crc.h" #include <ctype.h>

15 years, 10 months

Will SIP-Router handle better TCP childs avoiding blocking?

by Iñaki Baz Castillo

Hi, a current limitation in Kamailio (and AFAIK also in SER) is that TCP childs block waiting for the connection being established or ended. For example, if we run Kamailio with "tcp_children=8" and receive 8 "hacked" INVITE's via UDP like: INVITE sip:hello@non.responding.host1;transport=TCP SIP/2.0 INVITE sip:hello@non.responding.host2;transport=TCP SIP/2.0 INVITE sip:hello@non.responding.host3;transport=TCP SIP/2.0 ... INVITE sip:hello@non.responding.host2;transport=TCP SIP/2.0 then Kamailio will have all their TCP childs busy waiting for 8 outgoing TCP connections to timeout. If a new request requires TCP it must wait for long time until one of the TCP childs becomes available. Of course this can be very easily hackeable by an attacker. To improve it, a TCP child should not block waiting for the TCP connection to end. Perhaps I'm wrong (I will check it in a testing escenario soon). If not, is it planned to improve it? Thanks a lot. -- Iñaki Baz Castillo

15 years, 10 months

git:janakj/kcore: Adding crc32_uint

by Jan Janak

Module: sip-router Branch: janakj/kcore Commit: eed7087d808428e208db4c14ae44e0d73582432b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eed7087… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Mar 3 03:00:29 2009 +0100 Adding crc32_uint This function is was added by kamailio to crc32.c --- lib/kcore/km_crc.c | 30 ++++++++++++++++++++++++++++++ lib/kcore/km_crc.h | 9 +++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/lib/kcore/km_crc.c b/lib/kcore/km_crc.c new file mode 100644 index 0000000..0950f4e --- /dev/null +++ b/lib/kcore/km_crc.c @@ -0,0 +1,30 @@ +#include "km_crc.h" + +/*! + * \brief CRC32 value from source string + * \param source_string source string + * \param hash_ret calulated CRC32 + */ +void crc32_uint (str *source_string, unsigned int *hash_ret) +{ + unsigned int hash; + unsigned int len; + const char *data; + + hash = 0xffffffff; + data = source_string->s; + + for (len = source_string->len / 4; len--; data += 4) { + hash = crc_32_tab[((unsigned char)hash) ^ data[0]] ^ (hash >> 8); + hash = crc_32_tab[((unsigned char)hash) ^ data[1]] ^ (hash >> 8); + hash = crc_32_tab[((unsigned char)hash) ^ data[2]] ^ (hash >> 8); + hash = crc_32_tab[((unsigned char)hash) ^ data[3]] ^ (hash >> 8); + } + + for (len = source_string->len % 4; len--; data++) { + hash = crc_32_tab[((unsigned char)hash) ^ *data] ^ (hash >> 8); + } + + *hash_ret = hash; +} + diff --git a/lib/kcore/km_crc.h b/lib/kcore/km_crc.h new file mode 100644 index 0000000..43efd54 --- /dev/null +++ b/lib/kcore/km_crc.h @@ -0,0 +1,9 @@ +#ifndef _KM_CRC_H +#define _KM_CRC_H + +#include "../../crc.h" +#include "../../str.h" + +void crc32_uint (str *source_string, unsigned int *hash_ret); + +#endif /* _KM_CRC_H */

15 years, 10 months

git:master: Define fixup_spve_null

by Jan Janak

Module: sip-router Branch: master Commit: 32bf8f8ba1d72c0abac4befd3519d603814ebdf1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=32bf8f8… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Mar 3 02:50:34 2009 +0100 Define fixup_spve_null --- mod_fix.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mod_fix.c b/mod_fix.c index cbb348e..ccd3744 100644 --- a/mod_fix.c +++ b/mod_fix.c @@ -233,4 +233,4 @@ FIXUP_F2FP_T(igp_pvar_pvar, 1, 3, 1, FPARAM_INT|FPARAM_PVS, FPARAM_PVS) FIXUP_F_SPVE_T(spve_spve, 1, 2, 2, 0) FIXUP_F_SPVE_T(spve_uint, 1, 2, 2, FPARAM_INT) FIXUP_F_SPVE_T(spve_str, 1, 2, 2, FPARAM_STR) - +FIXUP_F_SPVE_T(spve_null, 1, 1, 1, 0)

15 years, 10 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev