sr-dev April 2013

sr-dev@lists.kamailio.org

38 participants
401 discussions

by Richard Fuchs

Hello, I'm currently debugging a segfault in the presence module, which is caused by it recursively calling srdb1 functions on the same db handle, which at least under db_mysql doesn't work and causes segfault. I was wondering what the preferred fix would be: Fix presence module so it doesn't do that, or fix db_mysql so that recursive queries are possible. Personally I'd prefer the second option, but AFAICS it would require some changes to srdb1 itself. Any other options I'm not seeing? cheers

11 years, 8 months

git:master: srdb1: add new db-private generic pointer to struct db1_res

by Richard Fuchs

Module: sip-router Branch: master Commit: 8366a26fb8e3c6d5815cd4cd5bde48575e9f6b71 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8366a26… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: Wed Apr 10 09:33:53 2013 -0400 srdb1: add new db-private generic pointer to struct db1_res --- lib/srdb1/db_res.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/lib/srdb1/db_res.h b/lib/srdb1/db_res.h index f8f909f..62fc11c 100644 --- a/lib/srdb1/db_res.h +++ b/lib/srdb1/db_res.h @@ -61,6 +61,7 @@ typedef struct db1_res { int n; /**< Number of rows in current fetch */ int res_rows; /**< Number of total rows in query */ int last_row; /**< Last row */ + void* ptr; /**< For use by DB modules */ } db1_res_t; @@ -78,6 +79,8 @@ typedef struct db1_res { #define RES_LAST_ROW(re) ((re)->last_row) /** Return the number of total result rows */ #define RES_NUM_ROWS(re) ((re)->res_rows) +/** Return the module-specific pointer */ +#define RES_PTR(re) ((re)->ptr) /**

11 years, 8 months

git:4.0: modules/pipelimit: check correctly for all arguments in mi_set_pipe

by Vicente Hernando

Module: sip-router Branch: 4.0 Commit: 3b9347e41195587c323f5d6d643c1807a9905941 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3b9347e… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: Wed Apr 10 13:55:57 2013 +0200 modules/pipelimit: check correctly for all arguments in mi_set_pipe (cherry picked from commit d17b02ed5014b4e32bd0060f32cabd750956779c) --- modules/pipelimit/pl_ht.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/pipelimit/pl_ht.c b/modules/pipelimit/pl_ht.c index c144e7e..1146468 100644 --- a/modules/pipelimit/pl_ht.c +++ b/modules/pipelimit/pl_ht.c @@ -544,7 +544,7 @@ struct mi_root* mi_set_pipe(struct mi_root* cmd_tree, void* param) pipeid = node->value; node = node->next; - if ( !node->value.s || !node->value.len) + if ( !node || !node->value.s || !node->value.len) goto error; if (str_map_str(algo_names, &(node->value), (int*)&algo_id)) { LM_ERR("unknown algorithm: '%.*s'\n", node->value.len, node->value.s); @@ -552,7 +552,7 @@ struct mi_root* mi_set_pipe(struct mi_root* cmd_tree, void* param) } node = node->next; - if ( !node->value.s || !node->value.len || strno2int(&node->value,&limit)<0) + if ( !node || !node->value.s || !node->value.len || strno2int(&node->value,&limit)<0) goto error; LM_DBG("set_pipe: %.*s:%d:%d\n", pipeid.len, pipeid.s, algo_id, limit);

11 years, 8 months

git:master: modules/pipelimit: check correctly for all arguments in mi_set_pipe

by Vicente Hernando

Module: sip-router Branch: master Commit: d17b02ed5014b4e32bd0060f32cabd750956779c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d17b02e… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: Wed Apr 10 13:55:57 2013 +0200 modules/pipelimit: check correctly for all arguments in mi_set_pipe --- modules/pipelimit/pl_ht.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/pipelimit/pl_ht.c b/modules/pipelimit/pl_ht.c index c144e7e..1146468 100644 --- a/modules/pipelimit/pl_ht.c +++ b/modules/pipelimit/pl_ht.c @@ -544,7 +544,7 @@ struct mi_root* mi_set_pipe(struct mi_root* cmd_tree, void* param) pipeid = node->value; node = node->next; - if ( !node->value.s || !node->value.len) + if ( !node || !node->value.s || !node->value.len) goto error; if (str_map_str(algo_names, &(node->value), (int*)&algo_id)) { LM_ERR("unknown algorithm: '%.*s'\n", node->value.len, node->value.s); @@ -552,7 +552,7 @@ struct mi_root* mi_set_pipe(struct mi_root* cmd_tree, void* param) } node = node->next; - if ( !node->value.s || !node->value.len || strno2int(&node->value,&limit)<0) + if ( !node || !node->value.s || !node->value.len || strno2int(&node->value,&limit)<0) goto error; LM_DBG("set_pipe: %.*s:%d:%d\n", pipeid.len, pipeid.s, algo_id, limit);

11 years, 8 months

git:master: modules/tm: documentation: Updated branch_failure route name format

by Hugh Waite

Module: sip-router Branch: master Commit: d20439c0398f6821f9e0e861a597d1dee62f6c91 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d20439c… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Wed Apr 10 12:31:41 2013 +0100 modules/tm: documentation: Updated branch_failure route name format - Updated event_route[tm:branch-failure:name] documentation - Updated t_next_contact_flow function --- modules/tm/README | 1632 ++++++++++++++++++++------------------- modules/tm/doc/event_routes.xml | 16 +- modules/tm/doc/functions.xml | 177 +++-- 3 files changed, 965 insertions(+), 860 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=d20…

11 years, 8 months

git:master: core: Allow colon separated tokens in event_route names

by Hugh Waite

Module: sip-router Branch: master Commit: fb4d9dae890705388275abe1fa06358187917d01 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fb4d9da… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Wed Apr 10 11:27:59 2013 +0100 core: Allow colon separated tokens in event_route names - Event routes can have named routes following the format: -- <module>:<event>:<name> - --- cfg.lex | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cfg.lex b/cfg.lex index 7973d6c..a290e0f 100644 --- a/cfg.lex +++ b/cfg.lex @@ -556,7 +556,7 @@ COLON ":" STAR \* DOT \. CR \n -EVENT_RT_NAME [a-zA-Z][0-9a-zA-Z-]*":"[a-zA-Z][0-9a-zA-Z-]* +EVENT_RT_NAME [a-zA-Z][0-9a-zA-Z-]*(":"[a-zA-Z][0-9a-zA-Z-]*)+ COM_LINE #

11 years, 8 months

git:master: modules/registrar: Remove unnecessary BRANCH_FAILURE flags

by Hugh Waite

Module: sip-router Branch: master Commit: a1edd20adff116ce78083ca9744e7072e0305728 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a1edd20… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Wed Apr 10 11:10:27 2013 +0100 modules/registrar: Remove unnecessary BRANCH_FAILURE flags Functions that run in an event route require the EVENT_ROUTE / REQUEST_ROUTE flag set, not the BRANCH_FAILURE_ROUTE flag --- modules/registrar/reg_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/registrar/reg_mod.c b/modules/registrar/reg_mod.c index a32909a..f07a44a 100644 --- a/modules/registrar/reg_mod.c +++ b/modules/registrar/reg_mod.c @@ -188,7 +188,7 @@ static cmd_export_t cmds[] = { {"unregister", (cmd_function)w_unregister, 2, unreg_fixup, 0, REQUEST_ROUTE| FAILURE_ROUTE }, {"unregister", (cmd_function)w_unregister2, 3, unreg_fixup, 0, - REQUEST_ROUTE| FAILURE_ROUTE | BRANCH_FAILURE_ROUTE }, + REQUEST_ROUTE| FAILURE_ROUTE }, {"reg_fetch_contacts", (cmd_function)pv_fetch_contacts, 3, fetchc_fixup, 0, REQUEST_ROUTE| FAILURE_ROUTE },

11 years, 8 months

ruid access after failing t_relay

by Juha Heinanen

i added possibility to call t_branch_timeout() and t_branch_replied() from branch-failure event route. i tested the possible result combinations and they seemed to work ok. however, during the tests is turned out that they don't help when it comes to unregistering unresponsive contacts in case the contacts are directly connected and set_forward_no_connect() is called before t_relay(). the reason is that in that case, failure route or branch failure route is not executed at all. -- juha

11 years, 8 months

git:master: modules/tm: updated README on t_branch_timeout and t_branch_replied usage

by Juha Heinanen

Module: sip-router Branch: master Commit: 200357577d70f13ad1f01d8f831eca274ca2e669 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2003575… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Apr 10 09:17:58 2013 +0300 modules/tm: updated README on t_branch_timeout and t_branch_replied usage --- modules/tm/README | 1416 +++++++++++++++++++++--------------------- modules/tm/doc/functions.xml | 10 +- 2 files changed, 711 insertions(+), 715 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=200…

11 years, 8 months

git:master: modules/tm: allow calling of t_branch_timeout() and t_branch_replied()

by Juha Heinanen

Module: sip-router Branch: master Commit: 3b785c288916269664bf77d916572945ce93e489 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3b785c2… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Apr 10 09:09:54 2013 +0300 modules/tm: allow calling of t_branch_timeout() and t_branch_replied() from tm:branch-failure event route --- modules/tm/tm.c | 32 +++++++++++++++++++++++++------- 1 files changed, 25 insertions(+), 7 deletions(-) diff --git a/modules/tm/tm.c b/modules/tm/tm.c index e08ce9f..82b544d 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -448,8 +448,10 @@ static cmd_export_t cmds[]={ fixup_var_int_1, REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, #endif /* CANCEL_REASON_SUPPORT */ - {"t_branch_timeout", t_branch_timeout, 0, 0, FAILURE_ROUTE}, - {"t_branch_replied", t_branch_replied, 0, 0, FAILURE_ROUTE}, + {"t_branch_timeout", t_branch_timeout, 0, 0, + FAILURE_ROUTE|EVENT_ROUTE}, + {"t_branch_replied", t_branch_replied, 0, 0, + FAILURE_ROUTE|EVENT_ROUTE}, {"t_any_timeout", t_any_timeout, 0, 0, REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, {"t_any_replied", t_any_replied, 0, 0, @@ -1831,21 +1833,37 @@ T_SET_FLAG_GEN_FUNC(t_set_no_e2e_cancel_reason, T_NO_E2E_CANCEL_REASON) #endif /* CANCEL_REASON_SUPPORT */ -/* script function, FAILURE_ROUTE only, returns true if the - * choosed "failure" branch failed because of a timeout, +/* script function, FAILURE_ROUTE and BRANCH_FAILURE_ROUTE only, + * returns true if the choosed "failure" branch failed because of a timeout, * -1 otherwise */ int t_branch_timeout(struct sip_msg* msg, char* foo, char* bar) { + switch(get_route_type()) { + case FAILURE_ROUTE: + case BRANCH_FAILURE_ROUTE: return (msg->msg_flags & FL_TIMEOUT)?1:-1; + default: + LOG(L_ERR, "ERROR:t_check_status: unsupported route type %d\n", + get_route_type()); + } + return -1; } - -/* script function, FAILURE_ROUTE only, returns true if the - * choosed "failure" branch ever received a reply, -1 otherwise */ +/* script function, FAILURE_ROUTE and BRANCH_FAILURE_ROUTE only, + * returns true if the choosed "failure" branch ever received a reply, + * -1 otherwise */ int t_branch_replied(struct sip_msg* msg, char* foo, char* bar) { + switch(get_route_type()) { + case FAILURE_ROUTE: + case BRANCH_FAILURE_ROUTE: return (msg->msg_flags & FL_REPLIED)?1:-1; + default: + LOG(L_ERR, "ERROR:t_check_status: unsupported route type %d\n", + get_route_type()); + } + return -1; }

11 years, 8 months

← Newer
1
...
23
24
25
26
27
28
29
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2013