sr-dev November 2013

sr-dev@lists.kamailio.org

29 participants
220 discussions

git:master: Merge branch 'luismartingil/ndb_cassandra'
by Luis Martin Gil 30 Nov '13

30 Nov '13

Module: sip-router Branch: master Commit: df1c03a06fde83d7145266c099c26dd291a3ff59 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=df1c03a… Author: Luis Martin Gil <martingil.luis(a)gmail.com> Committer: Luis Martin Gil <martingil.luis(a)gmail.com> Date: Sat Nov 30 21:09:46 2013 +0000 Merge branch 'luismartingil/ndb_cassandra' ---

1 0

git:luismartingil/ndb_cassandra: ndb_cassandra: Changing root Makefile not to compile the module by default.
by Luis Martin Gil 30 Nov '13

30 Nov '13

Module: sip-router Branch: luismartingil/ndb_cassandra Commit: 992ca11279eafe7fee300d0d8a29229b88eaeba0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=992ca11… Author: Luis Martin Gil <martingil.luis(a)gmail.com> Committer: Luis Martin Gil <martingil.luis(a)gmail.com> Date: Sat Nov 30 21:06:38 2013 +0000 ndb_cassandra: Changing root Makefile not to compile the module by default. - Reusing existing db_cassandra module in the Makefile.groups structure in order to not compile the ndb_cassandra module by default. --- Makefile.groups | 2 +- README-MODULES | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Makefile.groups b/Makefile.groups index d1cad86..fcd47b4 100644 --- a/Makefile.groups +++ b/Makefile.groups @@ -54,7 +54,7 @@ mod_list_postgres=db_postgres mod_list_unixodbc=db_unixodbc # - modules depending on mysql cassandra library -mod_list_cassandra=db_cassandra +mod_list_cassandra=db_cassandra ndb_cassandra # - modules depending on xml2 library mod_list_cpl=cpl-c diff --git a/README-MODULES b/README-MODULES index 4929d74..2499370 100644 --- a/README-MODULES +++ b/README-MODULES @@ -118,6 +118,7 @@ mqueue Message queue system for configuration file nat_traversal NAT :: NAT traversal module nathelper NAT :: NAT traversal module :: RTPproxy (SIPPY software) ndb_redis Connector to REDIS NoSQL Database engine +ndb_cassandra Connector to Apache Cassandra osp Open Settlement Protocol support outbound SIP Outbound Implementation p_usrloc Partitioned and distributed user location services

1 0

git:master: Merge branch 'luismartingil/ndb_cassandra'
by Luis Martin Gil 30 Nov '13

30 Nov '13

Module: sip-router Branch: master Commit: f4f1462816f20f74fd0cc1381d816257303b1943 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f4f1462… Author: Luis Martin Gil <martingil.luis(a)gmail.com> Committer: Luis Martin Gil <martingil.luis(a)gmail.com> Date: Sat Nov 30 10:49:27 2013 -0500 Merge branch 'luismartingil/ndb_cassandra' ---

1 0

git:luismartingil/ndb_cassandra: ndb_cassandra: Fixed dates and username in comments.
by Luis Martin Gil 30 Nov '13

30 Nov '13

Module: sip-router Branch: luismartingil/ndb_cassandra Commit: fcb520e9e6b6ea9748691d302088e41f98778f53 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fcb520e… Author: Luis Martin Gil <martingil.luis(a)gmail.com> Committer: Luis Martin Gil <martingil.luis(a)gmail.com> Date: Sat Nov 30 10:47:42 2013 -0500 ndb_cassandra: Fixed dates and username in comments. --- modules/ndb_cassandra/ndb_cassandra.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/ndb_cassandra/ndb_cassandra.c b/modules/ndb_cassandra/ndb_cassandra.c index f719ebe..fd35740 100644 --- a/modules/ndb_cassandra/ndb_cassandra.c +++ b/modules/ndb_cassandra/ndb_cassandra.c @@ -1,7 +1,7 @@ /* * ndb_cassandra.c * - * Copyright (C) 2012 Indigital Telecom. + * Copyright (C) 2013 Indigital Telecom. * * Author: Luis Martin Gil * <luis.martin.gil(a)indigital.net> @@ -25,7 +25,7 @@ * * History: * ------- - * 2012-05: Initial version @lmartin + * 2013-11: Initial version luismartingil */ /*! \file * \brief SIP-router indigital :: Module core

1 0

[tracker] Comment added: Crash in TCP Read on Kamailio 4.0.1
by sip-router 29 Nov '13

29 Nov '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#364 - Crash in TCP Read on Kamailio 4.0.1 User who did this - Vitaliy Aleksandrov (Vitaliy) ---------- Sorry, my fault. Original author of this ticket uses 4.0 I use kamailio 4.1 and bt results match to the latest branch-4.1 (latest commit i see is 0b85493f3c1bc7c6cbd48f39aea9d3ecc135d4ff) ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=364#comment1189 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

[tracker] Comment added: Database location table not updated correctly?
by sip-router 29 Nov '13

29 Nov '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#374 - Database location table not updated correctly? User who did this - Víctor Seva (linuxmaniac) ---------- fix just backported and pushed to 3.3 branch ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=374#comment1188 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

[tracker] Comment added: Database location table not updated correctly?
by sip-router 29 Nov '13

29 Nov '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#374 - Database location table not updated correctly? User who did this - Morten Tryfoss (mtryfoss) ---------- Version 3.3.3 ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=374#comment1187 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:4.0: registrar: clean static values at pack_ci
by Victor Seva 29 Nov '13

29 Nov '13

Module: sip-router Branch: 4.0 Commit: 24cb002f5af4cdbf6a54e8abf4bf31e311aff4cf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=24cb002… 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 (cherry picked from commit 66185905850cd2ac9ab933776184da0f0882e5ac) --- 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 cd637c3..8aaf912 100644 --- a/modules/registrar/save.c +++ b/modules/registrar/save.c @@ -301,6 +301,9 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, 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

git:4.0: usrloc: db_update contact by instance + reg-id
by Victor Seva 29 Nov '13

29 Nov '13

Module: sip-router Branch: 4.0 Commit: 32a4710d4ab7e3b03121154cbc609c6ac41d17b2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=32a4710… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Fri Nov 29 14:23:47 2013 +0100 usrloc: db_update contact by instance + reg-id - backport from master f67171c --- modules/usrloc/ucontact.c | 194 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 192 insertions(+), 2 deletions(-) diff --git a/modules/usrloc/ucontact.c b/modules/usrloc/ucontact.c index 996e8d5..fcd3005 100644 --- a/modules/usrloc/ucontact.c +++ b/modules/usrloc/ucontact.c @@ -1014,14 +1014,204 @@ int db_update_ucontact_ruid(ucontact_t* _c) } /*! + * \brief Update contact in the database by instance reg_id + * \param _c updated contact + * \return 0 on success, -1 on failure + */ +int db_update_ucontact_instance(ucontact_t* _c) +{ + str auser; + str adomain; + db_key_t keys1[2]; + db_val_t vals1[2]; + int n1; + + db_key_t keys2[13]; + db_val_t vals2[13]; + int n2; + + + if (_c->flags & FL_MEM) { + return 0; + } + + if(_c->instance.len<=0) { + LM_ERR("updating record in database failed - empty instance\n"); + return -1; + } + + n1 = 0; + keys1[n1] = &instance_col; + vals1[n1].type = DB1_STR; + vals1[n1].nul = 0; + vals1[n1].val.str_val = _c->instance; + n1++; + + keys1[n1] = &reg_id_col; + vals1[n1].type = DB1_INT; + vals1[n1].nul = 0; + vals1[n1].val.int_val = (int)_c->reg_id; + n1++; + + n2 = 0; + keys2[n2] = &expires_col; + vals2[n2].type = DB1_DATETIME; + vals2[n2].nul = 0; + vals2[n2].val.time_val = _c->expires; + n2++; + + keys2[n2] = &q_col; + vals2[n2].type = DB1_DOUBLE; + vals2[n2].nul = 0; + vals2[n2].val.double_val = q2double(_c->q); + n2++; + + keys2[n2] = &cseq_col; + vals2[n2].type = DB1_INT; + vals2[n2].nul = 0; + vals2[n2].val.int_val = _c->cseq; + n2++; + + keys2[n2] = &flags_col; + vals2[n2].type = DB1_INT; + vals2[n2].nul = 0; + vals2[n2].val.bitmap_val = _c->flags; + n2++; + + keys2[n2] = &cflags_col; + vals2[n2].type = DB1_INT; + vals2[n2].nul = 0; + vals2[n2].val.bitmap_val = _c->cflags; + n2++; + + keys2[n2] = &user_agent_col; + vals2[n2].type = DB1_STR; + vals2[n2].nul = 0; + vals2[n2].val.str_val = _c->user_agent; + n2++; + + keys2[n2] = &received_col; + vals2[n2].type = DB1_STR; + if (_c->received.s == 0) { + vals2[n2].nul = 1; + } else { + vals2[n2].nul = 0; + vals2[n2].val.str_val = _c->received; + } + n2++; + + keys2[n2] = &path_col; + vals2[n2].type = DB1_STR; + if (_c->path.s == 0) { + vals2[n2].nul = 1; + } else { + vals2[n2].nul = 0; + vals2[n2].val.str_val = _c->path; + } + n2++; + + keys2[n2] = &sock_col; + vals2[n2].type = DB1_STR; + if (_c->sock) { + vals2[n2].val.str_val = _c->sock->sock_str; + vals2[n2].nul = 0; + } else { + vals2[n2].nul = 1; + } + n2++; + + keys2[n2] = &methods_col; + vals2[n2].type = DB1_BITMAP; + if (_c->methods == 0xFFFFFFFF) { + vals2[n2].nul = 1; + } else { + vals2[n2].val.bitmap_val = _c->methods; + vals2[n2].nul = 0; + } + n2++; + + keys2[n2] = &last_mod_col; + vals2[n2].type = DB1_DATETIME; + vals2[n2].nul = 0; + vals2[n2].val.time_val = _c->last_modified; + n2++; + + keys2[n2] = &callid_col; + vals2[n2].type = DB1_STR; + vals2[n2].nul = 0; + vals2[n2].val.str_val = _c->callid; + n2++; + + keys2[n2] = &contact_col; + vals2[n2].type = DB1_STR; + vals2[n2].nul = 0; + vals2[n2].val.str_val.s = _c->c.s; + vals2[n2].val.str_val.len = _c->c.len; + LM_DBG("contact:%.*s\n", vals2[n2].val.str_val.len, vals2[n2].val.str_val.s); + n2++; + + if (ul_dbf.use_table(ul_dbh, _c->domain) < 0) { + LM_ERR("sql use_table failed\n"); + return -1; + } + + if (ul_dbf.update(ul_dbh, keys1, 0, vals1, keys2, vals2, n1, n2) < 0) { + LM_ERR("updating database failed\n"); + return -1; + } + + if (ul_db_check_update==1 && ul_dbf.affected_rows) { + /* supposed to be an UPDATE, but if affected rows is 0, then try + * to do an INSERT */ + if(ul_dbf.affected_rows(ul_dbh)==0) { + LM_DBG("affected rows by UPDATE was 0, doing an INSERT\n"); + if(db_insert_ucontact(_c)<0) + return -1; + } + } + + /* delete old db attrs and add the current list */ + auser = *_c->aor; + if (use_domain) { + adomain.s = memchr(_c->aor->s, '@', _c->aor->len); + if (adomain.s==0) { + auser.len = 0; + adomain = *_c->aor; + } else { + auser.len = adomain.s - _c->aor->s; + adomain.s++; + adomain.len = _c->aor->s + _c->aor->len - adomain.s; + } + + uldb_delete_attrs(_c->domain, &auser, + &adomain, &_c->ruid); + uldb_insert_attrs(_c->domain, &auser, + &adomain, &_c->ruid, _c->xavp); + } else { + uldb_delete_attrs(_c->domain, &auser, + NULL, &_c->ruid); + uldb_insert_attrs(_c->domain, &auser, + NULL, &_c->ruid, _c->xavp); + } + + return 0; +} + +/*! * \brief Update contact in the database * \param _c updated contact * \return 0 on success, -1 on failure */ int db_update_ucontact(ucontact_t* _c) { - if(ul_db_ops_ruid==0) - return db_update_ucontact_addr(_c); + if(ul_db_ops_ruid==0) { + if (_c->instance.len<=0) { + return db_update_ucontact_addr(_c); + } + else { + return db_update_ucontact_instance(_c); + } + } else return db_update_ucontact_ruid(_c); }

1 0

git:3.3: registrar: clean static values at pack_ci
by Victor Seva 29 Nov '13

29 Nov '13

Module: sip-router Branch: 3.3 Commit: f0203464ddc1e6f4b90d8d8d2bf0ff953760ba6c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f020346… 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 - backport from master 66185905850cd2ac9ab933776184da0f0882e5ac --- modules_k/registrar/save.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules_k/registrar/save.c b/modules_k/registrar/save.c index 9b0607a..0ec80f4 100644 --- a/modules_k/registrar/save.c +++ b/modules_k/registrar/save.c @@ -300,6 +300,9 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, 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