sr-dev November 2013

sr-dev@lists.kamailio.org

29 participants
220 discussions

git:master: tls: refreshed the README
by Daniel-Constantin Mierla 03 Nov '13

03 Nov '13

Module: sip-router Branch: master Commit: f4bf810a5af5b2d133df30e625691cc7b6ad2cf5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f4bf810… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Nov 3 13:15:31 2013 +0100 tls: refreshed the README --- modules/tls/README | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/modules/tls/README b/modules/tls/README index f723d65..9584354 100644 --- a/modules/tls/README +++ b/modules/tls/README @@ -4,7 +4,7 @@ Andrei Pelinescu-Onciul iptelorg GmbH - Copyright (c) 2007 iptelorg GmbH + Copyright � 2007 iptelorg GmbH __________________________________________________________________ Table of Contents @@ -486,17 +486,22 @@ Revoking a certificate and using a CRL 9.1. tls_method (string) Sets the SSL/TLS protocol method. Possible values are: + * TLSv1.1 - only TLSv1.2 connections are accepted (available starting + with openssl/libssl v1.0.1e) + * TLSv1.1 - only TLSv1.1 connections are accepted (available starting + with openssl/libssl v1.0.0) * TLSv1 - only TLSv1 connections are accepted. This is the default - and recommended method (if you want to be rfc3261 conformant don't - change it). + value. * SSLv3 - only SSLv3 connections are accepted * SSLv2 - only SSLv2 connections, for old clients. Note: you shouldn't use SSLv2 for anything which should be highly secure. - * SSLv23 - any of the above methods will be accepted, with the - following limitation: the initial SSL hello message must be V2 (in - the initial hello all the supported protocols are advertised - enabling switching to a higher and more secure version). This means - connections from SSLv3 or TLSv1 clients will not be accepted. + Newer versions of libssl don't include support for it anymore. + * SSLv23 - any of the SSLv2, SSLv3 and TLSv1 methods will be + accepted, with the following limitation: the initial SSL hello + message must be V2 (in the initial hello all the supported + protocols are advertised enabling switching to a higher and more + secure version). This means connections from SSLv3 or TLSv1 clients + will be accepted. If rfc3261 conformance is desired, TLSv1 must be used. For compatibility with older clients SSLv23 is a good option.

1 0

git:master: pkg/kamailio/centos: Improvement to the CentOS init.d script
by Peter Dunkley 02 Nov '13

02 Nov '13

Module: sip-router Branch: master Commit: 26fa46a421e0bb5e00e32115b610100481e64e6d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=26fa46a… Author: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Committer: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Date: Sat Nov 2 21:45:04 2013 +0000 pkg/kamailio/centos: Improvement to the CentOS init.d script --- pkg/kamailio/centos/6/kamailio.init | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pkg/kamailio/centos/6/kamailio.init b/pkg/kamailio/centos/6/kamailio.init index 48470e1..3ee9677 100644 --- a/pkg/kamailio/centos/6/kamailio.init +++ b/pkg/kamailio/centos/6/kamailio.init @@ -61,8 +61,8 @@ start() { echo -n $"Starting $PROG: " daemon $KAM $OPTIONS >/dev/null 2>/dev/null RETVAL=$? - echo [ $RETVAL = 0 ] && touch $LOCK_FILE && success + echo return $RETVAL }

1 0

mtree module issues
by Juha Heinanen 02 Nov '13

02 Nov '13

mtree module still has a few issues: - parameters mt_allow_duplicates/mt_ignore_duplicates seem to have global meaning affecting all mtrees. - if db_table module param is used instead of mtree module params, all trees in the table must have either int or string values my suggestion is that in the future db_table module param is removed and all relevant other module parameters is moved to parameters of mtree module parameter. -- juha

2 1

git:4.0: tls: include dprint.h where log functions are used
by Daniel-Constantin Mierla 02 Nov '13

02 Nov '13

Module: sip-router Branch: 4.0 Commit: fd17595f31f3e4edeea707c5049a883fa8410dfe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fd17595… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Nov 2 19:28:36 2013 +0100 tls: include dprint.h where log functions are used (cherry picked from commit 039f52deb384c71ecfb578e2cd648153dd9937d1) --- modules/tls/tls_cfg.c | 1 + modules/tls/tls_domain.c | 1 + modules/tls/tls_mod.c | 1 + modules/tls/tls_rpc.c | 1 + modules/tls/tls_select.c | 1 + modules/tls/tls_util.c | 1 + 6 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/tls/tls_cfg.c b/modules/tls/tls_cfg.c index 228f15d..d1253af 100644 --- a/modules/tls/tls_cfg.c +++ b/modules/tls/tls_cfg.c @@ -33,6 +33,7 @@ #include "../../ut.h" #include "../../pt.h" #include "../../mem/shm_mem.h" +#include "../../dprint.h" struct cfg_group_tls default_tls_cfg = { 0, /* tls_force_run */ diff --git a/modules/tls/tls_domain.c b/modules/tls/tls_domain.c index d353b81..2d49969 100644 --- a/modules/tls/tls_domain.c +++ b/modules/tls/tls_domain.c @@ -33,6 +33,7 @@ #include "../../mem/shm_mem.h" #include "../../pt.h" #include "../../cfg/cfg.h" +#include "../../dprint.h" #include "tls_server.h" #include "tls_util.h" #include "tls_mod.h" diff --git a/modules/tls/tls_mod.c b/modules/tls/tls_mod.c index a6cd958..69967da 100644 --- a/modules/tls/tls_mod.c +++ b/modules/tls/tls_mod.c @@ -60,6 +60,7 @@ #include "../../shm_init.h" #include "../../rpc_lookup.h" #include "../../cfg/cfg.h" +#include "../../dprint.h" #include "tls_init.h" #include "tls_server.h" #include "tls_domain.h" diff --git a/modules/tls/tls_rpc.c b/modules/tls/tls_rpc.c index 956154b..12a0711 100644 --- a/modules/tls/tls_rpc.c +++ b/modules/tls/tls_rpc.c @@ -32,6 +32,7 @@ #include "../../tcp_info.h" #include "../../timer.h" #include "../../cfg/cfg.h" +#include "../../dprint.h" #include "tls_init.h" #include "tls_mod.h" #include "tls_domain.h" diff --git a/modules/tls/tls_select.c b/modules/tls/tls_select.c index 6186f0b..fe28eff 100644 --- a/modules/tls/tls_select.c +++ b/modules/tls/tls_select.c @@ -38,6 +38,7 @@ #include "../../tcp_conn.h" #include "../../ut.h" #include "../../cfg/cfg.h" +#include "../../dprint.h" #include "tls_server.h" #include "tls_select.h" #include "tls_mod.h" diff --git a/modules/tls/tls_util.c b/modules/tls/tls_util.c index da0050d..a0897fc 100644 --- a/modules/tls/tls_util.c +++ b/modules/tls/tls_util.c @@ -30,6 +30,7 @@ #include <libgen.h> #include "../../mem/shm_mem.h" #include "../../globals.h" +#include "../../dprint.h" #include "tls_mod.h" #include "tls_util.h" /*!

1 0

git:master: tls: include dprint.h where log functions are used
by Daniel-Constantin Mierla 02 Nov '13

02 Nov '13

Module: sip-router Branch: master Commit: 039f52deb384c71ecfb578e2cd648153dd9937d1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=039f52d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Nov 2 19:28:36 2013 +0100 tls: include dprint.h where log functions are used --- modules/tls/tls_cfg.c | 1 + modules/tls/tls_domain.c | 1 + modules/tls/tls_mod.c | 1 + modules/tls/tls_rpc.c | 1 + modules/tls/tls_select.c | 1 + modules/tls/tls_util.c | 1 + 6 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/tls/tls_cfg.c b/modules/tls/tls_cfg.c index 228f15d..d1253af 100644 --- a/modules/tls/tls_cfg.c +++ b/modules/tls/tls_cfg.c @@ -33,6 +33,7 @@ #include "../../ut.h" #include "../../pt.h" #include "../../mem/shm_mem.h" +#include "../../dprint.h" struct cfg_group_tls default_tls_cfg = { 0, /* tls_force_run */ diff --git a/modules/tls/tls_domain.c b/modules/tls/tls_domain.c index d353b81..2d49969 100644 --- a/modules/tls/tls_domain.c +++ b/modules/tls/tls_domain.c @@ -33,6 +33,7 @@ #include "../../mem/shm_mem.h" #include "../../pt.h" #include "../../cfg/cfg.h" +#include "../../dprint.h" #include "tls_server.h" #include "tls_util.h" #include "tls_mod.h" diff --git a/modules/tls/tls_mod.c b/modules/tls/tls_mod.c index a6cd958..69967da 100644 --- a/modules/tls/tls_mod.c +++ b/modules/tls/tls_mod.c @@ -60,6 +60,7 @@ #include "../../shm_init.h" #include "../../rpc_lookup.h" #include "../../cfg/cfg.h" +#include "../../dprint.h" #include "tls_init.h" #include "tls_server.h" #include "tls_domain.h" diff --git a/modules/tls/tls_rpc.c b/modules/tls/tls_rpc.c index 956154b..12a0711 100644 --- a/modules/tls/tls_rpc.c +++ b/modules/tls/tls_rpc.c @@ -32,6 +32,7 @@ #include "../../tcp_info.h" #include "../../timer.h" #include "../../cfg/cfg.h" +#include "../../dprint.h" #include "tls_init.h" #include "tls_mod.h" #include "tls_domain.h" diff --git a/modules/tls/tls_select.c b/modules/tls/tls_select.c index 6186f0b..fe28eff 100644 --- a/modules/tls/tls_select.c +++ b/modules/tls/tls_select.c @@ -38,6 +38,7 @@ #include "../../tcp_conn.h" #include "../../ut.h" #include "../../cfg/cfg.h" +#include "../../dprint.h" #include "tls_server.h" #include "tls_select.h" #include "tls_mod.h" diff --git a/modules/tls/tls_util.c b/modules/tls/tls_util.c index da0050d..a0897fc 100644 --- a/modules/tls/tls_util.c +++ b/modules/tls/tls_util.c @@ -30,6 +30,7 @@ #include <libgen.h> #include "../../mem/shm_mem.h" #include "../../globals.h" +#include "../../dprint.h" #include "tls_mod.h" #include "tls_util.h" /*!

1 0

[tracker] Comment added: UAC Module Fail to refresh REGISTER
by sip-router 02 Nov '13

02 Nov '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#352 - UAC Module Fail to refresh REGISTER User who did this - rene montilva (renex) ---------- Hi Daniel it's works fine, thanks!!! ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=352#comment1145 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/mtree: when loading data from db, load each tree separately
by Juha Heinanen 01 Nov '13

01 Nov '13

Module: sip-router Branch: master Commit: 6fc84c2cf610791939ba73e38b8b5b3c0b5cd047 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6fc84c2… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Oct 30 17:31:04 2013 +0200 modules/mtree: when loading data from db, load each tree separately --- modules/mtree/mtree_mod.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/modules/mtree/mtree_mod.c b/modules/mtree/mtree_mod.c index 0f4348c..eeec89c 100644 --- a/modules/mtree/mtree_mod.c +++ b/modules/mtree/mtree_mod.c @@ -291,6 +291,9 @@ static int mod_init(void) while(pt!=NULL) { + LM_DBG("loading from tree <%.*s>\n", + pt->tname.len, pt->tname.s); + /* loading all information from database */ if(mt_load_db(&pt->tname)!=0) { @@ -491,6 +494,9 @@ error: static int mt_load_db(str *tname) { db_key_t db_cols[3] = {&tprefix_column, &tvalue_column}; + db_key_t key_cols[1]; + db_op_t op[1] = {OP_EQ}; + db_val_t vals[1]; str tprefix, tvalue; db1_res_t* db_res = NULL; int i, ret; @@ -498,6 +504,11 @@ static int mt_load_db(str *tname) m_tree_t *old_tree = NULL; mt_node_t *bk_head = NULL; + key_cols[0] = &tname_column; + VAL_TYPE(vals) = DB1_STRING; + VAL_NULL(vals) = 0; + VAL_STRING(vals) = tname->s; + if(db_con==NULL) { LM_ERR("no db connection\n"); @@ -521,7 +532,7 @@ static int mt_load_db(str *tname) } if (DB_CAPABILITY(mt_dbf, DB_CAP_FETCH)) { - if(mt_dbf.query(db_con, 0, 0, 0, db_cols, 0, 2, 0, 0) < 0) + if(mt_dbf.query(db_con, key_cols, op, vals, db_cols, 1, 2, 0, 0) < 0) { LM_ERR("Error while querying db\n"); return -1;

2 19

git:master: modules/mtree: added 'multi' param to mtree definition
by Juha Heinanen 01 Nov '13

01 Nov '13

Module: sip-router Branch: master Commit: 25ee7ea17b6553ce44eda6c0665ff80cfc41db35 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=25ee7ea… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Nov 1 21:27:31 2013 +0200 modules/mtree: added 'multi' param to mtree definition - new 'multi' param makes it possible to store both integer and string typed mtrees into single db table --- modules/mtree/README | 8 ++++++-- modules/mtree/doc/mtree_admin.xml | 9 +++++++-- modules/mtree/mtree.c | 23 ++++++++++++++++++----- modules/mtree/mtree.h | 5 +++-- modules/mtree/mtree_mod.c | 36 +++++++++++++++++++++++++----------- 5 files changed, 59 insertions(+), 22 deletions(-) diff --git a/modules/mtree/README b/modules/mtree/README index d548e89..c35fb7c 100644 --- a/modules/mtree/README +++ b/modules/mtree/README @@ -186,13 +186,17 @@ modparam("mtree", "db_table", "mymtrees") 3.3. mtree (string) - Definition of memory tree + Definition of memory tree with parameters name, dbtable, type, and + multi. Name is name of the tree, dbtable is name of dbtable where tree + is stored, type is type of tree elements (0 = string, 2 = integer), and + multi tells if dbtable can contain more than one tree (0 = one tree, 1 + = more than one tree identified by tname column). Default value is "none". Example 1.3. Set mtree parameter ... -modparam("mtree", "mtree", "name=mytable;dbtable=routes;type=0;") +modparam("mtree", "mtree", "name=mytree;dbtable=routes;type=0;multi=1") ... 3.4. tname_column (string) diff --git a/modules/mtree/doc/mtree_admin.xml b/modules/mtree/doc/mtree_admin.xml index 0d81e72..0d8fe33 100644 --- a/modules/mtree/doc/mtree_admin.xml +++ b/modules/mtree/doc/mtree_admin.xml @@ -97,7 +97,12 @@ modparam("mtree", "db_table", "mymtrees") <section> <title><varname>mtree</varname> (string)</title> <para> - Definition of memory tree + Definition of memory tree with parameters name, dbtable, + type, and multi. Name is name of the tree, dbtable is name + of dbtable where tree is stored, type is type of tree elements + (0 = string, 2 = integer), and multi tells if dbtable can + contain more than one tree (0 = one tree, 1 = more than + one tree identified by tname column). </para> <para> <emphasis> @@ -108,7 +113,7 @@ modparam("mtree", "db_table", "mymtrees") <title>Set <varname>mtree</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("mtree", "mtree", "name=mytable;dbtable=routes;type=0;") +modparam("mtree", "mtree", "name=mytree;dbtable=routes;type=0;multi=1") ... </programlisting> </example> diff --git a/modules/mtree/mtree.c b/modules/mtree/mtree.c index 6587909..2f8550c 100644 --- a/modules/mtree/mtree.c +++ b/modules/mtree/mtree.c @@ -98,7 +98,7 @@ int mt_init_list_head(void) /** * */ -m_tree_t* mt_init_tree(str* tname, str *dbtable, int type) +m_tree_t* mt_init_tree(str* tname, str *dbtable, int type, int multi) { m_tree_t *pt = NULL; @@ -111,6 +111,7 @@ m_tree_t* mt_init_tree(str* tname, str *dbtable, int type) memset(pt, 0, sizeof(m_tree_t)); pt->type = type; + pt->multi = multi; pt->tname.s = (char*)shm_malloc((1+tname->len)*sizeof(char)); if(pt->tname.s==NULL) { @@ -156,6 +157,9 @@ int mt_add_to_tree(m_tree_t *pt, str *sp, str *svalue) return -1; } + LM_DBG("adding to tree <%.*s> of type <%d>\n", pt->tname.len, + pt->tname.s, pt->type); + if ((pt->type == MT_TREE_IVAL) && (str2sint(svalue, &ivalue) != 0)) { LM_ERR("bad integer string <%.*s>\n", svalue->len, svalue->s); return -1; @@ -720,6 +724,9 @@ int mt_table_spec(char* val) } else if(pit->name.len==4 && strncasecmp(pit->name.s, "type", 4)==0) { str2sint(&pit->body, &tmp.type); + } else if(pit->name.len==5 + && strncasecmp(pit->name.s, "multi", 5)==0) { + str2sint(&pit->body, &tmp.multi); } else if(pit->name.len==7 && strncasecmp(pit->name.s, "dbtable", 7)==0) { tmp.dbtable = pit->body; @@ -740,7 +747,11 @@ int mt_table_spec(char* val) LM_ERR("unknown tree type <%d>\n", tmp.type); goto error; } - + if ((tmp.multi != 0) && (tmp.multi != 1)) { + LM_ERR("unknown multi value <%d>\n", tmp.multi); + goto error; + } + /* check for same tree */ if(_ptree == 0) { @@ -773,7 +784,8 @@ int mt_table_spec(char* val) { LM_DBG("adding new tname [%s]\n", tmp.tname.s); - ndl = mt_init_tree(&tmp.tname, &tmp.dbtable, tmp.type); + ndl = mt_init_tree(&tmp.tname, &tmp.dbtable, tmp.type, + tmp.multi); if(ndl==NULL) { LM_ERR("no more shm memory\n"); @@ -797,7 +809,8 @@ error: return -1; } -m_tree_t *mt_add_tree(m_tree_t **dpt, str *tname, str *dbtable, int type) +m_tree_t *mt_add_tree(m_tree_t **dpt, str *tname, str *dbtable, int type, + int multi) { m_tree_t *it = NULL; m_tree_t *prev = NULL; @@ -824,7 +837,7 @@ m_tree_t *mt_add_tree(m_tree_t **dpt, str *tname, str *dbtable, int type) { LM_DBG("adding new tname [%s]\n", tname->s); - ndl = mt_init_tree(tname, dbtable, type); + ndl = mt_init_tree(tname, dbtable, type, multi); if(ndl==NULL) { LM_ERR("no more shm memory\n"); diff --git a/modules/mtree/mtree.h b/modules/mtree/mtree.h index 69d8830..3a33db8 100644 --- a/modules/mtree/mtree.h +++ b/modules/mtree/mtree.h @@ -66,6 +66,7 @@ typedef struct _m_tree str tname; str dbtable; int type; + int multi; unsigned int nrnodes; unsigned int nritems; unsigned int memsize; @@ -84,7 +85,7 @@ is_t* mt_get_tvalue(m_tree_t *pt, str *tomatch); int mt_match_prefix(struct sip_msg *msg, m_tree_t *pt, str *tomatch, int mode); -m_tree_t* mt_init_tree(str* tname, str* dbtable, int type); +m_tree_t* mt_init_tree(str* tname, str* dbtable, int type, int multi); void mt_free_tree(m_tree_t *pt); int mt_print_tree(m_tree_t *pt); void mt_free_node(mt_node_t *pn, int type); @@ -100,7 +101,7 @@ int mt_defined_trees(void); m_tree_t *mt_swap_list_head(m_tree_t *ntree); int mt_init_list_head(void); m_tree_t *mt_add_tree(m_tree_t **dpt, str *tname, str *dbtable, - int type); + int type, int multi); #endif diff --git a/modules/mtree/mtree_mod.c b/modules/mtree/mtree_mod.c index 0f4348c..9099d5b 100644 --- a/modules/mtree/mtree_mod.c +++ b/modules/mtree/mtree_mod.c @@ -120,7 +120,7 @@ static struct mi_root* mt_mi_reload(struct mi_root*, void* param); static struct mi_root* mt_mi_list(struct mi_root*, void* param); static struct mi_root* mt_mi_summary(struct mi_root*, void* param); -static int mt_load_db(str *tname); +static int mt_load_db(m_tree_t *pt); static int mt_load_db_trees(); static cmd_export_t cmds[]={ @@ -291,8 +291,11 @@ static int mod_init(void) while(pt!=NULL) { + LM_DBG("loading from tree <%.*s>\n", + pt->tname.len, pt->tname.s); + /* loading all information from database */ - if(mt_load_db(&pt->tname)!=0) + if(mt_load_db(pt)!=0) { LM_ERR("cannot load info from database\n"); goto error1; @@ -488,9 +491,12 @@ error: } -static int mt_load_db(str *tname) +static int mt_load_db(m_tree_t *pt) { db_key_t db_cols[3] = {&tprefix_column, &tvalue_column}; + db_key_t key_cols[1]; + db_op_t op[1] = {OP_EQ}; + db_val_t vals[1]; str tprefix, tvalue; db1_res_t* db_res = NULL; int i, ret; @@ -498,16 +504,22 @@ static int mt_load_db(str *tname) m_tree_t *old_tree = NULL; mt_node_t *bk_head = NULL; + key_cols[0] = &tname_column; + VAL_TYPE(vals) = DB1_STRING; + VAL_NULL(vals) = 0; + VAL_STRING(vals) = pt->tname.s; + if(db_con==NULL) { LM_ERR("no db connection\n"); return -1; } - old_tree = mt_get_tree(tname); + old_tree = mt_get_tree(&(pt->tname)); if(old_tree==NULL) { - LM_ERR("tree definition not found [%.*s]\n", tname->len, tname->s); + LM_ERR("tree definition not found [%.*s]\n", pt->tname.len, + pt->tname.s); return -1; } memcpy(&new_tree, old_tree, sizeof(m_tree_t)); @@ -521,7 +533,8 @@ static int mt_load_db(str *tname) } if (DB_CAPABILITY(mt_dbf, DB_CAP_FETCH)) { - if(mt_dbf.query(db_con, 0, 0, 0, db_cols, 0, 2, 0, 0) < 0) + if(mt_dbf.query(db_con, key_cols, op, vals, db_cols, pt->multi, + 2, 0, 0) < 0) { LM_ERR("Error while querying db\n"); return -1; @@ -539,8 +552,8 @@ static int mt_load_db(str *tname) } } } else { - if((ret=mt_dbf.query(db_con, NULL, NULL, NULL, db_cols, - 0, 2, 0, &db_res))!=0 + if((ret=mt_dbf.query(db_con, key_cols, op, vals, db_cols, + pt->multi, 2, 0, &db_res))!=0 || RES_ROW_N(db_res)<=0 ) { mt_dbf.free_result(db_con, db_res); @@ -697,7 +710,8 @@ static int mt_load_db_trees() LM_ERR("Error - bad values in db\n"); continue; } - new_tree = mt_add_tree(&new_head, &tname, &db_table, _mt_tree_type); + new_tree = mt_add_tree(&new_head, &tname, &db_table, + _mt_tree_type, 0); if(new_tree==NULL) { LM_ERR("New tree cannot be initialized\n"); @@ -797,7 +811,7 @@ static struct mi_root* mt_mi_reload(struct mi_root *cmd_tree, void *param) && strncmp(pt->tname.s, tname.s, tname.len)==0)) { /* re-loading table from database */ - if(mt_load_db(&pt->tname)!=0) + if(mt_load_db(pt)!=0) { LM_ERR("cannot re-load info from database\n"); goto error; @@ -1081,7 +1095,7 @@ void rpc_mtree_reload(rpc_t* rpc, void* c) && strncmp(pt->tname.s, tname.s, tname.len)==0)) { /* re-loading table from database */ - if(mt_load_db(&pt->tname)!=0) + if(mt_load_db(pt)!=0) { LM_ERR("cannot re-load mtree from database\n"); goto error;

1 0

[tracker] Comment added: registrar: memory and db get not synced (Attachment added)
by sip-router 01 Nov '13

01 Nov '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#351 - registrar: memory and db get not synced User who did this - Víctor Seva (linuxmaniac) ---------- Second patch reworked. ---------- 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=351#comment1144 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: registrar: clean static values at pack_ci
by Victor Seva 01 Nov '13

01 Nov '13

Module: sip-router Branch: master Commit: 66185905850cd2ac9ab933776184da0f0882e5ac URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6618590… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Fri Nov 1 15:33:08 2013 +0100 registrar: clean static values at pack_ci --- modules/registrar/save.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules/registrar/save.c b/modules/registrar/save.c index 5cc4627..bc816cd 100644 --- a/modules/registrar/save.c +++ b/modules/registrar/save.c @@ -328,6 +328,9 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, unsig received_found = 0; /* not found yet */ m = _m; /* remember the message */ } + else { + memset( &ci.instance, 0, sizeof(str)); + } if(_c!=0) { /* hook uri address - should be more than 'sip:' chars */

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 November 2013