sr-dev August 2012

sr-dev@lists.kamailio.org

30 participants
169 discussions

git:3.3: pkg/deb Build kamailio-dbg package

by Jon Bonilla

Module: sip-router Branch: 3.3 Commit: 92254d15ebf880fee454e73a8b1d3b2fa9966180 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=92254d1… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Committer: Jon Bonilla <manwe(a)aholab.ehu.es> Date: Thu Aug 16 09:24:47 2012 +0200 pkg/deb Build kamailio-dbg package (cherry picked from commit 79e99ae5cbe7016f22454faf4f9e9f5a463a4f7d) --- pkg/kamailio/deb/debian/control | 13 ++++++++++++- pkg/kamailio/deb/debian/rules | 5 ++--- pkg/kamailio/deb/lenny/control | 11 ++++++++++- pkg/kamailio/deb/lenny/rules | 5 ++--- pkg/kamailio/deb/lucid/control | 13 ++++++++++++- pkg/kamailio/deb/lucid/rules | 5 ++--- pkg/kamailio/deb/precise/control | 13 ++++++++++++- pkg/kamailio/deb/precise/rules | 5 ++--- pkg/kamailio/deb/squeeze/control | 13 ++++++++++++- pkg/kamailio/deb/squeeze/rules | 5 ++--- pkg/kamailio/deb/wheezy/control | 13 ++++++++++++- pkg/kamailio/deb/wheezy/rules | 5 ++--- 12 files changed, 82 insertions(+), 24 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=922…

11 years, 9 months

git:master: dispatcher(k): corrected setid_pvname parameter name

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: e1149b05868b918d0bc52b2d46bb02f7799358db URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e1149b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Aug 15 13:01:43 2012 +0200 dispatcher(k): corrected setid_pvname parameter name - readme listed it as setid_pvar, the source code expected setid_pvname - reported by Dan B. --- modules_k/dispatcher/README | 18 +++++++++--------- modules_k/dispatcher/doc/dispatcher_admin.xml | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/modules_k/dispatcher/README b/modules_k/dispatcher/README index 5b6b13b..d91512e 100644 --- a/modules_k/dispatcher/README +++ b/modules_k/dispatcher/README @@ -51,7 +51,7 @@ Carsten Bock 3.14. dstid_avp (str) 3.15. attrs_avp (str) 3.16. hash_pvar (str) - 3.17. setid_pvar (str) + 3.17. setid_pvname (str) 3.18. ds_ping_method (string) 3.19. ds_ping_from (string) 3.20. ds_ping_interval (int) @@ -118,7 +118,7 @@ Carsten Bock 1.15. Set the "attrs_avp" parameter 1.16. Use $avp(i:273) for hashing: 1.17. Use combination of PVs for hashing: - 1.18. Set the "setid_pvar" parameter + 1.18. Set the "setid_pvname" parameter 1.19. Set the "ds_ping_method" parameter 1.20. Set the "ds_ping_from" parameter 1.21. Set the "ds_ping_interval" parameter @@ -165,7 +165,7 @@ Chapter 1. Admin Guide 3.14. dstid_avp (str) 3.15. attrs_avp (str) 3.16. hash_pvar (str) - 3.17. setid_pvar (str) + 3.17. setid_pvname (str) 3.18. ds_ping_method (string) 3.19. ds_ping_from (string) 3.20. ds_ping_interval (int) @@ -263,7 +263,7 @@ Chapter 1. Admin Guide 3.14. dstid_avp (str) 3.15. attrs_avp (str) 3.16. hash_pvar (str) - 3.17. setid_pvar (str) + 3.17. setid_pvname (str) 3.18. ds_ping_method (string) 3.19. ds_ping_from (string) 3.20. ds_ping_interval (int) @@ -509,16 +509,16 @@ Note modparam("dispatcher", "hash_pvar", "hash the $fU@$ci") ... -3.17. setid_pvar (str) +3.17. setid_pvname (str) The name of the PV where to store the set ID (group ID) when calling ds_is_from_list() with no parameter. Default value is "null" - don't set PV. - Example 1.18. Set the "setid_pvar" parameter + Example 1.18. Set the "setid_pvname" parameter ... - modparam("dispatcher", "setid_pvar", "$var(setid)") + modparam("dispatcher", "setid_pvname", "$var(setid)") ... 3.18. ds_ping_method (string) @@ -811,8 +811,8 @@ failure_route[tryagain] { Parameter groupid is optional, when it is missing, then the matching will be done against all addresses in all groups. Upon a match, the - variable specified by 'setid_pvar' parameter will be set to groupid of - matching address. + variable specified by 'setid_pvname' parameter will be set to groupid + of matching address. This function can be used from ANY_ROUTE. diff --git a/modules_k/dispatcher/doc/dispatcher_admin.xml b/modules_k/dispatcher/doc/dispatcher_admin.xml index b65ca5a..458cfdc 100644 --- a/modules_k/dispatcher/doc/dispatcher_admin.xml +++ b/modules_k/dispatcher/doc/dispatcher_admin.xml @@ -455,7 +455,7 @@ modparam("dispatcher", "force_dst", 1) </example> </section> <section> - <title><varname>setid_pvar</varname> (str)</title> + <title><varname>setid_pvname</varname> (str)</title> <para> The name of the PV where to store the set ID (group ID) when calling ds_is_from_list() with no parameter. @@ -466,10 +466,10 @@ modparam("dispatcher", "force_dst", 1) </emphasis> </para> <example> - <title>Set the <quote>setid_pvar</quote> parameter</title> + <title>Set the <quote>setid_pvname</quote> parameter</title> <programlisting format="linespecific"> ... - modparam("dispatcher", "setid_pvar", "$var(setid)") + modparam("dispatcher", "setid_pvname", "$var(setid)") ... </programlisting> </example> @@ -965,7 +965,7 @@ failure_route[tryagain] { <para> Parameter groupid is optional, when it is missing, then the matching will be done against all addresses in all groups. Upon a match, the - variable specified by 'setid_pvar' parameter will be set to groupid + variable specified by 'setid_pvname' parameter will be set to groupid of matching address. </para> <para>

11 years, 9 months

git:master: dispatcher(k): corrected the variable which is set by ds_is_from_list()

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: be05dfc0f4af62f9c368960fe75a810548be8b87 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=be05dfc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Aug 15 12:48:32 2012 +0200 dispatcher(k): corrected the variable which is set by ds_is_from_list() - setid_pvar is used instead of grp_avp - reported by Dan B. --- modules_k/dispatcher/README | 3 ++- modules_k/dispatcher/doc/dispatcher_admin.xml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules_k/dispatcher/README b/modules_k/dispatcher/README index e68a2a8..5b6b13b 100644 --- a/modules_k/dispatcher/README +++ b/modules_k/dispatcher/README @@ -811,7 +811,8 @@ failure_route[tryagain] { Parameter groupid is optional, when it is missing, then the matching will be done against all addresses in all groups. Upon a match, the - 'grp_avp' will be set to groupid of matching address. + variable specified by 'setid_pvar' parameter will be set to groupid of + matching address. This function can be used from ANY_ROUTE. diff --git a/modules_k/dispatcher/doc/dispatcher_admin.xml b/modules_k/dispatcher/doc/dispatcher_admin.xml index 3453210..b65ca5a 100644 --- a/modules_k/dispatcher/doc/dispatcher_admin.xml +++ b/modules_k/dispatcher/doc/dispatcher_admin.xml @@ -965,7 +965,8 @@ failure_route[tryagain] { <para> Parameter groupid is optional, when it is missing, then the matching will be done against all addresses in all groups. Upon a match, the - 'grp_avp' will be set to groupid of matching address. + variable specified by 'setid_pvar' parameter will be set to groupid + of matching address. </para> <para> This function can be used from ANY_ROUTE.

11 years, 9 months

git:master: acc(k): added notes about dynamic table name for db acc to docs

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 91d6d3c8a1484b23ff74f0cfd6356447985455a5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=91d6d3c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Aug 14 22:18:50 2012 +0200 acc(k): added notes about dynamic table name for db acc to docs --- modules_k/acc/README | 253 +++++++++++++++++++++++---------------- modules_k/acc/doc/acc_admin.xml | 13 ++- 2 files changed, 160 insertions(+), 106 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=91d…

11 years, 9 months

about the revert of dynamic acc table name

by Daniel-Constantin Mierla

Hi Juha, I see that you discarded my feature of allowing dynamic table names for acc module. This is the link to your commit: http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=commitdiff;h=95… My commit was several month before: http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=commitdiff;h=e8… Was it any reason for that? If not, such situation can happen only if one copies an old version over the latest taken from git, which should not be done. There is also another commit I did in between that has to be checked if it was discarded as well. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Training, Seattle, USA, Sep 23-26, 2012 - http://asipto.com/u/katu Kamailio Practical Workshop, Netherlands, Sep 10-12, 2012 - http://asipto.com/u/kpw

11 years, 9 months

git:master: acc(k): table name for db acc can be dynamic

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 95ee0a3ee75556a25f3a9286837a57decf6c3c91 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=95ee0a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 12 14:52:07 2010 +0200 acc(k): table name for db acc can be dynamic - you can include variables in table name and will be evaluated at runtime: modparam("acc", "db_table_acc", "acc_$time(year)_$time(mon)") will write now to table acc_2010_10 - same can be done for missed_calls table name - second parameter of acc_db_request() supports as well config variables (cherry picked from commit e8f6a95d43b6a4340cf7e97213af5c71fa2a69e9) --- modules_k/acc/acc_logic.c | 52 +++++++++++++++++++++++++++++++++++++++----- modules_k/acc/acc_mod.c | 24 ++++++++++++++++++++ modules_k/acc/acc_mod.h | 2 + 3 files changed, 72 insertions(+), 6 deletions(-) diff --git a/modules_k/acc/acc_logic.c b/modules_k/acc/acc_logic.c index 6d67fe1..f2efaa7 100644 --- a/modules_k/acc/acc_logic.c +++ b/modules_k/acc/acc_logic.c @@ -39,6 +39,7 @@ #include <string.h> #include "../../dprint.h" +#include "../../sr_module.h" #include "../../parser/parse_from.h" #include "../../parser/parse_content.h" #include "../../modules/tm/tm_load.h" @@ -102,8 +103,6 @@ struct acc_enviroment acc_env; #define is_acc_prepare_on(_rq) \ (is_acc_flag_set(_rq,acc_prepare_flag)) - - static void tmcb_func( struct cell* t, int type, struct tmcb_params *ps ); @@ -181,6 +180,35 @@ int w_acc_log_request(struct sip_msg *rq, char *comment, char *foo) #ifdef SQL_ACC +int acc_db_set_table_name(struct sip_msg *msg, void *param, str *table) +{ +#define DB_TABLE_NAME_SIZE 64 + static char db_table_name_buf[DB_TABLE_NAME_SIZE]; + str dbtable; + + if(param!=NULL) { + if(get_str_fparam(&dbtable, msg, (fparam_t*)param)<0) { + LM_ERR("cannot get acc db table name\n"); + return -1; + } + if(dbtable.len>=DB_TABLE_NAME_SIZE) { + LM_ERR("acc db table name too big [%.*s] max %d\n", + dbtable.len, dbtable.s, DB_TABLE_NAME_SIZE); + return -1; + } + strncpy(db_table_name_buf, dbtable.s, dbtable.len); + env_set_text(db_table_name_buf, dbtable.len); + } else { + if(table==NULL) { + LM_ERR("no acc table name\n"); + return -1; + } + env_set_text(table->s, table->len); + } + return 0; +} + + int w_acc_db_request(struct sip_msg *rq, char *comment, char *table) { if (!table) { @@ -189,9 +217,12 @@ int w_acc_db_request(struct sip_msg *rq, char *comment, char *table) } if (acc_preparse_req(rq)<0) return -1; + if(acc_db_set_table_name(rq, (void*)table, NULL)<0) { + LM_ERR("cannot set table name\n"); + return -1; + } env_set_to( rq->to ); env_set_comment((struct acc_param*)comment); - env_set_text(table, strlen(table)); return acc_db_request(rq); } #endif @@ -339,7 +370,10 @@ static inline void on_missed(struct cell *t, struct sip_msg *req, } #ifdef SQL_ACC if (is_db_mc_on(req)) { - env_set_text(db_table_mc.s, db_table_mc.len); + if(acc_db_set_table_name(req, db_table_mc_data, &db_table_mc)<0) { + LM_ERR("cannot set missed call db table name\n"); + return; + } acc_db_request( req ); flags_to_reset |= db_missed_flag; } @@ -410,7 +444,10 @@ static inline void acc_onreply( struct cell* t, struct sip_msg *req, } #ifdef SQL_ACC if (is_db_acc_on(req)) { - env_set_text( db_table_acc.s, db_table_acc.len); + if(acc_db_set_table_name(req, db_table_acc_data, &db_table_acc)<0) { + LM_ERR("cannot set acc db table name\n"); + return; + } acc_db_request(req); } #endif @@ -451,7 +488,10 @@ static inline void acc_onack( struct cell* t, struct sip_msg *req, } #ifdef SQL_ACC if (is_db_acc_on(req)) { - env_set_text( db_table_acc.s, db_table_acc.len); + if(acc_db_set_table_name(ack, db_table_acc_data, &db_table_acc)<0) { + LM_ERR("cannot set acc db table name\n"); + return; + } acc_db_request( ack ); } #endif diff --git a/modules_k/acc/acc_mod.c b/modules_k/acc/acc_mod.c index 1d5d252..9f40e14 100644 --- a/modules_k/acc/acc_mod.c +++ b/modules_k/acc/acc_mod.c @@ -184,7 +184,9 @@ static char *db_extra_str = 0; /*!< db extra variables */ struct acc_extra *db_extra = 0; static str db_url = {NULL, 0}; /*!< Database url */ str db_table_acc = str_init("acc"); /*!< name of database tables */ +void *db_table_acc_data = NULL; str db_table_mc = str_init("missed_calls"); +void *db_table_mc_data = NULL; /* names of columns in tables acc/missed calls*/ str acc_method_col = str_init("method"); str acc_fromtag_col = str_init("from_tag"); @@ -350,6 +352,8 @@ static int acc_fixup(void** param, int param_no) if (db_url.s==0) { pkg_free(p); *param = 0; + } else { + return fixup_var_pve_str_12(param, 2); } #endif } @@ -421,7 +425,27 @@ static int mod_init( void ) } } db_table_acc.len = strlen(db_table_acc.s); + if(db_table_acc.len!=3 || strncmp(db_table_acc.s, "acc", 3)!=0) + { + db_table_acc_data = db_table_acc.s; + if(fixup_var_pve_str_12(&db_table_acc_data, 1)<0) + { + LM_ERR("unable to parse acc table name [%.*s]\n", + db_table_acc.len, db_table_acc.s); + return -1; + } + } db_table_mc.len = strlen(db_table_mc.s); + if(db_table_mc.len!=12 || strncmp(db_table_mc.s, "missed_calls", 12)!=0) + { + db_table_mc_data = db_table_mc.s; + if(fixup_var_pve_str_12(&db_table_mc_data, 1)<0) + { + LM_ERR("unable to parse mc table name [%.*s]\n", + db_table_mc.len, db_table_mc.s); + return -1; + } + } acc_method_col.len = strlen(acc_method_col.s); acc_fromtag_col.len = strlen(acc_fromtag_col.s); acc_totag_col.len = strlen(acc_totag_col.s); diff --git a/modules_k/acc/acc_mod.h b/modules_k/acc/acc_mod.h index ca76eff..5e7792a 100644 --- a/modules_k/acc/acc_mod.h +++ b/modules_k/acc/acc_mod.h @@ -78,7 +78,9 @@ extern int db_flag; extern int db_missed_flag; extern str db_table_acc; +extern void *db_table_acc_data; extern str db_table_mc; +extern void *db_table_mc_data; extern str acc_method_col; extern str acc_fromuri_col;

11 years, 9 months

git:3.3: modules_k/rls: Fixed incorrect table version check

by Peter Dunkley

Module: sip-router Branch: 3.3 Commit: 985f9382703a0f5a493f8a4594220304276c2bd4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=985f938… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Aug 14 15:53:07 2012 +0100 modules_k/rls: Fixed incorrect table version check - Found by Hugh Waite @ Crocodile RCS (cherry picked from commit e22e5f83115d9f1e33c27ae437d93d7701330a8c) --- modules_k/rls/rls.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/rls/rls.c b/modules_k/rls/rls.c index 06de4cb..08dedcf 100644 --- a/modules_k/rls/rls.c +++ b/modules_k/rls/rls.c @@ -510,7 +510,7 @@ static int mod_init(void) } /* verify table version */ - if(db_check_table_version(&rlpres_dbf, rls_db, &rlpres_table, P_TABLE_VERSION) < 0) { + if(db_check_table_version(&rlpres_dbf, rlpres_db, &rlpres_table, P_TABLE_VERSION) < 0) { LM_ERR("error during table version check.\n"); return -1; }

11 years, 9 months

git:3.3: modules_k/rls: Fixed memory leak in rls under some error conditions

by Peter Dunkley

Module: sip-router Branch: 3.3 Commit: d94040eca0a9900fcf0b9f1140e3afeb38c9fcba URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d94040e… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Aug 14 15:52:37 2012 +0100 modules_k/rls: Fixed memory leak in rls under some error conditions - Found and fixed by Hugh Waite @ Crocodile RCS (cherry picked from commit de8b241ea39284cce4c7e1850fcf3cef4c4c4a0a) --- modules_k/rls/subscribe.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules_k/rls/subscribe.c b/modules_k/rls/subscribe.c index 66c295a..f719754 100644 --- a/modules_k/rls/subscribe.c +++ b/modules_k/rls/subscribe.c @@ -657,7 +657,8 @@ int rls_handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_doma LM_ERR("while sending reply\n"); goto error; } - return 0; + ret = 0; + goto stop; } /* if correct reply with 200 OK */ @@ -705,7 +706,8 @@ int rls_handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_doma LM_ERR("while sending reply\n"); goto error; } - return 0; + ret = 0; + goto stop; } } if(rls_get_service_list(&subs.pres_uri, &subs.watcher_user, @@ -745,6 +747,7 @@ int rls_handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_doma done: ret = 1; +stop: forpresence: if(contact!=NULL) {

11 years, 9 months

git:master: modules_k/rls: Fixed memory leak in rls under some error conditions

by Peter Dunkley

Module: sip-router Branch: master Commit: de8b241ea39284cce4c7e1850fcf3cef4c4c4a0a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=de8b241… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Aug 14 15:52:37 2012 +0100 modules_k/rls: Fixed memory leak in rls under some error conditions - Found and fixed by Hugh Waite @ Crocodile RCS --- modules_k/rls/subscribe.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules_k/rls/subscribe.c b/modules_k/rls/subscribe.c index 66c295a..f719754 100644 --- a/modules_k/rls/subscribe.c +++ b/modules_k/rls/subscribe.c @@ -657,7 +657,8 @@ int rls_handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_doma LM_ERR("while sending reply\n"); goto error; } - return 0; + ret = 0; + goto stop; } /* if correct reply with 200 OK */ @@ -705,7 +706,8 @@ int rls_handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_doma LM_ERR("while sending reply\n"); goto error; } - return 0; + ret = 0; + goto stop; } } if(rls_get_service_list(&subs.pres_uri, &subs.watcher_user, @@ -745,6 +747,7 @@ int rls_handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_doma done: ret = 1; +stop: forpresence: if(contact!=NULL) {

11 years, 9 months

git:master: modules_k/rls: Fixed incorrect table version check

by Peter Dunkley

Module: sip-router Branch: master Commit: e22e5f83115d9f1e33c27ae437d93d7701330a8c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e22e5f8… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Aug 14 15:53:07 2012 +0100 modules_k/rls: Fixed incorrect table version check - Found by Hugh Waite @ Crocodile RCS --- modules_k/rls/rls.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/rls/rls.c b/modules_k/rls/rls.c index 06de4cb..08dedcf 100644 --- a/modules_k/rls/rls.c +++ b/modules_k/rls/rls.c @@ -510,7 +510,7 @@ static int mod_init(void) } /* verify table version */ - if(db_check_table_version(&rlpres_dbf, rls_db, &rlpres_table, P_TABLE_VERSION) < 0) { + if(db_check_table_version(&rlpres_dbf, rlpres_db, &rlpres_table, P_TABLE_VERSION) < 0) { LM_ERR("error during table version check.\n"); return -1; }

11 years, 9 months

← Newer
1
...
6
7
8
9
10
11
12
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2012