sr-dev

sr-dev@lists.kamailio.org

13 participants
45252 discussions

git:master: module_k/p_usrloc better documentation
by Marius Zbihlei 25 Jan '11

25 Jan '11

Module: sip-router Branch: master Commit: 820ef88912289cfff72dc153f5c1240300d49688 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=820ef88… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 25 11:16:46 2011 +0200 module_k/p_usrloc better documentation --- modules_k/p_usrloc/README | 17 +++++++++-------- modules_k/p_usrloc/doc/p_usrloc_user.xml | 5 +++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/modules_k/p_usrloc/README b/modules_k/p_usrloc/README index de1dddc..02854fe 100644 --- a/modules_k/p_usrloc/README +++ b/modules_k/p_usrloc/README @@ -205,14 +205,15 @@ Chapter 1. User's Guide recovers, the module makes sure that no stale contacts are returned from it. - Write queries are replicated to two databases, depending on some - distribution keys, e.g. the username and domain of some subscribers. - Its main field of application is for storing and retrieving location - data. The actual database for this subscriber is choosen from a set - that is specified in the master database. Read queries are executed on - one database of the set. If this database is not available, the other - database would be used. This failure is recorded in the master - database. + Write queries are replicated to two or more databases, depending on + some distribution keys, e.g. the username and domain the subscribers. + The number of databases used for replication is configurable at compile + time by modifying the DB_NUM define. Its main field of application is + for storing and retrieving location data. The actual database for this + subscriber is choosen from a set that is specified in the master + database. Read queries are executed on one database of the set. If this + database is not available, the other database would be used. This + failure is recorded in the master database. Connections to the distributed databases are setup prior the actual query is executed. The module maintains a cache of the database handles diff --git a/modules_k/p_usrloc/doc/p_usrloc_user.xml b/modules_k/p_usrloc/doc/p_usrloc_user.xml index 8bc8041..86d0cac 100644 --- a/modules_k/p_usrloc/doc/p_usrloc_user.xml +++ b/modules_k/p_usrloc/doc/p_usrloc_user.xml @@ -39,8 +39,9 @@ <para> </para> - <para>Write queries are replicated to two databases, depending on some - distribution keys, e.g. the username and domain of some subscribers. + <para>Write queries are replicated to two or more databases, depending on some + distribution keys, e.g. the username and domain the subscribers. The number of databases + used for replication is configurable at compile time by modifying the DB_NUM define. Its main field of application is for storing and retrieving location data. The actual database for this subscriber is choosen from a set that is specified in the master database. Read queries are executed on one database of the set. If this database is

1 0

git:master: modules_k/p_usrloc Fixed a typo
by Marius Zbihlei 25 Jan '11

25 Jan '11

Module: sip-router Branch: master Commit: ddc717ff392f30c126feae6e80db2a1c827b8ae0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ddc717f… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 25 11:06:37 2011 +0200 modules_k/p_usrloc Fixed a typo --- modules_k/p_usrloc/ul_db_failover.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/p_usrloc/ul_db_failover.c b/modules_k/p_usrloc/ul_db_failover.c index a4d2889..f9f14ed 100644 --- a/modules_k/p_usrloc/ul_db_failover.c +++ b/modules_k/p_usrloc/ul_db_failover.c @@ -186,7 +186,7 @@ static int ul_db_failover_switch(db_func_t * dbf, db1_con_t * dbh, ul_db_handle_ "db %i.\n", handle->id, no); return -1; } - memset(&tmp, 0, sizeof(ul_db_handle_t)); + memset(&tmp, 0, sizeof(ul_db_t)); memmove(&tmp, db, sizeof(ul_db_t)); memset(tmp.url.s, 0, UL_DB_URL_LEN); memmove(tmp.url.s, db->url.s, UL_DB_URL_LEN);

1 0

[tracker] Comment added: UAC outgoing registration stability
by sip-router 25 Jan '11

25 Jan '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#107 - UAC outgoing registration stability User who did this - bernhards (bernhards) ---------- 2. is fixed within the current 3.X GIT version. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=107#comment154 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:master: rtpproxy: moved from modules_k to modules
by Ovidiu Sas 24 Jan '11

24 Jan '11

Module: sip-router Branch: master Commit: ca2e70cd6374f864cfe8af34a6f72fd572146a9e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ca2e70c… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Mon Jan 24 10:31:07 2011 -0500 rtpproxy: moved from modules_k to modules --- {modules_k => modules}/rtpproxy/Makefile | 0 {modules_k => modules}/rtpproxy/README | 0 {modules_k => modules}/rtpproxy/doc/Makefile | 0 {modules_k => modules}/rtpproxy/doc/rtpproxy.xml | 0 .../rtpproxy/doc/rtpproxy_admin.xml | 0 .../rtpproxy/doc/rtpproxy_faq.xml | 0 {modules_k => modules}/rtpproxy/examples/4to6.cfg | 0 {modules_k => modules}/rtpproxy/examples/alg.cfg | 0 {modules_k => modules}/rtpproxy/rtpproxy.c | 0 {modules_k => modules}/rtpproxy/rtpproxy.h | 0 {modules_k => modules}/rtpproxy/rtpproxy_funcs.c | 0 {modules_k => modules}/rtpproxy/rtpproxy_funcs.h | 0 {modules_k => modules}/rtpproxy/rtpproxy_stream.c | 0 {modules_k => modules}/rtpproxy/rtpproxy_stream.h | 0 .../rtpproxy/test/exec_pjsua.txt | 0 .../rtpproxy/test/exec_rtpproxy.txt | 0 {modules_k => modules}/rtpproxy/test/kamailio.cfg | 0 .../rtpproxy/test/rtpproxy.patch | 0 18 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modules_k/rtpproxy/Makefile b/modules/rtpproxy/Makefile similarity index 100% rename from modules_k/rtpproxy/Makefile rename to modules/rtpproxy/Makefile diff --git a/modules_k/rtpproxy/README b/modules/rtpproxy/README similarity index 100% rename from modules_k/rtpproxy/README rename to modules/rtpproxy/README diff --git a/modules_k/rtpproxy/doc/Makefile b/modules/rtpproxy/doc/Makefile similarity index 100% rename from modules_k/rtpproxy/doc/Makefile rename to modules/rtpproxy/doc/Makefile diff --git a/modules_k/rtpproxy/doc/rtpproxy.xml b/modules/rtpproxy/doc/rtpproxy.xml similarity index 100% rename from modules_k/rtpproxy/doc/rtpproxy.xml rename to modules/rtpproxy/doc/rtpproxy.xml diff --git a/modules_k/rtpproxy/doc/rtpproxy_admin.xml b/modules/rtpproxy/doc/rtpproxy_admin.xml similarity index 100% rename from modules_k/rtpproxy/doc/rtpproxy_admin.xml rename to modules/rtpproxy/doc/rtpproxy_admin.xml diff --git a/modules_k/rtpproxy/doc/rtpproxy_faq.xml b/modules/rtpproxy/doc/rtpproxy_faq.xml similarity index 100% rename from modules_k/rtpproxy/doc/rtpproxy_faq.xml rename to modules/rtpproxy/doc/rtpproxy_faq.xml diff --git a/modules_k/rtpproxy/examples/4to6.cfg b/modules/rtpproxy/examples/4to6.cfg similarity index 100% rename from modules_k/rtpproxy/examples/4to6.cfg rename to modules/rtpproxy/examples/4to6.cfg diff --git a/modules_k/rtpproxy/examples/alg.cfg b/modules/rtpproxy/examples/alg.cfg similarity index 100% rename from modules_k/rtpproxy/examples/alg.cfg rename to modules/rtpproxy/examples/alg.cfg diff --git a/modules_k/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c similarity index 100% rename from modules_k/rtpproxy/rtpproxy.c rename to modules/rtpproxy/rtpproxy.c diff --git a/modules_k/rtpproxy/rtpproxy.h b/modules/rtpproxy/rtpproxy.h similarity index 100% rename from modules_k/rtpproxy/rtpproxy.h rename to modules/rtpproxy/rtpproxy.h diff --git a/modules_k/rtpproxy/rtpproxy_funcs.c b/modules/rtpproxy/rtpproxy_funcs.c similarity index 100% rename from modules_k/rtpproxy/rtpproxy_funcs.c rename to modules/rtpproxy/rtpproxy_funcs.c diff --git a/modules_k/rtpproxy/rtpproxy_funcs.h b/modules/rtpproxy/rtpproxy_funcs.h similarity index 100% rename from modules_k/rtpproxy/rtpproxy_funcs.h rename to modules/rtpproxy/rtpproxy_funcs.h diff --git a/modules_k/rtpproxy/rtpproxy_stream.c b/modules/rtpproxy/rtpproxy_stream.c similarity index 100% rename from modules_k/rtpproxy/rtpproxy_stream.c rename to modules/rtpproxy/rtpproxy_stream.c diff --git a/modules_k/rtpproxy/rtpproxy_stream.h b/modules/rtpproxy/rtpproxy_stream.h similarity index 100% rename from modules_k/rtpproxy/rtpproxy_stream.h rename to modules/rtpproxy/rtpproxy_stream.h diff --git a/modules_k/rtpproxy/test/exec_pjsua.txt b/modules/rtpproxy/test/exec_pjsua.txt similarity index 100% rename from modules_k/rtpproxy/test/exec_pjsua.txt rename to modules/rtpproxy/test/exec_pjsua.txt diff --git a/modules_k/rtpproxy/test/exec_rtpproxy.txt b/modules/rtpproxy/test/exec_rtpproxy.txt similarity index 100% rename from modules_k/rtpproxy/test/exec_rtpproxy.txt rename to modules/rtpproxy/test/exec_rtpproxy.txt diff --git a/modules_k/rtpproxy/test/kamailio.cfg b/modules/rtpproxy/test/kamailio.cfg similarity index 100% rename from modules_k/rtpproxy/test/kamailio.cfg rename to modules/rtpproxy/test/kamailio.cfg diff --git a/modules_k/rtpproxy/test/rtpproxy.patch b/modules/rtpproxy/test/rtpproxy.patch similarity index 100% rename from modules_k/rtpproxy/test/rtpproxy.patch rename to modules/rtpproxy/test/rtpproxy.patch

1 0

git:master: permissions(k): do not check db con in child init
by Daniel-Constantin Mierla 24 Jan '11

24 Jan '11

Module: sip-router Branch: master Commit: be92c6713c2b7c7cb04320758a346ba6a1324982 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=be92c67… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 18 20:16:31 2011 +0100 permissions(k): do not check db con in child init - proper connection is returned by comparison of pids --- modules_k/permissions/address.c | 2 +- modules_k/permissions/trusted.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_k/permissions/address.c b/modules_k/permissions/address.c index ccdbf1a..3db6e58 100644 --- a/modules_k/permissions/address.c +++ b/modules_k/permissions/address.c @@ -287,7 +287,7 @@ error: */ int mi_init_addresses(void) { - if (!db_url.s || db_handle) return 0; + if (!db_url.s) return 0; db_handle = perm_dbf.init(&db_url); if (!db_handle) { LM_ERR("unable to connect database\n"); diff --git a/modules_k/permissions/trusted.c b/modules_k/permissions/trusted.c index 33cae33..1f8a106 100644 --- a/modules_k/permissions/trusted.c +++ b/modules_k/permissions/trusted.c @@ -235,7 +235,7 @@ int init_child_trusted(int rank) if ((rank <= 0) && (rank != PROC_RPC) && (rank != PROC_UNIXSOCK)) return 0; - if (!db_url.s || db_handle) { + if (!db_url.s) { return 0; } @@ -261,7 +261,7 @@ int init_child_trusted(int rank) */ int mi_init_trusted(void) { - if (!db_url.s || db_handle) return 0; + if (!db_url.s) return 0; db_handle = perm_dbf.init(&db_url); if (!db_handle) { LM_ERR("unable to connect database\n");

2 2

New commits on branch master
by Marius Zbihlei 24 Jan '11

24 Jan '11

URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7ce25a6… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Jan 24 16:41:10 2011 +0200 modules_k/usrloc removed some debug messages URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=592e5b8… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Jan 24 16:17:16 2011 +0200 modules_k/usrloc fixed rebase to master from 3.1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4d86198… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Jan 24 11:07:04 2011 +0200 Removed timer to delete contacts from db, as this is not supported from p_usrloc. As documented, the deletion of expired contacts must be done externally Also, because of the particularities of p_usrloc, only DB_ONLY mode is supported. (other modes are too centralized and can't scale) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b6ece81… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Jan 20 13:35:59 2011 +0200 modules_k/p_usrloc fixed compilation URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0b6beaf… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Jan 20 13:32:48 2011 +0200 Forgot Makefile URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5ae0856… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Jan 20 13:23:56 2011 +0200 Further refactoring of usrloc and p_usrloc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=edcca48… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Jan 20 12:08:34 2011 +0200 module_k/p_usrloc Refactoring of p_usrloc (it uses the usrloc API include) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ebdb0c5… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Jan 20 12:06:04 2011 +0200 modules_k/usrloc Further refactoring of code URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=df21482… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 18 17:09:06 2011 +0200 modules/p_usrloc Fixed mode WRITE_THROUGH (and WRITE_BACK) (crash) TODO: list of domains is kept in private mem, not shared. (!) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=81f9a40… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 18 15:11:12 2011 +0200 modules/p_usrloc Module implement the API of usrloc module. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=28c84b9… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 18 15:09:16 2011 +0200 modules/registrar : changes caused by usrloc refactoring URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f65d06b… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 18 15:06:17 2011 +0200 modules/usrloc Refactoring of usrloc: Moved interface declaration/definitions to one common header (usrloc.h) Before, mostly every header was included when using usrloc, thus the private parts were not hidden to user. Added a udomain_head_t data type which contains the first member of the udomain_t structure (this structure is different between p_usrloc and usrloc) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b6929fb… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 18 15:03:29 2011 +0200 modules/usrloc Some refactoring of usrloc to allow both usrloc and p_usrloc to coexist and share structs, code etc. First commit contains changes to code (.c files) Module interface (exported to registrar) is now in a common file "usrloc.h" which is used by every user of user location modules. P_usrloc also uses that header so changes to usrloc also affect it(changes to interface) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=80bd3fa… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 18 12:47:55 2011 +0200 test/unit Update p_usrloc test (it executes correctly now and performs cleaning) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=97fe4da… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 18 12:24:17 2011 +0200 test/unit improved p_usrloc test URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c826a79… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 11 16:03:30 2011 +0200 modules_k/p_usrloc updated documentation URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1687832… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 11 16:01:23 2011 +0200 modules/p_usrloc Fixed compilation errors caused by header renaming Removed use_second_key parameter that has the same meaning like use_domain Various other small bugfixes URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=120d162… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 11 13:45:49 2011 +0200 modules_k/p_usrloc Updated documentation URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ef9dc79… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 11 13:43:59 2011 +0200 modules_k/p_usrloc : renamed module definition/declaration files. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=76455f6… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 11 12:19:06 2011 +0200 modules/p_usrloc Updated documentation URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=485af22… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 11 12:18:11 2011 +0200 modules/p_usrloc removed some unneeded params URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=65a6043… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 11 11:30:27 2011 +0200 modules_k/p_usrloc : Documentation for the new p_usrloc module URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=295ac87… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Jan 10 16:57:06 2011 +0200 modules_k/p_usrloc : removed some dead code URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a3796c7… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Jan 10 16:25:17 2011 +0200 module_k/p_usrloc further interface cleaning URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1786f2a… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Jan 10 16:06:30 2011 +0200 modules_k:p_usrloc some interface cleaning URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8f7c41e… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Jan 10 12:27:22 2011 +0200 test:unit : Basic test for partitioned registration (work in progress) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fca5b28… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Jan 6 15:18:10 2011 +0200 Compleated interface of module. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=71a2606… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Jan 6 12:36:05 2011 +0200 New module p_usrloc Description: It is based on a usrloc module, but provides partitioned user location. This provides 3 benefits: 1. Redundancy - if a location db is down, there is a spare running 2. Load Balancing - the module balances the entries by hashing the username(or username@domain) 3. Failover- in case of error and recovery, it ensures that no stale contacts are returned More info in the READMEs(soon to come)

1 0

git:mariuszbihlei/p_usrloc: Removed timer to delete contacts from db, as this is not supported from p_usrloc.
by Marius Zbihlei 24 Jan '11

24 Jan '11

Module: sip-router Branch: mariuszbihlei/p_usrloc Commit: 22c89da808874eaa41860766c2781648adfb962e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=22c89da… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Jan 24 11:07:04 2011 +0200 Removed timer to delete contacts from db, as this is not supported from p_usrloc. As documented, the deletion of expired contacts must be done externally Also, because of the particularities of p_usrloc, only DB_ONLY mode is supported. (other modes are too centralized and can't scale) --- modules_k/p_usrloc/README | 15 ++------------- modules_k/p_usrloc/doc/p_usrloc_user.xml | 25 ++----------------------- modules_k/p_usrloc/p_usrloc_mod.c | 28 ++-------------------------- modules_k/p_usrloc/p_usrloc_mod.h | 1 - 4 files changed, 6 insertions(+), 63 deletions(-) diff --git a/modules_k/p_usrloc/README b/modules_k/p_usrloc/README index b9a235d..de1dddc 100644 --- a/modules_k/p_usrloc/README +++ b/modules_k/p_usrloc/README @@ -607,19 +607,8 @@ modparam("p_usrloc", "default_db_url", "mysql://ser:ser@localhost/ser") 5.1. db_mode (integer) The p_usrloc module must utilize database for persistent contact - storage. So mode 0 makes no sense in this setup. - * 1 - Write-Through scheme. All changes to usrloc are immediately - reflected in database too. This is very slow, but very reliable. - Use this scheme if speed is not your priority but need to make sure - that no registered contacts will be lost during crash or reboot. - * 2 - Write-Back scheme. This is a combination of previous two - schemes. All changes are made to memory and database - synchronization is done in the timer. The timer deletes all expired - contacts and flushes all modified or new contacts to database. Use - this scheme if you encounter high-load peaks and want them to - process as fast as possible. The mode will not help at all if the - load is high all the time. Also, latency of this mode is much lower - than latency of mode 1, but slightly higher than latency of mode 0. + storage. Only mode 3 is possible at this time. Because of the way other + matching mode work, they make no sense on a distributed environment. * 3 - DB-Only scheme. No memory cache is kept, all operations being directly performed with the database. The timer deletes all expired contacts from database - cleans after clients that didn't diff --git a/modules_k/p_usrloc/doc/p_usrloc_user.xml b/modules_k/p_usrloc/doc/p_usrloc_user.xml index 126aac3..8bc8041 100644 --- a/modules_k/p_usrloc/doc/p_usrloc_user.xml +++ b/modules_k/p_usrloc/doc/p_usrloc_user.xml @@ -609,33 +609,12 @@ modparam("p_usrloc", "default_db_url", "mysql://ser:ser@localhost/ser") <title><varname>db_mode</varname> (integer)</title> <para> The p_usrloc module must utilize database for persistent contact storage. - So mode 0 makes no sense in this setup. + Only mode 3 is possible at this time. Because of the way other matching mode work, + they make no sense on a distributed environment. </para> <itemizedlist> <listitem> <para> - 1 - Write-Through scheme. All changes to usrloc are immediately - reflected in database too. This is very slow, but very reliable. - Use this scheme if speed is not your priority but need to make - sure that no registered contacts will be lost during crash or - reboot. - </para> - </listitem> - <listitem> - <para> - 2 - Write-Back scheme. This is a combination of previous two - schemes. All changes are made to memory and database - synchronization is done in the timer. The timer deletes all - expired contacts and flushes all modified or new contacts to - database. Use this scheme if you encounter high-load peaks - and want them to process as fast as possible. The mode will - not help at all if the load is high all the time. Also, latency - of this mode is much lower than latency of mode 1, but slightly - higher than latency of mode 0. - </para> - </listitem> - <listitem> - <para> 3 - DB-Only scheme. No memory cache is kept, all operations being directly performed with the database. The timer deletes all expired contacts from database - cleans after clients that didn't diff --git a/modules_k/p_usrloc/p_usrloc_mod.c b/modules_k/p_usrloc/p_usrloc_mod.c index 4eaef74..6c8c76a 100644 --- a/modules_k/p_usrloc/p_usrloc_mod.c +++ b/modules_k/p_usrloc/p_usrloc_mod.c @@ -57,7 +57,6 @@ #include "../../sr_module.h" #include "../../dprint.h" #include "../../rpc_lookup.h" -#include "../../timer.h" /* register_timer */ #include "../../globals.h" /* is_main */ #include "../../ut.h" /* str_init */ #include "udomain.h" /* {insert,delete,get,release}_urecord */ @@ -92,7 +91,6 @@ MODULE_VERSION static int mod_init(void); /*!< Module initialization function */ static void destroy(void); /*!< Module destroy function */ -static void timer(unsigned int ticks, void* param); /*!< Timer handler */ static int child_init(int rank); /*!< Per-child init function */ static int mi_child_init(void); static int mi_child_loc_nr_init(void); @@ -151,7 +149,6 @@ str path_col = str_init(PATH_COL); /*!< Name of column containing the Pa str sock_col = str_init(SOCK_COL); /*!< Name of column containing the received socket */ str methods_col = str_init(METHODS_COL); /*!< Name of column containing the supported methods */ str last_mod_col = str_init(LAST_MOD_COL); /*!< Name of column containing the last modified date */ -int timer_interval = 60; /*!< Timer interval in seconds */ int db_mode = 3; /*!< Database sync scheme: 1-write through, 2-write back, 3-only db */ int use_domain = 0; /*!< Whether usrloc should use domain part of aor */ int desc_time_order = 0; /*!< By default do not enable timestamp ordering */ @@ -218,7 +215,6 @@ static param_export_t params[] = { {"cseq_column", STR_PARAM, &cseq_col.s }, {"flags_column", STR_PARAM, &flags_col.s }, {"cflags_column", STR_PARAM, &cflags_col.s }, - {"timer_interval", INT_PARAM, &timer_interval }, {"db_mode", INT_PARAM, &db_mode }, {"use_domain", INT_PARAM, &use_domain }, {"desc_time_order", INT_PARAM, &desc_time_order }, @@ -374,24 +370,17 @@ static int mod_init(void) return -1; } - /* Register cache timer */ - register_timer( timer, 0, timer_interval); - /* init the callbacks list */ if ( init_ulcb_list() < 0) { LM_ERR("usrloc/callbacks initialization failed\n"); return -1; } - if (db_mode == NO_DB) { - LM_ERR("No database was configured! Partioned user location is useless!"); + if (db_mode != DB_ONLY) { + LM_ERR("DB_ONLY is the only mode possible for partitioned usrloc. Please set db_mode to 3"); return -1; } - if (db_mode == WRITE_BACK) { - LM_WARN("The WRITE BACK mode will create discrepancies between memory and db backend"); - } - /* Shall we use database ? */ if (db_mode != NO_DB) { /* Yes */ if(!default_db_url.s || !strlen(default_db_url.s)){ @@ -481,9 +470,6 @@ static void destroy(void) { /* we need to sync DB in order to flush the cache */ ul_unlock_locks(); - if (synchronize_all_udomains() != 0) { - LM_ERR("flushing cache failed\n"); - } free_all_udomains(); ul_destroy_locks(); @@ -497,16 +483,6 @@ static void destroy(void) } -/*! \brief - * Timer handler - */ -static void timer(unsigned int ticks, void* param) -{ - if (synchronize_all_udomains() != 0) { - LM_ERR("synchronizing cache failed\n"); - } -} - static int mi_child_loc_nr_init(void) { if(ul_db_child_locnr_init() < 0){ diff --git a/modules_k/p_usrloc/p_usrloc_mod.h b/modules_k/p_usrloc/p_usrloc_mod.h index dd893e5..bba2e46 100644 --- a/modules_k/p_usrloc/p_usrloc_mod.h +++ b/modules_k/p_usrloc/p_usrloc_mod.h @@ -87,7 +87,6 @@ extern str sock_col; extern str methods_col; extern str last_mod_col; -extern int timer_interval; extern int db_mode; extern int use_domain; extern int desc_time_order;

1 0

git:carstenbock/ims: - Fixed some typos
by Carsten Bock 24 Jan '11

24 Jan '11

Module: sip-router Branch: carstenbock/ims Commit: 0cfbd512de5871d57ddb826b64a621abd09bd682 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0cfbd51… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Sun Jan 23 02:59:10 2011 +0100 - Fixed some typos --- modules_k/dialog/dialog.c | 4 ++-- modules_k/dialog/dlg_var.h | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index 300f4a3..839cf2f 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -267,8 +267,8 @@ static pv_export_t mod_items[] = { pv_set_dlg_ctx, pv_parse_dlg_ctx_name, 0, 0, 0 }, { {"dlg", sizeof("dlg")-1}, PVT_OTHER, pv_get_dlg, 0, pv_parse_dlg_name, 0, 0, 0 }, - { {"dlg_var", sizeof("dlg_var")-1}, PVT_OTHER, pv_get_dialog_var, - pv_set_dialog_var, pv_parse_dialog_var_name, 0, 0, 0}, + { {"dlg_var", sizeof("dlg_var")-1}, PVT_OTHER, pv_get_dlg_variable, + pv_set_dlg_variable, pv_parse_dialog_var_name, 0, 0, 0}, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; diff --git a/modules_k/dialog/dlg_var.h b/modules_k/dialog/dlg_var.h index b48e275..ee3aa4c 100644 --- a/modules_k/dialog/dlg_var.h +++ b/modules_k/dialog/dlg_var.h @@ -52,11 +52,9 @@ struct dlg_var { int pv_parse_dialog_var_name(pv_spec_p sp, str *in); -int pv_get_dialog_var(struct sip_msg *msg, pv_param_t *param, - pv_value_t *res); +int pv_get_dlg_variable(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); -int pv_set_dialog_var(struct sip_msg* msg, pv_param_t *param, - int op, pv_value_t *val); +int pv_set_dlg_variable(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val); /*! Delete the current var-list */ void deletevarlist();

1 0

git:carstenbock/ims: - several bug-fixes after testing (a memory leak, some logical bugs)
by Carsten Bock 24 Jan '11

24 Jan '11

Module: sip-router Branch: carstenbock/ims Commit: fa4be539953e5d6e97f0e767da6b2765b4c1197a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fa4be53… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Mon Jan 24 09:55:48 2011 +0100 - several bug-fixes after testing (a memory leak, some logical bugs) --- modules_k/dialog/dlg_db_handler.c | 4 +- modules_k/dialog/dlg_handlers.c | 4 +- modules_k/dialog/dlg_hash.c | 2 +- modules_k/dialog/dlg_var.c | 139 ++++++++++++++++++++++++++----------- modules_k/dialog/dlg_var.h | 7 +-- 5 files changed, 106 insertions(+), 50 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=fa4…

1 0

git:carstenbock/ims: - renamed columns in the table to "dialog_key" and " dialog_value", key and value may be reserved keywords by the database
by Carsten Bock 24 Jan '11

24 Jan '11

Module: sip-router Branch: carstenbock/ims Commit: 57ce90d509d80b0454be6ec65a7b3a22ea412e46 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=57ce90d… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Sun Jan 23 03:13:12 2011 +0100 - renamed columns in the table to "dialog_key" and "dialog_value", key and value may be reserved keywords by the database --- modules_k/dialog/dlg_db_handler.h | 4 ++-- modules_k/dialog/doc/dialog_admin.xml | 4 ++-- utils/kamctl/db_berkeley/kamailio/dialog_vars | 2 +- utils/kamctl/dbtext/kamailio/dialog_vars | 2 +- utils/kamctl/mysql/dialog-create.sql | 4 ++-- utils/kamctl/oracle/dialog-create.sql | 4 ++-- utils/kamctl/postgres/dialog-create.sql | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules_k/dialog/dlg_db_handler.h b/modules_k/dialog/dlg_db_handler.h index 89e0061..89b4cc7 100644 --- a/modules_k/dialog/dlg_db_handler.h +++ b/modules_k/dialog/dlg_db_handler.h @@ -60,8 +60,8 @@ #define VARS_HASH_ID_COL "hash_id" #define VARS_HASH_ENTRY_COL "hash_entry" -#define VARS_KEY_COL "key" -#define VARS_VALUE_COL "value" +#define VARS_KEY_COL "dialog_key" +#define VARS_VALUE_COL "dialog_value" #define DIALOG_VARS_TABLE_NAME "dialog_vars" #define DLG_VARS_TABLE_VERSION 1 diff --git a/modules_k/dialog/doc/dialog_admin.xml b/modules_k/dialog/doc/dialog_admin.xml index 00980d2..34ac2ac 100644 --- a/modules_k/dialog/doc/dialog_admin.xml +++ b/modules_k/dialog/doc/dialog_admin.xml @@ -961,7 +961,7 @@ modparam("dialog", "vars_h_entry_column", "vars_h_entry_name") </para> <para> <emphasis> - Default value is <quote>key</quote>. + Default value is <quote>dialog_key</quote>. </emphasis> </para> <example> @@ -981,7 +981,7 @@ modparam("dialog", "vars_key_column", "vars_key_name") </para> <para> <emphasis> - Default value is <quote>key</quote>. + Default value is <quote>dialog_value</quote>. </emphasis> </para> <example> diff --git a/utils/kamctl/db_berkeley/kamailio/dialog_vars b/utils/kamctl/db_berkeley/kamailio/dialog_vars index 3c9ebe2..e15e813 100644 --- a/utils/kamctl/db_berkeley/kamailio/dialog_vars +++ b/utils/kamctl/db_berkeley/kamailio/dialog_vars @@ -1,5 +1,5 @@ METADATA_COLUMNS -hash_entry(int) hash_id(int) key(str) value(str) +hash_entry(int) hash_id(int) dialog_key(str) dialog_value(str) METADATA_KEY 1 2 METADATA_READONLY diff --git a/utils/kamctl/dbtext/kamailio/dialog_vars b/utils/kamctl/dbtext/kamailio/dialog_vars index 5160a40..3392a20 100644 --- a/utils/kamctl/dbtext/kamailio/dialog_vars +++ b/utils/kamctl/dbtext/kamailio/dialog_vars @@ -1 +1 @@ -hash_entry(int) hash_id(int) key(string) value(string) +hash_entry(int) hash_id(int) dialog_key(string) dialog_value(string) diff --git a/utils/kamctl/mysql/dialog-create.sql b/utils/kamctl/mysql/dialog-create.sql index 4f4e18b..4af16b0 100644 --- a/utils/kamctl/mysql/dialog-create.sql +++ b/utils/kamctl/mysql/dialog-create.sql @@ -29,7 +29,7 @@ INSERT INTO version (table_name, table_version) values ('dialog_vars','1'); CREATE TABLE dialog_vars ( hash_entry INT(10) UNSIGNED NOT NULL, hash_id INT(10) UNSIGNED NOT NULL, - key VARCHAR(255) NOT NULL, - value VARCHAR(255) NOT NULL, + dialog_key VARCHAR(255) NOT NULL, + dialog_value VARCHAR(255) NOT NULL ) ENGINE=MyISAM; diff --git a/utils/kamctl/oracle/dialog-create.sql b/utils/kamctl/oracle/dialog-create.sql index ed2fd3f..c9c5d3a 100644 --- a/utils/kamctl/oracle/dialog-create.sql +++ b/utils/kamctl/oracle/dialog-create.sql @@ -39,7 +39,7 @@ INSERT INTO version (table_name, table_version) values ('dialog_vars','1'); CREATE TABLE dialog_vars ( hash_entry INT(10) UNSIGNED NOT NULL, hash_id INT(10) UNSIGNED NOT NULL, - key VARCHAR(255) NOT NULL, - value VARCHAR(255) NOT NULL, + dialog_key VARCHAR(255) NOT NULL, + dialog_value VARCHAR(255) NOT NULL, ); diff --git a/utils/kamctl/postgres/dialog-create.sql b/utils/kamctl/postgres/dialog-create.sql index f2cdf6b..c4f7161 100644 --- a/utils/kamctl/postgres/dialog-create.sql +++ b/utils/kamctl/postgres/dialog-create.sql @@ -31,7 +31,7 @@ INSERT INTO version (table_name, table_version) values ('dialog_vars','1'); CREATE TABLE dialog_vars ( hash_entry INT(10) UNSIGNED NOT NULL, hash_id INT(10) UNSIGNED NOT NULL, - key VARCHAR(255) NOT NULL, - value VARCHAR(255) NOT NULL, + dialog_key VARCHAR(255) NOT NULL, + dialog_value VARCHAR(255) NOT NULL, );

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