sr-dev March 2012

sr-dev@lists.kamailio.org

26 participants
149 discussions

git:master: modules/sipcapture: added check for corrupted and defragmented packets
by Alexandr Dubovikov 14 Mar '12

14 Mar '12

Module: sip-router Branch: master Commit: cb8c24f1ef873d16fd5c7edd96e2c0d3847b3dda URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cb8c24f… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Wed Mar 14 09:29:24 2012 +0100 modules/sipcapture: added check for corrupted and defragmented packets --- modules/sipcapture/sipcapture.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index 7e3a228..506c215 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -1528,6 +1528,12 @@ int raw_capture_rcv_loop(int rsock, int port1, int port2, int ipip) { /* fill dst_port && src_port */ dst_port=ntohs(udph->uh_dport); src_port=ntohs(udph->uh_sport); + + /* if the message has not alpha */ + if(!isalnum((buf+offset)[0])) { + DBG("not alpha and not digit... skiping...\n"); + continue; + } DBG("PORT: [%d] and [%d]\n", port1, port2); @@ -1586,6 +1592,7 @@ int raw_capture_rcv_loop(int rsock, int port1, int port2, int ipip) { ri.bind_address=si; + /* and now recieve message */ receive_msg(buf+offset, len, &ri); if(si) pkg_free(si);

1 0

rfc: unique id for profiles
by Daniel-Constantin Mierla 13 Mar '12

13 Mar '12

Hello, from the last IRC devel meetings discussions, one topic was about adding an unique id field per user profiles, with the decision to bring it to mailing lists for broader audience. That will help to reference easier across records. At this moment, the most relationships are via (username) or (username,domain) when use_domain=1, bringing some complexity. The main reasons I came up to this were: - in the perspective of gruu implementation for usrloc, with global addresses, an unique (opaque) id seem to simplify things, no matter SIP address of the user changes or not -- the public gruu id can be different than the internal one, though - it will open a new group of K and S modules for merging, S using unique ids mostly everywhere Moving towards it will be done gradually, keeping backward compatibility for a while. The first steps will be to add new column in few tables (subscriber, location), the username/domain columns will stay there forever in most of the cases, they will become additional info over the time (e.g., primary sip address in subscriber). From the point of view of filling up the column, can be as simple as setting it to username@domain, or generate some unique string with tools out there. Overall, there will be a bit more db space used at the benefit of reduced complexity in the code. Jason Penton mentioned that IMS architecture relies also on unique ids. Looking forward to comments, alternatives, etc ... sr-users community was cc-ed because it is not strictly technical discussion/decision. Cheers, Daniel -- Daniel-Constantin Mierla Kamailio Advanced Training, April 23-26, 2012, Berlin, Germany http://www.asipto.com/index.php/kamailio-advanced-training/

2 1

git:master: rls: updated usage of DB replace method
by Daniel-Constantin Mierla 13 Mar '12

13 Mar '12

Module: sip-router Branch: master Commit: c2ce62928cf1af7e509e262256d1de0e8784b8b4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c2ce629… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 13 14:10:12 2012 +0100 rls: updated usage of DB replace method --- modules_k/rls/resource_notify.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules_k/rls/resource_notify.c b/modules_k/rls/resource_notify.c index d0bf435..3ac6048 100644 --- a/modules_k/rls/resource_notify.c +++ b/modules_k/rls/resource_notify.c @@ -757,7 +757,8 @@ int rls_handle_notify(struct sip_msg* msg, char* c1, char* c2) if (rlpres_dbf.replace != NULL) { - if(rlpres_dbf.replace(rlpres_db, query_cols, query_vals, n_query_cols)< 0) + if(rlpres_dbf.replace(rlpres_db, query_cols, query_vals, n_query_cols, + 2, 0)< 0) { LM_ERR("in sql replace\n"); goto error;

1 0

git:master: p_usrloc: updated usage of DB replace method
by Daniel-Constantin Mierla 13 Mar '12

13 Mar '12

Module: sip-router Branch: master Commit: 51f3e6d5ce60f32cf9af19511663bc2f5fdfedae URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=51f3e6d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 13 14:11:11 2012 +0100 p_usrloc: updated usage of DB replace method - it has to be reviewed and fixed to make it work properly with db postgres - no effects when using it like so far with mysql or unixodbc - it keeps working like it was till now --- modules_k/p_usrloc/ul_db_form_query.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/p_usrloc/ul_db_form_query.c b/modules_k/p_usrloc/ul_db_form_query.c index 258d53a..c89af2d 100644 --- a/modules_k/p_usrloc/ul_db_form_query.c +++ b/modules_k/p_usrloc/ul_db_form_query.c @@ -115,7 +115,7 @@ static int db_do_query(ul_db_op_t ul_op, db_func_t * dbf, db1_con_t * dbh, str * } return 0; case UL_DB_REPL: - if(dbf->replace(dbh, _k, _v, _n) < 0) { + if(dbf->replace(dbh, _k, _v, _n, 0, 0) < 0) { LM_ERR("error in replacing in " "table %.*s.\n", table->len, table->s); return -1;

1 0

git:master: pua: updated usage of DB replace method
by Daniel-Constantin Mierla 13 Mar '12

13 Mar '12

Module: sip-router Branch: master Commit: 17937b2c9ae3a52f4f4ab62b012dbecae913767d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=17937b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 13 14:10:49 2012 +0100 pua: updated usage of DB replace method --- modules_k/pua/pua_db.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules_k/pua/pua_db.c b/modules_k/pua/pua_db.c index b652cee..3d3d387 100644 --- a/modules_k/pua/pua_db.c +++ b/modules_k/pua/pua_db.c @@ -1018,7 +1018,8 @@ int convert_temporary_dialog_puadb(ua_pres_t *pres) if (pua_dbf.replace != NULL) { - if (pua_dbf.replace(pua_db, query_cols, query_vals, n_query_cols) < 0) + if (pua_dbf.replace(pua_db, query_cols, query_vals, n_query_cols, + 4, 0) < 0) { LM_ERR("Failed replace db\n"); return -1;

1 0

git:master: db_postgres: added mod destroy function
by Daniel-Constantin Mierla 13 Mar '12

13 Mar '12

Module: sip-router Branch: master Commit: 0a946efc528dfbf2d35f9c22b94040bc0d596f1e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0a946ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 13 14:18:35 2012 +0100 db_postgres: added mod destroy function - clear locks set used for replace command --- modules/db_postgres/pg_mod.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/db_postgres/pg_mod.c b/modules/db_postgres/pg_mod.c index 57dd2fd..1b2d9f7 100644 --- a/modules/db_postgres/pg_mod.c +++ b/modules/db_postgres/pg_mod.c @@ -51,10 +51,11 @@ #include <float.h> #endif -static int pg_mod_init(void); - MODULE_VERSION +static int pg_mod_init(void); +static void pg_mod_destroy(void); + int pg_connect_timeout = 0; /* Default is unlimited */ int pg_retries = 2; /* How many times should the module try re-execute failed commands. * 0 disables reconnecting */ @@ -102,7 +103,7 @@ struct module_exports exports = { params, /* module parameters */ pg_mod_init, /* module initialization function */ 0, /* response function*/ - 0, /* destroy function */ + pg_mod_destroy, /* destroy function */ 0, /* oncancel function */ 0 /* per-child init function */ }; @@ -555,4 +556,9 @@ static int pg_mod_init(void) return km_postgres_mod_init(); } +static void pg_mod_destroy(void) +{ + pg_destroy_lock_set(); +} + /** @} */

1 0

git:master: db_mysql: DB API v1 replace prototype updated
by Daniel-Constantin Mierla 13 Mar '12

13 Mar '12

Module: sip-router Branch: master Commit: aac61596c586dc530953b7781df88392fb3cb9fe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aac6159… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 13 14:08:08 2012 +0100 db_mysql: DB API v1 replace prototype updated --- modules/db_mysql/km_dbase.c | 3 ++- modules/db_mysql/km_dbase.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index da429d6..208f64e 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -457,7 +457,8 @@ int db_mysql_update(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _o, * \param _n number of key=value pairs * \return zero on success, negative value on failure */ -int db_mysql_replace(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, const int _n) +int db_mysql_replace(const db1_con_t* _h, const db_key_t* _k, + const db_val_t* _v, const int _n, const int _un, const int _m) { return db_do_replace(_h, _k, _v, _n, db_mysql_val2str, db_mysql_submit_query); diff --git a/modules/db_mysql/km_dbase.h b/modules/db_mysql/km_dbase.h index a2b5f92..3a567f2 100644 --- a/modules/db_mysql/km_dbase.h +++ b/modules/db_mysql/km_dbase.h @@ -104,7 +104,8 @@ int db_mysql_update(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _o, /*! \brief * Just like insert, but replace the row if it exists */ -int db_mysql_replace(const db1_con_t* handle, const db_key_t* keys, const db_val_t* vals, const int n); +int db_mysql_replace(const db1_con_t* handle, const db_key_t* keys, + const db_val_t* vals, const int n, const int _un, const int _m); /*! \brief * Returns the last inserted ID

1 0

git:master: db_postgres: implemented custom REPLACE command for DB API v1
by Daniel-Constantin Mierla 13 Mar '12

13 Mar '12

Module: sip-router Branch: master Commit: 5db7f650ad0c5dd81ba5d8b670075816f9fe4f65 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5db7f65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 13 14:03:52 2012 +0100 db_postgres: implemented custom REPLACE command for DB API v1 - so far it implements replace as update, if affected rows == 0, then insert - it uses locks to ensure there is no race between update and insert commands - the lock to be used is selected based on the values for the update key, this ensuring that operations over the same record are done under mutex - if number of colums to be used for update key is 0, then a straight insert without locking is done --- modules/db_postgres/km_db_postgres.c | 1 + modules/db_postgres/km_db_postgres.h | 4 + modules/db_postgres/km_dbase.c | 120 ++++++++++++++++++++++++++++++++++ modules/db_postgres/km_dbase.h | 5 ++ modules/db_postgres/pg_mod.c | 5 ++ 5 files changed, 135 insertions(+), 0 deletions(-) diff --git a/modules/db_postgres/km_db_postgres.c b/modules/db_postgres/km_db_postgres.c index 5914e5f..9292319 100644 --- a/modules/db_postgres/km_db_postgres.c +++ b/modules/db_postgres/km_db_postgres.c @@ -93,6 +93,7 @@ int db_postgres_bind_api(db_func_t *dbb) dbb->insert = db_postgres_insert; dbb->delete = db_postgres_delete; dbb->update = db_postgres_update; + dbb->replace = db_postgres_replace; dbb->affected_rows = db_postgres_affected_rows; return 0; diff --git a/modules/db_postgres/km_db_postgres.h b/modules/db_postgres/km_db_postgres.h index 8959417..ae69d2f 100644 --- a/modules/db_postgres/km_db_postgres.h +++ b/modules/db_postgres/km_db_postgres.h @@ -36,4 +36,8 @@ int db_postgres_bind_api(db_func_t *dbb); int km_postgres_mod_init(void); +int pg_init_lock_set(int sz); + +void pg_destroy_lock_set(void); + #endif /* _KM_DB_POSTGRES_H */ diff --git a/modules/db_postgres/km_dbase.c b/modules/db_postgres/km_dbase.c index a7b9546..216ca05 100644 --- a/modules/db_postgres/km_dbase.c +++ b/modules/db_postgres/km_dbase.c @@ -75,12 +75,50 @@ #include "../../lib/srdb1/db.h" #include "../../lib/srdb1/db_ut.h" #include "../../lib/srdb1/db_query.h" +#include "../../locking.h" +#include "../../hashes.h" #include "km_dbase.h" #include "km_pg_con.h" #include "km_val.h" #include "km_res.h" #include "pg_mod.h" +static gen_lock_set_t *_pg_lock_set = NULL; +static unsigned int _pg_lock_size = 0; + +/*! + * \brief init lock set used to implement SQL REPLACE via UPDATE/INSERT + * \param sz power of two to compute the lock set size + * \return 0 on success, -1 on error + */ +int pg_init_lock_set(int sz) +{ + if(sz>0 && sz<=10) + { + _pg_lock_size = 1<<sz; + } else { + _pg_lock_size = 1<<4; + } + _pg_lock_set = lock_set_alloc(_pg_lock_size); + if(_pg_lock_set==NULL || lock_set_init(_pg_lock_set)==NULL) + { + LM_ERR("cannot initiate lock set\n"); + return -1; + } + return 0; +} + +void pg_destroy_lock_set(void) +{ + if(_pg_lock_set!=NULL) + { + lock_set_destroy(_pg_lock_set); + lock_set_dealloc(_pg_lock_set); + _pg_lock_set = NULL; + _pg_lock_size = 0; + } +} + static void db_postgres_free_query(const db1_con_t* _con); @@ -587,3 +625,85 @@ int db_postgres_use_table(db1_con_t* _con, const str* _t) { return db_use_table(_con, _t); } + + +/*! + * \brief SQL REPLACE implementation + * \param _h structure representing database connection + * \param _k key names + * \param _v values of the keys + * \param _n number of key=value pairs + * \param _un number of keys to build the unique key, starting from first + * \param _m mode - first update, then insert, or first insert, then update + * \return 0 on success, negative on failure + */ +int db_postgres_replace(const db1_con_t* _h, const db_key_t* _k, + const db_val_t* _v, const int _n, const int _un, const int _m) +{ + unsigned int pos = 0; + int i; + + if(_un > _n) + { + LM_ERR("number of columns for unique key is too high\n"); + return -1; + } + + if(_un > 0) + { + for(i=0; i<_un; i++) + { + if(!VAL_NULL(&_v[i])) + { + switch(VAL_TYPE(&_v[i])) + { + case DB1_INT: + pos += VAL_UINT(&_v[i]); + break; + case DB1_STR: + pos += get_hash1_raw((VAL_STR(&_v[i])).s, + (VAL_STR(&_v[i])).len); + break; + case DB1_STRING: + pos += get_hash1_raw(VAL_STRING(&_v[i]), + strlen(VAL_STRING(&_v[i]))); + break; + default: + break; + } + } + } + pos &= (_pg_lock_size-1); + lock_set_get(_pg_lock_set, pos); + if(db_postgres_update(_h, _k, 0, _v, _k + _un, + _v + _un, _un, _n -_un)< 0) + { + LM_ERR("update failed\n"); + lock_set_release(_pg_lock_set, pos); + return -1; + } + + if (db_postgres_affected_rows(_h) <= 0) + { + if(db_postgres_insert(_h, _k, _v, _n)< 0) + { + LM_ERR("insert failed\n"); + lock_set_release(_pg_lock_set, pos); + return -1; + } + LM_DBG("inserted new record in database table\n"); + } else { + LM_DBG("updated record in database table\n"); + } + lock_set_release(_pg_lock_set, pos); + } else { + if(db_postgres_insert(_h, _k, _v, _n)< 0) + { + LM_ERR("direct insert failed\n"); + return -1; + } + LM_DBG("directly inserted new record in database table\n"); + } + return 0; +} + diff --git a/modules/db_postgres/km_dbase.h b/modules/db_postgres/km_dbase.h index 7c15e8d..bfdd5b1 100644 --- a/modules/db_postgres/km_dbase.h +++ b/modules/db_postgres/km_dbase.h @@ -113,5 +113,10 @@ int db_postgres_affected_rows(const db1_con_t* _h); */ int db_postgres_use_table(db1_con_t* _h, const str* _t); +/* + * Replace a row in table (via update/insert) + */ +int db_postgres_replace(const db1_con_t* _h, const db_key_t* _k, + const db_val_t* _v, const int _n, const int _un, const int _m); #endif /* KM_DBASE_H */ diff --git a/modules/db_postgres/pg_mod.c b/modules/db_postgres/pg_mod.c index c560c9d..57dd2fd 100644 --- a/modules/db_postgres/pg_mod.c +++ b/modules/db_postgres/pg_mod.c @@ -59,6 +59,8 @@ int pg_connect_timeout = 0; /* Default is unlimited */ int pg_retries = 2; /* How many times should the module try re-execute failed commands. * 0 disables reconnecting */ +int pg_lockset = 4; + /* * Postgres module interface */ @@ -88,6 +90,7 @@ static cmd_export_t cmds[] = { */ static param_export_t params[] = { {"retries", PARAM_INT, &pg_retries }, + {"lockset", PARAM_INT, &pg_lockset }, {0, 0, 0} }; @@ -547,6 +550,8 @@ static int pg_mod_init(void) } return -1; #endif /* PG_TEST */ + if(pg_init_lock_set(pg_lockset)<0) + return -1; return km_postgres_mod_init(); }

1 0

git:master: lib/srdb1: updated DB API prototype for replace
by Daniel-Constantin Mierla 13 Mar '12

13 Mar '12

Module: sip-router Branch: master Commit: 061453b77e82e2fa92af2f57db67b6f9f8ac8302 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=061453b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 13 13:58:27 2012 +0100 lib/srdb1: updated DB API prototype for replace - replace method takes two more parameters to allow implementation of replace functionality inside the db connector module, via update, affected rows and insert - first is the number of column-value pairs to be used as unique key. They have to be located at the beginning of the array given so far as parameter to replace - second is a mode, that will allow doing custom replace by: - update, if affected rows == 0 then insert - insert, if duplicate key error, then update - for the db connectors that have access to a native REPLACE command in the DB backend, the new parameters are ignored --- lib/srdb1/db.h | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/lib/srdb1/db.h b/lib/srdb1/db.h index e27969f..6d3a45d 100644 --- a/lib/srdb1/db.h +++ b/lib/srdb1/db.h @@ -245,10 +245,15 @@ typedef int (*db_update_f) (const db1_con_t* _h, const db_key_t* _k, const db_op * \param _k key names * \param _v values of the keys * \param _n number of key=value pairs + * \param _un number of keys to build the unique key, starting from first _k + * \param _m mode - first update, then insert, or first insert, then update + * \note the last two parameters are used only if the DB server does not + * have native replace command (like postgres - the module doing an internal + * implementation using synchronized update/affected rows/insert mechanism) * \return returns 0 if everything is OK, otherwise returns value < 0 */ typedef int (*db_replace_f) (const db1_con_t* handle, const db_key_t* keys, - const db_val_t* vals, const int n); + const db_val_t* vals, const int n, const int _un, const int _m); /**

1 0

git:master: db_unixodbc: DB API v1 replace prototype updated
by Daniel-Constantin Mierla 13 Mar '12

13 Mar '12

Module: sip-router Branch: master Commit: fb7c301c438372d6429448f003ce89f449a7a4af URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fb7c301… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 13 14:09:08 2012 +0100 db_unixodbc: DB API v1 replace prototype updated --- modules_k/db_unixodbc/dbase.c | 3 ++- modules_k/db_unixodbc/dbase.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules_k/db_unixodbc/dbase.c b/modules_k/db_unixodbc/dbase.c index 9fce0f6..72edf1e 100644 --- a/modules_k/db_unixodbc/dbase.c +++ b/modules_k/db_unixodbc/dbase.c @@ -476,7 +476,8 @@ int db_unixodbc_update(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _ /* * Just like insert, but replace the row if it exists */ -int db_unixodbc_replace(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, const int _n) +int db_unixodbc_replace(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, const int _n, + const int _un, const int _m) { return db_do_replace(_h, _k, _v, _n, db_unixodbc_val2str, db_unixodbc_submit_query); diff --git a/modules_k/db_unixodbc/dbase.h b/modules_k/db_unixodbc/dbase.h index 017e982..d6f7919 100644 --- a/modules_k/db_unixodbc/dbase.h +++ b/modules_k/db_unixodbc/dbase.h @@ -90,7 +90,7 @@ const db_key_t* _uk, const db_val_t* _uv, const int _n, const int _un); * Just like insert, but replace the row if it exists */ int db_unixodbc_replace(const db1_con_t* handle, const db_key_t* keys, const db_val_t* vals, -const int n); + const int n, const int _un, const int _m); /* * Store name of table that will be used by

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2012