sr-dev April 2013

sr-dev@lists.kamailio.org

38 participants
401 discussions

git:master: usrloc: update call-id value in db when matching record by ruid

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 0125cdf0e75271a8478a3eadacc54ea1c1eb4da0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0125cdf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 24 17:26:15 2013 +0200 usrloc: update call-id value in db when matching record by ruid --- modules/usrloc/ucontact.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/modules/usrloc/ucontact.c b/modules/usrloc/ucontact.c index c50e8b4..35dfa0d 100644 --- a/modules/usrloc/ucontact.c +++ b/modules/usrloc/ucontact.c @@ -838,6 +838,11 @@ int db_update_ucontact_ruid(ucontact_t* _c) return 0; } + if(_c->ruid.len<=0) { + LM_ERR("updating record in database failed - empty ruid\n"); + return -1; + } + n1 = 0; keys1[n1] = &ruid_col; vals1[n1].type = DB1_STR; @@ -928,15 +933,10 @@ int db_update_ucontact_ruid(ucontact_t* _c) vals2[n2].val.time_val = _c->last_modified; n2++; - keys2[n2] = &ruid_col; - if(_c->ruid.len>0) - { - vals2[n2].type = DB1_STR; - vals2[n2].nul = 0; - vals2[n2].val.str_val = _c->ruid; - } else { - vals2[n2].nul = 1; - } + keys2[n2] = &callid_col; + vals2[n2].type = DB1_STR; + vals2[n2].nul = 0; + vals2[n2].val.str_val = _c->callid; n2++; keys2[n2] = &instance_col; @@ -1101,8 +1101,7 @@ int db_delete_ucontact_ruid(ucontact_t* _c) return 0; } - if(_c->ruid.len<=0) - { + if(_c->ruid.len<=0) { LM_ERR("deleting from database failed - empty ruid\n"); return -1; }

11 years

siptrace default DB URL

by Klaus Darilion

Hi! Siptrace's default db_url is: DEFAULT_RODB_URL Imo it does not make sense to use the read-only URL, as siptrace module writes into the DB, no reading. If agreed, I can change it. regards Klaus

11 years

git:master: pkg/deb: Deprecate lenny

by Jon Bonilla

Module: sip-router Branch: master Commit: ef0a17f0e4c9426f64168eb24568ba906e554315 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ef0a17f… Author: Jon Bonilla <jbonilla(a)sipwise.com> Committer: Jon Bonilla <jbonilla(a)sipwise.com> Date: Wed Apr 24 16:46:55 2013 +0200 pkg/deb: Deprecate lenny Lenny is not a supported version of debian any more. At sip-router squeeze and wheezy are being mantained at the moment. Let's deprecate lenny for future releases. --- pkg/kamailio/deb/lenny/changelog | 82 ------ pkg/kamailio/deb/lenny/compat | 1 - pkg/kamailio/deb/lenny/control | 387 ------------------------- pkg/kamailio/deb/lenny/copyright | 27 -- pkg/kamailio/deb/lenny/kamailio.README.Debian | 38 --- pkg/kamailio/deb/lenny/kamailio.default | 33 -- pkg/kamailio/deb/lenny/kamailio.dirs | 2 - pkg/kamailio/deb/lenny/kamailio.examples | 2 - pkg/kamailio/deb/lenny/kamailio.init | 240 --------------- pkg/kamailio/deb/lenny/kamailio.postinst | 48 --- pkg/kamailio/deb/lenny/rules | 227 --------------- 11 files changed, 0 insertions(+), 1087 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ef0…

11 years

Debian Packaging: memcache problem

by Klaus Darilion

Hi! In Debian there exists package: libmemcache-dev and libmemcached-dev. The 'control' file requires 'libmemcache-dev', but I had to install 'libmemcached-dev' to build Kamailio. Maybe someone knows the difference of memcache/memcached can fix this. Thanks Klaus

11 years

git:master: pkg/deb: Change memcache module dependencies

by Jon Bonilla

Module: sip-router Branch: master Commit: d9b7cfcd63b5432bc956f0be3a9b4d5eea026786 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d9b7cfc… Author: Jon Bonilla <jbonilla(a)sipwise.com> Committer: Jon Bonilla <jbonilla(a)sipwise.com> Date: Wed Apr 24 16:42:59 2013 +0200 pkg/deb: Change memcache module dependencies libmemcached-dev is the new dependency deprecating libmemcache --- pkg/kamailio/deb/debian/control | 2 +- pkg/kamailio/deb/lucid/control | 2 +- pkg/kamailio/deb/precise/control | 2 +- pkg/kamailio/deb/squeeze/control | 2 +- pkg/kamailio/deb/wheezy/control | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index f614f42..45784f1 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -18,7 +18,7 @@ Build-Depends: bison, libjson0-dev, libldap2-dev, liblua5.1-0-dev, - libmemcache-dev, + libmemcached-dev, libmono-dev, libmysqlclient-dev, libncurses5-dev, diff --git a/pkg/kamailio/deb/lucid/control b/pkg/kamailio/deb/lucid/control index af9f473..93997b7 100644 --- a/pkg/kamailio/deb/lucid/control +++ b/pkg/kamailio/deb/lucid/control @@ -15,7 +15,7 @@ Build-Depends: bison, libgeoip-dev (>= 1.4.5), libldap2-dev, liblua5.1-0-dev, - libmemcache-dev, + libmemcached-dev, libmysqlclient-dev, libncurses5-dev, libpcre3-dev, diff --git a/pkg/kamailio/deb/precise/control b/pkg/kamailio/deb/precise/control index 6b4dd51..ef55d51 100644 --- a/pkg/kamailio/deb/precise/control +++ b/pkg/kamailio/deb/precise/control @@ -18,7 +18,7 @@ Build-Depends: bison, libjson0-dev, libldap2-dev, liblua5.1-0-dev, - libmemcache-dev, + libmemcached-dev, libmono-2.0-dev, libmysqlclient-dev, libncurses5-dev, diff --git a/pkg/kamailio/deb/squeeze/control b/pkg/kamailio/deb/squeeze/control index 0abff2b..71428e1 100644 --- a/pkg/kamailio/deb/squeeze/control +++ b/pkg/kamailio/deb/squeeze/control @@ -17,7 +17,7 @@ Build-Depends: bison, libjson0-dev, libldap2-dev, liblua5.1-0-dev, - libmemcache-dev, + libmemcached-dev, libmysqlclient-dev, libncurses5-dev, libpcre3-dev, diff --git a/pkg/kamailio/deb/wheezy/control b/pkg/kamailio/deb/wheezy/control index e5323db..ce58700 100644 --- a/pkg/kamailio/deb/wheezy/control +++ b/pkg/kamailio/deb/wheezy/control @@ -18,7 +18,7 @@ Build-Depends: bison, libjson0-dev, libldap2-dev, liblua5.1-0-dev, - libmemcache-dev, + libmemcached-dev, libmono-2.0-dev, libmysqlclient-dev, libncurses5-dev,

11 years

[tracker] Comment added: Dialog bugs

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#282 - Dialog bugs User who did this - Eduardo Lejarreta (lejarreta.e) ---------- Good evening Daniel. I've sent to you "diff -u" from: dlg_handlers.c and dlg_db_handler.c files Please remember this: 1.- dlg->dflags |= DLG_FLAG_TOBYE; --------------->(IMPROVEMENT: DLG_FLAG_TOBYE should be also saved in any way on DB. After a "kamctl restart" we loose this contextual flag. As for us it's very important we've forced on code.) 2.- We've detected another issue we have still not corrected: the final "duration" of acc_cdr.c accounting adds the time Kamailio is "out of service" during "kamctl restart" which is usually over 6-7 seconds. The real problem is when there is a a long while between a "kamctl stop" and a "kamctl start". I'll correct this. Regards. Eduardo Lejarreta. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=282#comment856 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.

11 years

location table expire/ruid problem again

by Juha Heinanen

i was again hit by the problem of non-expiring location table entries. this time it happened without any mi commands when pjsua crashed right after registration. 15 minutes after expiring, that registration is still in location table, but not in memory cash. related to this location entry, i also got to syslog: Apr 23 09:32:30 siika /usr/sbin/sip-proxy[14304]: ERROR: db_mysql [km_dbase.c:122]: driver error on query: Duplicate entry 'uloc-51761da3-37fb-e' for key 'ruid_idx' Apr 23 09:32:30 siika /usr/sbin/sip-proxy[14304]: ERROR: <core> [db_query.c:235]: error while submitting query Apr 23 09:32:30 siika /usr/sbin/sip-proxy[14304]: ERROR: usrloc [ucontact.c:615]: inserting contact in db failed Apr 23 09:32:30 siika /usr/sbin/sip-proxy[14304]: ERROR: usrloc [urecord.c:363]: updating contact in db failed that update was triggered by some timer, because it was not related to any sip request. i haven't checked from the code what update is in question, but unless ruid field itself is updated, i don't see how it can result in duplicate entry. -- juha

11 years

git:master: usrloc: regenerated the readme for db_ops_ruid parameter

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 9106eca16924dd6dc797295ba2d74ee16865acaf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9106eca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 24 16:27:13 2013 +0200 usrloc: regenerated the readme for db_ops_ruid parameter --- modules/usrloc/README | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/modules/usrloc/README b/modules/usrloc/README index 68772fb..d688f8e 100644 --- a/modules/usrloc/README +++ b/modules/usrloc/README @@ -67,6 +67,7 @@ Bogdan-Andrei Iancu 3.29. db_check_update (string) 3.30. timer_procs (string) 3.31. xavp_contact (string) + 3.32. db_obs_ruid (string) 4. Functions 5. MI Commands @@ -147,6 +148,7 @@ Bogdan-Andrei Iancu 1.29. Set db_check_update parameter 1.30. Set timer_procs parameter 1.31. Set xavp_contact parameter + 1.32. Set db_obs_ruid parameter Chapter 1. Admin Guide @@ -194,6 +196,7 @@ Chapter 1. Admin Guide 3.29. db_check_update (string) 3.30. timer_procs (string) 3.31. xavp_contact (string) + 3.32. db_obs_ruid (string) 4. Functions 5. MI Commands @@ -306,6 +309,7 @@ Chapter 1. Admin Guide 3.29. db_check_update (string) 3.30. timer_procs (string) 3.31. xavp_contact (string) + 3.32. db_obs_ruid (string) 3.1. nat_bflag (integer) @@ -732,6 +736,19 @@ modparam("usrloc", "timer_procs", 4) modparam("usrloc", "xavp_contact", "ulattrs") ... +3.32. db_obs_ruid (string) + + If set to 1, database queries for update or delete are done using ruid + value. If it is set to 0, the old style using aor, contact and call-id + is done. + + Default value is "0". + + Example 1.32. Set db_obs_ruid parameter +... +modparam("usrloc", "db_obs_ruid", 1) +... + 4. Functions There are no exported functions that could be used in scripts.

11 years

git:master: usrloc: documented db_ops_ruid parameter

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: e66842c2fc34d8dc8980efa821f7039685edef87 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e66842c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 24 15:41:34 2013 +0200 usrloc: documented db_ops_ruid parameter --- modules/usrloc/doc/usrloc_admin.xml | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/modules/usrloc/doc/usrloc_admin.xml b/modules/usrloc/doc/usrloc_admin.xml index d38556d..451063f 100644 --- a/modules/usrloc/doc/usrloc_admin.xml +++ b/modules/usrloc/doc/usrloc_admin.xml @@ -853,6 +853,28 @@ modparam("usrloc", "xavp_contact", "ulattrs") </example> </section> + <section id="usrloc.p.db_obs_ruid"> + <title><varname>db_obs_ruid</varname> (string)</title> + <para> + If set to 1, database queries for update or delete are done using + ruid value. If it is set to 0, the old style using aor, contact and + call-id is done. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>db_obs_ruid</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "db_obs_ruid", 1) +... +</programlisting> + </example> + </section> + </section> <section>

11 years

git:master: usrloc: option to do db update/delete ops using ruid

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 61e08282c905c2ee03a2be618b1e700fc0acbdeb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=61e0828… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 24 15:34:16 2013 +0200 usrloc: option to do db update/delete ops using ruid - new parameter db_obs_ruid - if set to 1, db update/delete operations are done using ruid value - if paramter set to 0 (default) the old style using aor, contact and call-id is done --- modules/usrloc/ucontact.c | 260 ++++++++++++++++++++++++++++++++++++++++++++- modules/usrloc/ul_mod.c | 3 + modules/usrloc/ul_mod.h | 1 + 3 files changed, 260 insertions(+), 4 deletions(-) diff --git a/modules/usrloc/ucontact.c b/modules/usrloc/ucontact.c index c265580..c50e8b4 100644 --- a/modules/usrloc/ucontact.c +++ b/modules/usrloc/ucontact.c @@ -624,11 +624,11 @@ int db_insert_ucontact(ucontact_t* _c) /*! - * \brief Update contact in the database + * \brief Update contact in the database by address * \param _c updated contact * \return 0 on success, -1 on failure */ -int db_update_ucontact(ucontact_t* _c) +int db_update_ucontact_addr(ucontact_t* _c) { char* dom; db_key_t keys1[4]; @@ -816,13 +816,212 @@ int db_update_ucontact(ucontact_t* _c) return 0; } +/*! + * \brief Update contact in the database by ruid + * \param _c updated contact + * \return 0 on success, -1 on failure + */ +int db_update_ucontact_ruid(ucontact_t* _c) +{ + str auser; + str adomain; + db_key_t keys1[1]; + db_val_t vals1[1]; + int n1; + + db_key_t keys2[14]; + db_val_t vals2[14]; + int n2; + + + if (_c->flags & FL_MEM) { + return 0; + } + + n1 = 0; + keys1[n1] = &ruid_col; + vals1[n1].type = DB1_STR; + vals1[n1].nul = 0; + vals1[n1].val.str_val = _c->ruid; + 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] = &ruid_col; + if(_c->ruid.len>0) + { + vals2[n2].type = DB1_STR; + vals2[n2].nul = 0; + vals2[n2].val.str_val = _c->ruid; + } else { + vals2[n2].nul = 1; + } + n2++; + + keys2[n2] = &instance_col; + if(_c->instance.len>0) + { + vals2[n2].type = DB1_STR; + vals2[n2].nul = 0; + vals2[n2].val.str_val = _c->instance; + } else { + vals2[n2].nul = 1; + } + n2++; + + keys2[n2] = &reg_id_col; + vals2[n2].type = DB1_INT; + vals2[n2].nul = 0; + vals2[n2].val.int_val = (int)_c->reg_id; + 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 Delete contact from the database + * \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); + else + return db_update_ucontact_ruid(_c); +} + +/*! + * \brief Delete contact from the database by address * \param _c deleted contact * \return 0 on success, -1 on failure */ -int db_delete_ucontact(ucontact_t* _c) +int db_delete_ucontact_addr(ucontact_t* _c) { char* dom; db_key_t keys[4]; @@ -887,6 +1086,59 @@ int db_delete_ucontact(ucontact_t* _c) return 0; } +/*! + * \brief Delete contact from the database by ruid + * \param _c deleted contact + * \return 0 on success, -1 on failure + */ +int db_delete_ucontact_ruid(ucontact_t* _c) +{ + db_key_t keys[1]; + db_val_t vals[1]; + int n; + + if (_c->flags & FL_MEM) { + return 0; + } + + if(_c->ruid.len<=0) + { + LM_ERR("deleting from database failed - empty ruid\n"); + return -1; + } + + n = 0; + keys[n] = &ruid_col; + vals[n].type = DB1_STR; + vals[n].nul = 0; + vals[n].val.str_val = _c->ruid; + n++; + + if (ul_dbf.use_table(ul_dbh, _c->domain) < 0) { + LM_ERR("sql use_table failed\n"); + return -1; + } + + if (ul_dbf.delete(ul_dbh, keys, 0, vals, n) < 0) { + LM_ERR("deleting from database failed\n"); + return -1; + } + + return 0; +} + +/*! + * \brief Delete contact from the database + * \param _c deleted contact + * \return 0 on success, -1 on failure + */ +int db_delete_ucontact(ucontact_t* _c) +{ + if(ul_db_ops_ruid==0) + return db_delete_ucontact_addr(_c); + else + return db_delete_ucontact_ruid(_c); +} /*! * \brief Remove a contact from list belonging to a certain record diff --git a/modules/usrloc/ul_mod.c b/modules/usrloc/ul_mod.c index e4e1246..08126fd 100644 --- a/modules/usrloc/ul_mod.c +++ b/modules/usrloc/ul_mod.c @@ -118,6 +118,8 @@ int ul_timer_procs = 0; int ul_db_check_update = 0; int ul_keepalive_timeout = 0; +int ul_db_ops_ruid = 0; + str ul_xavp_contact_name = {0}; /* sruid to get internal uid for mi/rpc commands */ @@ -217,6 +219,7 @@ static param_export_t params[] = { {"timer_procs", INT_PARAM, &ul_timer_procs}, {"db_check_update", INT_PARAM, &ul_db_check_update}, {"xavp_contact", STR_PARAM, &ul_xavp_contact_name.s}, + {"db_ops_ruid", INT_PARAM, &ul_db_ops_ruid}, {0, 0, 0} }; diff --git a/modules/usrloc/ul_mod.h b/modules/usrloc/ul_mod.h index 5ddf7df..2435b5e 100644 --- a/modules/usrloc/ul_mod.h +++ b/modules/usrloc/ul_mod.h @@ -105,5 +105,6 @@ extern db_func_t ul_dbf; extern int matching_mode; +extern int ul_db_ops_ruid; #endif /* UL_MOD_H */

11 years

← Newer
1
...
7
8
9
10
11
12
13
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2013