sr-dev July 2013

sr-dev@lists.kamailio.org

21 participants
246 discussions

Re: [sr-dev] libval as kamailio server requirement
by Victor Seva 10 Jul '13

10 Jul '13

Hello, as Jon already said, kamailio 4.1 dnssec module will need a few new libraries provided by dnsssec-tools[0] 2.0: - dns-validator_2.0-1_i386.deb - libval-threads_2.0-1_i386.deb - libval-threads-dev_2.0-1_i386.deb - libsres_2.0-1_i386.deb - libsres-dev_2.0-1_i386.deb So, have you any plans to upgrade the package and add those libraries? Cheers, Victor [0] http://www.kamailio.org/wiki/tutorials/dns/dnssec

1 0

git:master: htable: sht_lock() and sht_unlock() documented in readme
by Elena-Ramona Modroiu 10 Jul '13

10 Jul '13

Module: sip-router Branch: master Commit: 4a425a88be796c4b2c8447e6eafc53652ddf8e72 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4a425a8… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Sat Jul 6 19:03:49 2013 +0200 htable: sht_lock() and sht_unlock() documented in readme --- modules/htable/README | 32 ++++++++++++++++++++++++++++ modules/htable/doc/htable_admin.xml | 40 +++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 0 deletions(-) diff --git a/modules/htable/README b/modules/htable/README index 2cf178e..3324807 100644 --- a/modules/htable/README +++ b/modules/htable/README @@ -51,6 +51,8 @@ Alex Balashov 4.1. sht_print() 4.2. sht_rm_name_re(htable=>regexp) 4.3. sht_rm_value_re(htable=>regexp) + 4.4. sht_lock(htable=>key) + 4.5. sht_unlock(htable=>key) 5. Exported pseudo-variables 6. MI Commands @@ -92,6 +94,8 @@ Alex Balashov 1.15. sht_print usage 1.16. sht_rm_name_re usage 1.17. sht_rm_value_re usage + 1.18. sht_lock usage + 1.19. sht_unlock usage Chapter 1. Admin Guide @@ -124,6 +128,8 @@ Chapter 1. Admin Guide 4.1. sht_print() 4.2. sht_rm_name_re(htable=>regexp) 4.3. sht_rm_value_re(htable=>regexp) + 4.4. sht_lock(htable=>key) + 4.5. sht_unlock(htable=>key) 5. Exported pseudo-variables 6. MI Commands @@ -450,6 +456,8 @@ modparam("htable", "db_expires", 1) 4.1. sht_print() 4.2. sht_rm_name_re(htable=>regexp) 4.3. sht_rm_value_re(htable=>regexp) + 4.4. sht_lock(htable=>key) + 4.5. sht_unlock(htable=>key) 4.1. sht_print() @@ -490,6 +498,30 @@ sht_rm_name_re("ha=>.*"); sht_rm_value_re("ha=>.*"); ... +4.4. sht_lock(htable=>key) + + Lock the slot in htable corespoding to the key item. + + This function can be used from ANY_ROUTE. + + Example 1.18. sht_lock usage +... +sht_lock("ha=>test"); +... + +4.5. sht_unlock(htable=>key) + + Unlock the slot in htable corespoding to the key item. + + This function can be used from ANY_ROUTE. + + Example 1.19. sht_unlock usage +... +sht_lock("ha=>test"); +$sht(ha=>test) = $sht(ha=>test) + 10; +sht_unlock("ha=>test"); +... + 5. Exported pseudo-variables * $sht(htable=>key) diff --git a/modules/htable/doc/htable_admin.xml b/modules/htable/doc/htable_admin.xml index ae7dc3d..c38e555 100644 --- a/modules/htable/doc/htable_admin.xml +++ b/modules/htable/doc/htable_admin.xml @@ -570,6 +570,46 @@ sht_rm_value_re("ha=>.*"); </programlisting> </example> </section> + <section id="htable.f.sht_lock"> + <title> + <function moreinfo="none">sht_lock(htable=>key)</function> + </title> + <para> + Lock the slot in htable corespoding to the key item. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>sht_lock</function> usage</title> + <programlisting format="linespecific"> +... +sht_lock("ha=>test"); +... +</programlisting> + </example> + </section> + <section id="htable.f.sht_unlock"> + <title> + <function moreinfo="none">sht_unlock(htable=>key)</function> + </title> + <para> + Unlock the slot in htable corespoding to the key item. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>sht_unlock</function> usage</title> + <programlisting format="linespecific"> +... +sht_lock("ha=>test"); +$sht(ha=>test) = $sht(ha=>test) + 10; +sht_unlock("ha=>test"); +... +</programlisting> + </example> + </section> </section> <section> <title>Exported pseudo-variables</title>

1 0

git:master: htable: two new functions to lock htable slots based on item name
by Elena-Ramona Modroiu 10 Jul '13

10 Jul '13

Module: sip-router Branch: master Commit: bc5cc684efad11f9affe648f3d0f6da98e43ad25 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bc5cc68… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Sat Jul 6 18:31:17 2013 +0200 htable: two new functions to lock htable slots based on item name - sht_lock("htable=>key") and sht_unlock("htable=>key") - useful to update existing items without aditional locks --- modules/htable/ht_api.c | 4 -- modules/htable/ht_api.h | 3 + modules/htable/htable.c | 98 +++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 97 insertions(+), 8 deletions(-) diff --git a/modules/htable/ht_api.c b/modules/htable/ht_api.c index 6a74793..84eb2e0 100644 --- a/modules/htable/ht_api.c +++ b/modules/htable/ht_api.c @@ -36,10 +36,6 @@ #include "ht_db.h" -#define ht_compute_hash(_s) core_case_hash(_s,0,0) -#define ht_get_entry(_h,_size) (_h)&((_size)-1) - - ht_t *_ht_root = NULL; typedef struct _keyvalue { diff --git a/modules/htable/ht_api.h b/modules/htable/ht_api.h index c8b88f7..98b2eae 100644 --- a/modules/htable/ht_api.h +++ b/modules/htable/ht_api.h @@ -29,6 +29,9 @@ #include "../../locking.h" #include "../../pvar.h" +#define ht_compute_hash(_s) core_case_hash(_s,0,0) +#define ht_get_entry(_h,_size) (_h)&((_size)-1) + typedef struct _ht_cell { unsigned int cellid; diff --git a/modules/htable/htable.c b/modules/htable/htable.c index 68a7a5b..37c68f4 100644 --- a/modules/htable/htable.c +++ b/modules/htable/htable.c @@ -32,6 +32,7 @@ #include "../../timer.h" #include "../../route.h" #include "../../dprint.h" +#include "../../hashes.h" #include "../../ut.h" #include "../../rpc.h" #include "../../rpc_lookup.h" @@ -58,9 +59,11 @@ static int mod_init(void); static int child_init(int rank); static void destroy(void); -static int fixup_ht_rm(void** param, int param_no); +static int fixup_ht_key(void** param, int param_no); static int ht_rm_name_re(struct sip_msg* msg, char* key, char* foo); static int ht_rm_value_re(struct sip_msg* msg, char* key, char* foo); +static int ht_slot_lock(struct sip_msg* msg, char* key, char* foo); +static int ht_slot_unlock(struct sip_msg* msg, char* key, char* foo); int ht_param(modparam_t type, void* val); @@ -96,9 +99,13 @@ static mi_export_t mi_cmds[] = { static cmd_export_t cmds[]={ {"sht_print", (cmd_function)ht_print, 0, 0, 0, ANY_ROUTE}, - {"sht_rm_name_re", (cmd_function)ht_rm_name_re, 1, fixup_ht_rm, 0, + {"sht_rm_name_re", (cmd_function)ht_rm_name_re, 1, fixup_ht_key, 0, ANY_ROUTE}, - {"sht_rm_value_re", (cmd_function)ht_rm_value_re, 1, fixup_ht_rm, 0, + {"sht_rm_value_re", (cmd_function)ht_rm_value_re, 1, fixup_ht_key, 0, + ANY_ROUTE}, + {"sht_lock", (cmd_function)ht_slot_lock, 1, fixup_ht_key, 0, + ANY_ROUTE}, + {"sht_unlock", (cmd_function)ht_slot_unlock, 1, fixup_ht_key, 0, ANY_ROUTE}, {"bind_htable", (cmd_function)bind_htable, 0, 0, 0, ANY_ROUTE}, @@ -245,7 +252,7 @@ static int ht_print(struct sip_msg *msg, char *s1, char *s2) return 1; } -static int fixup_ht_rm(void** param, int param_no) +static int fixup_ht_key(void** param, int param_no) { pv_spec_t *sp; str s; @@ -324,6 +331,89 @@ static int ht_rm_value_re(struct sip_msg* msg, char* key, char* foo) return 1; } +/** + * lock the slot for a given key in a hash table + */ +static int ht_slot_lock(struct sip_msg* msg, char* key, char* foo) +{ + ht_pv_t *hpv; + str skey; + pv_spec_t *sp; + unsigned int hid; + unsigned int idx; + + sp = (pv_spec_t*)key; + + hpv = (ht_pv_t*)sp->pvp.pvn.u.dname; + + if(hpv->ht==NULL) + { + hpv->ht = ht_get_table(&hpv->htname); + if(hpv->ht==NULL) { + LM_ERR("cannot get $ht root\n"); + return -11; + } + } + if(pv_printf_s(msg, hpv->pve, &skey)!=0) + { + LM_ERR("cannot get $ht key\n"); + return -1; + } + + hid = ht_compute_hash(&skey); + + idx = ht_get_entry(hid, hpv->ht->htsize); + + LM_DBG("unlocking slot %.*s[%u] for key %.*s\n", + hpv->htname.len, hpv->htname.s, + idx, skey.len, skey.s); + + lock_get(&hpv->ht->entries[idx].lock); + + return 1; +} + +/** + * unlock the slot for a given key in a hash table + */ +static int ht_slot_unlock(struct sip_msg* msg, char* key, char* foo) +{ + ht_pv_t *hpv; + str skey; + pv_spec_t *sp; + unsigned int hid; + unsigned int idx; + + sp = (pv_spec_t*)key; + + hpv = (ht_pv_t*)sp->pvp.pvn.u.dname; + + if(hpv->ht==NULL) + { + hpv->ht = ht_get_table(&hpv->htname); + if(hpv->ht==NULL) { + LM_ERR("cannot get $ht root\n"); + return -11; + } + } + if(pv_printf_s(msg, hpv->pve, &skey)!=0) + { + LM_ERR("cannot get $ht key\n"); + return -1; + } + + hid = ht_compute_hash(&skey); + + idx = ht_get_entry(hid, hpv->ht->htsize); + + LM_DBG("unlocking slot %.*s[%u] for key %.*s\n", + hpv->htname.len, hpv->htname.s, + idx, skey.len, skey.s); + + lock_release(&hpv->ht->entries[idx].lock); + + return 1; +} int ht_param(modparam_t type, void *val) {

1 0

Makefile and environment XXFLAGS
by Victor Seva 10 Jul '13

10 Jul '13

Hello, I have a bugreport[0] about hardening [1] and how I try to pass this flags to the build system [2][3] Is there any proper way to configure this flags? Should I try to modify the Makefile.def for use the environment flags and not clean their values? Cheers, Victor [0] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=690396 [1] http://wiki.debian.org/Hardening [2] configure phase: configure: configure-stamp configure-stamp: dh_testdir # Add here commands to configure the package. $(MAKE) FLAVOUR=kamailio cfg prefix=/usr cfg_prefix=$(CURDIR)/debian/kamailio \ cfg_target=/etc/kamailio/ \ basedir=$(CURDIR)/debian/kamailio \ skip_modules="$(EXCLUDED_MODULES) $(EXTRA_EXCLUDED_MODULES)" \ $(shell dpkg-buildflags --export=configure) \ group_include="kstandard" quiet=verbose touch configure-stamp [3] $(shell dpkg-buildflags --export=configure) output: CFLAGS="-g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security" CPPFLAGS="-D_FORTIFY_SOURCE=2" CXXFLAGS="-g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security" FFLAGS="-g -O2" LDFLAGS="-Wl,-z,relro"

2 1

git:rfuchs/rtpproxy-ng: rtpproxy-ng: initial checkin
by Richard Fuchs 09 Jul '13

09 Jul '13

Module: sip-router Branch: rfuchs/rtpproxy-ng Commit: ddea262fd70521eec450e57519f63a63880a94df URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ddea262… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: Tue Jul 9 12:28:48 2013 -0400 rtpproxy-ng: initial checkin --- Makefile.groups | 2 +- modules/rtpproxy-ng/Makefile | 19 + modules/rtpproxy-ng/README | 635 +++++++++ modules/rtpproxy-ng/bencode.c | 701 ++++++++++ modules/rtpproxy-ng/bencode.h | 521 ++++++++ modules/rtpproxy-ng/doc/Makefile | 4 + modules/rtpproxy-ng/doc/rtpproxy-ng.xml | 103 ++ modules/rtpproxy-ng/doc/rtpproxy_admin.xml | 821 ++++++++++++ modules/rtpproxy-ng/doc/rtpproxy_faq.xml | 79 ++ modules/rtpproxy-ng/rtpproxy.c | 1971 ++++++++++++++++++++++++++++ modules/rtpproxy-ng/rtpproxy.h | 64 + modules/rtpproxy-ng/rtpproxy_funcs.c | 430 ++++++ modules/rtpproxy-ng/rtpproxy_funcs.h | 40 + 13 files changed, 5389 insertions(+), 1 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=dde…

1 0

git:rfuchs/rtpproxy-ng: modules/app_lua: added param to sr.xavp. get to choose between all the values (default) or just the first ones.
by Richard Fuchs 09 Jul '13

09 Jul '13

Module: sip-router Branch: rfuchs/rtpproxy-ng Commit: 8cd7a48479594052b6b6e70d48946e8963e1625d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8cd7a48… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Tue Jul 9 17:50:06 2013 +0200 modules/app_lua: added param to sr.xavp.get to choose between all the values (default) or just the first ones. --- modules/app_lua/app_lua_sr.c | 88 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 81 insertions(+), 7 deletions(-) diff --git a/modules/app_lua/app_lua_sr.c b/modules/app_lua/app_lua_sr.c index 4075ef8..c5229f4 100644 --- a/modules/app_lua/app_lua_sr.c +++ b/modules/app_lua/app_lua_sr.c @@ -1237,6 +1237,57 @@ static int lua_sr_push_xavp_table(lua_State *L, sr_xavp_t *xavp) { return 1; } + /** + * creates and push a table to the lua stack with + * only the firsts elements of the xavp + */ +static int lua_sr_push_xavp_table_simple(lua_State *L, sr_xavp_t *xavp) { + lua_Number i = 1; + sr_xavp_t *avp = NULL; + + if(xavp->val.type!=SR_XTYPE_XAVP){ + LM_ERR("%s not xavp?\n", xavp->name.s); + return 0; + } + avp = xavp->val.v.xavp; + + lua_newtable(L); + while(avp!=NULL){ + switch(avp->val.type) { + case SR_XTYPE_NULL: + lua_pushnil(L); + lua_setfield(L, -2, avp->name.s); + break; + case SR_XTYPE_INT: + i = avp->val.v.i; + lua_pushnumber(L, i); + lua_setfield(L, -2, avp->name.s); + break; + case SR_XTYPE_STR: + lua_pushlstring(L, avp->val.v.s.s, avp->val.v.s.len); + lua_setfield(L, -2, avp->name.s); + break; + case SR_XTYPE_TIME: + case SR_XTYPE_LONG: + case SR_XTYPE_LLONG: + case SR_XTYPE_DATA: + lua_pushnil(L); + lua_setfield(L, -2, avp->name.s); + LM_WARN("XAVP type:%d value not supported\n", avp->val.type); + break; + case SR_XTYPE_XAVP: + if(!lua_sr_push_xavp_table(L,avp->val.v.xavp)){ + LM_ERR("xavp:%.*s subtable error. Nil value added\n", avp->name.len, avp->name.s); + lua_pushnil(L); + } + lua_setfield(L, -2, avp->name.s); + break; + } + avp = avp->next; + } + return 1; +} + /** * puts a table with content of a xavp */ @@ -1246,23 +1297,38 @@ static int lua_sr_xavp_get(lua_State *L) int indx = 0; sr_lua_env_t *env_L; sr_xavp_t *avp; + int num_param = 0; + int param = -1; + int simple_flag = 0; env_L = sr_lua_env_get(); - - if(lua_gettop(L)<2) + num_param = lua_gettop(L); + if(num_param<2 && num_param>3) { - LM_ERR("to few parameters [%d]\n",lua_gettop(L)); + LM_ERR("wrong number of parameters [%d]\n", num_param); return 0; } - if(!lua_isnumber(L, -1)) + if(num_param==3) + { + if(!lua_isnumber(L, param)) + { + LM_ERR("invalid int parameter\n"); + return 0; + } + simple_flag = lua_tointeger(L, param); + param = param - 1; + } + + if(!lua_isnumber(L, param)) { LM_ERR("invalid int parameter\n"); return 0; } - indx = lua_tointeger(L, -1); + indx = lua_tointeger(L, param); + param = param - 1; - xavp_name.s = (char*)lua_tostring(L, -2); + xavp_name.s = (char*)lua_tostring(L, param); if(xavp_name.s==NULL || env_L->msg==NULL) return 0; xavp_name.len = strlen(xavp_name.s); @@ -1273,7 +1339,15 @@ static int lua_sr_xavp_get(lua_State *L) lua_pushnil(L); return 1; } - lua_sr_push_xavp_table(L, avp); + + if (simple_flag != 0) + { + lua_sr_push_xavp_table_simple(L, avp); + } + else + { + lua_sr_push_xavp_table(L, avp); + } return 1; }

1 0

git:master: modules/app_lua: added param to sr.xavp. get to choose between all the values (default) or just the first ones.
by Victor Seva 09 Jul '13

09 Jul '13

Module: sip-router Branch: master Commit: 8cd7a48479594052b6b6e70d48946e8963e1625d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8cd7a48… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Tue Jul 9 17:50:06 2013 +0200 modules/app_lua: added param to sr.xavp.get to choose between all the values (default) or just the first ones. --- modules/app_lua/app_lua_sr.c | 88 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 81 insertions(+), 7 deletions(-) diff --git a/modules/app_lua/app_lua_sr.c b/modules/app_lua/app_lua_sr.c index 4075ef8..c5229f4 100644 --- a/modules/app_lua/app_lua_sr.c +++ b/modules/app_lua/app_lua_sr.c @@ -1237,6 +1237,57 @@ static int lua_sr_push_xavp_table(lua_State *L, sr_xavp_t *xavp) { return 1; } + /** + * creates and push a table to the lua stack with + * only the firsts elements of the xavp + */ +static int lua_sr_push_xavp_table_simple(lua_State *L, sr_xavp_t *xavp) { + lua_Number i = 1; + sr_xavp_t *avp = NULL; + + if(xavp->val.type!=SR_XTYPE_XAVP){ + LM_ERR("%s not xavp?\n", xavp->name.s); + return 0; + } + avp = xavp->val.v.xavp; + + lua_newtable(L); + while(avp!=NULL){ + switch(avp->val.type) { + case SR_XTYPE_NULL: + lua_pushnil(L); + lua_setfield(L, -2, avp->name.s); + break; + case SR_XTYPE_INT: + i = avp->val.v.i; + lua_pushnumber(L, i); + lua_setfield(L, -2, avp->name.s); + break; + case SR_XTYPE_STR: + lua_pushlstring(L, avp->val.v.s.s, avp->val.v.s.len); + lua_setfield(L, -2, avp->name.s); + break; + case SR_XTYPE_TIME: + case SR_XTYPE_LONG: + case SR_XTYPE_LLONG: + case SR_XTYPE_DATA: + lua_pushnil(L); + lua_setfield(L, -2, avp->name.s); + LM_WARN("XAVP type:%d value not supported\n", avp->val.type); + break; + case SR_XTYPE_XAVP: + if(!lua_sr_push_xavp_table(L,avp->val.v.xavp)){ + LM_ERR("xavp:%.*s subtable error. Nil value added\n", avp->name.len, avp->name.s); + lua_pushnil(L); + } + lua_setfield(L, -2, avp->name.s); + break; + } + avp = avp->next; + } + return 1; +} + /** * puts a table with content of a xavp */ @@ -1246,23 +1297,38 @@ static int lua_sr_xavp_get(lua_State *L) int indx = 0; sr_lua_env_t *env_L; sr_xavp_t *avp; + int num_param = 0; + int param = -1; + int simple_flag = 0; env_L = sr_lua_env_get(); - - if(lua_gettop(L)<2) + num_param = lua_gettop(L); + if(num_param<2 && num_param>3) { - LM_ERR("to few parameters [%d]\n",lua_gettop(L)); + LM_ERR("wrong number of parameters [%d]\n", num_param); return 0; } - if(!lua_isnumber(L, -1)) + if(num_param==3) + { + if(!lua_isnumber(L, param)) + { + LM_ERR("invalid int parameter\n"); + return 0; + } + simple_flag = lua_tointeger(L, param); + param = param - 1; + } + + if(!lua_isnumber(L, param)) { LM_ERR("invalid int parameter\n"); return 0; } - indx = lua_tointeger(L, -1); + indx = lua_tointeger(L, param); + param = param - 1; - xavp_name.s = (char*)lua_tostring(L, -2); + xavp_name.s = (char*)lua_tostring(L, param); if(xavp_name.s==NULL || env_L->msg==NULL) return 0; xavp_name.len = strlen(xavp_name.s); @@ -1273,7 +1339,15 @@ static int lua_sr_xavp_get(lua_State *L) lua_pushnil(L); return 1; } - lua_sr_push_xavp_table(L, avp); + + if (simple_flag != 0) + { + lua_sr_push_xavp_table_simple(L, avp); + } + else + { + lua_sr_push_xavp_table(L, avp); + } return 1; }

1 0

git:tmp/tm_async_reply_support: modules/tm: improved functionality for async transaction framework
by Jason Penton 09 Jul '13

09 Jul '13

Module: sip-router Branch: tmp/tm_async_reply_support Commit: 03a8a0030644146a920f03c2d5186eb72806d3f3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=03a8a00… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Tue Jul 9 17:05:38 2013 +0200 modules/tm: improved functionality for async transaction framework --- modules/tm/h_table.h | 12 ++++++- modules/tm/t_reply.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++ modules/tm/t_reply.h | 1 + modules/tm/t_suspend.c | 28 +++++++++++++-- 4 files changed, 126 insertions(+), 5 deletions(-) diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index e260d7e..966f374 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -91,6 +91,7 @@ struct cell; struct timer; struct retr_buf; struct ua_client; +struct async_state; #include "../../mem/shm_mem.h" #include "lock.h" @@ -264,6 +265,13 @@ typedef struct ua_client unsigned short on_unused; }ua_client_type; +/* structure for storing trnasaction state prior to suspending for async transactions */ +typedef struct async_state +{ + unsigned int backup_route; + unsigned int backup_branch; + unsigned int ruri_new; +}async_state_type; struct totag_elem { struct totag_elem *next; @@ -403,6 +411,9 @@ typedef struct cell outbound buffer, for proxies transactions pointer to original message; needed for reply matching */ str method; + + /* store transaction state to be used with async transactions */ + struct async_state async_backup; /* head of callback list */ struct tmcb_head_list tmcb_hl; @@ -460,7 +471,6 @@ typedef struct cell } tm_cell_t; - #if 0 /* warning: padding too much => big size increase */ #define ENTRY_PAD_TO 128 /* should be a multiple of cacheline size for diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 359fd90..d6f6030 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -951,6 +951,96 @@ void faked_env_resp( struct cell *t, struct sip_msg *msg) } } +void faked_env_async( struct cell *t, struct sip_msg *msg) { + static int backup_route_type; + static struct cell *backup_t; + static int backup_branch; + static unsigned int backup_msgid; + static avp_list_t* backup_user_from, *backup_user_to; + static avp_list_t* backup_domain_from, *backup_domain_to; + static avp_list_t* backup_uri_from, *backup_uri_to; +#ifdef WITH_XAVP + static sr_xavp_t **backup_xavps; +#endif + static struct socket_info* backup_si; + + static struct lump *backup_add_rm; + static struct lump *backup_body_lumps; + static struct lump_rpl *backup_reply_lump; + + + if (msg) { + /* remember we are back in request processing, but process + * a shmem-ed replica of the request; advertise it in route type; + * for example t_reply needs to know that + */ + backup_route_type=get_route_type(); + set_route_type(t->async_backup.backup_route); + if (t->async_backup.ruri_new) { + ruri_mark_new(); + } + + if (!is_route_type(REQUEST_ROUTE)) { + /* don't bother backing up ruri state, since failure route + is called either on reply or on timer and in both cases + the ruri should not be used again for forking */ + ruri_mark_consumed(); /* in failure route we assume ruri + should not be used again for forking */ + } + /* also, tm actions look in beginning whether transaction is + * set -- whether we are called from a reply-processing + * or a timer process, we need to set current transaction; + * otherwise the actions would attempt to look the transaction + * up (unnecessary overhead, refcounting) + */ + /* backup */ + backup_t=get_t(); + backup_branch=get_t_branch(); + backup_msgid=global_msg_id; + /* fake transaction and message id */ + global_msg_id=msg->id; + set_t(t, t->async_backup.backup_branch); + /* make available the avp list from transaction */ + + backup_uri_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, &t->uri_avps_from ); + backup_uri_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, &t->uri_avps_to ); + backup_user_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, &t->user_avps_from ); + backup_user_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, &t->user_avps_to ); + backup_domain_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, &t->domain_avps_from ); + backup_domain_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, &t->domain_avps_to ); +#ifdef WITH_XAVP + backup_xavps = xavp_set_list(&t->xavps_list); +#endif + /* set default send address to the saved value */ + backup_si=bind_address; + bind_address=t->uac[0].request.dst.send_sock; + /* backup lump lists */ + backup_add_rm = t->uas.request->add_rm; + backup_body_lumps = t->uas.request->body_lumps; + backup_reply_lump = t->uas.request->reply_lump; + } else { + /* restore original environment */ + set_t(backup_t, backup_branch); + global_msg_id=backup_msgid; + set_route_type(backup_route_type); + /* restore original avp list */ + set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, backup_user_from ); + set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, backup_user_to ); + set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, backup_domain_from ); + set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, backup_domain_to ); + set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, backup_uri_from ); + set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, backup_uri_to ); +#ifdef WITH_XAVP + xavp_set_list(backup_xavps); +#endif + bind_address=backup_si; + /* restore lump lists */ + t->uas.request->add_rm = backup_add_rm; + t->uas.request->body_lumps = backup_body_lumps; + t->uas.request->reply_lump = backup_reply_lump; + } +} + /** create or restore a "fake environment" for running a failure_route. *if msg is set -> it will fake the env. vars conforming with the msg; if NULL * the env. will be restore to original. diff --git a/modules/tm/t_reply.h b/modules/tm/t_reply.h index 17f046b..6ac7928 100644 --- a/modules/tm/t_reply.h +++ b/modules/tm/t_reply.h @@ -236,6 +236,7 @@ void t_drop_replies(int v); void rpc_reply(rpc_t* rpc, void* c); void faked_env( struct cell *t,struct sip_msg *msg); +void faked_env_async( struct cell *t, struct sip_msg *msg); void faked_env_resp( struct cell *t,struct sip_msg *msg); int fake_req(struct sip_msg *faked_req, diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index ad51ef0..b9806a0 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -33,6 +33,7 @@ #include "../../action.h" #include "../../script_cb.h" +#include "../../dset.h" #include "config.h" #include "sip_msg.h" @@ -95,7 +96,10 @@ int t_suspend(struct sip_msg *msg, } /* save the message flags */ t->uas.request->flags = msg->flags; - + t->async_backup.backup_route = get_route_type(); + t->async_backup.backup_branch = get_t_branch(); + t->async_backup.ruri_new = ruri_get_forking_state(); + *hash_index = t->hash_index; *label = t->label; @@ -242,16 +246,32 @@ int t_continue(unsigned int hash_index, unsigned int label, ret = -1; goto kill_trans; } - faked_env( t, &faked_req); + faked_env_async( t, &faked_req); /* The sip msg is a faked msg just like in failure route * therefore execute the pre- and post-script callbacks * of failure route (Miklos) */ - if (exec_pre_script_cb(&faked_req, FAILURE_CB_TYPE)>0) { + + int cb_type = REQUEST_CB_TYPE; + switch (t->async_backup.backup_route) { + case REQUEST_ROUTE: + cb_type = REQUEST_CB_TYPE; + break; + case FAILURE_ROUTE: + cb_type = FAILURE_CB_TYPE; + break; + case TM_ONREPLY_ROUTE: + cb_type = ONREPLY_CB_TYPE; + break; + case BRANCH_ROUTE: + cb_type = BRANCH_CB_TYPE; + break; + } + if (exec_pre_script_cb(&faked_req, cb_type)>0) { if (run_top_route(route, &faked_req, 0)<0) LOG(L_ERR, "ERROR: t_continue: Error in run_top_route\n"); - exec_post_script_cb(&faked_req, FAILURE_CB_TYPE); + exec_post_script_cb(&faked_req, cb_type); } /* TODO: save_msg_lumps should clone the lumps to shm mem */

1 0

git:tmp/tm_async_reply_support: Merge branch 'tmp/tm_async_reply_support' of ssh://git.sip-router.org/sip-router into tm_async
by Jason Penton 09 Jul '13

09 Jul '13

Module: sip-router Branch: tmp/tm_async_reply_support Commit: 39bbda959ff61197d7056460c078d7049a69ce5c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=39bbda9… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Tue Jul 9 17:07:48 2013 +0200 Merge branch 'tmp/tm_async_reply_support' of ssh://git.sip-router.org/sip-router into tm_async ---

1 0

git:master: modules/app_lua: fix sr.xavp.get. Get all the values not only the first one.
by Victor Seva 09 Jul '13

09 Jul '13

Module: sip-router Branch: master Commit: 4a79fcdd9965c6c3195601baeb82d489d970aa12 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4a79fcd… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Tue Jul 9 15:55:35 2013 +0200 modules/app_lua: fix sr.xavp.get. Get all the values not only the first one. --- modules/app_lua/app_lua_sr.c | 65 ++++++++++++++++++++++++++++++++--------- 1 files changed, 50 insertions(+), 15 deletions(-) diff --git a/modules/app_lua/app_lua_sr.c b/modules/app_lua/app_lua_sr.c index 93b89b8..4075ef8 100644 --- a/modules/app_lua/app_lua_sr.c +++ b/modules/app_lua/app_lua_sr.c @@ -1151,42 +1151,40 @@ static int lua_sr_push_str_list_table(lua_State *L, struct str_list *list) { return 1; } +static int lua_sr_push_xavp_table(lua_State *L, sr_xavp_t *xavp); + /** - * creates and push a table to the lua stack with - * the elements of the xavp + * creates and push a table for the key name in xavp */ -static int lua_sr_push_xavp_table(lua_State *L, sr_xavp_t *xavp) { +static void lua_sr_push_xavp_name_table(lua_State *L, sr_xavp_t *xavp, str name) { lua_Number i = 1; - sr_xavp_t *avp = NULL; + lua_Number elem = 1; + sr_xavp_t *avp = xavp; - if(xavp->val.type!=SR_XTYPE_XAVP){ - LM_ERR("%s not xavp?\n", xavp->name.s); - return 0; + while(avp!=NULL&&!STR_EQ(avp->name,name)) + { + avp = avp->next; } - avp = xavp->val.v.xavp; - lua_newtable(L); + while(avp!=NULL){ + lua_pushnumber(L, elem); switch(avp->val.type) { case SR_XTYPE_NULL: lua_pushnil(L); - lua_setfield(L, -2, avp->name.s); break; case SR_XTYPE_INT: i = avp->val.v.i; lua_pushnumber(L, i); - lua_setfield(L, -2, avp->name.s); break; case SR_XTYPE_STR: lua_pushlstring(L, avp->val.v.s.s, avp->val.v.s.len); - lua_setfield(L, -2, avp->name.s); break; case SR_XTYPE_TIME: case SR_XTYPE_LONG: case SR_XTYPE_LLONG: case SR_XTYPE_DATA: lua_pushnil(L); - lua_setfield(L, -2, avp->name.s); LM_WARN("XAVP type:%d value not supported\n", avp->val.type); break; case SR_XTYPE_XAVP: @@ -1194,11 +1192,48 @@ static int lua_sr_push_xavp_table(lua_State *L, sr_xavp_t *xavp) { LM_ERR("xavp:%.*s subtable error. Nil value added\n", avp->name.len, avp->name.s); lua_pushnil(L); } - lua_setfield(L, -2, avp->name.s); + break; + default: + LM_ERR("xavp:%.*s unknown type: %d. Nil value added\n", + avp->name.len, avp->name.s, avp->val.type); + lua_pushnil(L); break; } - avp = avp->next; + lua_rawset(L, -3); + elem = elem + 1; + avp = xavp_get_next(avp); + } + lua_setfield(L, -2, name.s); +} + +/** + * creates and push a table to the lua stack with + * the elements of the xavp + */ +static int lua_sr_push_xavp_table(lua_State *L, sr_xavp_t *xavp) { + sr_xavp_t *avp = NULL; + struct str_list *keys; + struct str_list *k; + + if(xavp->val.type!=SR_XTYPE_XAVP){ + LM_ERR("%s not xavp?\n", xavp->name.s); + return 0; } + avp = xavp->val.v.xavp; + keys = xavp_get_list_key_names(xavp); + + lua_newtable(L); + if(keys!=NULL) + { + do + { + lua_sr_push_xavp_name_table(L, avp, keys->s); + k = keys; + keys = keys->next; + pkg_free(k); + }while(keys!=NULL); + } + return 1; }

2 1

← Newer
1
...
16
17
18
19
20
21
22
...
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2013