sr-dev January 2012

sr-dev@lists.kamailio.org

25 participants
165 discussions

git:3.2: app_lua: lookup pv in cached table for unset and isnull
by Daniel-Constantin Mierla 27 Jan '12

27 Jan '12

Module: sip-router Branch: 3.2 Commit: 6b8cdd3fbe3e4cb930dedd5e52ff447e9ed91164 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6b8cdd3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 11 12:04:56 2012 +0100 app_lua: lookup pv in cached table for unset and isnull (cherry picked from commit f101dacbf640f08e2133c197c465ff7d312dda1b) --- modules/app_lua/app_lua_sr.c | 32 ++++++++++++++++++++++++-------- 1 files changed, 24 insertions(+), 8 deletions(-) diff --git a/modules/app_lua/app_lua_sr.c b/modules/app_lua/app_lua_sr.c index 3a2bf72..b5a6a6c 100644 --- a/modules/app_lua/app_lua_sr.c +++ b/modules/app_lua/app_lua_sr.c @@ -1027,9 +1027,10 @@ static int lua_sr_pv_sets (lua_State *L) static int lua_sr_pv_unset (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(); @@ -1039,14 +1040,21 @@ static int lua_sr_pv_unset (lua_State *L) pvn.len = strlen(pvn.s); LM_DBG("pv unset: %s\n", pvn.s); - if(pv_parse_spec(&pvn, &pvs)<0) + pl = pv_locate_name(&pvn); + if(pl != pvn.len) + { + 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("unable to parse pv [%s]\n", pvn.s); + LM_ERR("cannot get pv spec for [%s]\n", pvn.s); return 0; } memset(&val, 0, sizeof(pv_value_t)); val.flags |= PV_VAL_NULL; - if(pv_set_spec_value(env_L->msg, &pvs, 0, &val)<0) + if(pv_set_spec_value(env_L->msg, pvs, 0, &val)<0) { LM_ERR("unable to unset pv [%s]\n", pvn.s); return 0; @@ -1061,9 +1069,10 @@ static int lua_sr_pv_unset (lua_State *L) static int lua_sr_pv_is_null (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(); @@ -1073,13 +1082,20 @@ static int lua_sr_pv_is_null (lua_State *L) pvn.len = strlen(pvn.s); LM_DBG("pv is null test: %s\n", pvn.s); - if(pv_parse_spec(&pvn, &pvs)<0) + pl = pv_locate_name(&pvn); + if(pl != pvn.len) + { + 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("unable to parse pv [%s]\n", pvn.s); + 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_NOTICE("unable to get pv value for [%s]\n", pvn.s); lua_pushboolean(L, 1);

1 0

git:3.2: rtimer: use faked msg from lib to get a src IP address
by Daniel-Constantin Mierla 27 Jan '12

27 Jan '12

Module: sip-router Branch: 3.2 Commit: 3890005e4410008537e4d9491daae9f5e9c8d777 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3890005… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 18 10:19:18 2012 +0100 rtimer: use faked msg from lib to get a src IP address - reported by Uri Shacked (cherry picked from commit 6c829c1794fb79fbce213238e88346522f584fcf) --- modules_k/rtimer/Makefile | 3 ++ modules_k/rtimer/rtimer_mod.c | 44 +++++++++++++--------------------------- 2 files changed, 17 insertions(+), 30 deletions(-) diff --git a/modules_k/rtimer/Makefile b/modules_k/rtimer/Makefile index 8a0b3be..bb3d573 100644 --- a/modules_k/rtimer/Makefile +++ b/modules_k/rtimer/Makefile @@ -12,4 +12,7 @@ LIBS= DEFS+=-DOPENSER_MOD_INTERFACE +SERLIBPATH=../../lib +SER_LIBS+=$(SERLIBPATH)/kcore/kcore + include ../../Makefile.modules diff --git a/modules_k/rtimer/rtimer_mod.c b/modules_k/rtimer/rtimer_mod.c index 33c7c2e..ddff5ee 100644 --- a/modules_k/rtimer/rtimer_mod.c +++ b/modules_k/rtimer/rtimer_mod.c @@ -40,6 +40,7 @@ #include "../../timer_proc.h" #include "../../script_cb.h" #include "../../parser/parse_param.h" +#include "../../lib/kcore/faked_msg.h" MODULE_VERSION @@ -93,11 +94,6 @@ struct module_exports exports= { }; -#define STM_SIP_MSG "OPTIONS sip:you@kamailio.org SIP/2.0\r\nVia: SIP/2.0/UDP 127.0.0.1\r\nFrom: <you(a)kamailio.org>;tag=123\r\nTo: <you(a)kamailio.org>\r\nCall-ID: 123\r\nCSeq: 1 OPTIONS\r\nContent-Length: 0\r\n\r\n" -#define STM_SIP_MSG_LEN (sizeof(STM_SIP_MSG)-1) -static char _stm_sip_buf[STM_SIP_MSG_LEN+1]; -static struct sip_msg _stm_msg; -static unsigned int _stm_msg_no = 1; /** * init module function */ @@ -107,6 +103,14 @@ static int mod_init(void) if(_stm_list==NULL) return 0; + /* init faked sip msg */ + if(faked_msg_init()<0) + { + LM_ERR("failed to init timer local sip msg\n"); + return -1; + } + + /* register timers */ it = _stm_list; while(it) { @@ -123,24 +127,6 @@ static int mod_init(void) it = it->next; } - /* init faked sip msg */ - memcpy(_stm_sip_buf, STM_SIP_MSG, STM_SIP_MSG_LEN); - _stm_sip_buf[STM_SIP_MSG_LEN] = '\0'; - - memset(&_stm_msg, 0, sizeof(struct sip_msg)); - - _stm_msg.buf=_stm_sip_buf; - _stm_msg.len=STM_SIP_MSG_LEN; - - _stm_msg.set_global_address=default_global_address; - _stm_msg.set_global_port=default_global_port; - - if (parse_msg(_stm_msg.buf, _stm_msg.len, &_stm_msg)!=0) - { - LM_ERR("parse_msg failed\n"); - return -1; - } - return 0; } @@ -175,7 +161,7 @@ void stm_timer_exec(unsigned int ticks, void *param) { stm_timer_t *it; stm_route_t *rt; - + sip_msg_t *fmsg; if(param==NULL) return; @@ -185,14 +171,12 @@ void stm_timer_exec(unsigned int ticks, void *param) for(rt=it->rt; rt; rt=rt->next) { - /* update local parameters */ - _stm_msg.id=_stm_msg_no++; - clear_branches(); - if (exec_pre_script_cb(&_stm_msg, REQUEST_CB_TYPE)==0 ) + fmsg = faked_msg_next(); + if (exec_pre_script_cb(fmsg, REQUEST_CB_TYPE)==0 ) continue; /* drop the request */ set_route_type(REQUEST_ROUTE); - run_top_route(main_rt.rlist[rt->route], &_stm_msg, 0); - exec_post_script_cb(&_stm_msg, REQUEST_CB_TYPE); + run_top_route(main_rt.rlist[rt->route], fmsg, 0); + exec_post_script_cb(fmsg, REQUEST_CB_TYPE); } }

1 0

git:3.2: async: readme file was regenerated
by Daniel-Constantin Mierla 27 Jan '12

27 Jan '12

Module: sip-router Branch: 3.2 Commit: 022567c0d170ea6d1a7b26a0c28b528fd1ffc82a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=022567c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Dec 11 00:05:46 2011 +0100 async: readme file was regenerated (cherry picked from commit dcea57fb83b480a8d55e466a26e677a639bda6bb) --- modules/async/README | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/async/README b/modules/async/README index 45d0971..21b2cc2 100644 --- a/modules/async/README +++ b/modules/async/README @@ -10,7 +10,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright © 2011 asipto.com + Copyright � 2011 asipto.com __________________________________________________________________ Table of Contents @@ -107,7 +107,7 @@ modparam("async", "workers", 2) 4.1. async_route(routename, seconds) 4.2. async_sleep(seconds) -4.1. async_route(routename, seconds) +4.1. async_route(routename, seconds) Simulate a sleep of 'seconds' and then continue the processing of SIP request with the route[routename]. In case of internal errors, the @@ -126,6 +126,8 @@ modparam("async", "workers", 2) that the execution of config after resume will end once the route[routename] is finished. + This function can be used from REQUEST_ROUTE. + Example 1.2. async_sleep usage ... async_route("RESUME", "4"); @@ -136,7 +138,7 @@ route[RESUME] { } ... -4.2. async_sleep(seconds) +4.2. async_sleep(seconds) Simulate a sleep of 'seconds' and then continue the processing of SIP request with the next action. In case of internal errors, the function @@ -152,6 +154,8 @@ route[RESUME] { that the execution of config after resume will end once the route block where async_sleep() is called is finished. + This function can be used from REQUEST_ROUTE. + Example 1.3. async_sleep usage ... async_sleep("4");

1 0

git:3.2: async: cfg functions cannot be used in branch_route
by Daniel-Constantin Mierla 27 Jan '12

27 Jan '12

Module: sip-router Branch: 3.2 Commit: 17773ed1cbc99f1b61a9920f42e5019336e8b5b3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=17773ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Dec 11 00:02:14 2011 +0100 async: cfg functions cannot be used in branch_route - that routing block is processing outgoing brnaches, not requests - reported by Jasmin Schnatterbeck, FS#190 (cherry picked from commit 22278ed608d598ac353b32cd44517e961faa41b3) --- modules/async/async_mod.c | 4 ++-- modules/async/doc/async_admin.xml | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/async/async_mod.c b/modules/async/async_mod.c index 17c7179..26e94b7 100644 --- a/modules/async/async_mod.c +++ b/modules/async/async_mod.c @@ -56,9 +56,9 @@ struct tm_binds tmb; static cmd_export_t cmds[]={ {"async_route", (cmd_function)w_async_route, 2, fixup_async_route, - 0, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, + 0, REQUEST_ROUTE|FAILURE_ROUTE}, {"async_sleep", (cmd_function)w_async_sleep, 1, fixup_async_sleep, - 0, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, + 0, REQUEST_ROUTE|FAILURE_ROUTE}, {0, 0, 0, 0, 0, 0} }; diff --git a/modules/async/doc/async_admin.xml b/modules/async/doc/async_admin.xml index 37b9a75..9087f62 100644 --- a/modules/async/doc/async_admin.xml +++ b/modules/async/doc/async_admin.xml @@ -112,6 +112,8 @@ modparam("async", "workers", 2) that the execution of config after resume will end once the route[routename] is finished. </para> + <para> + This function can be used from REQUEST_ROUTE. <example> <title><function>async_sleep</function> usage</title> <programlisting format="linespecific"> @@ -148,6 +150,8 @@ route[RESUME] { that the execution of config after resume will end once the route block where async_sleep() is called is finished. </para> + <para> + This function can be used from REQUEST_ROUTE. <example> <title><function>async_sleep</function> usage</title> <programlisting format="linespecific">

1 0

git:3.2: async: fixed broken docbook crated in previous commit
by Daniel-Constantin Mierla 27 Jan '12

27 Jan '12

Module: sip-router Branch: 3.2 Commit: 4c0fb6b6db3ed8c709ea4b30a2d6650ec12ad971 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4c0fb6b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Dec 11 00:04:47 2011 +0100 async: fixed broken docbook crated in previous commit (cherry picked from commit 5176f66abb7c9f588431ba3a05a9b54d2d8e5093) --- modules/async/doc/async_admin.xml | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/async/doc/async_admin.xml b/modules/async/doc/async_admin.xml index 9087f62..e4ddde4 100644 --- a/modules/async/doc/async_admin.xml +++ b/modules/async/doc/async_admin.xml @@ -114,6 +114,7 @@ modparam("async", "workers", 2) </para> <para> This function can be used from REQUEST_ROUTE. + </para> <example> <title><function>async_sleep</function> usage</title> <programlisting format="linespecific"> @@ -152,6 +153,7 @@ route[RESUME] { </para> <para> This function can be used from REQUEST_ROUTE. + </para> <example> <title><function>async_sleep</function> usage</title> <programlisting format="linespecific">

1 0

git:3.2: modules_k/pua: Fixed race hazard relating to RLS back-end SUBSCRIBEs
by Peter Dunkley 27 Jan '12

27 Jan '12

Module: sip-router Branch: 3.2 Commit: 047f66369f0c3eaa75592942f56565eb0f39f848 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=047f663… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Fri Jan 27 15:34:16 2012 +0000 modules_k/pua: Fixed race hazard relating to RLS back-end SUBSCRIBEs - This resulted in the "no presence dialog record for non-TERMINATED state..." error message coming out of RLS a lot. - On the sending side you have can have two dialogs (one temporary and one full) stored for a short period of time. This is because the full dialog is written before the temporary one is deleted. This can make the lookup when a back-end NOTIFY is received fail because only one record is expected. This is now fixed - instead of inserting and then deleting we do a swap (while the hash table is locked). - Based on... (cherry picked from commit e627bc31776b521a1078b2a004e8ed179521cae2) --- modules_k/pua/hash.c | 48 ++++++++++++++++++++++++++------------- modules_k/pua/hash.h | 1 + modules_k/pua/send_subscribe.c | 16 ++++++++----- 3 files changed, 43 insertions(+), 22 deletions(-) diff --git a/modules_k/pua/hash.c b/modules_k/pua/hash.c index 805be74..1b6784c 100644 --- a/modules_k/pua/hash.c +++ b/modules_k/pua/hash.c @@ -215,33 +215,28 @@ void update_htable(ua_pres_t* p, time_t desired_expires, int expires, } } /* insert in front; so when searching the most recent result is returned*/ -void insert_htable(ua_pres_t* presentity) +void _insert_htable(ua_pres_t* presentity, unsigned int hash_code) { ua_pres_t* p= NULL; - unsigned int hash_code; - - hash_code= core_hash(presentity->pres_uri,presentity->watcher_uri, - HASH_SIZE); - - lock_get(&HashT->p_records[hash_code].lock); -/* - * useless since always checking before calling insert - if(get_dialog(presentity, hash_code)!= NULL ) - { - LM_DBG("Dialog already found- do not insert\n"); - return; - } -*/ p= HashT->p_records[hash_code].entity; presentity->db_flag= INSERTDB_FLAG; presentity->next= p->next; p->next= presentity; +} - lock_release(&HashT->p_records[hash_code].lock); +void insert_htable(ua_pres_t* presentity) +{ + unsigned int hash_code; + + hash_code= core_hash(presentity->pres_uri,presentity->watcher_uri, HASH_SIZE); + lock_get(&HashT->p_records[hash_code].lock); + + _insert_htable(presentity, hash_code); + lock_release(&HashT->p_records[hash_code].lock); } /* This function used to perform a search to find the hash table @@ -302,6 +297,27 @@ void destroy_htable(void) return; } +int convert_temporary_dialog(ua_pres_t *dialog) +{ + ua_pres_t *temp_dialog; + unsigned int hash_code; + + hash_code= core_hash(dialog->pres_uri,dialog->watcher_uri, HASH_SIZE); + lock_get(&HashT->p_records[hash_code].lock); + + temp_dialog = get_temporary_dialog(dialog, hash_code); + if (temp_dialog) + delete_htable(temp_dialog, hash_code); + else + return -1; + + _insert_htable(dialog, hash_code); + + lock_release(&HashT->p_records[hash_code].lock); + + return 1; +} + /* must lock the record line before calling this function*/ ua_pres_t* get_dialog(ua_pres_t* dialog, unsigned int hash_code) { diff --git a/modules_k/pua/hash.h b/modules_k/pua/hash.h index 141296f..c2204c4 100644 --- a/modules_k/pua/hash.h +++ b/modules_k/pua/hash.h @@ -126,6 +126,7 @@ int is_dialog(ua_pres_t* dialog); ua_pres_t* get_dialog(ua_pres_t* dialog, unsigned int hash_code); ua_pres_t* get_temporary_dialog(ua_pres_t* dialog, unsigned int hash_code); +int convert_temporary_dialog(ua_pres_t *dialog); int get_record_id(ua_pres_t* dialog, str** rec_id); typedef int (*get_record_id_t)(ua_pres_t* dialog, str** rec_id); diff --git a/modules_k/pua/send_subscribe.c b/modules_k/pua/send_subscribe.c index 08e3d3d..c4caad1 100644 --- a/modules_k/pua/send_subscribe.c +++ b/modules_k/pua/send_subscribe.c @@ -612,7 +612,11 @@ void subs_cback_func(struct cell *t, int cb_type, struct tmcb_params *ps) LM_DBG("record for subscribe from %.*s to %.*s inserted in datatbase\n", presentity->watcher_uri->len, presentity->watcher_uri->s, presentity->pres_uri->len, presentity->pres_uri->s); - insert_htable(presentity); + if (convert_temporary_dialog(presentity) < 0) + { + LM_ERR("Could not convert temporary dialog into a dialog\n"); + goto error; + } done: if(hentity->ua_flag == REQ_OTHER) @@ -620,13 +624,13 @@ done: hentity->flag= flag; run_pua_callbacks( hentity, msg); } + goto end; + error: - lock_get(&HashT->p_records[hash_code].lock); - presentity = get_temporary_dialog(hentity, hash_code); - if (presentity!=NULL) - delete_htable(presentity, hash_code); - lock_release(&HashT->p_records[hash_code].lock); + if (presentity->remote_contact.s) shm_free(presentity->remote_contact.s); + if (presentity) shm_free(presentity); +end: if(hentity) { shm_free(hentity);

1 0

git:master: acc_radius/misc_radius(k): use uint32_t type instead of UINT4
by Daniel-Constantin Mierla 27 Jan '12

27 Jan '12

Module: sip-router Branch: master Commit: 5db228f1a47c8119aeba3731e0129459a6c1e8e4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5db228f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 27 10:54:54 2012 -0500 acc_radius/misc_radius(k): use uint32_t type instead of UINT4 - UINT4 is not defined by freeradiusclient library - libradiusclient-ng typedefs anyhow UINT4 to uint32_t in radiusclient-ng.h --- modules_k/acc_radius/acc_radius_mod.c | 8 ++++---- modules_k/misc_radius/functions.c | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules_k/acc_radius/acc_radius_mod.c b/modules_k/acc_radius/acc_radius_mod.c index fdeb869..abfb69f 100644 --- a/modules_k/acc_radius/acc_radius_mod.c +++ b/modules_k/acc_radius/acc_radius_mod.c @@ -293,7 +293,7 @@ int acc_radius_init(acc_init_info_t *inf) return 0; } -static inline UINT4 rad_status( struct sip_msg *req, int code ) +static inline uint32_t rad_status( struct sip_msg *req, int code ) { str tag; unsigned int in_dialog_req = 0; @@ -324,7 +324,7 @@ int acc_radius_send_request(struct sip_msg *req, acc_info_t *inf) { int attr_cnt; VALUE_PAIR *send; - UINT4 av_type; + uint32_t av_type; int offset; int i; @@ -340,14 +340,14 @@ int acc_radius_send_request(struct sip_msg *req, acc_info_t *inf) av_type = rd_vals[RV_SIP_SESSION].v; /* session*/ ADD_RAD_AVPAIR( RA_SERVICE_TYPE, &av_type, -1); - av_type = (UINT4)inf->env->code; /* status=integer */ + av_type = (uint32_t)inf->env->code; /* status=integer */ ADD_RAD_AVPAIR( RA_SIP_RESPONSE_CODE, &av_type, -1); av_type = req->REQ_METHOD; /* method */ ADD_RAD_AVPAIR( RA_SIP_METHOD, &av_type, -1); /* unix time */ - av_type = (UINT4)inf->env->ts; + av_type = (uint32_t)inf->env->ts; ADD_RAD_AVPAIR( RA_TIME_STAMP, &av_type, -1); /* add extra also */ diff --git a/modules_k/misc_radius/functions.c b/modules_k/misc_radius/functions.c index 3bf6e7a..2a42024 100644 --- a/modules_k/misc_radius/functions.c +++ b/modules_k/misc_radius/functions.c @@ -164,7 +164,7 @@ int radius_load_caller_avps(struct sip_msg* _m, char* _caller, char* _s2) { str user; VALUE_PAIR *send, *received; - UINT4 service; + uint32_t service; static char msg[4096]; int extra_cnt, offset, i, res; @@ -245,7 +245,7 @@ int radius_load_callee_avps(struct sip_msg* _m, char* _callee, char* _s2) { str user; VALUE_PAIR *send, *received; - UINT4 service; + uint32_t service; static char msg[4096]; int extra_cnt, offset, i, res; @@ -328,7 +328,7 @@ int radius_is_user_in(struct sip_msg* _m, char* _user, char* _group) { str user, *group; VALUE_PAIR *send, *received; - UINT4 service; + uint32_t service; static char msg[4096]; int extra_cnt, offset, i, res; @@ -423,7 +423,7 @@ int radius_does_uri_user_host_exist(struct sip_msg* _m, str user, str host) { char* at, *user_host; VALUE_PAIR *send, *received; - UINT4 service; + uint32_t service; static char msg[4096]; int extra_cnt, offset, i, res; @@ -589,7 +589,7 @@ int radius_does_uri_user_exist(struct sip_msg* _m, str user) { static char msg[4096]; VALUE_PAIR *send, *received; - UINT4 service; + uint32_t service; int res, extra_cnt, offset, i; send = received = 0;

1 0

git:master: modules_k/pua: Fixed race hazards relating to RLS back-end SUBSCRIBEs
by Peter Dunkley 27 Jan '12

27 Jan '12

Module: sip-router Branch: master Commit: e627bc31776b521a1078b2a004e8ed179521cae2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e627bc3… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Fri Jan 27 15:34:16 2012 +0000 modules_k/pua: Fixed race hazards relating to RLS back-end SUBSCRIBEs - These resulted in the "no presence dialog record for non-TERMINATED state..." error message coming out of RLS a lot. - When in DB only mode if we receive a back-end NOTIFY we look for a matching dialog. If we don't find one we search the DB again for a matching temporary dialog. You can get the situation where both DB queries fail because a 200 OK to a SUBSCRIBE is processed and the dialog made "complete" between the two searches. This is now fixed. - On the sending side (for both hash table and DB only mode) you have can have two dialogs (one temporary and one full) stored for a short period of time. This is because the full dialog is written before the temporary one is deleted. This can make the lookup when a back-end NOTIFY is received fail because only one record is expected. This is now fixed - instead of inserting and then deleting we do a swap (while the hash table is locked) and an update operation on the DB. --- modules_k/pua/hash.c | 48 +++++++--- modules_k/pua/hash.h | 1 + modules_k/pua/pua_db.c | 200 +++++++++++++++++++++++++++++++++++----- modules_k/pua/pua_db.h | 1 + modules_k/pua/send_subscribe.c | 45 ++++------ 5 files changed, 226 insertions(+), 69 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e62…

1 0

git:master: modules_k/siputils: allow use of is_uri_user_e164() from any route.
by admin＠sip-router.org 27 Jan '12

27 Jan '12

Module: sip-router Branch: master Commit: a684e393bce00a89c9aa66647472b56dea567c2e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a684e39… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Jan 27 04:53:47 2012 +0200 modules_k/siputils: allow use of is_uri_user_e164() from any route. --- modules_k/siputils/README | 2 +- modules_k/siputils/doc/siputils_admin.xml | 2 +- modules_k/siputils/siputils.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_k/siputils/README b/modules_k/siputils/README index 87b30b1..91335cb 100644 --- a/modules_k/siputils/README +++ b/modules_k/siputils/README @@ -547,7 +547,7 @@ if (is_e164("$avp(i:705)") { Checks if userpart of URI stored in pseudo variable is E164 number. - This function can be used from REQUEST_ROUTE and FAILURE_ROUTE. + This function can be used from ANY_ROUTE. Example 1.19. is_uri_user_e164 usage ... diff --git a/modules_k/siputils/doc/siputils_admin.xml b/modules_k/siputils/doc/siputils_admin.xml index dd7a4ae..06eb130 100644 --- a/modules_k/siputils/doc/siputils_admin.xml +++ b/modules_k/siputils/doc/siputils_admin.xml @@ -560,7 +560,7 @@ if (is_e164("$avp(i:705)") { E164 number. </para> <para> - This function can be used from REQUEST_ROUTE and FAILURE_ROUTE. + This function can be used from ANY_ROUTE. </para> <example> <title><function>is_uri_user_e164</function> usage</title> diff --git a/modules_k/siputils/siputils.c b/modules_k/siputils/siputils.c index b5c9806..e82be24 100644 --- a/modules_k/siputils/siputils.c +++ b/modules_k/siputils/siputils.c @@ -133,7 +133,7 @@ static cmd_export_t cmds[]={ {"is_e164", (cmd_function)is_e164, 1, fixup_pvar_null, fixup_free_pvar_null, REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, {"is_uri_user_e164", (cmd_function)w_is_uri_user_e164, 1, fixup_pvar_null, - fixup_free_pvar_null, REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, + fixup_free_pvar_null, ANY_ROUTE}, {"encode_contact", (cmd_function)encode_contact, 2, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {"decode_contact", (cmd_function)decode_contact, 0, 0,

1 0

git:3.2: modules_k/rls: Memory leak in parse_subs_state() in resource_notify.c
by Peter Dunkley 26 Jan '12

26 Jan '12

Module: sip-router Branch: 3.2 Commit: 14520f905e4354cc4b159745142fedb25b062ec5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=14520f9… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Thu Jan 26 13:59:06 2012 +0000 modules_k/rls: Memory leak in parse_subs_state() in resource_notify.c - Also the function didn't appear to be doing quite the right thing. - Found by Paul Pankhurst @ Crocodile RCS and fixed by Peter Dunkley @ Crocodile RCS --- modules_k/rls/resource_notify.c | 77 +++++++++++++++++++-------------------- 1 files changed, 38 insertions(+), 39 deletions(-) diff --git a/modules_k/rls/resource_notify.c b/modules_k/rls/resource_notify.c index f0b7ea1..762be0c 100644 --- a/modules_k/rls/resource_notify.c +++ b/modules_k/rls/resource_notify.c @@ -401,46 +401,39 @@ done: } -int parse_subs_state(str auth_state, str** reason, int* expires) +int parse_subs_state(str auth_state, str *reason, int *expires) { str str_exp; - str* res= NULL; char* smc= NULL; int len, flag= -1; - - if( strncmp(auth_state.s, "active", 6)== 0) + if (strncmp(auth_state.s, "active", 6)== 0) flag= ACTIVE_STATE; - if( strncmp(auth_state.s, "pending", 7)== 0) + if (strncmp(auth_state.s, "pending", 7)== 0) flag= PENDING_STATE; - if( strncmp(auth_state.s, "terminated", 10)== 0) + if (strncmp(auth_state.s, "terminated", 10)== 0) { smc= strchr(auth_state.s, ';'); - if(smc== NULL) + if (smc== NULL) { LM_ERR("terminated state and no reason found"); return -1; } - if(strncmp(smc+1, "reason=", 7)) + if (strncmp(smc+1, "reason=", 7)) { LM_ERR("terminated state and no reason found"); return -1; - } - res= (str*)pkg_malloc(sizeof(str)); - if(res== NULL) - { - ERR_MEM(PKG_MEM_STR); - } + } len= auth_state.len- 10- 1- 7; - res->s= (char*)pkg_malloc(len* sizeof(char)); - if(res->s== NULL) + reason->s = (char*) pkg_malloc(len* sizeof(char)); + if (reason->s== NULL) { ERR_MEM(PKG_MEM_STR); } - memcpy(res->s, smc+ 8, len); - res->len= len; + memcpy(reason->s, smc+ 8, len); + reason->len= len; return TERMINATED_STATE; } @@ -451,7 +444,7 @@ int parse_subs_state(str auth_state, str** reason, int* expires) { LM_ERR("active or pending state and no expires parameter found"); return -1; - } + } if(strncmp(smc+1, "expires=", 8)) { LM_ERR("active or pending state and no expires parameter found"); @@ -461,22 +454,16 @@ int parse_subs_state(str auth_state, str** reason, int* expires) str_exp.len= auth_state.s+ auth_state.len- smc- 9; if( str2int(&str_exp, (unsigned int*)expires)< 0) - { + { LM_ERR("while getting int from str\n"); return -1; - } + } return flag; } - return -1; error: - if(res) - { - if(res->s) - pkg_free(res->s); - pkg_free(res); - } + if (reason->s) pkg_free(reason->s); return -1; } @@ -492,7 +479,7 @@ int rls_handle_notify(struct sip_msg* msg, char* c1, char* c2) int n_query_cols= 0; str auth_state= {0, 0}; int found= 0; - str* reason= NULL; + str reason = {0, 0}; int auth_flag; struct hdr_field* hdr= NULL; int n, expires= -1; @@ -534,7 +521,7 @@ int rls_handle_notify(struct sip_msg* msg, char* c1, char* c2) } memset(&dialog, 0, sizeof(ua_pres_t)); dialog.watcher_uri= &pto->uri; - if (pto->tag_value.s==NULL || pto->tag_value.len==0 ) + if (pto->tag_value.s==NULL || pto->tag_value.len==0 ) { LM_ERR("to tag value not parsed\n"); goto error; @@ -619,7 +606,7 @@ int rls_handle_notify(struct sip_msg* msg, char* c1, char* c2) */ if(auth_flag==TERMINATED_STATE) goto done; - LM_ERR("no presence dialog record for non-TERMINATED state uri pres_uri = %.*s watcher_uri = %.*s\n", + LM_ERR("no presence dialog record for non-TERMINATED state uri pres_uri = %.*s watcher_uri = %.*s\n", dialog.pres_uri->len, dialog.pres_uri->s, dialog.watcher_uri->len, dialog.watcher_uri->s); goto error; } @@ -633,9 +620,9 @@ int rls_handle_notify(struct sip_msg* msg, char* c1, char* c2) /*constructing the xml body*/ if(get_content_length(msg) == 0 ) - { - goto done; - } + { + goto done; + } else { if(content_type.s== 0) @@ -680,12 +667,18 @@ int rls_handle_notify(struct sip_msg* msg, char* c1, char* c2) query_vals[n_query_cols].val.int_val= auth_flag; n_query_cols++; - if(reason) + query_cols[n_query_cols]= &str_reason_col; + query_vals[n_query_cols].type = DB1_STR; + query_vals[n_query_cols].nul = 0; + if(reason.len > 0) + { + query_vals[n_query_cols].val.str_val.s= reason.s; + query_vals[n_query_cols].val.str_val.len= reason.len; + } + else { - query_cols[n_query_cols]= &str_reason_col; - query_vals[n_query_cols].type = DB1_STR; - query_vals[n_query_cols].nul = 0; - query_vals[n_query_cols].val.str_val= *reason; + query_vals[n_query_cols].val.str_val.s = ""; + query_vals[n_query_cols].val.str_val.len = 0; n_query_cols++; } query_cols[n_query_cols]= &str_content_type_col; @@ -761,6 +754,9 @@ done: pkg_free(res_id->s); pkg_free(res_id); } + + if (reason.s) pkg_free(reason.s); + free_to_params(&TO); return 1; @@ -770,6 +766,9 @@ error: pkg_free(res_id->s); pkg_free(res_id); } + + if (reason.s) pkg_free(reason.s); + free_to_params(&TO); return -1; }

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2012