sr-dev March 2010

sr-dev@lists.kamailio.org

24 participants
359 discussions

git:master: mtree: fixed attr size in mt_list command

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: e39526cf8e082ff3c9f282916d3dd1e339452758 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e39526c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 15 13:15:09 2010 +0100 mtree: fixed attr size in mt_list command --- modules/mtree/mtree_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/mtree/mtree_mod.c b/modules/mtree/mtree_mod.c index a5d42f7..23e06a1 100644 --- a/modules/mtree/mtree_mod.c +++ b/modules/mtree/mtree_mod.c @@ -796,7 +796,7 @@ int mt_print_mi_node(m_tree_t *tree, mt_node_t *pt, struct mi_node* rpl, code[len]=mt_char_list.s[i]; if(pt[i].tvalue.s!=NULL) { - node = add_mi_node_child(rpl, 0, "MT", 3, 0, 0); + node = add_mi_node_child(rpl, 0, "MT", 2, 0, 0); if(node == NULL) goto error; attr = add_mi_attr(node, MI_DUP_VALUE, "TNAME", 5,

14 years, 9 months

git:master: mtree: documented new parameters

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 1e115fd9666ae6b5d674e6a9f0c98fe2a1cb3e05 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1e115fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 15 12:07:01 2010 +0100 mtree: documented new parameters - new parameters: db_table, tname_column and mt_tree_type --- modules/mtree/README | 122 +++++++++++++++++++++++++------------ modules/mtree/doc/mtree_admin.xml | 63 +++++++++++++++++++- 2 files changed, 146 insertions(+), 39 deletions(-) diff --git a/modules/mtree/README b/modules/mtree/README index 20062a2..f11bac1 100644 --- a/modules/mtree/README +++ b/modules/mtree/README @@ -26,12 +26,15 @@ Daniel-Constantin Mierla 3. Exported Parameters 3.1. db_url (string) - 3.2. mtree (string) - 3.3. tprefix_column (string) - 3.4. tvalue_column (string) - 3.5. fetch_rows (integer) - 3.6. char_list (string) - 3.7. pv_value (string) + 3.2. db_table (string) + 3.3. mtree (string) + 3.4. tname_column (string) + 3.5. tprefix_column (string) + 3.6. tvalue_column (string) + 3.7. fetch_rows (integer) + 3.8. char_list (string) + 3.9. pv_value (string) + 3.10. mt_tree_type (integer) 4. Exported Functions @@ -45,13 +48,16 @@ Daniel-Constantin Mierla List of Examples 1.1. Set db_url parameter - 1.2. Set mtree parameter - 1.3. Set prefix_column parameter - 1.4. Set tvalue_column parameter - 1.5. Set fetch_rows parameter - 1.6. Set char_list parameter - 1.7. Set pv_value parameter - 1.8. mt_match usage + 1.2. Set db_table parameter + 1.3. Set mtree parameter + 1.4. Set tname_column parameter + 1.5. Set tprefix_column parameter + 1.6. Set tvalue_column parameter + 1.7. Set fetch_rows parameter + 1.8. Set char_list parameter + 1.9. Set pv_value parameter + 1.10. Set mt_tree_type parameter + 1.11. mt_match usage Chapter 1. Admin Guide @@ -66,12 +72,15 @@ Chapter 1. Admin Guide 3. Exported Parameters 3.1. db_url (string) - 3.2. mtree (string) - 3.3. tprefix_column (string) - 3.4. tvalue_column (string) - 3.5. fetch_rows (integer) - 3.6. char_list (string) - 3.7. pv_value (string) + 3.2. db_table (string) + 3.3. mtree (string) + 3.4. tname_column (string) + 3.5. tprefix_column (string) + 3.6. tvalue_column (string) + 3.7. fetch_rows (integer) + 3.8. char_list (string) + 3.9. pv_value (string) + 3.10. mt_tree_type (integer) 4. Exported Functions @@ -106,12 +115,15 @@ Chapter 1. Admin Guide 3. Exported Parameters 3.1. db_url (string) - 3.2. mtree (string) - 3.3. tprefix_column (string) - 3.4. tvalue_column (string) - 3.5. fetch_rows (integer) - 3.6. char_list (string) - 3.7. pv_value (string) + 3.2. db_table (string) + 3.3. mtree (string) + 3.4. tname_column (string) + 3.5. tprefix_column (string) + 3.6. tvalue_column (string) + 3.7. fetch_rows (integer) + 3.8. char_list (string) + 3.9. pv_value (string) + 3.10. mt_tree_type (integer) 3.1. db_url (string) @@ -124,73 +136,107 @@ Chapter 1. Admin Guide modparam("mtree", "db_url", "dbdriver://username:password@dbhost/dbname") ... -3.2. mtree (string) +3.2. db_table (string) + + Name of DB table where data for trees is store. It is ignored if a + 'mtree' parameter is defined. + + Default value is "mtrees". + + Example 1.2. Set db_table parameter +... +modparam("mtree", "db_table", "mymtrees") +... + +3.3. mtree (string) Definition of memory tree Default value is "none". - Example 1.2. Set mtree parameter + Example 1.3. Set mtree parameter ... modparam("mtree", "mtree", "name=mytable;dbtable=routes;type=0;") ... -3.3. tprefix_column (string) +3.4. tname_column (string) + + Name of 'tname' column. + + Default value is "tname". + + Example 1.4. Set tname_column parameter +... +modparam("mtree", "tname_column", "name") +... + +3.5. tprefix_column (string) Name of 'tprefix' column. Default value is "tprefix". - Example 1.3. Set prefix_column parameter + Example 1.5. Set tprefix_column parameter ... modparam("mtree", "tprefix_column", "prefix") ... -3.4. tvalue_column (string) +3.6. tvalue_column (string) Name of 'tvalue' column. Default value is "tvalue". - Example 1.4. Set tvalue_column parameter + Example 1.6. Set tvalue_column parameter ... modparam("mtree", "tvalue_column", "ipaddr") ... -3.5. fetch_rows (integer) +3.7. fetch_rows (integer) Number of rows to be loaded in one step from database. Default value is 1000. - Example 1.5. Set fetch_rows parameter + Example 1.7. Set fetch_rows parameter ... modparam("mtree", "fetch_rows", 4000) ... -3.6. char_list (string) +3.8. char_list (string) The list with characters allowed in prefix. Default value is "0123456789". - Example 1.6. Set char_list parameter + Example 1.8. Set char_list parameter ... modparam("mtree", "char_list", "0123456789*+") ... -3.7. pv_value (string) +3.9. pv_value (string) The PV spec where to store the matched value. It can be any writtable PV. Default value is "$avp(s:tvalue)". - Example 1.7. Set pv_value parameter + Example 1.9. Set pv_value parameter ... modparam("mtree", "pv_value", "$var(mtval)") ... +3.10. mt_tree_type (integer) + + Default payload type for trees data stored in 'db_table'. + + Default value is 0. + + Example 1.10. Set mt_tree_type parameter +... +modparam("mtree", "mt_tree_type", 1) +... + 4. Exported Functions 4.1. mt_match(mtree, pv, mode) @@ -200,7 +246,7 @@ modparam("mtree", "pv_value", "$var(mtval)") Match 'pv' value against mtree. mode is reserved for further use, now set any integer or PV. - Example 1.8. mt_match usage + Example 1.11. mt_match usage ... mt_match("mytree", "$rU", "0"); ... diff --git a/modules/mtree/doc/mtree_admin.xml b/modules/mtree/doc/mtree_admin.xml index 2e527fc..f4b9698 100644 --- a/modules/mtree/doc/mtree_admin.xml +++ b/modules/mtree/doc/mtree_admin.xml @@ -74,6 +74,27 @@ modparam("mtree", "db_url", "&exampledb;") </section> <section> + <title><varname>db_table</varname> (string)</title> + <para> + Name of DB table where data for trees is store. It is ignored if a + 'mtree' parameter is defined. + </para> + <para> + <emphasis> + Default value is <quote>mtrees</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>db_table</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("mtree", "db_table", "mymtrees") +... +</programlisting> + </example> + </section> + + <section> <title><varname>mtree</varname> (string)</title> <para> Definition of memory tree @@ -94,6 +115,26 @@ modparam("mtree", "mtree", "name=mytable;dbtable=routes;type=0;") </section> <section> + <title><varname>tname_column</varname> (string)</title> + <para> + Name of 'tname' column. + </para> + <para> + <emphasis> + Default value is <quote>tname</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>tname_column</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("mtree", "tname_column", "name") +... +</programlisting> + </example> + </section> + + <section> <title><varname>tprefix_column</varname> (string)</title> <para> Name of 'tprefix' column. @@ -104,7 +145,7 @@ modparam("mtree", "mtree", "name=mytable;dbtable=routes;type=0;") </emphasis> </para> <example> - <title>Set <varname>prefix_column</varname> parameter</title> + <title>Set <varname>tprefix_column</varname> parameter</title> <programlisting format="linespecific"> ... modparam("mtree", "tprefix_column", "prefix") @@ -194,6 +235,26 @@ modparam("mtree", "pv_value", "$var(mtval)") </example> </section> + <section> + <title><varname>mt_tree_type</varname> (integer)</title> + <para> + Default payload type for trees data stored in 'db_table'. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>mt_tree_type</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("mtree", "mt_tree_type", 1) +... +</programlisting> + </example> + </section> + </section> <section>

14 years, 9 months

git:master: mtree: mt_reload updated

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d896bb5f001641a6fcd9cd598eb3edf0255f1546 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d896bb5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 15 12:16:58 2010 +0100 mtree: mt_reload updated - reload function takes in consideration the operation mode --- modules/mtree/mtree_mod.c | 62 ++++++++++++++++++++++++++------------------- 1 files changed, 36 insertions(+), 26 deletions(-) diff --git a/modules/mtree/mtree_mod.c b/modules/mtree/mtree_mod.c index 9eea87e..a5d42f7 100644 --- a/modules/mtree/mtree_mod.c +++ b/modules/mtree/mtree_mod.c @@ -726,42 +726,52 @@ static struct mi_root* mt_mi_reload(struct mi_root *cmd_tree, void *param) m_tree_t *pt; struct mi_node* node = NULL; - if(!mt_defined_trees()) + if(db_table.len>0) { - LM_ERR("empty tree list\n"); - return init_mi_tree( 500, MI_INTERNAL_ERR_S, MI_INTERNAL_ERR_LEN); - } + /* re-loading all information from database */ + if(mt_load_db_trees()!=0) + { + LM_ERR("cannot re-load info from database\n"); + goto error; + } + } else { + if(!mt_defined_trees()) + { + LM_ERR("empty tree list\n"); + return init_mi_tree( 500, MI_INTERNAL_ERR_S, MI_INTERNAL_ERR_LEN); + } - /* read tree name */ - node = cmd_tree->node.kids; - if(node != NULL) - { - tname = node->value; - if(tname.s == NULL || tname.len== 0) - return init_mi_tree( 404, "domain not found", 16); + /* read tree name */ + node = cmd_tree->node.kids; + if(node != NULL) + { + tname = node->value; + if(tname.s == NULL || tname.len== 0) + return init_mi_tree( 404, "domain not found", 16); - if(*tname.s=='.') { - tname.s = 0; - tname.len = 0; + if(*tname.s=='.') { + tname.s = 0; + tname.len = 0; + } } - } - pt = mt_get_first_tree(); + pt = mt_get_first_tree(); - while(pt!=NULL) - { - if(tname.s==NULL || - (tname.s!=NULL && pt->tname.len>=tname.len && - strncmp(pt->tname.s, tname.s, tname.len)==0)) + while(pt!=NULL) { - /* re-loading table from database */ - if(mt_load_db(&pt->tname)!=0) + if(tname.s==NULL + || (tname.s!=NULL && pt->tname.len>=tname.len + && strncmp(pt->tname.s, tname.s, tname.len)==0)) { - LM_ERR("cannot re-load info from database\n"); - goto error; + /* re-loading table from database */ + if(mt_load_db(&pt->tname)!=0) + { + LM_ERR("cannot re-load info from database\n"); + goto error; + } } + pt = pt->next; } - pt = pt->next; } return init_mi_tree( 200, MI_OK_S, MI_OK_LEN);

14 years, 9 months

git:master: mtree: fixet mt_tree_type param name

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d0716521f3b4e2c3dd308ff5897756e016802e51 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d071652… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 15 12:04:04 2010 +0100 mtree: fixet mt_tree_type param name --- modules/mtree/mtree_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/mtree/mtree_mod.c b/modules/mtree/mtree_mod.c index 3c204a6..9eea87e 100644 --- a/modules/mtree/mtree_mod.c +++ b/modules/mtree/mtree_mod.c @@ -134,7 +134,7 @@ static param_export_t params[]={ {"pv_dstid", STR_PARAM, &dstid_param.s}, {"pv_weight", STR_PARAM, &weight_param.s}, {"pv_count", STR_PARAM, &count_param.s}, - {"_mt_tree_type", INT_PARAM, &_mt_tree_type}, + {"mt_tree_type", INT_PARAM, &_mt_tree_type}, {0, 0, 0} };

14 years, 9 months

git:master: mtree: load many trees from same table

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 7449e6a6e9d064ca39413ada8a9fbf64da8a22fd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7449e6a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 15 11:55:44 2010 +0100 mtree: load many trees from same table - support to load data for different trees from same table - this is a different operating mode, where tree names are dynamic, it is no need to define them via parameters - static tree definition takes priority (if a static tree is defined, the table with dynamic trees name is not loaded) --- modules/mtree/mtree.c | 84 ++++++++++++++++++++- modules/mtree/mtree.h | 5 + modules/mtree/mtree_mod.c | 182 +++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 257 insertions(+), 14 deletions(-) diff --git a/modules/mtree/mtree.c b/modules/mtree/mtree.c index 615472c..54f82da 100644 --- a/modules/mtree/mtree.c +++ b/modules/mtree/mtree.c @@ -50,6 +50,9 @@ static m_tree_t **_ptree = NULL; /* quick transaltion table */ unsigned char _mt_char_table[256]; +/** + * + */ void mt_char_table_init(void) { unsigned int i; @@ -59,6 +62,39 @@ void mt_char_table_init(void) _mt_char_table[(unsigned int)mt_char_list.s[i]] = (unsigned char)i; } + +/** + * + */ +m_tree_t *mt_swap_list_head(m_tree_t *ntree) +{ + m_tree_t *otree; + + otree = *_ptree; + *_ptree = ntree; + + return otree; +} + +/** + * + */ +int mt_init_list_head(void) +{ + if(_ptree!=NULL) + return 0; + _ptree = (m_tree_t**)shm_malloc( sizeof(m_tree_t*) ); + if (_ptree==0) { + LM_ERR("out of shm mem for pdtree\n"); + return -1; + } + *_ptree=0; + return 0; +} + +/** + * + */ m_tree_t* mt_init_tree(str* tname, str *dbtable, int type) { m_tree_t *pt = NULL; @@ -629,7 +665,8 @@ int mt_table_spec(char* val) it = it->next; } - if(it!=NULL || str_strcmp(&it->tname, &tmp.tname)==0) + /* found */ + if(it!=NULL && str_strcmp(&it->tname, &tmp.tname)==0) { LM_ERR("duplicate tree with name [%s]\n", tmp.tname.s); goto error; @@ -663,6 +700,51 @@ error: return -1; } +m_tree_t *mt_add_tree(m_tree_t **dpt, str *tname, str *dbtable, int type) +{ + m_tree_t *it = NULL; + m_tree_t *prev = NULL; + m_tree_t *ndl = NULL; + + if(dpt==NULL) + return NULL; + + it = *dpt; + prev = NULL; + /* search the it position before which to insert new tvalue */ + while(it!=NULL && str_strcmp(&it->tname, tname)<0) + { + prev = it; + it = it->next; + } + + if(it!=NULL && str_strcmp(&it->tname, tname)==0) + { + return it; + } + /* add new tname*/ + if(it==NULL || str_strcmp(&it->tname, tname)>0) + { + LM_DBG("adding new tname [%s]\n", tname->s); + + ndl = mt_init_tree(tname, dbtable, type); + if(ndl==NULL) + { + LM_ERR("no more shm memory\n"); + return NULL; + } + + ndl->next = it; + + /* new tvalue must be added as first element */ + if(prev==NULL) + *dpt = ndl; + else + prev->next=ndl; + } + return ndl; +} + void mt_destroy_trees(void) { if (_ptree!=NULL) diff --git a/modules/mtree/mtree.h b/modules/mtree/mtree.h index 5a1d9ec..0bacb90 100644 --- a/modules/mtree/mtree.h +++ b/modules/mtree/mtree.h @@ -83,5 +83,10 @@ int mt_table_spec(char* val); void mt_destroy_trees(void); 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); + #endif diff --git a/modules/mtree/mtree_mod.c b/modules/mtree/mtree_mod.c index 4d7d154..3c204a6 100644 --- a/modules/mtree/mtree_mod.c +++ b/modules/mtree/mtree_mod.c @@ -61,10 +61,20 @@ CREATE TABLE mtree ( tvalue VARCHAR(128) DEFAULT '' NOT NULL, CONSTRAINT tprefix_idx UNIQUE (tprefix) ) ENGINE=MyISAM; +INSERT INTO version (table_name, table_version) values ('mtrees','1'); +CREATE TABLE mtrees ( + id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, + tname VARCHAR(128) NOT NULL, + tprefix VARCHAR(32) NOT NULL, + tvalue VARCHAR(128) DEFAULT '' NOT NULL, + CONSTRAINT tname_tprefix_idx UNIQUE (tname, tprefix) +) ENGINE=MyISAM; #endif /** parameters */ static str db_url = str_init(DEFAULT_DB_URL); +static str db_table = str_init(""); +static str tname_column = str_init("tname"); static str tprefix_column = str_init("tprefix"); static str tvalue_column = str_init("tvalue"); @@ -102,7 +112,8 @@ static int mt_match(struct sip_msg *msg, gparam_t *dm, gparam_t *var, 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 int mt_load_db(); +static int mt_load_db(str *tname); +static int mt_load_db_trees(); static cmd_export_t cmds[]={ {"mt_match", (cmd_function)w_mt_match, 3, fixup_mt_match, @@ -113,6 +124,8 @@ static cmd_export_t cmds[]={ static param_export_t params[]={ {"mtree", STR_PARAM|USE_FUNC_PARAM, (void*)mt_param}, {"db_url", STR_PARAM, &db_url.s}, + {"db_table", STR_PARAM, &db_table.s}, + {"tname_column", STR_PARAM, &tname_column.s}, {"tprefix_column", STR_PARAM, &tprefix_column.s}, {"tvalue_column", STR_PARAM, &tvalue_column.s}, {"char_list", STR_PARAM, &mt_char_list.s}, @@ -121,6 +134,7 @@ static param_export_t params[]={ {"pv_dstid", STR_PARAM, &dstid_param.s}, {"pv_weight", STR_PARAM, &weight_param.s}, {"pv_count", STR_PARAM, &count_param.s}, + {"_mt_tree_type", INT_PARAM, &_mt_tree_type}, {0, 0, 0} }; @@ -162,6 +176,8 @@ static int mod_init(void) } db_url.len = strlen(db_url.s); + db_table.len = strlen(db_table.s); + tname_column.len = strlen(tname_column.s); tprefix_column.len = strlen(tprefix_column.s); tvalue_column.len = strlen(tvalue_column.s); @@ -243,25 +259,40 @@ static int mod_init(void) goto error1; } - if(!mt_defined_trees()) + if(mt_defined_trees()) { - LM_ERR("no trees defined\n"); - goto error1; - } + LM_DBG("static trees defined\n"); - pt = mt_get_first_tree(); - - while(pt!=NULL) - { + pt = mt_get_first_tree(); + + while(pt!=NULL) + { + /* loading all information from database */ + if(mt_load_db(&pt->tname)!=0) + { + LM_ERR("cannot load info from database\n"); + goto error1; + } + pt = pt->next; + } + } else { + if(db_table.len<=0) + { + LM_ERR("no trees table defined\n"); + goto error1; + } + if(mt_init_list_head()<0) + { + LM_ERR("unable to init trees list head\n"); + goto error1; + } /* loading all information from database */ - if(mt_load_db(&pt->tname)!=0) + if(mt_load_db_trees()!=0) { - LM_ERR("cannot load info from database\n"); + LM_ERR("cannot load trees from database\n"); goto error1; } - pt = pt->next; } - mt_dbf.close(db_con); db_con = 0; @@ -558,6 +589,131 @@ error: return -1; } +static int mt_load_db_trees() +{ + db_key_t db_cols[3] = {&tname_column, &tprefix_column, &tvalue_column}; + str tprefix, tvalue, tname; + db1_res_t* db_res = NULL; + int i, ret; + m_tree_t *new_head = NULL; + m_tree_t *new_tree = NULL; + m_tree_t *old_head = NULL; + + if(db_con==NULL) + { + LM_ERR("no db connection\n"); + return -1; + } + + if (mt_dbf.use_table(db_con, &db_table) < 0) + { + LM_ERR("failed to use_table\n"); + return -1; + } + + if (DB_CAPABILITY(mt_dbf, DB_CAP_FETCH)) + { + if(mt_dbf.query(db_con,0,0,0,db_cols,0,3,&tname_column,0) < 0) + { + LM_ERR("Error while querying db\n"); + return -1; + } + if(mt_dbf.fetch_result(db_con, &db_res, mt_fetch_rows)<0) + { + LM_ERR("Error while fetching result\n"); + if (db_res) + mt_dbf.free_result(db_con, db_res); + goto error; + } else { + if(RES_ROW_N(db_res)==0) + { + return 0; + } + } + } else { + if((ret=mt_dbf.query(db_con, NULL, NULL, NULL, db_cols, + 0, 3, &tname_column, &db_res))!=0 + || RES_ROW_N(db_res)<=0 ) + { + mt_dbf.free_result(db_con, db_res); + if( ret==0) + { + return 0; + } else { + goto error; + } + } + } + + do { + for(i=0; i<RES_ROW_N(db_res); i++) + { + /* check for NULL values ?!?! */ + tname.s = (char*)(RES_ROWS(db_res)[i].values[0].val.string_val); + tname.len = strlen(tname.s); + + tprefix.s = (char*)(RES_ROWS(db_res)[i].values[1].val.string_val); + tprefix.len = strlen(tprefix.s); + + tvalue.s = (char*)(RES_ROWS(db_res)[i].values[2].val.string_val); + tvalue.len = strlen(tvalue.s); + + if(tprefix.s==NULL || tvalue.s==NULL || tname.s==NULL || + tprefix.len<=0 || tvalue.len<=0 || tname.len<=0) + { + LM_ERR("Error - bad values in db\n"); + continue; + } + new_tree = mt_add_tree(&new_head, &tname, &db_table, _mt_tree_type); + if(new_tree==NULL) + { + LM_ERR("New tree cannot be initialized\n"); + goto error; + } + if(mt_add_to_tree(new_tree, &tprefix, &tvalue)<0) + { + LM_ERR("Error adding info to tree\n"); + goto error; + } + } + if (DB_CAPABILITY(mt_dbf, DB_CAP_FETCH)) { + if(mt_dbf.fetch_result(db_con, &db_res, mt_fetch_rows)<0) { + LM_ERR("Error while fetching!\n"); + if (db_res) + mt_dbf.free_result(db_con, db_res); + goto error; + } + } else { + break; + } + } while(RES_ROW_N(db_res)>0); + mt_dbf.free_result(db_con, db_res); + + /* block all readers */ + lock_get( mt_lock ); + mt_reload_flag = 1; + lock_release( mt_lock ); + + while (mt_tree_refcnt) { + sleep_us(10); + } + + old_head = mt_swap_list_head(new_head); + + mt_reload_flag = 0; + /* free old data */ + if (old_head!=NULL) + mt_free_tree(old_head); + + return 0; + +error: + mt_dbf.free_result(db_con, db_res); + if (new_head!=NULL) + mt_free_tree(new_head); + return -1; +} + /**************************** MI ***************************/ /**

14 years, 9 months

git:master: perl(k): fix mk_action call

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: a14aaf3f2fe11cdc0d56e1a12cb60ae0cd53b8f5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a14aaf3… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Mar 14 17:13:40 2010 +0100 perl(k): fix mk_action call The mk_action() call used the old openser format, instead of the sip_router one. --- modules_k/perl/openserxs.xs | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/modules_k/perl/openserxs.xs b/modules_k/perl/openserxs.xs index 418f1e3..4ee86b6 100644 --- a/modules_k/perl/openserxs.xs +++ b/modules_k/perl/openserxs.xs @@ -220,7 +220,6 @@ int moduleFunc(struct sip_msg *m, char *func, unsigned mod_ver; char *argv[2]; int argc = 0; - action_u_t elems[MAX_ACTIONS]; struct run_act_ctx ra_ctx; if (!func) { @@ -260,16 +259,12 @@ int moduleFunc(struct sip_msg *m, char *func, return -1; } - elems[0].type = MODULE_T; - elems[0].u.data = exp_func_struct; - elems[1].type = STRING_ST; - elems[1].u.data = argv[0]; - elems[2].type = STRING_ST; - elems[2].u.data = argv[1]; - act = mk_action( MODULE_T, - 3, - elems, - 0); + act = mk_action(MODULE_T, 4 /* number of (type, value) pairs */, + MODEXP_ST, exp_func_struct, /* function */ + NUMBER_ST, 2, /* parameter number */ + STRING_ST, argv[0], /* param. 1 */ + STRING_ST, argv[1] /* param. 2 */ + ); if (!act) {

14 years, 9 months

git:master: app_python: fix mk_action() call

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 9a5418799e219da911cb06a45edfd7cdb752e1c6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9a54187… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Mar 14 17:15:32 2010 +0100 app_python: fix mk_action() call The mk_action() call used the old openser format instead of the sip_router one. --- modules/app_python/python_msgobj.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/modules/app_python/python_msgobj.c b/modules/app_python/python_msgobj.c index 3b54ade..0299228 100644 --- a/modules/app_python/python_msgobj.c +++ b/modules/app_python/python_msgobj.c @@ -192,7 +192,6 @@ msg_call_function(msgobject *self, PyObject *args) char *fname, *arg1, *arg2; union cmd_export_u* fexport; struct action *act; - action_u_t elems[MAX_ACTIONS]; struct run_act_ctx ra_ctx; unsigned mod_ver; @@ -220,13 +219,12 @@ msg_call_function(msgobject *self, PyObject *args) return Py_None; } - elems[0].type = MODEXP_ST; - elems[0].u.data = fexport; - elems[1].type = STRING_ST; - elems[1].u.data = arg1; - elems[2].type = STRING_ST; - elems[2].u.data = arg2; - act = mk_action(MODULE_T, 3, elems, 0); + act = mk_action(MODULE_T, 4 /* number of (type, value) pairs */, + MODEXP_ST, fexport, /* function */ + NUMBER_ST, 2, /* parameter number */ + STRING_ST, arg1, /* param. 1 */ + STRING_ST, arg2 /* param. 2 */ + ); if (act == NULL) { PyErr_SetString(PyExc_RuntimeError,

14 years, 9 months

Re: [sr-dev] [Kamailio-Users] kamailio crashes

by Daniel-Constantin Mierla

Hello, what version do you have? If it is for 3.0, please register a bug at: http://sip-router.org/tracker/ In 3.0 the crash is at: 186 case HDR_REFER_TO_T: 187 free_to(hf->parsed); 188 break; I am out of the office without my linux box these days to be able to check more. Maybe some other devel can look a bit at it. Thanks, Daniel On Wed, Mar 10, 2010 at 9:17 AM, Panagiotis Skoulikaritis <pskoul(a)algonet.gr > wrote: > Dear fellow kaimailio users > > We have a kamailio server which crashes. > below is the backtrace from the core files > any idea why the kamailio is crashing > > Regards > > Panagiotis > > core.29568 Mar 10 09:27 > > #0 fm_status (qm=0x73a040) at mem/f_malloc.c:609 > #1 0x0000000000423d5c in sig_usr (signo=15) at main.c:563 > #2 <signal handler called> > #3 0x00000037e3cd4711 in __recvfrom_nocancel () from /lib64/libc.so.6 > #4 0x00000000004790cc in udp_rcv_loop () at udp_server.c:408 > #5 0x000000000042760e in main (argc=3, argv=0x7fff8bf6abc8) at main.c:774 > > > > > > core.19350 Mar 10 09:05 > > (gdb) backtrace > #0 free_to (tb=0x775c00) at parser/parse_to.c:79 > #1 0x000000000047fd42 in clean_hdr_field (hf=0x2ad2432de100) at > parser/hf.c:187 > #2 0x00002ad23fe3e525 in run_trans_callbacks (type=<value optimized out>, > trans=<value optimized out>, req=0x2ad2432dcf58, > rpl=0x772d28, code=<value optimized out>) at sip_msg.h:54 > #3 0x00002ad23fe47b46 in t_reply_matching (p_msg=0x772d28, p_branch=<value > optimized out>) at t_lookup.c:888 > #4 0x00002ad23fe47fa2 in t_check (p_msg=0x772d28, > param_branch=0x7ffff9c016bc) at t_lookup.c:964 > #5 0x00002ad23fe58ac2 in reply_received (p_msg=0x73a040) at t_reply.c:1395 > #6 0x000000000041eebc in forward_reply (msg=0x772d28) at forward.c:521 > #7 0x0000000000445313 in receive_msg ( > buf=0x718dc0 "SIP/2.0 200 OK\r\nVia: SIP/2.0/UDP > 77.247.97.11;branch=z9hG4bK45f7.70f91294.0;received=77.247.97.11\r\nV", > len=920, rcv_info=0x7ffff9c017a0) at receive.c:212 > #8 0x00000000004794ae in udp_rcv_loop () at udp_server.c:449 > #9 0x000000000042760e in main (argc=3, argv=0x7ffff9c019b8) at main.c:774 > (gdb) > > > > > core.29567 Mar 10 09:27 > > gdb) backtrace > #0 free_to (tb=0x776460) at parser/parse_to.c:79 > #1 0x000000000047fd42 in clean_hdr_field (hf=0x2ad1805fa100) at > parser/hf.c:187 > #2 0x00002ad17d15a525 in run_trans_callbacks (type=<value optimized out>, > trans=<value optimized out>, req=0x2ad1805f8f58, > rpl=0x771920, code=<value optimized out>) at sip_msg.h:54 > #3 0x00002ad17d163b46 in t_reply_matching (p_msg=0x771920, p_branch=<value > optimized out>) at t_lookup.c:888 > #4 0x00002ad17d163fa2 in t_check (p_msg=0x771920, > param_branch=0x7fff8bf6a8cc) at t_lookup.c:964 > #5 0x00002ad17d174ac2 in reply_received (p_msg=0x73a040) at t_reply.c:1395 > #6 0x000000000041eebc in forward_reply (msg=0x771920) at forward.c:521 > #7 0x0000000000445313 in receive_msg ( > buf=0x718dc0 "SIP/2.0 200 OK\r\nVia: SIP/2.0/UDP > 77.247.97.11;branch=z9hG4bKddc9.fa58f7e.0;received=77.247.97.11\r\nVia: > SIP/2.0/UDP 213.170.194.47:5060;branch=z9hG4bKb973f6a69c9bea270e9db867dd7cc90f\r\nRecord-Route: > <si"..., len=919, rcv_info=0x7fff8bf6a9b0) > at receive.c:212 > #8 0x00000000004794ae in udp_rcv_loop () at udp_server.c:449 > #9 0x000000000042760e in main (argc=3, argv=0x7fff8bf6abc8) at main.c:774 > (gdb) > > > core.5326 Mar 10 09:02 > > (gdb) backtrace > #0 free_to (tb=0x772c48) at parser/parse_to.c:79 > #1 0x000000000047fd42 in clean_hdr_field (hf=0x2b2578e22560) at > parser/hf.c:187 > #2 0x00002b257597b525 in run_trans_callbacks (type=<value optimized out>, > trans=<value optimized out>, req=0x2b2578e213b8, > rpl=0x771b50, code=<value optimized out>) at sip_msg.h:54 > #3 0x00002b2575984b46 in t_reply_matching (p_msg=0x771b50, p_branch=<value > optimized out>) at t_lookup.c:888 > #4 0x00002b2575984fa2 in t_check (p_msg=0x771b50, > param_branch=0x7fff7cdc63ac) at t_lookup.c:964 > #5 0x00002b2575995ac2 in reply_received (p_msg=0x772c48) at t_reply.c:1395 > #6 0x000000000041eebc in forward_reply (msg=0x771b50) at forward.c:521 > #7 0x0000000000445313 in receive_msg ( > buf=0x718dc0 "SIP/2.0 200 OK\r\nVia: SIP/2.0/UDP > 77.247.97.11;branch=z9hG4bKec2f.dc3d97a7.0;received=77.247.97.11\r\nVia: > SIP/2.0/UDP 213.170.194.47:5060;branch=z9hG4bK47703457194f5be415efc231f6b3e923\r\nRecord-Route: > <s"..., len=918, rcv_info=0x7fff7cdc6490) > at receive.c:212 > #8 0x00000000004794ae in udp_rcv_loop () at udp_server.c:449 > #9 0x000000000042760e in main (argc=5, argv=0x7fff7cdc66a8) at main.c:774 > (gdb) quit > > _______________________________________________ > Kamailio (OpenSER) - Users mailing list > Users(a)lists.kamailio.org > http://lists.kamailio.org/cgi-bin/mailman/listinfo/users > http://lists.openser-project.org/cgi-bin/mailman/listinfo/users > -- Daniel-Constantin Mierla http://www.asipto.com

14 years, 9 months

[tracker] Comment added: kamailio registrar module / usrloc should be able to recover from temporary data loss

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#41 - kamailio registrar module / usrloc should be able to recover from temporary data loss User who did this - Ronald Voermans (voermans) ---------- Other thing: with the current database setup: the username isn't part of the primary key any more. So an insert always works, and there is never going to be an update. Just tried it, and the table is full of duplicates! If that patch makes it into Kamailio, the database structure for the location-table needs to be adjusted! ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=41#comment37 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.

14 years, 9 months

[tracker] Comment added: kamailio registrar module / usrloc should be able to recover from temporary data loss

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#41 - kamailio registrar module / usrloc should be able to recover from temporary data loss User who did this - Ronald Voermans (voermans) ---------- When restarting Kamailio, I thought it retreived the registrations from the location-table. Correct? If so, all should be consistent. But for some reason, it is/was not. Is the memory location preserved when restarting Kamailio? To be honest: i don't really know what the expected behaviour should be. When using db_mode("1"), what exactly is the use of the location-table? I do expect the memory location to be available when the database is not. On the other hand: when an update isn't possible, I do think it the location-entry should be inserted (or, as you state it the other way around: first INSERT, if that fails, UPDATE). ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=41#comment36 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.

14 years, 9 months

← Newer
1
...
21
22
23
24
25
26
27
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2010