sr-dev September 2011

sr-dev@lists.kamailio.org

40 participants
298 discussions

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 08a4bbcecfb878fc520f4a2bab182bda1526ce62 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=08a4bbc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 6 21:47:45 2011 +0200 app_lua: use pv spec cache - avoid memory leaks when working with PVs that have dynamic name --- modules/app_lua/app_lua_sr.c | 48 +++++++++++++++++++++++++++++++---------- 1 files changed, 36 insertions(+), 12 deletions(-) diff --git a/modules/app_lua/app_lua_sr.c b/modules/app_lua/app_lua_sr.c index c5f5bf8..1271ba2 100644 --- a/modules/app_lua/app_lua_sr.c +++ b/modules/app_lua/app_lua_sr.c @@ -873,9 +873,10 @@ static const luaL_reg _sr_hdr_Map [] = { static int lua_sr_pv_get (lua_State *L) { str pvn; - pv_spec_t pvs; + pv_spec_t *pvs; pv_value_t val; sr_lua_env_t *env_L; + int pl; env_L = sr_lua_env_get(); @@ -885,13 +886,20 @@ static int lua_sr_pv_get (lua_State *L) pvn.len = strlen(pvn.s); LM_DBG("pv get: %s\n", pvn.s); - if(pv_parse_spec(&pvn, &pvs)<0) + pl = pv_locate_name(&pvn); + if(pl != pvn.len) { - LM_ERR("unable to parse pv [%s]\n", pvn.s); + LM_ERR("invalid pv [%s] (%d/%d)\n", pvn.s, pl, pvn.len); + return 0; + } + pvs = pv_cache_get(&pvn); + if(pvs==NULL) + { + LM_ERR("cannot get pv spec for [%s]\n", pvn.s); return 0; } memset(&val, 0, sizeof(pv_value_t)); - if(pv_get_spec_value(env_L->msg, &pvs, &val) != 0) + if(pv_get_spec_value(env_L->msg, pvs, &val) != 0) { LM_ERR("unable to get pv value for [%s]\n", pvn.s); return 0; @@ -915,9 +923,10 @@ static int lua_sr_pv_get (lua_State *L) static int lua_sr_pv_seti (lua_State *L) { str pvn; - pv_spec_t pvs; + pv_spec_t *pvs; pv_value_t val; sr_lua_env_t *env_L; + int pl; env_L = sr_lua_env_get(); @@ -941,12 +950,19 @@ static int lua_sr_pv_seti (lua_State *L) pvn.len = strlen(pvn.s); LM_DBG("pv set: %s\n", pvn.s); - if(pv_parse_spec(&pvn, &pvs)<0) + pl = pv_locate_name(&pvn); + if(pl != pvn.len) { - LM_ERR("unable to parse pv [%s]\n", pvn.s); + LM_ERR("invalid pv [%s] (%d/%d)\n", pvn.s, pl, pvn.len); return 0; } - if(pv_set_spec_value(env_L->msg, &pvs, 0, &val)<0) + pvs = pv_cache_get(&pvn); + if(pvs==NULL) + { + LM_ERR("cannot get pv spec for [%s]\n", pvn.s); + return 0; + } + if(pv_set_spec_value(env_L->msg, pvs, 0, &val)<0) { LM_ERR("unable to set pv [%s]\n", pvn.s); return 0; @@ -961,9 +977,10 @@ static int lua_sr_pv_seti (lua_State *L) static int lua_sr_pv_sets (lua_State *L) { str pvn; - pv_spec_t pvs; + pv_spec_t *pvs; pv_value_t val; sr_lua_env_t *env_L; + int pl; env_L = sr_lua_env_get(); @@ -983,12 +1000,19 @@ static int lua_sr_pv_sets (lua_State *L) pvn.len = strlen(pvn.s); LM_DBG("pv set: %s\n", pvn.s); - if(pv_parse_spec(&pvn, &pvs)<0) + pl = pv_locate_name(&pvn); + if(pl != pvn.len) { - LM_ERR("unable to parse pv [%s]\n", pvn.s); + LM_ERR("invalid pv [%s] (%d/%d)\n", pvn.s, pl, pvn.len); return 0; } - if(pv_set_spec_value(env_L->msg, &pvs, 0, &val)<0) + pvs = pv_cache_get(&pvn); + if(pvs==NULL) + { + LM_ERR("cannot get pv spec for [%s]\n", pvn.s); + return 0; + } + if(pv_set_spec_value(env_L->msg, pvs, 0, &val)<0) { LM_ERR("unable to set pv [%s]\n", pvn.s); return 0;

12 years, 8 months

git:master: core: caching support for pv spec parsing

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: b24b560af3acaec10c61d0709d7b1ad63c377b92 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b24b560… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 6 21:44:12 2011 +0200 core: caching support for pv spec parsing - can be used to reduce pkg memory usage by PVs - solves memory leak of using PVs with dynamic names from embedded languages --- pvapi.c | 196 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- pvar.h | 3 + 2 files changed, 197 insertions(+), 2 deletions(-) diff --git a/pvapi.c b/pvapi.c index ff76eb2..940f017 100644 --- a/pvapi.c +++ b/pvapi.c @@ -40,8 +40,9 @@ #include "pvapi.h" #include "pvar.h" -#define PV_TABLE_SIZE 16 /*!< pseudo-variable table size */ -#define TR_TABLE_SIZE 4 /*!< PV transformation size */ +#define PV_TABLE_SIZE 32 /*!< pseudo-variables table size */ +#define PV_CACHE_SIZE 32 /*!< pseudo-variables table size */ +#define TR_TABLE_SIZE 16 /*!< transformations table size */ void tr_destroy(trans_t *t); @@ -57,6 +58,16 @@ typedef struct _pv_item static pv_item_t* _pv_table[PV_TABLE_SIZE]; static int _pv_table_set = 0; +typedef struct _pv_cache +{ + str pvname; + unsigned int pvid; + pv_spec_t spec; + struct _pv_cache *next; +} pv_cache_t; + +static pv_cache_t* _pv_cache[PV_CACHE_SIZE]; +static int _pv_cache_set = 0; /** * @@ -68,6 +79,16 @@ void pv_init_table(void) } /** + * + */ +void pv_init_cache(void) +{ + memset(_pv_cache, 0, sizeof(pv_cache_t*)*PV_CACHE_SIZE); + _pv_cache_set = 1; +} + + +/** * @brief Check if a char is valid according to the PV syntax * @param c checked char * @return 1 if char is valid, 0 if not valid @@ -83,6 +104,75 @@ static int is_pv_valid_char(char c) /** * */ +int pv_locate_name(str *in) +{ + int i; + int pcount; + + if(in==NULL || in->s==NULL || in->len<2) + { + LM_ERR("bad parameters\n"); + return -1; + } + + if(in->s[0]!=PV_MARKER) + { + LM_ERR("missing pv marker [%.*s]\n", in->len, in->s); + return -1; + } + pcount = 0; + if(in->s[1]==PV_LNBRACKET) + { + /* name with parenthesis: $(...) */ + pcount = 1; + for(i=1; i<in->len; i++) + { + if(in->s[i]==PV_LNBRACKET) + pcount++; + else if(in->s[i]==PV_RNBRACKET) + pcount--; + if(pcount==0) + return i+1; + } + /* non-closing name parenthesis */ + return -1; + } + + /* name without parenthesis: $xyz(...) */ + for(i=1; i<in->len; i++) + { + if(!is_pv_valid_char(in->s[i])) + { + if(in->s[i]==PV_LNBRACKET) + { + /* inner-name parenthesis */ + pcount = 1; + break; + } else { + return i; + } + } + } + if(pcount==0) + return i; + + i++; + for( ; i<in->len; i++) + { + if(in->s[i]==PV_LNBRACKET) + pcount++; + else if(in->s[i]==PV_RNBRACKET) + pcount--; + if(pcount==0) + return i+1; + } + /* non-closing inner-name parenthesis */ + return -1; +} + +/** + * + */ int pv_table_add(pv_export_t *e) { char *p; @@ -162,6 +252,108 @@ done: /** * */ +pv_spec_t* pv_cache_add(str *name) +{ + pv_cache_t *pvn; + unsigned int pvid; + char *p; + + if(_pv_cache_set==0) + { + LM_DBG("PV cache not initialized, doing it now\n"); + pv_init_cache(); + } + pvid = get_hash1_raw(name->s, name->len); + pvn = (pv_cache_t*)pkg_malloc(sizeof(pv_cache_t) + name->len + 1); + if(pvn==0) + { + LM_ERR("no more memory\n"); + return NULL; + } + memset(pvn, 0, sizeof(pv_item_t) + name->len + 1); + p = pv_parse_spec(name, &pvn->spec); + + if(p==NULL) + { + pkg_free(pvn); + return NULL; + } + pvn->pvname.len = name->len; + pvn->pvname.s = (char*)pvn + sizeof(pv_cache_t); + memcpy(pvn->pvname.s, name->s, name->len); + pvn->pvid = pvid; + pvn->next = _pv_cache[pvid%PV_CACHE_SIZE]; + _pv_cache[pvid%PV_CACHE_SIZE] = pvn; + + LM_DBG("pvar [%.*s] added in cache\n", name->len, name->s); + return &pvn->spec; +} + +/** + * + */ +pv_spec_t* pv_cache_lookup(str *name) +{ + pv_cache_t *pvi; + unsigned int pvid; + int found; + + if(_pv_cache_set==0) + return NULL; + + pvid = get_hash1_raw(name->s, name->len); + pvi = _pv_cache[pvid%PV_CACHE_SIZE]; + while(pvi) + { + if(pvi->pvid == pvid) { + if(pvi->pvname.len==name->len) + { + found = strncmp(pvi->pvname.s, name->s, name->len); + + if(found==0) + { + LM_DBG("pvar [%.*s] found in cache\n", + name->len, name->s); + return &pvi->spec; + } + } + } + pvi = pvi->next; + } + return NULL; +} + +/** + * + */ +pv_spec_t* pv_cache_get(str *name) +{ + pv_spec_t *pvs; + str tname; + + if(name->s==NULL || name->len==0) + { + LM_ERR("invalid parameters\n"); + return NULL; + } + + tname.s = name->s; + tname.len = pv_locate_name(name); + + if(tname.len < 0) + return NULL; + + pvs = pv_cache_lookup(&tname); + + if(pvs!=NULL) + return pvs; + + return pv_cache_add(&tname); +} + +/** + * + */ int register_pvars_mod(char *mod_name, pv_export_t *items) { int ret; diff --git a/pvar.h b/pvar.h index e7701f2..df83e69 100644 --- a/pvar.h +++ b/pvar.h @@ -204,6 +204,9 @@ pvname_list_t* parse_pvname_list(str *in, unsigned int type); int register_pvars_mod(char *mod_name, pv_export_t *items); int pv_free_extra_list(void); +int pv_locate_name(str *in); +pv_spec_t* pv_cache_get(str *name); + /*! \brief PV helper functions */ int pv_get_null(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

12 years, 8 months

[tracker] Comment added: Gentoo ebuild/pkg

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#134 - Gentoo ebuild/pkg User who did this - Henning Westerholt (henningw) ---------- Fixes were also cherry-picked into the 3.1 branch, Claudio will provide an update to the ebuild that fixes the remaining small issues. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=134#comment261 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.

12 years, 8 months

git:3.1: pkg: also remove Makefile.defs.diff from calling files

by Henning Westerholt

Module: sip-router Branch: 3.1 Commit: b76666deb6221fedfdf2927b2db6e07e8440864c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b76666d… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Sep 5 21:46:12 2011 +0200 pkg: also remove Makefile.defs.diff from calling files (cherry picked from commit 4c201e8c08e607f60efe695b5b9bb22042b7dbbe) --- pkg/ser/gentoo/Manifest | 1 - pkg/ser/gentoo/sip-router-3.1.2.ebuild | 3 --- pkg/ser/gentoo/sip-router-3.1.3.ebuild | 3 --- pkg/ser/gentoo/sip-router-3.1.4-r1.ebuild | 3 --- pkg/ser/gentoo/sip-router-3.1.4.ebuild | 3 --- 5 files changed, 0 insertions(+), 13 deletions(-) diff --git a/pkg/ser/gentoo/Manifest b/pkg/ser/gentoo/Manifest index 033e40e..15ed9dd 100644 --- a/pkg/ser/gentoo/Manifest +++ b/pkg/ser/gentoo/Manifest @@ -1,4 +1,3 @@ -AUX Makefile.defs.diff 280 RMD160 b45541a28f0d7abf816785503733a5856ec99f9d SHA1 c7f5a827705a798dace6b0f2a1d76c6b6b7bb72e SHA256 b8e90c4f7515eff038d08019cd949090f6e960aca32ec35505f44f155bfbedf1 AUX siprouter.confd 496 RMD160 1bbdc51c80a1622b0d2cf17540c572590d35a0ad SHA1 deadd28c437edd3cd5a2f7c2ad7add39275d5845 SHA256 f01307979d2ef07b53889a6d17a2b65313ff109ac15bcb16446fb08cf390ee4a AUX siprouter.init 793 RMD160 6bc17c6d454c0c57a0c8720ac0ec34c3548a2431 SHA1 794dc51028151d2b312c1c9d1c085d68dcbc1b45 SHA256 e4755430ca44e1d7dff7049b130a4a08d99e3149e3842dc4a822795367c5ae88 DIST kamailio-3.1.2_src.tar.gz 6936249 RMD160 8811bc7b1310e4ca550b40d108002f6a36cd6ab8 SHA1 76b417f9b54575d8ec179558c16953a8e6510809 SHA256 03396f7a202507075d8c81fd1bbc689cedc8bf96941faaa570e007164f2f9550 diff --git a/pkg/ser/gentoo/sip-router-3.1.2.ebuild b/pkg/ser/gentoo/sip-router-3.1.2.ebuild index fd1fcc6..13bca39 100644 --- a/pkg/ser/gentoo/sip-router-3.1.2.ebuild +++ b/pkg/ser/gentoo/sip-router-3.1.2.ebuild @@ -106,9 +106,6 @@ src_unpack() { use ipv6 || \ sed -i -e "s/-DUSE_IPV6//g" Makefile.defs || die - - # Patch for sip-router flavour binaries names - epatch "${FILESDIR}/Makefile.defs.diff" } src_compile() { diff --git a/pkg/ser/gentoo/sip-router-3.1.3.ebuild b/pkg/ser/gentoo/sip-router-3.1.3.ebuild index fd1fcc6..13bca39 100644 --- a/pkg/ser/gentoo/sip-router-3.1.3.ebuild +++ b/pkg/ser/gentoo/sip-router-3.1.3.ebuild @@ -106,9 +106,6 @@ src_unpack() { use ipv6 || \ sed -i -e "s/-DUSE_IPV6//g" Makefile.defs || die - - # Patch for sip-router flavour binaries names - epatch "${FILESDIR}/Makefile.defs.diff" } src_compile() { diff --git a/pkg/ser/gentoo/sip-router-3.1.4-r1.ebuild b/pkg/ser/gentoo/sip-router-3.1.4-r1.ebuild index 1d8fb85..ccf4083 100644 --- a/pkg/ser/gentoo/sip-router-3.1.4-r1.ebuild +++ b/pkg/ser/gentoo/sip-router-3.1.4-r1.ebuild @@ -115,9 +115,6 @@ src_unpack() { use ipv6 || \ sed -i -e "s/-DUSE_IPV6//g" Makefile.defs || die - - # Patch for sip-router flavour binaries names - epatch "${FILESDIR}/Makefile.defs.diff" } src_compile() { diff --git a/pkg/ser/gentoo/sip-router-3.1.4.ebuild b/pkg/ser/gentoo/sip-router-3.1.4.ebuild index 2d5d670..2ade9c4 100644 --- a/pkg/ser/gentoo/sip-router-3.1.4.ebuild +++ b/pkg/ser/gentoo/sip-router-3.1.4.ebuild @@ -106,9 +106,6 @@ src_unpack() { use ipv6 || \ sed -i -e "s/-DUSE_IPV6//g" Makefile.defs || die - - # Patch for sip-router flavour binaries names - epatch "${FILESDIR}/Makefile.defs.diff" } src_compile() {

12 years, 8 months

git:3.1: pkg: remove Makefile.defs.diff file, which set special daemon name - use the default

by Henning Westerholt

Module: sip-router Branch: 3.1 Commit: 738f0b36bf416de6cd1232f18e4f9dbaf650f2c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=738f0b3… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Sep 5 21:42:03 2011 +0200 pkg: remove Makefile.defs.diff file, which set special daemon name - use the default (cherry picked from commit 65340ae5b19f20d904d6a80b2e80711c93d44f7d) --- pkg/ser/gentoo/files/Makefile.defs.diff | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/pkg/ser/gentoo/files/Makefile.defs.diff b/pkg/ser/gentoo/files/Makefile.defs.diff deleted file mode 100644 index 3c2d430..0000000 --- a/pkg/ser/gentoo/files/Makefile.defs.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.defs~ 2011-03-22 14:57:24.759454311 -0300 -+++ Makefile.defs 2011-03-23 10:06:57.997000132 -0300 -@@ -133,7 +133,7 @@ - - ifeq ($(FLAVOUR),sip-router) - # main binary name --MAIN_NAME=ser -+MAIN_NAME=siprouter - else ifeq ($(FLAVOUR),ser) - # main binary name - MAIN_NAME=ser

12 years, 8 months

git:3.1: pgk: add symlink to kamailio directory for new gentoo ebuild

by Henning Westerholt

Module: sip-router Branch: 3.1 Commit: 19f3a0d6a6951ddae4734f9d217ae8f223d60de7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=19f3a0d… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Sep 5 21:50:23 2011 +0200 pgk: add symlink to kamailio directory for new gentoo ebuild (cherry picked from commit a89e2b1a2f71c932f38c0bfdcceb2fa1880431f5) --- pkg/kamailio/gentoo | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/pkg/kamailio/gentoo b/pkg/kamailio/gentoo new file mode 120000 index 0000000..6cd8d42 --- /dev/null +++ b/pkg/kamailio/gentoo @@ -0,0 +1 @@ +../ser/gentoo/ \ No newline at end of file

12 years, 8 months

git:3.1: pkg: move gentoo ebuild to ser directory, remove obselete 0.8. X ebuild

by Henning Westerholt

Module: sip-router Branch: 3.1 Commit: 007cd3ffdadf0964f6e338d2999658bac6676f74 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=007cd3f… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Sep 5 21:33:21 2011 +0200 pkg: move gentoo ebuild to ser directory, remove obselete 0.8.X ebuild --- pkg/gentoo/ser-0.8.10.ebuild | 68 ------------- pkg/gentoo/ser-0.8.11.ebuild | 106 -------------------- pkg/gentoo/ser-0.8.12.ebuild | 106 -------------------- pkg/gentoo/ser-0.8.14.ebuild | 106 -------------------- pkg/gentoo/ser-0.8.9.ebuild | 59 ----------- pkg/gentoo/ser.init | 33 ------ pkg/{sip-router => ser}/gentoo/ChangeLog | 0 pkg/{sip-router => ser}/gentoo/Manifest | 0 .../gentoo/files/Makefile.defs.diff | 0 .../gentoo/files/siprouter.confd | 0 .../gentoo/files/siprouter.init | 0 pkg/{sip-router => ser}/gentoo/metadata.xml | 0 .../gentoo/sip-router-3.1.2.ebuild | 0 .../gentoo/sip-router-3.1.3.ebuild | 0 .../gentoo/sip-router-3.1.4-r1.ebuild | 0 .../gentoo/sip-router-3.1.4.ebuild | 0 16 files changed, 0 insertions(+), 478 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=007…

12 years, 8 months

git:master: dispatcher: just some 80 char long line alignaments

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: ed55e6f5080df7a154ba4c233d098672e688b305 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ed55e6f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 6 14:14:01 2011 +0200 dispatcher: just some 80 char long line alignaments --- modules_k/dispatcher/dispatcher.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/modules_k/dispatcher/dispatcher.c b/modules_k/dispatcher/dispatcher.c index 2fb8cb6..a95f998 100644 --- a/modules_k/dispatcher/dispatcher.c +++ b/modules_k/dispatcher/dispatcher.c @@ -282,10 +282,13 @@ static int mod_init(void) if (ds_ping_from.s) ds_ping_from.len = strlen(ds_ping_from.s); if (ds_ping_method.s) ds_ping_method.len = strlen(ds_ping_method.s); - if(cfg_declare("dispatcher", dispatcher_cfg_def, &default_dispatcher_cfg, cfg_sizeof(dispatcher), &dispatcher_cfg)){ - LM_ERR("Fail to declare the configuration\n"); - return -1; - } + if(cfg_declare("dispatcher", dispatcher_cfg_def, + &default_dispatcher_cfg, cfg_sizeof(dispatcher), + &dispatcher_cfg)){ + LM_ERR("Fail to declare the configuration\n"); + return -1; + } + /* Initialize the counter */ ds_ping_reply_codes = (int**)shm_malloc(sizeof(unsigned int*)); *ds_ping_reply_codes = 0; @@ -293,14 +296,16 @@ static int mod_init(void) *ds_ping_reply_codes_cnt = 0; if(ds_ping_reply_codes_str.s) { ds_ping_reply_codes_str.len = strlen(ds_ping_reply_codes_str.s); - cfg_get(dispatcher, dispatcher_cfg, ds_ping_reply_codes_str) = ds_ping_reply_codes_str; + cfg_get(dispatcher, dispatcher_cfg, ds_ping_reply_codes_str) + = ds_ping_reply_codes_str; if(ds_parse_reply_codes()< 0) { return -1; } } /* Copy Threshhold to Config */ - cfg_get(dispatcher, dispatcher_cfg, probing_threshhold) = probing_threshhold; + cfg_get(dispatcher, dispatcher_cfg, probing_threshhold) + = probing_threshhold; if(init_data()!= 0)

12 years, 8 months

git:master: tm: update T msg flags after {branch/failure}_route

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: c589ca35b2aa3097a3c9e2a5a050514337300c05 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c589ca3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 6 14:12:00 2011 +0200 tm: update T msg flags after {branch/failure}_route - after execution of branch_route or failure_route, set the message flags of the temporary request back to transaction request - 1.x behaviour - reported and partial patch by Alex Hermann --- modules/tm/t_fwd.c | 3 +++ modules/tm/t_reply.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index 30558ab..210601d 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -1511,6 +1511,9 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg , setbflagsval(0, backup_bflags); + /* update message flags, if changed in branch route */ + t->uas.request->flags = p_msg->flags; + /* don't forget to clear all branches processed so far */ /* things went wrong ... no new branch has been fwd-ed at all */ diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 2efaa69..b7c3a84 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -968,11 +968,13 @@ int run_failure_handlers(struct cell *t, struct sip_msg *rpl, on_failure = t->on_negative; t->on_negative=0; if (exec_pre_script_cb(&faked_req, FAILURE_CB_TYPE)>0) { - /* run a reply_route action if some was marked */ + /* run a failure_route action if some was marked */ if (run_top_route(failure_rt.rlist[on_failure], &faked_req, 0)<0) LOG(L_ERR, "ERROR: run_failure_handlers: Error in run_top_route\n"); exec_post_script_cb(&faked_req, FAILURE_CB_TYPE); } + /* update message flags, if changed in failure route */ + t->uas.request->flags = faked_req.flags; } /* restore original environment and free the fake msg */

12 years, 8 months

rfc: things about RPC/MI child initialization

by Daniel-Constantin Mierla

Hello, currently there is a known issue with the processes initialized for processing MI commands when using event_route[tm:local-request]. Since the child init function for other modules is not executed for such processes, functions from various modules (especially with database interaction) cannot be executed, for example: calling acc_db_request() for BYE generated through MI dlg_end_dlg. On another hand, MI functions cannot be called properly via RPC (through mi_rpc module) when using XMLRPC. The reason is that XMLRPC is handled by SIP workers, which do not execute mi_child_init function. These may render obsolete the mi_init_child function, since it should be merged in the normal child_init function. Moreover, the rank PROC_RPC applies to SIP worker processes when XMLRPC module is loaded. Thus I think some RPC commands don't work properly over XMLRPC (cc-ed Jan and Andrei for more comments here). It should be also like a RPC flag per process than only type One option to solve is to add a new parameter to child init function, flags, where to tell whether the process is going to handle MI/RPC requests. Based on that, call mi_child_init if still requires. PROC_RPC needs to stay also as rank for specially forked processes. This change will require to touch all modules, and they are a lot, so maybe somebody here finds other solution. Cheers, Daniel -- Daniel-Constantin Mierla -- http://www.asipto.com Kamailio Advanced Training, Oct 10-13, Berlin: http://asipto.com/u/kat http://linkedin.com/in/miconda -- http://twitter.com/miconda

12 years, 8 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2011