sr-dev May 2013

sr-dev@lists.kamailio.org

29 participants
317 discussions

git:master: core: Add callback to be able to log assign actions.

by Victor Seva

Module: sip-router Branch: master Commit: a2316f35deef2586f79dc575367224af853e9b70 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a2316f3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Wed May 29 12:25:09 2013 +0200 core: Add callback to be able to log assign actions. --- lvalue.c | 14 ++++++++++++++ lvalue.h | 3 ++- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/lvalue.c b/lvalue.c index a235ccc..156e506 100644 --- a/lvalue.c +++ b/lvalue.c @@ -36,7 +36,16 @@ #include "dprint.h" #include "route.h" +/* callback to log assign actions */ +static log_assign_action_f _log_assign_action = NULL; +/** + * @brief set callback function log assign actions + */ +void set_log_assign_action_cb(log_assign_action_f f) +{ + _log_assign_action = f; +} /** * @brief eval rve and assign the result to an avp @@ -406,6 +415,11 @@ int lval_assign(struct run_act_ctx* h, struct sip_msg* msg, rve->fpos.s_line, rve->fpos.s_col, rve->fpos.e_line, rve->fpos.e_col); } + else + { + if(unlikely(_log_assign_action!=NULL)) + _log_assign_action(msg, lv); + } rval_destroy(rv); return ret; error: diff --git a/lvalue.h b/lvalue.h index 3dbbcb1..b5eccd4 100644 --- a/lvalue.h +++ b/lvalue.h @@ -51,7 +51,8 @@ struct lvalue{ /* lval operators */ #define EQ_T 254 /* k compatibility */ - +typedef int (*log_assign_action_f)(struct sip_msg* msg, struct lvalue *lv); +void set_log_assign_action_cb(log_assign_action_f f); /** eval rve and assign the result to lv * lv=eval(rve)

11 years, 6 months

git:master: core: added helper function pv_cache_get_name() in order

by Victor Seva

Module: sip-router Branch: master Commit: a21137507bea759d4945402dc47486ac324724db URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a211375… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Wed May 29 12:25:50 2013 +0200 core: added helper function pv_cache_get_name() in order to get the name of a pv_spec_t on pv_cache. --- pvapi.c | 30 ++++++++++++++++++++++++++++++ pvar.h | 1 + 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/pvapi.c b/pvapi.c index 6245ee9..98b3d90 100644 --- a/pvapi.c +++ b/pvapi.c @@ -357,6 +357,36 @@ pv_spec_t* pv_cache_get(str *name) return pv_cache_add(&tname); } +str* pv_cache_get_name(pv_spec_t *spec) +{ + int i; + pv_cache_t *pvi; + if(spec==NULL) + { + LM_ERR("invalid parameters\n"); + return NULL; + } + + if(_pv_cache_set==0) + return NULL; + + for(i=0;i<PV_CACHE_SIZE;i++) + { + pvi = _pv_cache[i]; + while(pvi) + { + if(&pvi->spec == spec) + { + LM_DBG("pvar[%p]->name[%.*s] found in cache\n", spec, + pvi->pvname.len, pvi->pvname.s); + return &pvi->pvname; + } + pvi = pvi->next; + } + } + return NULL; +} + /** * */ diff --git a/pvar.h b/pvar.h index f6d6318..c3d7b44 100644 --- a/pvar.h +++ b/pvar.h @@ -207,6 +207,7 @@ int pv_free_extra_list(void); int pv_locate_name(str *in); pv_spec_t* pv_cache_get(str *name); +str* pv_cache_get_name(pv_spec_t *spec); /*! \brief PV helper functions */ int pv_get_null(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

11 years, 6 months

git:master: core: use pointer to pv_spec_t on lvalue union. Use pv_cache_get() on interpreter.

by Victor Seva

Module: sip-router Branch: master Commit: 6fba3230222214fccb72fd07817f29693d98b877 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6fba323… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Wed May 29 12:24:00 2013 +0200 core: use pointer to pv_spec_t on lvalue union. Use pv_cache_get() on interpreter. --- cfg.y | 30 +++++++++--------------------- lvalue.c | 2 +- lvalue.h | 2 +- 3 files changed, 11 insertions(+), 23 deletions(-) diff --git a/cfg.y b/cfg.y index 968888a..0e5f8b1 100644 --- a/cfg.y +++ b/cfg.y @@ -2611,17 +2611,10 @@ attr_id_any_str: ; pvar: PVAR { - pv_spec=pkg_malloc(sizeof(*pv_spec)); - if (!pv_spec) { - yyerror("Not enough memory"); - YYABORT; - } - memset(pv_spec, 0, sizeof(*pv_spec)); s_tmp.s=$1; s_tmp.len=strlen($1); - if (pv_parse_spec(&s_tmp, pv_spec)==0){ - yyerror("unknown script pseudo variable %s", $1 ); - pkg_free(pv_spec); - pv_spec=0; + pv_spec=pv_cache_get(&s_tmp); + if (!pv_spec) { + yyerror("Can't get from cache: %s", $1); YYABORT; } $$=pv_spec; @@ -2636,12 +2629,8 @@ avp_pvar: AVP_OR_PVAR { } memset(lval_tmp, 0, sizeof(*lval_tmp)); s_tmp.s=$1; s_tmp.len=strlen(s_tmp.s); - if (pv_parse_spec2(&s_tmp, &lval_tmp->lv.pvs, 1)==0){ - /* not a pvar, try avps */ - /* lval_tmp might be partially filled by the failed - pv_parse_spec2() (especially if the avp name is the - same as a pv class) => clean it again */ - memset(lval_tmp, 0, sizeof(*lval_tmp)); + lval_tmp->lv.pvs = pv_cache_get(&s_tmp); + if (lval_tmp->lv.pvs==NULL){ lval_tmp->lv.avps.type|= AVP_NAME_STR; lval_tmp->lv.avps.name.s.s = s_tmp.s+1; lval_tmp->lv.avps.name.s.len = s_tmp.len-1; @@ -2688,15 +2677,14 @@ lval: attr_id_ass { yyerror("Not enough memory"); YYABORT; } - lval_tmp->type=LV_PVAR; lval_tmp->lv.pvs=*($1); - pkg_free($1); /* free the pvar spec we just copied */ + lval_tmp->type=LV_PVAR; lval_tmp->lv.pvs=$1; $$=lval_tmp; } | avp_pvar { if (($1)->type==LV_PVAR){ - if (!pv_is_w(&($1)->lv.pvs)) + if (!pv_is_w($1->lv.pvs)) yyerror("read only pvar in assignment left side"); - if ($1->lv.pvs.trans!=0) + if ($1->lv.pvs->trans!=0) yyerror("pvar with transformations in assignment" " left side"); } @@ -2715,7 +2703,7 @@ rval: intno {$$=mk_rve_rval(RV_INT, (void*)$1); } $$=mk_rve_rval(RV_AVP, &$1->lv.avps); break; case LV_PVAR: - $$=mk_rve_rval(RV_PVAR, &$1->lv.pvs); + $$=mk_rve_rval(RV_PVAR, $1->lv.pvs); break; default: yyerror("BUG: invalid lvalue type "); diff --git a/lvalue.c b/lvalue.c index a89cfce..a235ccc 100644 --- a/lvalue.c +++ b/lvalue.c @@ -255,7 +255,7 @@ inline static int lval_pvar_assign(struct run_act_ctx* h, struct sip_msg* msg, pv_get_null(msg, 0, &pval) destroy_pval=0; - pvar=&lv->lv.pvs; + pvar=lv->lv.pvs; if (unlikely(!pv_is_w(pvar))){ ERR("read only pvar\n"); goto error; diff --git a/lvalue.h b/lvalue.h index 566f84e..3dbbcb1 100644 --- a/lvalue.h +++ b/lvalue.h @@ -35,7 +35,7 @@ #include "action.h" union lval_u{ - pv_spec_t pvs; + pv_spec_t *pvs; avp_spec_t avps; };

11 years, 6 months

[tracker] Comment added: modules/debugger: be able to log assign actions

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#299 - modules/debugger: be able to log assign actions User who did this - Daniel-Constantin Mierla (miconda) ---------- The first three patches look ok, they can be committed. For the 4th patch I think the cache has to be in private memory, kept by each process (practically, using pkg and no need anymore for locks). I was thinking a bit more about it, and some modules can add items in PV cache (in the core) at runtime (like app_lua). Although the ones used in config should be core PV cache from startup, still there is a potential that a module uses actions inside at runtime and can end up in some assignment. By the nature of pv_spec that can have pkg alloc'ed content, keeping in share memory a reference to it might lead to a different process accessing it than the one that added it in core PV cache. If kept in pkg, the debugger pv assign cache can hold only the pv_spec pointer and the name can be taken computing the offset in core pv cache structure relative to it (or simply keep a pointer to the whole structure or directly to the name). ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=299#comment910 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years, 6 months

[tracker] Task closed: Kamailio crash when module topoh module is loaded and removing Via headers in reply route with remov

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#300 - Kamailio crash when module topoh module is loaded and removing Via headers in reply route with remov User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: Reopen if still an issue. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=300 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years, 6 months

[tracker] Comment added: Kamailio crash when module topoh module is loaded and removing Via headers in reply route with remov

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#300 - Kamailio crash when module topoh module is loaded and removing Via headers in reply route with remov User who did this - Daniel-Constantin Mierla (miconda) ---------- I added a safety check for it in master and 4.0 branches. You have to use git branches to test if works ok for you. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=300#comment909 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years, 6 months

git:4.0: topoh: safety check for Via header when removed from script

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: 817d5dfdd8fbae905c64c41672f197143b6f563c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=817d5df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed May 29 10:49:40 2013 +0200 topoh: safety check for Via header when removed from script - reported by Guillaume Bour, FS#300 (cherry picked from commit b480ac55508e5d9b92cc9560e0b1d338d04f3b11) --- modules/topoh/th_msg.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules/topoh/th_msg.c b/modules/topoh/th_msg.c index df29ea1..4d25750 100644 --- a/modules/topoh/th_msg.c +++ b/modules/topoh/th_msg.c @@ -967,6 +967,11 @@ int th_del_via_cookie(sip_msg_t *msg, struct via_body *via) { struct via_param *p; struct lump* l; + + if(via==NULL) { + LM_DBG("no via header\n"); + return 0; + } for(p=via->param_lst; p; p=p->next) { if(p->name.len==th_cookie_name.len

11 years, 6 months

git:master: topoh: safety check for Via header when removed from script

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: b480ac55508e5d9b92cc9560e0b1d338d04f3b11 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b480ac5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed May 29 10:49:40 2013 +0200 topoh: safety check for Via header when removed from script - reported by Guillaume Bour, FS#300 --- modules/topoh/th_msg.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules/topoh/th_msg.c b/modules/topoh/th_msg.c index df29ea1..4d25750 100644 --- a/modules/topoh/th_msg.c +++ b/modules/topoh/th_msg.c @@ -967,6 +967,11 @@ int th_del_via_cookie(sip_msg_t *msg, struct via_body *via) { struct via_param *p; struct lump* l; + + if(via==NULL) { + LM_DBG("no via header\n"); + return 0; + } for(p=via->param_lst; p; p=p->next) { if(p->name.len==th_cookie_name.len

11 years, 6 months

[tracker] Comment added: modules/debugger: be able to log assign actions (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#299 - modules/debugger: be able to log assign actions User who did this - Víctor Seva (linuxmaniac) ---------- Patches refreshed. Now I don't call pv_parse_spec/pv_parse_spec2 on patch 0001. Added a while loop inside the FOR on patch 0003. Thanks Daniel for your reviews ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=299#comment908 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years, 6 months

[tracker] Task opened: Kamailio crash when module topoh module is loaded and removing Via headers in reply route with remov

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Guillaume Bour (gbour) Attached to Project - sip-router Summary - Kamailio crash when module topoh module is loaded and removing Via headers in reply route with remov Task Type - Bug Report Category - Module Status - Unconfirmed Assigned To - Operating System - Linux Severity - Low Priority - Normal Reported Version - 4.0 Due in Version - Undecided Due Date - Undecided Details - Reproduceable on kamailio 4.0.0 and 4.0.1. Kamailio crash when module topoh module is loaded and removing Via headers in reply route with remove_hf("Via"); command. Here is the backtrace: Program received signal SIGSEGV, Segmentation fault. th_del_via_cookie (msg=0x7fffffffd620, via=0x0) at th_msg.c:970 970 for(p=via->param_lst; p; p=p->next) Missing separate debuginfos, use: debuginfo-install glibc-2.12-1.107.el6.x86_64 pcre-7.8-6.el6.x86_64 (gdb) (gdb) bt #0 th_del_via_cookie (msg=0x7fffffffd620, via=0x0) at th_msg.c:970 #1 0x00007ffff32b70c4 in th_del_cookie (msg=0x7fffffffd620) at th_msg.c:991 #2 0x00007ffff32bea7e in th_msg_sent (data=0x7fffffffdd70) at topoh_mod.c:347 #3 0x00007ffff60f93c6 in msg_send (rb=0x7ffff15240d0, buf=0x7ffff7283a20, len=<value optimized out>) at ../../forward.h:141 #4 send_pr_buffer (rb=0x7ffff15240d0, buf=0x7ffff7283a20, len=<value optimized out>) at t_funcs.c:102 #5 0x00007ffff6130d90 in relay_reply (t=<value optimized out>, p_msg=<value optimized out>, branch=0, msg_status=200, cancel_data=0x7fffffffe110, do_put_on_wait=1) at t_reply.c:1877 #6 0x00007ffff61333e6 in reply_received (p_msg=0x7ffff7296270) at t_reply.c:2370 #7 0x00000000004547f5 in do_forward_reply (msg=0x7ffff7296270, mode=<value optimized out>) at forward.c:799 #8 0x000000000049a5ba in receive_msg (buf=<value optimized out>, len=1251, rcv_info=0x7fffffffe3a0) at receive.c:270 #9 0x00000000005281a6 in udp_rcv_loop () at udp_server.c:544 #10 0x0000000000464d3a in main_loop () at main.c:1638 #11 0x0000000000467a6c in main (argc=<value optimized out>, argv=<value optimized out>) at main.c:2566 More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=300 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years, 6 months

← Newer
1
2
3
4
5
6
7
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2013