sr-dev April 2014

sr-dev@lists.kamailio.org

26 participants
304 discussions

git:master: tm: free extra attributes stored in uac branch

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: c5e0bda5e20adeaa2a899fcc55ad12cf4678cf39 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c5e0bda… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 15 17:50:52 2014 +0200 tm: free extra attributes stored in uac branch - credits to Geoffrey M. for reporting and giving access for troubleshooting --- modules/tm/h_table.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/modules/tm/h_table.c b/modules/tm/h_table.c index 26ca3e3..db93725 100644 --- a/modules/tm/h_table.c +++ b/modules/tm/h_table.c @@ -210,6 +210,15 @@ void free_cell( struct cell* dead_cell ) if (unlikely(dead_cell->uac[i].path.s)) { shm_free_unsafe(dead_cell->uac[i].path.s); } + if (unlikely(dead_cell->uac[i].instance.s)) { + shm_free_unsafe(dead_cell->uac[i].instance.s); + } + if (unlikely(dead_cell->uac[i].ruid.s)) { + shm_free_unsafe(dead_cell->uac[i].ruid.s); + } + if (unlikely(dead_cell->uac[i].location_ua.s)) { + shm_free_unsafe(dead_cell->uac[i].location_ua.s); + } } #ifdef WITH_AS_SUPPORT

10 years, 7 months

[tracker] Task opened: Change default max_limit in maxfwd module to RfC3261 recommended value (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Sebastian Damm (sdamm) Attached to Project - sip-router Summary - Change default max_limit in maxfwd module to RfC3261 recommended value Task Type - Bug Report Category - Module Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - 4.1 Due in Version - Undecided Due Date - Undecided Details - RfC3261 says about the Max-Forwards header: A UAC MUST insert a Max-Forwards header field into each request it originates with a value that SHOULD be 70. Since Kamailio 4.0 the default max_limit of the Max-Forwards header in maxfwd module has been decreased from 256 to 16. This might surprise users upgrading and could even lead to interoperability issues, because when converting calls from SIP to ISUP, the value can be used to set the Hop Counter, and when assuming 70 as the starting value, the system can reject the packet because the Hop Counter is already too high. Attached is a patch setting the default max_limit to 70. 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=418 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.

10 years, 7 months

git:master: acc: if db_insert_mode==2, use async db insert to store the record

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 922e034e35410d2008d7d4d907fd535c1f5ad3fa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=922e034… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 14 22:33:13 2014 +0200 acc: if db_insert_mode==2, use async db insert to store the record - the acc record will be stored via async framework if db driver implement insert_async() --- modules/acc/acc.c | 10 ++++++++++ modules/acc/acc_cdr.c | 5 +++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/modules/acc/acc.c b/modules/acc/acc.c index c44a9e4..60c3e38 100644 --- a/modules/acc/acc.c +++ b/modules/acc/acc.c @@ -488,6 +488,11 @@ int acc_db_request( struct sip_msg *rq) LM_ERR("failed to insert delayed into database\n"); return -1; } + } else if(acc_db_insert_mode==2 && acc_dbf.insert_async!=NULL) { + if (acc_dbf.insert_async(db_handle, db_keys, db_vals, m) < 0) { + LM_ERR("failed to insert async into database\n"); + return -1; + } } else { if (acc_dbf.insert(db_handle, db_keys, db_vals, m) < 0) { LM_ERR("failed to insert into database\n"); @@ -504,6 +509,11 @@ int acc_db_request( struct sip_msg *rq) LM_ERR("failed to insert delayed into database\n"); return -1; } + } else if(acc_db_insert_mode==2 && acc_dbf.insert_async!=NULL) { + if(acc_dbf.insert_async(db_handle,db_keys,db_vals,m+n)<0) { + LM_ERR("failed to insert async into database\n"); + return -1; + } } else { if (acc_dbf.insert(db_handle, db_keys, db_vals, m+n) < 0) { LM_ERR("failed to insert into database\n"); diff --git a/modules/acc/acc_cdr.c b/modules/acc/acc_cdr.c index 68792e9..1ae0aa0 100644 --- a/modules/acc/acc_cdr.c +++ b/modules/acc/acc_cdr.c @@ -183,6 +183,11 @@ static int db_write_cdr( struct dlg_cell* dialog, LM_ERR("failed to insert delayed into database\n"); return -1; } + } else if(acc_db_insert_mode==2 && df->insert_async!=NULL) { + if (df->insert_async(dh, db_cdr_keys, db_cdr_vals, m) < 0) { + LM_ERR("failed to insert async into database\n"); + return -1; + } } else { if (df->insert(dh, db_cdr_keys, db_cdr_vals, m) < 0) { LM_ERR("failed to insert into database\n");

10 years, 7 months

git:master: sqlops: documentation for sql_query_async()

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 23bc165dc1f697714a922afb5806abe162033ad1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=23bc165… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 14 22:27:20 2014 +0200 sqlops: documentation for sql_query_async() --- modules/sqlops/README | 32 ++++++++++++++++++++++++--- modules/sqlops/doc/sqlops_admin.xml | 40 +++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 4 deletions(-) diff --git a/modules/sqlops/README b/modules/sqlops/README index 5be7274..1ad1be6 100644 --- a/modules/sqlops/README +++ b/modules/sqlops/README @@ -35,6 +35,7 @@ Daniel-Constantin Mierla 4.2. sql_xquery(connection, query, result) 4.3. sql_pvquery(connection, query, result) 4.4. sql_result_free(result) + 4.5. sql_query_async(connection, query) 5. Exported pseudo-variables @@ -49,8 +50,9 @@ Daniel-Constantin Mierla 1.4. sql_xquery() usage 1.5. sql_pvquery() usage 1.6. sql_result_free() usage - 1.7. $dbr(result=>key) usage - 1.8. $sqlrows(con) usage + 1.7. sql_query_async() usage + 1.8. $dbr(result=>key) usage + 1.9. $sqlrows(con) usage Chapter 1. Admin Guide @@ -73,6 +75,7 @@ Chapter 1. Admin Guide 4.2. sql_xquery(connection, query, result) 4.3. sql_pvquery(connection, query, result) 4.4. sql_result_free(result) + 4.5. sql_query_async(connection, query) 5. Exported pseudo-variables @@ -169,6 +172,7 @@ modparam("sqlops", "sqlres", "ra") 4.2. sql_xquery(connection, query, result) 4.3. sql_pvquery(connection, query, result) 4.4. sql_result_free(result) + 4.5. sql_query_async(connection, query) Note that sql_query(), sql_xquery() and sql_pvquery() functions have the following return values: @@ -270,6 +274,26 @@ xlog("number of rows in table domain: $dbr(ra=>rows)\n"); sql_result_free("ra"); ... +4.5. sql_query_async(connection, query) + + Make an async SQL query using 'connection', if implemented by db driver + module (e.g., db_mysql). The query is executed in another process and + result is not available back to config, thus it should be used only for + sql statements that don't return values (e.g., insert, delete, + update...). + * connection - the name of the connection to be used for the query + (defined via "sqlcon" parameter). + * query - SQL query string or pseudo-variables containing SQL query. + + This function can be used from ANY_ROUTE. + + Example 1.7. sql_query_async() usage +... +modparam("sqlops","sqlcon","ca=>dbdriver://username:password@dbhost/dbname") +... +sql_query_async("ca", "delete from domain"); +... + 5. Exported pseudo-variables 5.1. $dbr(result=>key) @@ -290,7 +314,7 @@ sql_result_free("ra"); integer. * colname[N] - return the name of the N-th column in the result set. - Example 1.7. $dbr(result=>key) usage + Example 1.8. $dbr(result=>key) usage ... modparam("sqlops","sqlcon","ca=>dbdriver://username:password@dbhost/dbname") ... @@ -349,7 +373,7 @@ if (sql_xquery("ca", "select * from domain", "ra") == 1) "con" must be the name identifying a DB connection. - Example 1.8. $sqlrows(con) usage + Example 1.9. $sqlrows(con) usage ... modparam("sqlops","sqlcon","ca=>dbdriver://username:password@dbhost/dbname") ... diff --git a/modules/sqlops/doc/sqlops_admin.xml b/modules/sqlops/doc/sqlops_admin.xml index b11f7e2..ec61cac 100644 --- a/modules/sqlops/doc/sqlops_admin.xml +++ b/modules/sqlops/doc/sqlops_admin.xml @@ -376,6 +376,46 @@ sql_result_free("ra"); </programlisting> </example> </section> + <section id="sqlops.f.sql_query_async"> + <title> + <function moreinfo="none">sql_query_async(connection, query)</function> + </title> + <para> + Make an async SQL query using 'connection', if implemented by db + driver module (e.g., db_mysql). The query is executed in another + process and result is not available back to config, thus it should + be used only for sql statements that don't return values (e.g., + insert, delete, update...). + </para> + <itemizedlist> + <listitem> + <para> + <emphasis>connection</emphasis> - the name of the connection + to be used for the query (defined via <quote>sqlcon</quote> + parameter). + </para> + </listitem> + <listitem> + <para> + <emphasis>query</emphasis> - SQL query string or + pseudo-variables containing SQL query. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>sql_query_async()</function> usage</title> + <programlisting format="linespecific"> +... +modparam("sqlops","sqlcon","ca=>&exampledb;") +... +sql_query_async("ca", "delete from domain"); +... +</programlisting> + </example> + </section> </section> <section>

10 years, 7 months

git:master: sqlops: new cfg function - sql_query_asycn(con, sql)

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 6f8863392ac230d85289d5edcab1d0d83fc85b00 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6f88633… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 14 22:18:52 2014 +0200 sqlops: new cfg function - sql_query_asycn(con, sql) - execute sql statement via async raw query, if implemented by db driver module (e.g., db_mysql) - the query is executed in another process and result is not available back to config, thus it should be used only for sql statements that don't return values (e.g., insert, delete, update...) --- modules/sqlops/sql_api.c | 23 +++++++++++++++++++++++ modules/sqlops/sql_api.h | 1 + modules/sqlops/sqlops.c | 15 +++++++++++++++ 3 files changed, 39 insertions(+), 0 deletions(-) diff --git a/modules/sqlops/sql_api.c b/modules/sqlops/sql_api.c index 2518db1..0202bc5 100644 --- a/modules/sqlops/sql_api.c +++ b/modules/sqlops/sql_api.c @@ -415,6 +415,29 @@ error: return -1; } +int sql_do_query_async(sql_con_t *con, str *query) +{ + db1_res_t* db_res = NULL; + int i, j; + str sv; + + if(query==NULL) + { + LM_ERR("bad parameters\n"); + return -1; + } + if(con->dbf.raw_query_async==NULL) { + LM_ERR("the db driver module doesn't support async query\n"); + return -1; + } + if(con->dbf.raw_query_async(con->dbh, query)!=0) + { + LM_ERR("cannot do the query\n"); + return -1; + } + return 1; +} + #ifdef WITH_XAVP int sql_exec_xquery(struct sip_msg *msg, sql_con_t *con, str *query, str *xavp) diff --git a/modules/sqlops/sql_api.h b/modules/sqlops/sql_api.h index aaffca6..374d9cc 100644 --- a/modules/sqlops/sql_api.h +++ b/modules/sqlops/sql_api.h @@ -73,6 +73,7 @@ void sql_destroy(void); int sql_connect(void); int sql_do_query(sql_con_t *con, str *query, sql_result_t *res); +int sql_do_query_async(sql_con_t *con, str *query); #ifdef WITH_XAVP int sql_do_xquery(sip_msg_t *msg, sql_con_t *con, pv_elem_t *query, pv_elem_t *res); diff --git a/modules/sqlops/sqlops.c b/modules/sqlops/sqlops.c index 695c6c5..2602bd9 100644 --- a/modules/sqlops/sqlops.c +++ b/modules/sqlops/sqlops.c @@ -62,6 +62,7 @@ static int bind_sqlops(sqlops_api_t* api); /** module functions */ static int sql_query(struct sip_msg*, char*, char*, char*); static int sql_query2(struct sip_msg*, char*, char*); +static int sql_query_async(struct sip_msg*, char*, char*); #ifdef WITH_XAVP static int sql_xquery(struct sip_msg *msg, char *dbl, char *query, char *res); #endif @@ -93,6 +94,8 @@ static cmd_export_t cmds[]={ ANY_ROUTE}, {"sql_query", (cmd_function)sql_query2, 2, fixup_sql_query, 0, ANY_ROUTE}, + {"sql_query_async", (cmd_function)sql_query_async, 2, fixup_sql_query, 0, + ANY_ROUTE}, #ifdef WITH_XAVP {"sql_xquery", (cmd_function)sql_xquery, 3, fixup_sql_xquery, 0, ANY_ROUTE}, @@ -214,6 +217,18 @@ static int sql_query2(struct sip_msg *msg, char *dbl, char *query) return sql_query(msg, dbl, query, NULL); } +static int sql_query_async(struct sip_msg *msg, char *dbl, char *query) +{ + str sq; + if(pv_printf_s(msg, (pv_elem_t*)query, &sq)!=0) + { + LM_ERR("cannot print the sql query\n"); + return -1; + } + return sql_do_query_async((sql_con_t*)dbl, &sq); +} + + #ifdef WITH_XAVP /** *

10 years, 7 months

git:master: db_mysql: implemented async raw query and async insert

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 0d78e9a9cc56b642255fbdf5af1e1a9bf4d874cb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0d78e9a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 14 22:17:51 2014 +0200 db_mysql: implemented async raw query and async insert - both use the core async framework --- modules/db_mysql/km_db_mysql.c | 2 + modules/db_mysql/km_dbase.c | 86 ++++++++++++++++++++++++++++++++++++++++ modules/db_mysql/km_dbase.h | 13 ++++++ 3 files changed, 101 insertions(+), 0 deletions(-) diff --git a/modules/db_mysql/km_db_mysql.c b/modules/db_mysql/km_db_mysql.c index 5758f6e..aa3da2f 100644 --- a/modules/db_mysql/km_db_mysql.c +++ b/modules/db_mysql/km_db_mysql.c @@ -119,6 +119,8 @@ int db_mysql_bind_api(db_func_t *dbb) dbb->start_transaction= db_mysql_start_transaction; dbb->end_transaction = db_mysql_end_transaction; dbb->abort_transaction= db_mysql_abort_transaction; + dbb->raw_query_async = db_mysql_raw_query_async; + dbb->insert_async = db_mysql_insert_async; return 0; } diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index e486e5f..46efdd4 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -40,6 +40,7 @@ #include <mysql/mysql_version.h> #include "../../mem/mem.h" #include "../../dprint.h" +#include "../../async_task.h" #include "../../lib/srdb1/db_query.h" #include "../../lib/srdb1/db_ut.h" #include "mysql_mod.h" @@ -124,6 +125,66 @@ static int db_mysql_submit_query(const db1_con_t* _h, const str* _s) } +/** + * + */ +void db_mysql_async_exec_task(void *param) +{ + str *p; + db1_con_t* dbc; + + p = (str*)param; + + dbc = db_mysql_init(&p[0]); + + if(dbc==NULL) { + LM_ERR("failed to open connection for [%.*s]\n", p[0].len, p[0].s); + return; + } + if(db_mysql_submit_query(dbc, &p[1])<0) { + LM_ERR("failed to execute query on async worker\n"); + } + db_mysql_close(dbc); +} + +/** + * Execute a raw SQL query via core async framework. + * \param _h handle for the database + * \param _s raw query string + * \return zero on success, negative value on failure + */ +int db_mysql_submit_query_async(const db1_con_t* _h, const str* _s) +{ + struct db_id* di; + async_task_t *atask; + int asize; + str *p; + + di = ((struct pool_con*)_h->tail)->id; + + asize = sizeof(async_task_t) + 2*sizeof(str) + di->url.len + _s->len + 2; + atask = shm_malloc(asize); + if(atask==NULL) { + LM_ERR("no more shared memory to allocate %d\n", asize); + return -1; + } + + atask->exec = db_mysql_async_exec_task; + atask->param = (char*)atask + sizeof(async_task_t); + + p = (str*)((char*)atask + sizeof(async_task_t)); + p[0].s = (char*)p + 2*sizeof(str); + p[0].len = di->url.len; + strncpy(p[0].s, di->url.s, di->url.len); + p[1].s = p[0].s + p[0].len + 1; + p[1].len = _s->len; + strncpy(p[1].s, _s->s, _s->len); + + async_task_push(atask); + + return 0; +} + /** * Initialize the database module. @@ -397,6 +458,16 @@ int db_mysql_raw_query(const db1_con_t* _h, const str* _s, db1_res_t** _r) db_mysql_store_result); } +/** + * Execute a raw SQL query via core async framework. + * \param _h handle for the database + * \param _s raw query string + * \return zero on success, negative value on failure + */ +int db_mysql_raw_query_async(const db1_con_t* _h, const str* _s) +{ + return db_mysql_submit_query_async(_h, _s); +} /** * Insert a row into a specified table. @@ -767,6 +838,21 @@ int db_mysql_insert_delayed(const db1_con_t* _h, const db_key_t* _k, const db_va db_mysql_submit_query); } +/** + * Insert a row into a specified table via core async framework. + * \param _h structure representing database connection + * \param _k key names + * \param _v values of the keys + * \param _n number of key=value pairs + * \return zero on success, negative value on failure + */ +int db_mysql_insert_async(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, const int _n) +{ + return db_do_insert_delayed(_h, _k, _v, _n, db_mysql_val2str, + db_mysql_submit_query_async); +} + + /** * Store the name of table that will be used by subsequent database functions diff --git a/modules/db_mysql/km_dbase.h b/modules/db_mysql/km_dbase.h index 23fc002..367bd2b 100644 --- a/modules/db_mysql/km_dbase.h +++ b/modules/db_mysql/km_dbase.h @@ -82,6 +82,12 @@ int db_mysql_raw_query(const db1_con_t* _h, const str* _s, db1_res_t** _r); /*! \brief + * Raw SQL query via async framework + */ +int db_mysql_raw_query_async(const db1_con_t* _h, const str* _s); + + +/*! \brief * Insert a row into table */ int db_mysql_insert(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, const int _n); @@ -150,6 +156,13 @@ int db_mysql_insert_delayed(const db1_con_t* _h, const db_key_t* _k, /*! \brief + * Insert a row into table via async framework + */ +int db_mysql_insert_async(const db1_con_t* _h, const db_key_t* _k, + const db_val_t* _v, const int _n); + + +/*! \brief * Store name of table that will be used by * subsequent database functions */

10 years, 7 months

git:master: lib/srdb1: extented DBv1 with async raw query and async insert

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: ca92959a8709982554721c63376a5fb009fb0aff URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ca92959… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 14 22:16:20 2014 +0200 lib/srdb1: extented DBv1 with async raw query and async insert - functions that should be executed in async mode --- lib/srdb1/db.h | 34 ++++++++++++++++++++++++++++++++++ lib/srdb1/db_id.c | 1 + 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/lib/srdb1/db.h b/lib/srdb1/db.h index cf33062..0b51245 100644 --- a/lib/srdb1/db.h +++ b/lib/srdb1/db.h @@ -194,6 +194,23 @@ typedef int (*db_raw_query_f) (const db1_con_t* _h, const str* _s, db1_res_t** _ /** + * \brief Raw SQL query via async framework. + * + * This function can be used to do database specific queries. Please + * use this function only if needed, as this creates portability issues + * for the different databases. Also keep in mind that you need to + * escape all external data sources that you use. You could use the + * escape_common and unescape_common functions in the core for this task. + * \see escape_common + * \see unescape_common + * \param _h structure representing database connection + * \param _s the SQL query + * \return returns 0 if everything is OK, otherwise returns value < 0 + */ +typedef int (*db_raw_query_async_f) (const db1_con_t* _h, const str* _s); + + +/** * \brief Free a result allocated by db_query. * * This function frees all memory allocated previously in db_query. Its @@ -326,6 +343,21 @@ typedef int (*db_insert_update_f) (const db1_con_t* _h, const db_key_t* _k, typedef int (*db_insert_delayed_f) (const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, const int _n); +/** + * \brief Insert a row into the specified table via async framework. + * + * This function implements INSERT DELAYED SQL directive. It is possible to + * insert one or more rows in a table with delay using this function. + * \param _h database connection handle + * \param _k array of keys (column names) + * \param _v array of values for keys specified in _k parameter + * \param _n number of keys-value pairs int _k and _v parameters + * \return returns 0 if everything is OK, otherwise returns value < 0 + */ +typedef int (*db_insert_async_f) (const db1_con_t* _h, const db_key_t* _k, + const db_val_t* _v, const int _n); + + /** * \brief Retrieve the number of affected rows for the last query. @@ -388,11 +420,13 @@ typedef struct db_func { in a table */ db_insert_update_f insert_update; /* Insert into table, update on duplicate key */ db_insert_delayed_f insert_delayed; /* Insert delayed into table */ + db_insert_async_f insert_async; /* Insert async into table */ db_affected_rows_f affected_rows; /* Numer of affected rows for last query */ db_start_transaction_f start_transaction; /* Start a single transaction consisting of multiple queries */ db_end_transaction_f end_transaction; /* End a transaction */ db_abort_transaction_f abort_transaction; /* Abort a transaction */ db_query_f query_lock; /* query a table and lock rows for update */ + db_raw_query_async_f raw_query_async; /* Raw query - SQL */ } db_func_t; diff --git a/lib/srdb1/db_id.c b/lib/srdb1/db_id.c index d37e521..497913a 100644 --- a/lib/srdb1/db_id.c +++ b/lib/srdb1/db_id.c @@ -254,6 +254,7 @@ struct db_id* new_db_id(const str* url, db_pooling_t pooling) if (pooling == DB_POOLING_NONE) ptr->poolid = ++poolid; else ptr->poolid = 0; ptr->pid = my_pid(); + ptr->url.s = (char*)ptr + sizeof(struct db_id); ptr->url.len = url->len; strncpy(ptr->url.s, url->s, url->len); ptr->url.s[url->len] = '\0';

10 years, 7 months

git:master: lib/srdb1: clone db url in db_id structure

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 5457bcbc51012e93775c3aaefa32c73f956aa279 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5457bcb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 14 20:19:44 2014 +0200 lib/srdb1: clone db url in db_id structure --- lib/srdb1/db_id.c | 7 +++++-- lib/srdb1/db_id.h | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/srdb1/db_id.c b/lib/srdb1/db_id.c index 29b0226..d37e521 100644 --- a/lib/srdb1/db_id.c +++ b/lib/srdb1/db_id.c @@ -239,12 +239,12 @@ struct db_id* new_db_id(const str* url, db_pooling_t pooling) return 0; } - ptr = (struct db_id*)pkg_malloc(sizeof(struct db_id)); + ptr = (struct db_id*)pkg_malloc(sizeof(struct db_id) + url->len + 1); if (!ptr) { LM_ERR("no private memory left\n"); goto err; } - memset(ptr, 0, sizeof(struct db_id)); + memset(ptr, 0, sizeof(struct db_id)+url->len+1); if (parse_db_url(ptr, url) < 0) { LM_ERR("error while parsing database URL: '%.*s' \n", url->len, url->s); @@ -254,6 +254,9 @@ struct db_id* new_db_id(const str* url, db_pooling_t pooling) if (pooling == DB_POOLING_NONE) ptr->poolid = ++poolid; else ptr->poolid = 0; ptr->pid = my_pid(); + ptr->url.len = url->len; + strncpy(ptr->url.s, url->s, url->len); + ptr->url.s[url->len] = '\0'; return ptr; diff --git a/lib/srdb1/db_id.h b/lib/srdb1/db_id.h index 6d5a93f..ea312c9 100644 --- a/lib/srdb1/db_id.h +++ b/lib/srdb1/db_id.h @@ -35,6 +35,7 @@ /** Structure representing a database ID */ struct db_id { + str url; /**< full URL clone */ char* scheme; /**< URL scheme */ char* username; /**< Username, case sensitive */ char* password; /**< Password, case sensitive */

10 years, 7 months

[tracker] Task opened: Dialog never times-out when ka_timer < 10, even on 481 or 408(fake) response

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Bill Radis (radisb) Attached to Project - sip-router Summary - Dialog never times-out when ka_timer < 10, even on 481 or 408(fake) response Task Type - Bug Report Category - dialog Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - In the dialog module (https://github.com/kamailio/kamailio/blob/master/modules/dialog/dlg_req_wit…) in line 264 there is this code: if(ps->code==408 || ps->code==481) { if(update_dlg_timer(&dlg->tl, 10)<0) { LM_ERR("failed to update dialog lifetime\n"); goto done; } dlg->lifetime = 10; dlg->dflags |= DLG_FLAG_CHANGED; } This code is for updating the dialog's lifetime when a timeout occurs (by a fake 408 reply) or a 481 is received. But in the call update_dlg_timer(&dlg->tl, 10) in the code above, the second argument is a hardcoded 10, which causes the dialog to refresh its lifetime to 10 more seconds, every time a timeout (or 481) occurs. But when ka_timer is < 10 secs this gets refreshed again before the dialog expires. I did a test with update_dlg_timer(&dlg->tl, 1) and it correctly works for values of ka_timer >= 2 I cant say the correct value, propably should be 1, so that the dialog gets expired the next second that the dlg_timer_routine runs. Anyway this value should be less than the ka_timer value so there should be a minimum valid ka_timer value. So maybe (ka_timer - 1) ? More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=417 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.

10 years, 7 months

git:master: async: allow module to start without internal async timer procs

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 879aec4c22202d86b1abf75c428221e72e0a85c5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=879aec4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 14 15:37:33 2014 +0200 async: allow module to start without internal async timer procs - async_route() and async_sleep() will return false - useful when only async_task_route() is used --- modules/async/async_mod.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/modules/async/async_mod.c b/modules/async/async_mod.c index cc838f8..89f204d 100644 --- a/modules/async/async_mod.c +++ b/modules/async/async_mod.c @@ -100,6 +100,9 @@ static int mod_init(void) return -1; } + if(async_workers<=0) + return 0; + if(async_init_timer_list()<0) { LM_ERR("cannot initialize internal structure\n"); return -1; @@ -118,6 +121,9 @@ static int child_init(int rank) if (rank!=PROC_MAIN) return 0; + if(async_workers<=0) + return 0; + if(fork_dummy_timer(PROC_TIMER, "ASYNC MOD TIMER", 1 /*socks flag*/, async_timer_exec, NULL, 1 /*sec*/)<0) { LM_ERR("failed to register timer routine as process\n"); @@ -145,6 +151,12 @@ static int w_async_sleep(struct sip_msg* msg, char* sec, char* str2) if(msg==NULL) return -1; + if(async_workers<=0) + { + LM_ERR("no async mod timer wokers\n"); + return -1; + } + ap = (async_param_t*)sec; if(fixup_get_ivalue(msg, ap->pinterval, &s)!=0) { @@ -203,6 +215,12 @@ static int w_async_route(struct sip_msg* msg, char* rt, char* sec) if(msg==NULL) return -1; + if(async_workers<=0) + { + LM_ERR("no async mod timer wokers\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t*)rt, &rn)!=0) { LM_ERR("no async route block name\n");

10 years, 7 months

← Newer
1
...
20
21
22
23
24
25
26
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2014