sr-dev April 2012

sr-dev@lists.kamailio.org

29 participants
346 discussions

[tracker] Comment added: not null-terminated string in function pipport2su (modules_k/siptrace/siptrace.c)
by sip-router 03 Apr '12

03 Apr '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#210 - not null-terminated string in function pipport2su (modules_k/siptrace/siptrace.c) User who did this - Alexandr Dubovikov (adubovikov) ---------- Hallo Michal, fixed. Thanks http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d5fbc4e… Wbr, Alexandr ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=210#comment513 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.

1 0

[tracker] Assignee added: not null-terminated string in function pipport2su (modules_k/siptrace/siptrace.c)
by sip-router 03 Apr '12

03 Apr '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#210 - not null-terminated string in function pipport2su (modules_k/siptrace/siptrace.c) User who did this - Alexandr Dubovikov (adubovikov) http://sip-router.org/tracker/index.php?do=details&task_id=210 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.

1 0

git:master: modules_k/siptrace: Fixed \0 termination for tmp_pipport.
by Alexandr Dubovikov 03 Apr '12

03 Apr '12

Module: sip-router Branch: master Commit: d5fbc4ead58c7ef47aba91238c74f40f9162f78d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d5fbc4e… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Tue Apr 3 13:10:37 2012 +0200 modules_k/siptrace: Fixed \0 termination for tmp_pipport. Thanks Michal Karas for the patch. --- modules_k/siptrace/siptrace.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/siptrace/siptrace.c b/modules_k/siptrace/siptrace.c index b54d893..eb893a3 100644 --- a/modules_k/siptrace/siptrace.c +++ b/modules_k/siptrace/siptrace.c @@ -1694,13 +1694,13 @@ static int pipport2su (char *pipport, union sockaddr_union *tmp_su, unsigned int return -1; } - if((len = strlen(pipport)) > 256) { + if((len = strlen(pipport)) >= 256) { LM_ERR("too big pipport\n"); goto error; } /* our tmp string */ - strncpy(tmp_piport, pipport, len); + strncpy(tmp_piport, pipport, len+1); len = 0;

1 0

git:master: db_cluster: new module for generic database clustering
by Daniel-Constantin Mierla 03 Apr '12

03 Apr '12

Module: sip-router Branch: master Commit: 201fc2d600e48fbb717531c79013c1b971f82d76 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=201fc2d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 27 14:38:57 2012 +0200 db_cluster: new module for generic database clustering - the module allow to group several DB connections and perform commands over them, based on policies such as round robin, serial try or parallel execution - any kind of db connection can make part from a cluster - example use case: write in parallel to two databases and do round robin read from them - the module is a middle layer between modules and databases, reusing existing db connectors. A module that wants to use such cluster, just have to set the db_url to "cluster://clusterid" - the module allow definition of multiple clusters - see README for more details - todo: enable/disable connections at runtime and via rpc --- modules_k/db_cluster/Makefile | 15 + modules_k/db_cluster/README | 162 +++++++++ modules_k/db_cluster/db_cluster_mod.c | 112 ++++++ modules_k/db_cluster/dbcl_api.c | 437 ++++++++++++++++++++++ modules_k/db_cluster/dbcl_api.h | 142 ++++++++ modules_k/db_cluster/dbcl_data.c | 479 +++++++++++++++++++++++++ modules_k/db_cluster/dbcl_data.h | 89 +++++ modules_k/db_cluster/doc/Makefile | 4 + modules_k/db_cluster/doc/db_cluster.xml | 37 ++ modules_k/db_cluster/doc/db_cluster_admin.xml | 167 +++++++++ 10 files changed, 1644 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=201…

4 10

[tracker] Assignee added: not null-terminated string in function pipport2su (modules_k/siptrace/siptrace.c)
by sip-router 03 Apr '12

03 Apr '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#210 - not null-terminated string in function pipport2su (modules_k/siptrace/siptrace.c) User who did this - Michal Karas (Largon) http://sip-router.org/tracker/index.php?do=details&task_id=210 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.

1 0

[tracker] Task opened: not null-terminated string in function pipport2su (modules_k/siptrace/siptrace.c) (Attachment added)
by sip-router 03 Apr '12

03 Apr '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Michal Karas (Largon) Attached to Project - sip-router Summary - not null-terminated string in function pipport2su (modules_k/siptrace/siptrace.c) Task Type - Bug Report Category - Modules kamailio Status - Assigned Assigned To - Daniel-Constantin Mierla Operating System - Linux Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Hello, we encountered bug causing some packets to be ignored because of not null-terminated string in function pipport2su. One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=210 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.

1 0

git:master: modules/tm, modules/app_lua: Exported t_replicate() to app_lua
by Peter Dunkley 02 Apr '12

02 Apr '12

Module: sip-router Branch: master Commit: 412fc6621e91fee014188ef0a20aaa09dc602a33 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=412fc66… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Apr 2 18:01:24 2012 +0100 modules/tm, modules/app_lua: Exported t_replicate() to app_lua - Feature added by Hugh Waite @ Crocodile RCS --- modules/app_lua/app_lua_exp.c | 34 ++++++++++++++++++++++++++++++++++ modules/tm/t_fwd.h | 2 ++ modules/tm/tm.c | 27 ++++++++++++++++----------- modules/tm/tm_load.c | 1 + modules/tm/tm_load.h | 1 + 5 files changed, 54 insertions(+), 11 deletions(-) diff --git a/modules/app_lua/app_lua_exp.c b/modules/app_lua/app_lua_exp.c index 587d8c0..beb4ccd 100644 --- a/modules/app_lua/app_lua_exp.c +++ b/modules/app_lua/app_lua_exp.c @@ -573,6 +573,39 @@ static int lua_sr_tm_t_release(lua_State *L) /** * */ +static int lua_sr_tm_t_replicate(lua_State *L) +{ + int ret; + sr_lua_env_t *env_L; + str suri; + + env_L = sr_lua_env_get(); + + if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_TM)) + { + LM_WARN("weird: tm function executed but module not registered\n"); + return app_lua_return_error(L); + } + if(env_L->msg==NULL) + { + LM_WARN("invalid parameters from Lua env\n"); + return app_lua_return_error(L); + } + suri.s = (char*)lua_tostring(L, -1); + if(suri.s == NULL) + { + LM_WARN("invalid parameters from Lua\n"); + return app_lua_return_error(L); + } + suri.len = strlen(suri.s); + + ret = _lua_tmb.t_replicate(env_L->msg, &suri); + return app_lua_return_int(L, ret); +} + +/** + * + */ static const luaL_reg _sr_tm_Map [] = { {"t_reply", lua_sr_tm_t_reply}, {"t_relay", lua_sr_tm_t_relay}, @@ -583,6 +616,7 @@ static const luaL_reg _sr_tm_Map [] = { {"t_is_canceled", lua_sr_tm_t_is_canceled}, {"t_newtran", lua_sr_tm_t_newtran}, {"t_release", lua_sr_tm_t_release}, + {"t_replicate", lua_sr_tm_t_replicate}, {NULL, NULL} }; diff --git a/modules/tm/t_fwd.h b/modules/tm/t_fwd.h index 109510f..0484c5d 100644 --- a/modules/tm/t_fwd.h +++ b/modules/tm/t_fwd.h @@ -49,9 +49,11 @@ enum unmatched_cancel_t { UM_CANCEL_STATEFULL=0, UM_CANCEL_STATELESS, typedef int (*tfwd_f)(struct sip_msg* p_msg , struct proxy_l * proxy ); typedef int (*taddblind_f)( /*struct cell *t */ ); +typedef int (*treplicate_uri_f)(struct sip_msg* p_msg , str *suri ); void t_on_branch(unsigned int go_to); unsigned int get_on_branch(); +int t_replicate_uri(struct sip_msg *p_msg, str *suri); int t_replicate(struct sip_msg *p_msg, struct proxy_l * proxy, int proto); /* -- not use outside t_fwd.c for noe char *print_uac_request( struct cell *t, struct sip_msg *i_req, diff --git a/modules/tm/tm.c b/modules/tm/tm.c index 20167bb..3ca56ba 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -1472,22 +1472,14 @@ inline static int w_t_relay_to_avp( struct sip_msg *p_msg , return r; } -inline static int w_t_replicate_uri(struct sip_msg *msg , - char *uri, /* sip uri as string or variable */ - char *_foo /* nothing expected */ ) +int t_replicate_uri(struct sip_msg *msg, str *suri) { struct proxy_l *proxy; struct sip_uri turi; - str suri; int r = -1; memset(&turi, 0, sizeof(struct sip_uri)); - if(fixup_get_svalue(msg, (gparam_p)uri, &suri)!=0) - { - LM_ERR("invalid replicate uri parameter"); - return -1; - } - if(parse_uri(suri.s, suri.len, &turi)!=0) + if(parse_uri(suri->s, suri->len, &turi)!=0) { LM_ERR("bad replicate SIP address!\n"); return -1; @@ -1496,7 +1488,7 @@ inline static int w_t_replicate_uri(struct sip_msg *msg , proxy=mk_proxy(&turi.host, turi.port_no, turi.proto); if (proxy==0) { LM_ERR("cannot create proxy from URI <%.*s>\n", - suri.len, suri.s ); + suri->len, suri->s ); return -1; } @@ -1504,7 +1496,20 @@ inline static int w_t_replicate_uri(struct sip_msg *msg , free_proxy(proxy); pkg_free(proxy); return r; +} +inline static int w_t_replicate_uri(struct sip_msg *msg , + char *uri, /* sip uri as string or variable */ + char *_foo /* nothing expected */ ) +{ + str suri; + + if(fixup_get_svalue(msg, (gparam_p)uri, &suri)!=0) + { + LM_ERR("invalid replicate uri parameter"); + return -1; + } + return t_replicate_uri(msg, &suri); } inline static int w_t_replicate( struct sip_msg *p_msg , diff --git a/modules/tm/tm_load.c b/modules/tm/tm_load.c index d57fd45..9cb6a4d 100644 --- a/modules/tm/tm_load.c +++ b/modules/tm/tm_load.c @@ -84,6 +84,7 @@ int load_tm( struct tm_binds *tmb) }*/ /* non-cfg API */ + tmb->t_replicate = t_replicate_uri; tmb->register_tmcb =register_tmcb; tmb->t_reply = w_t_reply_wrp; tmb->t_reply_with_body = t_reply_with_body; diff --git a/modules/tm/tm_load.h b/modules/tm/tm_load.h index 370c2ef..1c43d41 100644 --- a/modules/tm/tm_load.h +++ b/modules/tm/tm_load.h @@ -59,6 +59,7 @@ struct tm_binds { cmd_function t_relay_to_udp; /* WARNING: failure_route unsafe */ cmd_function t_relay_to_tcp; /* WARNING: failure_route unsafe */ cmd_function t_relay; /* WARNING: failure_route unsafe */ + treplicate_uri_f t_replicate; /* WARNING: failure_route unsafe */ tnewtran_f t_newtran; treply_f t_reply; treply_wb_f t_reply_with_body;

1 0

Throttling NOTIFY requests from presence
by Peter Dunkley 02 Apr '12

02 Apr '12

Hi, RFC 3856 section 6.10 states: "A PA SHOULD NOT generate notifications for a single presentity at a rate of more than once every five seconds." I would like to add this to the presence module (making the rate configurable). I have an idea as to how I would like to do it: - Add a last notified time-stamp field to each presentity - Add a updated since last notified flag field to each presentity - Add a notify required flag field to each active_watcher - When a presentity is updated the last notified time-stamp is checked. If the time is far enough in the past the notifies are sent and the time-stamp is updated. If enough time has not passed the updated since flag is set for the presentity and the notify required flag is set for all active_watchers of that presentity. - When a presentity is subscribed to (this includes re-subscribes) the last notified time-stamp is checked. If the time is far enough in the past the (single) notify is sent and the time-stamp is updated. If enough time has not passed the updated since flag is set for the presentity and the notify required flag is set for this active_watcher record. - A timer (the minimum time between subscribes - default 5 seconds) is run. On expiry a query is done on the presentity table for presentities that have been updated _AND_ the last notified time is more than the minimum time ago. For each of these presentities, a query is done on the active_watchers for watchers of that presentity that have the notify required flag set. Notifies containing the presentities are then sent to the watchers waiting on them. This should ensure that no presentity notifies more than it should, while ensuring that all changes are (eventually) sent out, and all subscribes result in a notify (eventually) being sent. Eventually being typically within 5 seconds and in under 10 seconds in the worst case (assuming the default setting of 5 seconds). Can anyone see any problems with this? Are there any objections to me implementing this? In theory running a (5 second) timer could make presence "lumpy" in the same way RLS is (see my previous email). However, if this proves to be the case I believe the same mechanism I have proposed for RLS can be used here. Regards, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

3 4

git:master: core: Added void to declarations of functions with empty argument list
by Marius Zbihlei 02 Apr '12

02 Apr '12

Module: sip-router Branch: master Commit: abb01fb41068f9accc49f638b107abc12d83ef5e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=abb01fb… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Apr 2 17:19:17 2012 +0300 core: Added void to declarations of functions with empty argument list In C language, a declaration in the form int f(); is equivalent to int f(...);, thus being able to accept an indefinit number of parameters. With the -Wstrict-prototypes GCC options, these declarations are reported as "function declaration isn’t a prototype". On some cases, this may trick the compiler into generating unoptimized code (like preparing to handle variadic argument list). In all cases having a declaration int f() and a definition inf f(int) is missleading, even if standard compliant. This is still Work in Progress. (maybe adding the -Wstrict-prototypes option to default is desireable) --- atomic_ops_init.h | 4 ++-- basex.h | 2 +- cfg/cfg_select.h | 4 ++-- counters.h | 4 ++-- daemonize.c | 2 +- daemonize.h | 12 ++++++------ dns_cache.h | 4 ++-- dprint.h | 2 +- dst_blacklist.c | 2 +- dst_blacklist.h | 4 ++-- endianness.h | 2 +- flags.h | 2 +- hash_func.c | 2 +- lock_ops.c | 4 ++-- lock_ops_init.h | 4 ++-- main.c | 14 +++++++------- nonsip_hooks.h | 4 ++-- poll_types.h | 2 +- pt.h | 6 +++--- rand/fastrand.h | 2 +- resolve.h | 2 +- route.h | 8 ++++---- rpc_lookup.h | 4 ++-- script_cb.h | 4 ++-- sctp_options.h | 6 +++--- sctp_server.h | 12 ++++++------ select_buf.h | 2 +- shm_init.h | 4 ++-- socket_info.h | 10 +++++----- tcp_init.h | 8 ++++---- tcp_options.h | 6 +++--- tcp_stats.h | 4 ++-- timer.h | 18 +++++++++--------- tls_hooks.h | 4 ++-- tls_hooks_init.h | 8 ++++---- udp_server.h | 2 +- ut.h | 2 +- 37 files changed, 93 insertions(+), 93 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=abb…

1 0

git:master: modules_k/pua: Fixed CSeq double increment bug
by Peter Dunkley 02 Apr '12

02 Apr '12

Module: sip-router Branch: master Commit: b3568cf5613890d71560a40444bc16ab78a65954 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b3568cf… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Apr 2 11:47:23 2012 +0100 modules_k/pua: Fixed CSeq double increment bug - This was added during the recent PUA DB only mode performance improvements. - This bug doesn't really do any harm as things work as long as the CSeq is going up - but it wasn't right. --- modules_k/pua/hash.c | 5 +---- modules_k/pua/pua_db.c | 8 ++++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/modules_k/pua/hash.c b/modules_k/pua/hash.c index 9bb3619..fe6d82b 100644 --- a/modules_k/pua/hash.c +++ b/modules_k/pua/hash.c @@ -260,9 +260,6 @@ void insert_htable(ua_pres_t* presentity) hash_code= core_hash(presentity->pres_uri,presentity->watcher_uri, HASH_SIZE); lock_get(&HashT->p_records[hash_code].lock); - if (presentity->watcher_uri) - presentity->cseq++; - _insert_htable(presentity, hash_code); lock_release(&HashT->p_records[hash_code].lock); @@ -698,4 +695,4 @@ list_entry_t *get_subs_list(str *did) } done: return list; -} +} \ No newline at end of file diff --git a/modules_k/pua/pua_db.c b/modules_k/pua/pua_db.c index 4209918..c9846d0 100644 --- a/modules_k/pua/pua_db.c +++ b/modules_k/pua/pua_db.c @@ -525,7 +525,7 @@ int convert_temporary_dialog_puadb(ua_pres_t *pres) query_cols[n_query_cols] = &str_cseq_col; query_vals[n_query_cols].type = DB1_INT; query_vals[n_query_cols].nul = 0; - query_vals[n_query_cols].val.int_val = pres->cseq + 1; + query_vals[n_query_cols].val.int_val = pres->cseq; n_query_cols++; query_cols[n_query_cols] = &str_record_route_col; @@ -1092,7 +1092,7 @@ int insert_dialog_puadb(ua_pres_t* pres) db_cols[n_cols] = &str_cseq_col; db_vals[n_cols].type = DB1_INT; db_vals[n_cols].nul = 0; - db_vals[n_cols].val.int_val = pres->cseq + 1; + db_vals[n_cols].val.int_val = pres->cseq; n_cols++; db_cols[n_cols] = &str_record_route_col; @@ -1333,7 +1333,7 @@ int update_dialog_puadb(ua_pres_t *pres, int expires, str *contact) u_cols[n_update_cols] = &str_cseq_col; u_vals[n_update_cols].type = DB1_INT; u_vals[n_update_cols].nul = 0; - u_vals[n_update_cols].val.int_val = pres->cseq + 1; + u_vals[n_update_cols].val.int_val = pres->cseq; n_update_cols++; u_cols[n_update_cols] = &str_remote_contact_col; @@ -1566,4 +1566,4 @@ list_entry_t *get_subs_list_puadb(str *did) && (RES_ROWS(res)>0)); return list; -} +} \ No newline at end of file

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2012