sr-dev March 2012

sr-dev@lists.kamailio.org

26 participants
150 discussions

git:master: modules_k/cfgutils: Added exported function for core_hash()
by Peter Dunkley 29 Mar '12

29 Mar '12

Module: sip-router Branch: master Commit: 8afb4cdfdbb99be12d434a8d0ad2a2c26f0595d7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8afb4cd… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 29 15:56:25 2012 +0100 modules_k/cfgutils: Added exported function for core_hash() - This means you can calculate hashes on strings within the configuration file. --- modules_k/cfgutils/README | 116 +++++++++++++++++------------ modules_k/cfgutils/cfgutils.c | 45 +++++++++++ modules_k/cfgutils/doc/cfgutils_admin.xml | 32 ++++++++ 3 files changed, 146 insertions(+), 47 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=8af…

2 2

git:master: modules_k/cfgutils: Added note about the core_hash function not being secure to the README
by Peter Dunkley 29 Mar '12

29 Mar '12

Module: sip-router Branch: master Commit: 48e2695dfb8a0a45e09ff555121a53293bddda3c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=48e2695… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 29 21:56:00 2012 +0100 modules_k/cfgutils: Added note about the core_hash function not being secure to the README --- modules_k/cfgutils/README | 4 ++++ modules_k/cfgutils/doc/cfgutils_admin.xml | 5 +++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/modules_k/cfgutils/README b/modules_k/cfgutils/README index 694cf74..7df91b1 100644 --- a/modules_k/cfgutils/README +++ b/modules_k/cfgutils/README @@ -513,6 +513,10 @@ unlock("$rU"); Exported function that enables the core_hash() function to be used from the configuration file. + This is a quick and simple hash function and it is not + cryptographically secure. This function should not be used for any + security related purposes. + Parameters: * “string1” first string to hash * “string2” (optional) second string to hash (set to "" if not diff --git a/modules_k/cfgutils/doc/cfgutils_admin.xml b/modules_k/cfgutils/doc/cfgutils_admin.xml index f391e1d..1ae6192 100644 --- a/modules_k/cfgutils/doc/cfgutils_admin.xml +++ b/modules_k/cfgutils/doc/cfgutils_admin.xml @@ -530,6 +530,11 @@ unlock("$rU"); Exported function that enables the core_hash() function to be used from the configuration file. </para> + <para> + This is a quick and simple hash function and it is not + cryptographically secure. This function should not be used for + any security related purposes. + </para> <para>Parameters:</para> <itemizedlist> <listitem>

1 0

git:master: modules_k/presence: Fixed DB insert race hazard on the watchers table
by Peter Dunkley 29 Mar '12

29 Mar '12

Module: sip-router Branch: master Commit: 5a89af6ea8b83ecc781d3f169023fde8388a2da6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5a89af6… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 29 16:02:13 2012 +0100 modules_k/presence: Fixed DB insert race hazard on the watchers table - The time between the query on the watchers table (which determines there is no matching entry) and the insert is substantial. During a soak I observed inserts failing because rows had been inserted in this time window. - The fix is to use replace (where available) instead of insert. - Also fixed a small whitespace issue I noticed, and added an extra use_table call (as I think there was one missing). --- modules_k/presence/presence.c | 2 +- modules_k/presence/subscribe.c | 32 ++++++++++++++++++++++++++++---- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/modules_k/presence/presence.c b/modules_k/presence/presence.c index dd415f7..f6f9152 100644 --- a/modules_k/presence/presence.c +++ b/modules_k/presence/presence.c @@ -833,7 +833,7 @@ int update_watchers_status(str pres_uri, pres_ev_t* ev, str* rules_doc) }ws_t; ws_t* ws_list= NULL; - LM_DBG("start\n"); + LM_DBG("start\n"); if(ev->content_type.s== NULL) { diff --git a/modules_k/presence/subscribe.c b/modules_k/presence/subscribe.c index 0c914c7..0a9db83 100644 --- a/modules_k/presence/subscribe.c +++ b/modules_k/presence/subscribe.c @@ -315,6 +315,12 @@ int insert_subs_db(subs_t* s, int type) query_vals[reason_col].val.str_val= s->reason; query_vals[socket_info_col].val.str_val= s->sockinfo_str; + if (pa_dbf.use_table(pa_db, &active_watchers_table) < 0) + { + LM_ERR("in use table sql operation\n"); + return -1; + } + LM_DBG("inserting subscription in active_watchers table\n"); if(pa_dbf.insert(pa_db, query_cols, query_vals, n_query_cols) < 0) { @@ -2310,10 +2316,28 @@ int insert_db_subs_auth(subs_t* subs) return -1; } - if(pa_dbf.insert(pa_db, db_keys, db_vals, n_query_cols )< 0) - { - LM_ERR("in sql insert\n"); - return -1; + if (pa_dbf.replace != NULL) + { + if(pa_dbf.replace(pa_db, db_keys, db_vals, n_query_cols, + 2, 0) < 0) + { + LM_ERR("in sql replace\n"); + return -1; + } + } + else + { + /* If you use insert() instead of replace() be prepared for some + DB error messages. There is a lot of time between the + query() that indicated there was no matching entry in the DB + and this insert(), so on a multi-user system it is entirely + possible (even likely) that a record will be added after the + query() but before this insert(). */ + if(pa_dbf.insert(pa_db, db_keys, db_vals, n_query_cols )< 0) + { + LM_ERR("in sql insert\n"); + return -1; + } } return 0;

2 2

git:master: modules_k/pua: PUA DB only mode improvements and fixes
by Peter Dunkley 29 Mar '12

29 Mar '12

Module: sip-router Branch: master Commit: 8324f5cd795b846575a027f5269af0d7ecbad20f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8324f5c… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 29 16:11:22 2012 +0100 modules_k/pua: PUA DB only mode improvements and fixes - Fixed an issue where CSeq wasn't updated in DB only mode - Fixed a bug with pua.c:update_pua() in DB only mode - Tidied up the code in pua_db.c - Separated out the pua dialog (SUBSCRIBE/NOTIFY related) and record (PUBLISH related) handling functions in pua_db.c --- modules_k/pua/hash.c | 5 +- modules_k/pua/pua.c | 4 +- modules_k/pua/pua_db.c | 669 ++++++++++++++++++++-------------------- modules_k/pua/pua_db.h | 12 +- modules_k/pua/send_publish.c | 9 +- modules_k/pua/send_subscribe.c | 25 +- 6 files changed, 365 insertions(+), 359 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=832…

1 0

git:master: modules/mqueue: Queue names can now be in pseudo variables
by Peter Dunkley 29 Mar '12

29 Mar '12

Module: sip-router Branch: master Commit: 77209fb7fcfc793928719d966ebc2b174681f17d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=77209fb… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 29 15:58:39 2012 +0100 modules/mqueue: Queue names can now be in pseudo variables - mq_add()/mq_fetch() can use pseudo variables (as well as strings) for queue names. - $mqk()/$mqv() can use pseudo variables (as well as strings) for for queue names. --- modules/mqueue/mqueue_api.c | 96 +++++++++++++++++++++++++++++++------------ modules/mqueue/mqueue_api.h | 3 +- modules/mqueue/mqueue_mod.c | 33 ++++++++++----- 3 files changed, 93 insertions(+), 39 deletions(-) diff --git a/modules/mqueue/mqueue_api.c b/modules/mqueue/mqueue_api.c index a86d375..efa6290 100644 --- a/modules/mqueue/mqueue_api.c +++ b/modules/mqueue/mqueue_api.c @@ -33,6 +33,7 @@ #include "../../parser/parse_param.h" #include "../../ut.h" #include "../../shm_init.h" +#include "../../lib/kcore/faked_msg.h" #include "mqueue_api.h" @@ -353,21 +354,54 @@ int mq_item_add(str *qname, str *key, str *val) /** * */ -int pv_parse_mqk_name(pv_spec_t *sp, str *in) +int pv_parse_mq_name(pv_spec_t *sp, str *in) { - mq_head_t *mh = NULL; - mh = mq_head_get(in); - if(mh==NULL) - { - LM_ERR("mqueue not found: %.*s\n", in->len, in->s); - return -1; - } sp->pvp.pvn.u.isname.name.s = *in; sp->pvp.pvn.type = PV_NAME_INTSTR; sp->pvp.pvn.u.isname.type = 1; return 0; } +str *pv_get_mq_name(str *in) +{ + str *queue; + + if (in->s[0] != '$') + queue = in; + else + { + pv_spec_t *pvs; + pv_value_t pvv; + + if (pv_locate_name(in) != in->len) + { + LM_ERR("invalid pv [%.*s]\n", in->len, in->s); + return NULL; + } + if ((pvs = pv_cache_get(in)) == NULL) + { + LM_ERR("failed to get pv spec for [%.*s]\n", in->len, in->s); + return NULL; + } + + memset(&pvv, 0, sizeof(pv_value_t)); + if (faked_msg_init() < 0) + { + LM_ERR("faked_msg_init() failed\n"); + return NULL; + } + if (pv_get_spec_value(faked_msg_next(), pvs, &pvv) != 0) + { + LM_ERR("failed to get pv value for [%.*s]\n", in->len, in->s); + return NULL; + } + + queue = &pvv.rs; + } + + return queue; +} + /** * */ @@ -375,28 +409,24 @@ int pv_get_mqk(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { mq_pv_t *mp = NULL; - mp = mq_pv_get(&param->pvn.u.isname.name.s); - if(mp==NULL || mp->item==NULL || mp->item->key.len<=0) - return pv_get_null(msg, param, res); - return pv_get_strval(msg, param, res, &mp->item->key); -} + str *in = pv_get_mq_name(&param->pvn.u.isname.name.s); -/** - * - */ -int pv_parse_mqv_name(pv_spec_t *sp, str *in) -{ - mq_head_t *mh = NULL; - mh = mq_head_get(in); - if(mh==NULL) + if (in == NULL) + { + LM_ERR("failed to get mq name\n"); + return -1; + } + + if (mq_head_get(in) == NULL) { LM_ERR("mqueue not found: %.*s\n", in->len, in->s); return -1; } - sp->pvp.pvn.u.isname.name.s = *in; - sp->pvp.pvn.type = PV_NAME_INTSTR; - sp->pvp.pvn.u.isname.type = 1; - return 0; + + mp = mq_pv_get(in); + if(mp==NULL || mp->item==NULL || mp->item->key.len<=0) + return pv_get_null(msg, param, res); + return pv_get_strval(msg, param, res, &mp->item->key); } /** @@ -406,7 +436,21 @@ int pv_get_mqv(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { mq_pv_t *mp = NULL; - mp = mq_pv_get(&param->pvn.u.isname.name.s); + str *in = pv_get_mq_name(&param->pvn.u.isname.name.s); + + if (in == NULL) + { + LM_ERR("failed to get mq name\n"); + return -1; + } + + if (mq_head_get(in) == NULL) + { + LM_ERR("mqueue not found: %.*s\n", in->len, in->s); + return -1; + } + + mp = mq_pv_get(in); if(mp==NULL || mp->item==NULL || mp->item->val.len<=0) return pv_get_null(msg, param, res); return pv_get_strval(msg, param, res, &mp->item->val); diff --git a/modules/mqueue/mqueue_api.h b/modules/mqueue/mqueue_api.h index 11a94ad..04ad1e4 100644 --- a/modules/mqueue/mqueue_api.h +++ b/modules/mqueue/mqueue_api.h @@ -28,10 +28,9 @@ #include "../../pvar.h" #include "../../parser/msg_parser.h" -int pv_parse_mqk_name(pv_spec_p sp, str *in); +int pv_parse_mq_name(pv_spec_p sp, str *in); int pv_get_mqk(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); -int pv_parse_mqv_name(pv_spec_p sp, str *in); int pv_get_mqv(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); diff --git a/modules/mqueue/mqueue_mod.c b/modules/mqueue/mqueue_mod.c index a99a361..b4b9517 100644 --- a/modules/mqueue/mqueue_mod.c +++ b/modules/mqueue/mqueue_mod.c @@ -52,15 +52,15 @@ static int bind_mq(mq_api_t* api); static pv_export_t mod_pvs[] = { { {"mqk", sizeof("mqk")-1}, PVT_OTHER, pv_get_mqk, 0, - pv_parse_mqk_name, 0, 0, 0 }, + pv_parse_mq_name, 0, 0, 0 }, { {"mqv", sizeof("mqv")-1}, PVT_OTHER, pv_get_mqv, 0, - pv_parse_mqv_name, 0, 0, 0 }, + pv_parse_mq_name, 0, 0, 0 }, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; static cmd_export_t cmds[]={ - {"mq_fetch", (cmd_function)w_mq_fetch, 1, fixup_str_null, + {"mq_fetch", (cmd_function)w_mq_fetch, 1, fixup_spve_null, 0, ANY_ROUTE}, {"mq_add", (cmd_function)w_mq_add, 3, fixup_mq_add, 0, ANY_ROUTE}, @@ -114,8 +114,14 @@ static void mod_destroy(void) static int w_mq_fetch(struct sip_msg* msg, char* mq, char* str2) { int ret; + str q; - ret = mq_head_fetch((str*)mq); + if(fixup_get_svalue(msg, (gparam_t*)mq, &q)<0) + { + LM_ERR("cannot get the queue\n"); + return -1; + } + ret = mq_head_fetch(&q); if(ret<0) return ret; return 1; @@ -123,8 +129,15 @@ static int w_mq_fetch(struct sip_msg* msg, char* mq, char* str2) static int w_mq_add(struct sip_msg* msg, char* mq, char* key, char* val) { + str q; str qkey; str qval; + + if(fixup_get_svalue(msg, (gparam_t*)mq, &q)<0) + { + LM_ERR("cannot get the queue\n"); + return -1; + } if(fixup_get_svalue(msg, (gparam_t*)key, &qkey)<0) { LM_ERR("cannot get the key\n"); @@ -135,7 +148,7 @@ static int w_mq_add(struct sip_msg* msg, char* mq, char* key, char* val) LM_ERR("cannot get the val\n"); return -1; } - if(mq_item_add((str*)mq, &qkey, &qval)<0) + if(mq_item_add(&q, &qkey, &qval)<0) return -1; return 1; } @@ -202,14 +215,12 @@ int mq_param(modparam_t type, void *val) static int fixup_mq_add(void** param, int param_no) { - if(param_no==2 || param_no==3) { + if(param_no==1 || param_no==2 || param_no==3) { return fixup_spve_null(param, 1); } - if (param_no != 1) { - LM_ERR("invalid parameter number %d\n", param_no); - return E_UNSPEC; - } - return fixup_str_null(param, 1); + + LM_ERR("invalid parameter number %d\n", param_no); + return E_UNSPEC; } static int bind_mq(mq_api_t* api)

1 0

Update of wiki write access
by Daniel-Constantin Mierla 29 Mar '12

29 Mar '12

Hello, just to let you know that over the weekend the ACL (user authentication) for write access to wiki portals of the project has been turned on. Anyone that wants to write to the wiki has to create herself/himself an account. The reason for requiring user authentication is weakness of the captha system used for anonymous posting -- during the past weeks lot of wiki pages were updated by spam bots. If anyone is aware of a stronger captcha-like system to be used for anonymous posting, write back here. It has to work with dokuwiki. Cheers, Daniel -- Daniel-Constantin Mierla Kamailio Advanced Training, April 23-26, 2012, Berlin, Germany http://www.asipto.com/index.php/kamailio-advanced-training/

2 3

git:master: core: new parameters to control and alert on time consuming ops
by Daniel-Constantin Mierla 29 Mar '12

29 Mar '12

Module: sip-router Branch: master Commit: 930aba2973c19370a5d50aac2661be66e9aacbc3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=930aba2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 25 13:39:20 2012 +0200 core: new parameters to control and alert on time consuming ops - latency_log - log level to print the messages related to latency - latency_limit_db - limit of latency in ms for db operations. If a db operation executed via DB API v1 takes longer that its value, a message is printed in the logs, showing the first 50 characters of the db query - latency_limit_action - limit of latency in ms for config actions. If a config action executed by cfg interpreter takes longer than its value, a message is printed in the logs, showing config path, line and action name when it is a module function, as well as intenal action id --- action.c | 15 +++++++++++++++ cfg.lex | 7 +++++++ cfg.y | 9 +++++++++ cfg_core.c | 11 ++++++++++- cfg_core.h | 3 +++ lib/srdb1/db_query.c | 36 ++++++++++++++++++++++++++++++------ route_struct.h | 3 +++ 7 files changed, 77 insertions(+), 7 deletions(-) diff --git a/action.c b/action.c index e044f65..6178dd7 100644 --- a/action.c +++ b/action.c @@ -1580,6 +1580,7 @@ int run_actions(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) struct action* t; int ret; struct sr_module *mod; + unsigned int ms; ret=E_UNSPEC; h->rec_lev++; @@ -1609,7 +1610,21 @@ int run_actions(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) } for (t=a; t!=0; t=t->next){ + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) + ms = TICKS_TO_MS(get_ticks_raw()); ret=do_action(h, t, msg); + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { + ms = TICKS_TO_MS(get_ticks_raw()) - ms; + if(ms >= cfg_get(core, core_cfg, latency_limit_action)) { + LOG(cfg_get(core, core_cfg, latency_log), + "alert - action [%s (%d)]" + " cfg [%s:%d] took too long [%u ms]\n", + is_mod_func(t) ? + ((cmd_export_common_t*)(t->val[0].u.data))->name + : "corefunc", + t->type, (t->cfile)?t->cfile:"", t->cline, ms); + } + } /* break, return or drop/exit stop execution of the current block */ if (unlikely(h->run_flags & (BREAK_R_F|RETURN_R_F|EXIT_R_F))){ diff --git a/cfg.lex b/cfg.lex index 00a55e0..2d1494b 100644 --- a/cfg.lex +++ b/cfg.lex @@ -503,6 +503,10 @@ STUN_ALLOW_FP "stun_allow_fp" SERVER_ID "server_id" +LATENCY_LOG latency_log +LATENCY_LIMIT_DB latency_limit_db +LATENCY_LIMIT_ACTION latency_limit_action + CFG_DESCRIPTION "description"|"descr"|"desc" LOADMODULE loadmodule @@ -965,6 +969,9 @@ IMPORTFILE "import_file" <INITIAL>{HTTP_REPLY_HACK} { count(); yylval.strval=yytext; return HTTP_REPLY_HACK; } <INITIAL>{SERVER_ID} { count(); yylval.strval=yytext; return SERVER_ID;} +<INITIAL>{LATENCY_LOG} { count(); yylval.strval=yytext; return LATENCY_LOG;} +<INITIAL>{LATENCY_LIMIT_DB} { count(); yylval.strval=yytext; return LATENCY_LIMIT_DB;} +<INITIAL>{LATENCY_LIMIT_ACTION} { count(); yylval.strval=yytext; return LATENCY_LIMIT_ACTION;} <INITIAL>{CFG_DESCRIPTION} { count(); yylval.strval=yytext; return CFG_DESCRIPTION; } <INITIAL>{LOADMODULE} { count(); yylval.strval=yytext; return LOADMODULE; } <INITIAL>{LOADPATH} { count(); yylval.strval=yytext; return LOADPATH; } diff --git a/cfg.y b/cfg.y index 9edd0fde..274e1e8 100644 --- a/cfg.y +++ b/cfg.y @@ -559,6 +559,9 @@ extern char *finame; %token HTTP_REPLY_HACK %token CFG_DESCRIPTION %token SERVER_ID +%token LATENCY_LOG +%token LATENCY_LIMIT_DB +%token LATENCY_LIMIT_ACTION %token FLAGS_DECL %token AVPFLAGS_DECL @@ -1671,6 +1674,12 @@ assign_stm: | STUN_ALLOW_FP EQUAL NUMBER { IF_STUN(stun_allow_fp=$3) ; } | STUN_ALLOW_FP EQUAL error{ yyerror("number expected"); } | SERVER_ID EQUAL NUMBER { server_id=$3; } + | LATENCY_LOG EQUAL NUMBER { default_core_cfg.latency_log=$3; } + | LATENCY_LOG EQUAL error { yyerror("number expected"); } + | LATENCY_LIMIT_DB EQUAL NUMBER { default_core_cfg.latency_limit_db=$3; } + | LATENCY_LIMIT_DB EQUAL error { yyerror("number expected"); } + | LATENCY_LIMIT_ACTION EQUAL NUMBER { default_core_cfg.latency_limit_action=$3; } + | LATENCY_LIMIT_ACTION EQUAL error { yyerror("number expected"); } | UDP_MTU EQUAL NUMBER { default_core_cfg.udp_mtu=$3; } | UDP_MTU EQUAL error { yyerror("number expected"); } | FORCE_RPORT EQUAL NUMBER diff --git a/cfg_core.c b/cfg_core.c index 27a55b3..87af945 100644 --- a/cfg_core.c +++ b/cfg_core.c @@ -121,7 +121,10 @@ struct cfg_group_core default_core_cfg = { L_DBG, /*!< memlog */ 3, /*!< mem_summary -flags: 0 off, 1 pkg_status, 2 shm_status, 4 pkg_sums, 8 shm_sums, 16 short_status */ - L_ERR /*!< corelog */ + L_ERR, /*!< corelog */ + L_ERR, /*!< latency log */ + 0, /*!< latency limit db */ + 0 /*!< latency limit action */ }; void *core_cfg = &default_core_cfg; @@ -311,5 +314,11 @@ cfg_def_t core_cfg_def[] = { " 16 - short status instead of dump" }, {"corelog", CFG_VAR_INT|CFG_ATOMIC, 0, 0, 0, 0, "log level for non-critical core error messages"}, + {"latency_log", CFG_VAR_INT|CFG_ATOMIC, 0, 0, 0, 0, + "log level for latency limits alert messages"}, + {"latency_limit_db", CFG_VAR_INT|CFG_ATOMIC, 0, 0, 0, 0, + "limit is ms for alerting on time consuming db commands"}, + {"latency_limit_action", CFG_VAR_INT|CFG_ATOMIC, 0, 0, 0, 0, + "limit is ms for alerting on time consuming config actions"}, {0, 0, 0, 0, 0, 0} }; diff --git a/cfg_core.h b/cfg_core.h index 25f69ae..c5c4250 100644 --- a/cfg_core.h +++ b/cfg_core.h @@ -109,6 +109,9 @@ struct cfg_group_core { int memlog; /*!< log level for memory status/summary info */ int mem_summary; /*!< display memory status/summary info on exit */ int corelog; /*!< log level for non-critcal core error messages */ + int latency_log; /*!< log level for latency limits messages */ + int latency_limit_db; /*!< alert limit of running db commands */ + int latency_limit_action; /*!< alert limit of running cfg actions */ }; extern struct cfg_group_core default_core_cfg; diff --git a/lib/srdb1/db_query.c b/lib/srdb1/db_query.c index 3f75421..99079dc 100644 --- a/lib/srdb1/db_query.c +++ b/lib/srdb1/db_query.c @@ -38,10 +38,34 @@ #include "db_ut.h" #include "db_query.h" #include "../../globals.h" +#include "../../timer.h" static str sql_str; static char *sql_buf = NULL; +static inline int db_do_submit_query(const db1_con_t* _h, const str *_query, + int (*submit_query)(const db1_con_t*, const str*)) +{ + int ret; + unsigned int ms; + + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) + ms = TICKS_TO_MS(get_ticks_raw()); + + ret = submit_query(_h, _query); + + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { + ms = TICKS_TO_MS(get_ticks_raw()) - ms; + if(ms >= cfg_get(core, core_cfg, latency_limit_action)) { + LOG(cfg_get(core, core_cfg, latency_log), + "alert - query execution too long [%u ms] for [%.*s]\n", + ms, _query->len<50?_query->len:50, _query->s); + } + } + + return ret; +} + int db_do_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op, const db_val_t* _v, const db_key_t* _c, const int _n, const int _nc, const db_key_t _o, db1_res_t** _r, int (*val2str) (const db1_con_t*, @@ -99,7 +123,7 @@ int db_do_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op, sql_str.s = sql_buf; sql_str.len = off; - if (submit_query(_h, &sql_str) < 0) { + if (db_do_submit_query(_h, &sql_str, submit_query) < 0) { LM_ERR("error while submitting query\n"); return -2; } @@ -128,7 +152,7 @@ int db_do_raw_query(const db1_con_t* _h, const str* _s, db1_res_t** _r, return -1; } - if (submit_query(_h, _s) < 0) { + if (db_do_submit_query(_h, _s, submit_query) < 0) { LM_ERR("error while submitting query\n"); return -2; } @@ -182,7 +206,7 @@ int db_do_insert_cmd(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v sql_str.s = sql_buf; sql_str.len = off; - if (submit_query(_h, &sql_str) < 0) { + if (db_do_submit_query(_h, &sql_str, submit_query) < 0) { LM_ERR("error while submitting query\n"); return -2; } @@ -238,7 +262,7 @@ int db_do_delete(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _o, sql_str.s = sql_buf; sql_str.len = off; - if (submit_query(_h, &sql_str) < 0) { + if (db_do_submit_query(_h, &sql_str, submit_query) < 0) { LM_ERR("error while submitting query\n"); return -2; } @@ -284,7 +308,7 @@ int db_do_update(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _o, sql_str.s = sql_buf; sql_str.len = off; - if (submit_query(_h, &sql_str) < 0) { + if (db_do_submit_query(_h, &sql_str, submit_query) < 0) { LM_ERR("error while submitting query\n"); return -2; } @@ -330,7 +354,7 @@ int db_do_replace(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, sql_str.s = sql_buf; sql_str.len = off; - if (submit_query(_h, &sql_str) < 0) { + if (db_do_submit_query(_h, &sql_str, submit_query) < 0) { LM_ERR("error while submitting query\n"); return -2; } diff --git a/route_struct.h b/route_struct.h index 4bb5045..b176b9c 100644 --- a/route_struct.h +++ b/route_struct.h @@ -119,6 +119,9 @@ enum action_type{ CFG_SELECT_T, CFG_RESET_T }; + +#define is_mod_func(a) ((a)->type>=MODULE0_T && (a)->type<=MODULEX_RVE_T) + /* parameter types for actions or types for expression right operands (WARNING right operands only, not working for left operands) */ enum _operand_subtype{

5 6

git:master: Makefile: version set to 3.3.0-dev7
by Daniel-Constantin Mierla 29 Mar '12

29 Mar '12

Module: sip-router Branch: master Commit: d8afbb6562c5145ce715f6b3a2d6c7bb29cc24d6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d8afbb6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Mar 29 14:04:47 2012 +0200 Makefile: version set to 3.3.0-dev7 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 1e475d9..a35e32d 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -162,7 +162,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 3 PATCHLEVEL = 3 SUBLEVEL = 0 -EXTRAVERSION = -dev6 +EXTRAVERSION = -dev7 # memory debugger switcher # 0 - off (release mode)

1 0

git:master: core: mem - join free packets option can be set from config
by Daniel-Constantin Mierla 29 Mar '12

29 Mar '12

Module: sip-router Branch: master Commit: d89420df21b48440aeb10e8b4b92a4be65203c2b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d89420d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Mar 29 13:57:22 2012 +0200 core: mem - join free packets option can be set from config - better control over existing code for joining free memory fragments - existing QM_JOIN_FREE renamed to MEM_JOIN_FREE - to be used in other memory managers than q_malloc - new cfg parameter mem_join - if set to 1, q_malloc does join of free memory fragments. default is 0. in use if MEM_JOIN_FREE is defined --- Makefile.defs | 3 ++ cfg.lex | 4 ++- cfg.y | 3 ++ cfg_core.c | 3 ++ cfg_core.h | 1 + mem/q_malloc.c | 68 ++++++++++++++++++++++++++++---------------------------- ver_defs.h | 6 ++-- 7 files changed, 50 insertions(+), 38 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 2a7abbb..1e475d9 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -560,6 +560,8 @@ data_target = $(prefix)/$(data_dir) # now. # -DDBG_MALLOC # issues additional debugging information if lock/unlock is called +# -DMEM_JOIN_FREE +# enable the join of free memory chunks (see also mem_join cfg param) # -DFAST_LOCK # uses fast arhitecture specific locking (see the arh. specific section) # -DUSE_SYSV_SEM @@ -704,6 +706,7 @@ C_DEFS= $(extra_defs) \ ifeq ($(MEMDBG), 1) C_DEFS+= -DDBG_QM_MALLOC + C_DEFS+= -DMEM_JOIN_FREE else C_DEFS+= -DF_MALLOC endif diff --git a/cfg.lex b/cfg.lex index f2da3c1..8769cfc 100644 --- a/cfg.lex +++ b/cfg.lex @@ -398,7 +398,8 @@ SYN_BRANCH syn_branch MEMLOG "memlog"|"mem_log" MEMDBG "memdbg"|"mem_dbg" MEMSUM "mem_summary" -MEMSAFETY "mem_safety" +MEMSAFETY "mem_safety" +MEMJOIN "mem_join" CORELOG "corelog"|"core_log" SIP_WARNING sip_warning SERVER_SIGNATURE server_signature @@ -799,6 +800,7 @@ IMPORTFILE "import_file" <INITIAL>{MEMDBG} { count(); yylval.strval=yytext; return MEMDBG; } <INITIAL>{MEMSUM} { count(); yylval.strval=yytext; return MEMSUM; } <INITIAL>{MEMSAFETY} { count(); yylval.strval=yytext; return MEMSAFETY; } +<INITIAL>{MEMJOIN} { count(); yylval.strval=yytext; return MEMJOIN; } <INITIAL>{CORELOG} { count(); yylval.strval=yytext; return CORELOG; } <INITIAL>{SIP_WARNING} { count(); yylval.strval=yytext; return SIP_WARNING; } <INITIAL>{USER} { count(); yylval.strval=yytext; return USER; } diff --git a/cfg.y b/cfg.y index ded9ede..99f77a6 100644 --- a/cfg.y +++ b/cfg.y @@ -453,6 +453,7 @@ extern char *finame; %token MEMDBG %token MEMSUM %token MEMSAFETY +%token MEMJOIN %token CORELOG %token SIP_WARNING %token SERVER_SIGNATURE @@ -962,6 +963,8 @@ assign_stm: | MEMSUM EQUAL error { yyerror("int value expected"); } | MEMSAFETY EQUAL intno { default_core_cfg.mem_safety=$3; } | MEMSAFETY EQUAL error { yyerror("int value expected"); } + | MEMJOIN EQUAL intno { default_core_cfg.mem_join=$3; } + | MEMJOIN EQUAL error { yyerror("int value expected"); } | CORELOG EQUAL intno { default_core_cfg.corelog=$3; } | CORELOG EQUAL error { yyerror("int value expected"); } | SIP_WARNING EQUAL NUMBER { sip_warning=$3; } diff --git a/cfg_core.c b/cfg_core.c index 72c0388..55a5638 100644 --- a/cfg_core.c +++ b/cfg_core.c @@ -122,6 +122,7 @@ struct cfg_group_core default_core_cfg = { 3, /*!< mem_summary -flags: 0 off, 1 pkg_status, 2 shm_status, 4 pkg_sums, 8 shm_sums, 16 short_status */ 0, /*!< mem_safety - 0 disabled */ + 0, /*!< mem_join - 0 disabled */ L_ERR, /*!< corelog */ L_ERR, /*!< latency log */ 0, /*!< latency limit db */ @@ -315,6 +316,8 @@ cfg_def_t core_cfg_def[] = { " 16 - short status instead of dump" }, {"mem_safety", CFG_VAR_INT|CFG_ATOMIC, 0, 0, 0, 0, "safety level for memory operations"}, + {"mem_join", CFG_VAR_INT|CFG_ATOMIC, 0, 0, 0, 0, + "join free memory fragments"}, {"corelog", CFG_VAR_INT|CFG_ATOMIC, 0, 0, 0, 0, "log level for non-critical core error messages"}, {"latency_log", CFG_VAR_INT|CFG_ATOMIC, 0, 0, 0, 0, diff --git a/cfg_core.h b/cfg_core.h index 5fc2139..4bfbfbb 100644 --- a/cfg_core.h +++ b/cfg_core.h @@ -109,6 +109,7 @@ struct cfg_group_core { int memlog; /*!< log level for memory status/summary info */ int mem_summary; /*!< display memory status/summary info on exit */ int mem_safety; /*!< memory safety control option */ + int mem_join; /*!< memory free fragments join option */ int corelog; /*!< log level for non-critcal core error messages */ int latency_log; /*!< log level for latency limits messages */ int latency_limit_db; /*!< alert limit of running db commands */ diff --git a/mem/q_malloc.c b/mem/q_malloc.c index 9310385..fd93edb 100644 --- a/mem/q_malloc.c +++ b/mem/q_malloc.c @@ -428,10 +428,10 @@ void qm_free(struct qm_block* qm, void* p) { struct qm_frag* f; unsigned long size; -#ifdef QM_JOIN_FREE +#ifdef MEM_JOIN_FREE struct qm_frag* next; struct qm_frag* prev; -#endif /* QM_JOIN_FREE*/ +#endif /* MEM_JOIN_FREE*/ #ifdef DBG_QM_MALLOC MDBG("qm_free(%p, %p), called from %s: %s(%d)\n", qm, p, file, func, line); @@ -446,9 +446,6 @@ void qm_free(struct qm_block* qm, void* p) LOG(L_WARN, "WARNING:qm_free: free(0) called\n"); return; } -#ifdef QM_JOIN_FREE - next=prev=0; -#endif /* QM_JOIN_FREE*/ f=(struct qm_frag*) ((char*)p-sizeof(struct qm_frag)); #ifdef DBG_QM_MALLOC qm_debug_frag(qm, f); @@ -470,43 +467,46 @@ void qm_free(struct qm_block* qm, void* p) sr_event_exec(SREV_PKG_SET_REAL_USED, (void*)qm->real_used); #endif -#ifdef QM_JOIN_FREE - /* mark this fragment as used (might fall into the middle of joined frags) - to give us an extra chance of detecting a double free call (if the joined - fragment has not yet been reused) */ - f->u.nxt_free=(void*)0x1L; /* bogus value, just to mark it as free */ - /* join packets if possible*/ - next=FRAG_NEXT(f); - if (((char*)next < (char*)qm->last_frag_end) &&( next->u.is_free)){ +#ifdef MEM_JOIN_FREE + if(unlikely(cfg_get(core, core_cfg, mem_join)!=0)) { + next=prev=0; + /* mark this fragment as used (might fall into the middle of joined frags) + to give us an extra chance of detecting a double free call (if the joined + fragment has not yet been reused) */ + f->u.nxt_free=(void*)0x1L; /* bogus value, just to mark it as free */ + /* join packets if possible*/ + next=FRAG_NEXT(f); + if (((char*)next < (char*)qm->last_frag_end) &&( next->u.is_free)){ /* join */ #ifdef DBG_QM_MALLOC - qm_debug_frag(qm, next); + qm_debug_frag(qm, next); #endif - qm_detach_free(qm, next); - size+=next->size+FRAG_OVERHEAD; - qm->real_used-=FRAG_OVERHEAD; - qm->free_hash[GET_HASH(next->size)].no--; /* FIXME slow */ - } + qm_detach_free(qm, next); + size+=next->size+FRAG_OVERHEAD; + qm->real_used-=FRAG_OVERHEAD; + qm->free_hash[GET_HASH(next->size)].no--; /* FIXME slow */ + } - if (f > qm->first_frag){ - prev=FRAG_PREV(f); - /* (struct qm_frag*)((char*)f - (struct qm_frag_end*)((char*)f- + if (f > qm->first_frag){ + prev=FRAG_PREV(f); + /* (struct qm_frag*)((char*)f - (struct qm_frag_end*)((char*)f- sizeof(struct qm_frag_end))->size);*/ #ifdef DBG_QM_MALLOC - qm_debug_frag(qm, prev); + qm_debug_frag(qm, prev); #endif - if (prev->u.is_free){ - /*join*/ - qm_detach_free(qm, prev); - size+=prev->size+FRAG_OVERHEAD; - qm->real_used-=FRAG_OVERHEAD; - qm->free_hash[GET_HASH(prev->size)].no--; /* FIXME slow */ - f=prev; + if (prev->u.is_free){ + /*join*/ + qm_detach_free(qm, prev); + size+=prev->size+FRAG_OVERHEAD; + qm->real_used-=FRAG_OVERHEAD; + qm->free_hash[GET_HASH(prev->size)].no--; /* FIXME slow */ + f=prev; + } } - } - f->size=size; - FRAG_END(f)->size=f->size; -#endif /* QM_JOIN_FREE*/ + f->size=size; + FRAG_END(f)->size=f->size; + } /* if cfg_core->mem_join */ +#endif /* MEM_JOIN_FREE*/ #ifdef DBG_QM_MALLOC f->file=file; f->func=func; diff --git a/ver_defs.h b/ver_defs.h index 957bb69..a69a4c9 100644 --- a/ver_defs.h +++ b/ver_defs.h @@ -303,10 +303,10 @@ #define HAVE_RESOLV_RES_STR "" #endif -#ifdef QM_JOIN_FREE -#define QM_JOIN_FREE_STR ", QM_JOIN_FREE" +#ifdef MEM_JOIN_FREE +#define MEM_JOIN_FREE_STR ", MEM_JOIN_FREE" #else -#define QM_JOIN_FREE_STR "" +#define MEM_JOIN_FREE_STR "" #endif #ifdef SYSLOG_CALLBACK_SUPPORT

1 0

git:master: core: new param mem_safety
by Daniel-Constantin Mierla 29 Mar '12

29 Mar '12

Module: sip-router Branch: master Commit: ffb8754f441779def6fd1e50b61ef628920cb2f4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ffb8754… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Mar 29 12:55:04 2012 +0200 core: new param mem_safety - if set to 1, memory free operation does not call abort() for double freeing a pointer or freeing an invalid address - default is 0, can be set via config framework --- cfg.lex | 2 ++ cfg.y | 3 +++ cfg_core.c | 3 +++ cfg_core.h | 1 + mem/q_malloc.c | 18 ++++++++++-------- 5 files changed, 19 insertions(+), 8 deletions(-) diff --git a/cfg.lex b/cfg.lex index e2cbaf4..f2da3c1 100644 --- a/cfg.lex +++ b/cfg.lex @@ -398,6 +398,7 @@ SYN_BRANCH syn_branch MEMLOG "memlog"|"mem_log" MEMDBG "memdbg"|"mem_dbg" MEMSUM "mem_summary" +MEMSAFETY "mem_safety" CORELOG "corelog"|"core_log" SIP_WARNING sip_warning SERVER_SIGNATURE server_signature @@ -797,6 +798,7 @@ IMPORTFILE "import_file" <INITIAL>{MEMLOG} { count(); yylval.strval=yytext; return MEMLOG; } <INITIAL>{MEMDBG} { count(); yylval.strval=yytext; return MEMDBG; } <INITIAL>{MEMSUM} { count(); yylval.strval=yytext; return MEMSUM; } +<INITIAL>{MEMSAFETY} { count(); yylval.strval=yytext; return MEMSAFETY; } <INITIAL>{CORELOG} { count(); yylval.strval=yytext; return CORELOG; } <INITIAL>{SIP_WARNING} { count(); yylval.strval=yytext; return SIP_WARNING; } <INITIAL>{USER} { count(); yylval.strval=yytext; return USER; } diff --git a/cfg.y b/cfg.y index 83a21df..ded9ede 100644 --- a/cfg.y +++ b/cfg.y @@ -452,6 +452,7 @@ extern char *finame; %token MEMLOG %token MEMDBG %token MEMSUM +%token MEMSAFETY %token CORELOG %token SIP_WARNING %token SERVER_SIGNATURE @@ -959,6 +960,8 @@ assign_stm: | MEMDBG EQUAL error { yyerror("int value expected"); } | MEMSUM EQUAL intno { default_core_cfg.mem_summary=$3; } | MEMSUM EQUAL error { yyerror("int value expected"); } + | MEMSAFETY EQUAL intno { default_core_cfg.mem_safety=$3; } + | MEMSAFETY EQUAL error { yyerror("int value expected"); } | CORELOG EQUAL intno { default_core_cfg.corelog=$3; } | CORELOG EQUAL error { yyerror("int value expected"); } | SIP_WARNING EQUAL NUMBER { sip_warning=$3; } diff --git a/cfg_core.c b/cfg_core.c index 87af945..72c0388 100644 --- a/cfg_core.c +++ b/cfg_core.c @@ -121,6 +121,7 @@ struct cfg_group_core default_core_cfg = { L_DBG, /*!< memlog */ 3, /*!< mem_summary -flags: 0 off, 1 pkg_status, 2 shm_status, 4 pkg_sums, 8 shm_sums, 16 short_status */ + 0, /*!< mem_safety - 0 disabled */ L_ERR, /*!< corelog */ L_ERR, /*!< latency log */ 0, /*!< latency limit db */ @@ -312,6 +313,8 @@ cfg_def_t core_cfg_def[] = { " 4 - summary of pkg used blocks," " 8 - summary of shm used blocks," " 16 - short status instead of dump" }, + {"mem_safety", CFG_VAR_INT|CFG_ATOMIC, 0, 0, 0, 0, + "safety level for memory operations"}, {"corelog", CFG_VAR_INT|CFG_ATOMIC, 0, 0, 0, 0, "log level for non-critical core error messages"}, {"latency_log", CFG_VAR_INT|CFG_ATOMIC, 0, 0, 0, 0, diff --git a/cfg_core.h b/cfg_core.h index c5c4250..5fc2139 100644 --- a/cfg_core.h +++ b/cfg_core.h @@ -108,6 +108,7 @@ struct cfg_group_core { int force_rport; /*!< if set rport will always be forced*/ int memlog; /*!< log level for memory status/summary info */ int mem_summary; /*!< display memory status/summary info on exit */ + int mem_safety; /*!< memory safety control option */ int corelog; /*!< log level for non-critcal core error messages */ int latency_log; /*!< log level for latency limits messages */ int latency_limit_db; /*!< alert limit of running db commands */ diff --git a/mem/q_malloc.c b/mem/q_malloc.c index 76bf938..9310385 100644 --- a/mem/q_malloc.c +++ b/mem/q_malloc.c @@ -436,9 +436,10 @@ void qm_free(struct qm_block* qm, void* p) #ifdef DBG_QM_MALLOC MDBG("qm_free(%p, %p), called from %s: %s(%d)\n", qm, p, file, func, line); if (p>(void*)qm->last_frag_end || p<(void*)qm->first_frag){ - LOG(L_CRIT, "BUG: qm_free: bad pointer %p (out of memory block!) - " - "aborting\n", p); - abort(); + LOG(L_CRIT, "BUG: qm_free: bad pointer %p (out of memory block!)" + " called from %s: %s(%d) - aborting\n", p, file, func, line); + if(likely(cfg_get(core, core_cfg, mem_safety)==0)) + abort(); } #endif if (p==0) { @@ -452,10 +453,11 @@ void qm_free(struct qm_block* qm, void* p) #ifdef DBG_QM_MALLOC qm_debug_frag(qm, f); if (f->u.is_free){ - LOG(L_CRIT, "BUG: qm_free: freeing already freed pointer," - " first free: %s: %s(%ld) - aborting\n", - f->file, f->func, f->line); - abort(); + LOG(L_CRIT, "BUG: qm_free: freeing already freed pointer (%p)," + " called from %s: %s(%d), first free %s: %s(%ld) - aborting\n", + p, file, func, line, f->file, f->func, f->line); + if(likely(cfg_get(core, core_cfg, mem_safety)==0)) + abort(); } MDBG("qm_free: freeing frag. %p alloc'ed from %s: %s(%ld)\n", f, f->file, f->func, f->line); @@ -470,7 +472,7 @@ void qm_free(struct qm_block* qm, void* p) #ifdef QM_JOIN_FREE /* mark this fragment as used (might fall into the middle of joined frags) - to give us an extra change of detecting a double free call (if the joined + to give us an extra chance of detecting a double free call (if the joined fragment has not yet been reused) */ f->u.nxt_free=(void*)0x1L; /* bogus value, just to mark it as free */ /* join packets if possible*/

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2012