sr-dev October 2013

sr-dev@lists.kamailio.org

33 participants
254 discussions

git:tmp/tm_async_reply_support: modules/tm: removed another duplicate variable caused by master merge
by Richard Good 07 Oct '13

07 Oct '13

Module: sip-router Branch: tmp/tm_async_reply_support Commit: c814ad14d662d728aa4e0e2fb890f33ed293e832 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c814ad1… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Mon Oct 7 12:43:34 2013 +0200 modules/tm: removed another duplicate variable caused by master merge --- modules/tm/t_reply.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/modules/tm/t_reply.h b/modules/tm/t_reply.h index 1a40a82..b4d2b0f 100644 --- a/modules/tm/t_reply.h +++ b/modules/tm/t_reply.h @@ -148,8 +148,6 @@ int t_get_reply_totag(struct sip_msg *msg, str *totag); #define LOCK_REPLIES(_t) lock(&(_t)->reply_mutex ) #define UNLOCK_REPLIES(_t) unlock(&(_t)->reply_mutex ) -#define LOCK_ASYNC_CONTINUE(_t) lock(&(_t)->async_mutex ) -#define UNLOCK_ASYNC_CONTINUE(_t) unlock(&(_t)->async_mutex ) /* This function is called whenever a reply for our module is received; * we need to register this function on module initialization;

1 0

git:master: modules/tm: missing lock initialisation for async_lock
by Jason Penton 07 Oct '13

07 Oct '13

Module: sip-router Branch: master Commit: a4370dc336e5552b93d32314249d4d613d77ef99 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a4370dc… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Mon Oct 7 12:49:00 2013 +0200 modules/tm: missing lock initialisation for async_lock - related to commit 5ab44c7c2fc78038302bf455ff49e374fc79550b --- modules/tm/h_table.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/tm/h_table.c b/modules/tm/h_table.c index 92e8ba8..26ca3e3 100644 --- a/modules/tm/h_table.c +++ b/modules/tm/h_table.c @@ -380,6 +380,7 @@ struct cell* build_cell( struct sip_msg* p_msg ) init_synonym_id(new_cell); init_cell_lock( new_cell ); + init_async_lock( new_cell ); t_stats_created(); return new_cell;

1 0

git:tmp/tm_async_reply_support: modules/tm: Removed duplicate variable caused by master merge
by Richard Good 07 Oct '13

07 Oct '13

Module: sip-router Branch: tmp/tm_async_reply_support Commit: 32ebdea6342b46390a7219114c5d0f23182e2f97 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=32ebdea… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Mon Oct 7 12:35:47 2013 +0200 modules/tm: Removed duplicate variable caused by master merge --- modules/tm/lock.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules/tm/lock.h b/modules/tm/lock.h index 6c770fd..90c76b3 100644 --- a/modules/tm/lock.h +++ b/modules/tm/lock.h @@ -75,7 +75,6 @@ void lock_cleanup(void); int init_cell_lock( struct cell *cell ); -int init_async_lock( struct cell *cell ); int init_entry_lock( struct s_table* ht, struct entry *entry ); int init_async_lock( struct cell *cell );

1 0

git:tmp/tm_async_reply_support: Merge branch 'master' into tmp/ tm_async_reply_support
by Richard Good 07 Oct '13

07 Oct '13

Module: sip-router Branch: tmp/tm_async_reply_support Commit: 5a52525a1e2fff4ed39df36b85ff5896353718aa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5a52525… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Mon Oct 7 12:23:12 2013 +0200 Merge branch 'master' into tmp/tm_async_reply_support ---

1 0

git:richard.good/diameter_rx_media: Merge branch 'master' into richard.good /diameter_rx_media
by Richard Good 07 Oct '13

07 Oct '13

Module: sip-router Branch: richard.good/diameter_rx_media Commit: 0864ad4046edb381aff43d520b817c6da461a737 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0864ad4… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Mon Oct 7 12:21:33 2013 +0200 Merge branch 'master' into richard.good/diameter_rx_media ---

1 0

git:master: examples/pcscf: Removed dependency to Presence-User-Agent and SQLite.
by Carsten Bock 07 Oct '13

07 Oct '13

Module: sip-router Branch: master Commit: 6e19debdf9b240c71ca90bfd6cadd46f0f57ace8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6e19deb… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Mon Oct 7 10:15:11 2013 +0200 examples/pcscf: Removed dependency to Presence-User-Agent and SQLite. --- examples/pcscf/kamailio.cfg | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/examples/pcscf/kamailio.cfg b/examples/pcscf/kamailio.cfg index 948656a..c44d587 100644 --- a/examples/pcscf/kamailio.cfg +++ b/examples/pcscf/kamailio.cfg @@ -155,8 +155,6 @@ loadmodule "textops" loadmodule "textopsx" loadmodule "maxfwd" loadmodule "xlog" -loadmodule "pua" -loadmodule "db_sqlite" loadmodule "ims_registrar_pcscf" loadmodule "sanity" loadmodule "siputils" @@ -209,11 +207,6 @@ modparam("mi_fifo", "fifo_mode", 0666) modparam("mi_fifo", "fifo_user", "kamailio") modparam("mi_fifo", "fifo_group", "kamailio") -# ----- pua params ----- -# Database is disabled (for now) -modparam("pua", "db_mode", 0) -modparam("pua", "db_url", "sqlite:///etc/kamailio/kamailio.db") - # ----- tm params ----- # auto-discard branches from previous serial forking leg modparam("tm", "failure_reply_mode", 3)

1 0

git:master: htable: update documentation for dmq integration
by Charles Chance 07 Oct '13

07 Oct '13

Module: sip-router Branch: master Commit: c9395e690435cdb8fc62b7fb13b378fe0a6ca8e5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c9395e6… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: Mon Oct 7 07:52:21 2013 +0100 htable: update documentation for dmq integration --- modules/htable/README | 58 +++++++++++++++++++++++++++------- modules/htable/doc/htable_admin.xml | 40 +++++++++++++++++++++++- 2 files changed, 84 insertions(+), 14 deletions(-) diff --git a/modules/htable/README b/modules/htable/README index 45e45af..31db1bc 100644 --- a/modules/htable/README +++ b/modules/htable/README @@ -45,6 +45,7 @@ Alex Balashov 3.10. timer_interval (integer) 3.11. timer_mode (integer) 3.12. db_expires (integer) + 3.13. enable_dmq (integer) 4. Functions @@ -92,11 +93,12 @@ Alex Balashov 1.12. Set timer_interval parameter 1.13. Set timer_mode parameter 1.14. Set db_expires parameter - 1.15. sht_print usage - 1.16. sht_rm_name_re usage - 1.17. sht_rm_value_re usage - 1.18. sht_lock usage - 1.19. sht_unlock usage + 1.15. Set enable_dmq parameter + 1.16. sht_print usage + 1.17. sht_rm_name_re usage + 1.18. sht_rm_value_re usage + 1.19. sht_lock usage + 1.20. sht_unlock usage Chapter 1. Admin Guide @@ -123,6 +125,7 @@ Chapter 1. Admin Guide 3.10. timer_interval (integer) 3.11. timer_mode (integer) 3.12. db_expires (integer) + 3.13. enable_dmq (integer) 4. Functions @@ -169,6 +172,9 @@ Chapter 1. Admin Guide expiration time of cached items. The expiration time can be adjusted per itme via assignment operation at runtime. + Replication between multiple servers is performed automatically (if + enabled) via the DMQ module. + You can read more about hash tables at: http://en.wikipedia.org/wiki/Hash_table. @@ -248,7 +254,8 @@ if(is_present_hf("Authorization")) 2.1. Kamailio Modules The following modules must be loaded before this module: - * No dependencies on other Kamailio modules. + * If DMQ replication is enabled, the DMQ module must be loaded + first.. 2.2. External Libraries or Applications @@ -287,6 +294,7 @@ if(is_present_hf("Authorization")) 3.10. timer_interval (integer) 3.11. timer_mode (integer) 3.12. db_expires (integer) + 3.13. enable_dmq (integer) 3.1. htable (str) @@ -318,6 +326,11 @@ if(is_present_hf("Authorization")) an item is reset when that item is updated. Certain uses of htable may dictate that updates should not reset the expiration timeout, however, in which case this attribute can be set to 0. + * dmqreplicate - if set to 1, any actions (set, update, delete etc.) + performed upon entries in this table will be replicated to other + nodes (htable peers). Please note, module parameter "enable_dmq" + must also be set in order for this to apply (see below). Default is + 0 (no replication). Default value is NULL. @@ -325,7 +338,8 @@ if(is_present_hf("Authorization")) ... modparam("htable", "htable", "a=>size=4;autoexpire=7200;dbtable=htable_a;") modparam("htable", "htable", "b=>size=5;") -modparam("htable", "htable", "c=>size=4;autoexpire=7200;initval=1;") +modparam("htable", "htable", "c=>size=4;autoexpire=7200;initval=1;dmqreplicate=1 +;") ... 3.2. db_url (str) @@ -453,6 +467,26 @@ modparam("htable", "timer_mode", 1) modparam("htable", "db_expires", 1) ... +3.13. enable_dmq (integer) + + If set to 1, will enable DMQ replication of actions performed upon + entries in all tables having "dmqreplicate" parameter set. Any update + action performed via psuedo-variables, MI and RPC commands will be + repeated on all other nodes. Therefore, it is important to ensure the + table definition (size, autoexpire etc.) is identical across all + instances. + + Currently, values are not replicated on load from DB as it is expected + that in these cases, all servers will load their values from the same + DB. + + Default value is 0. + + Example 1.15. Set enable_dmq parameter +... +modparam("htable", "enable_dmq", 1) +... + 4. Functions 4.1. sht_print() @@ -469,7 +503,7 @@ modparam("htable", "db_expires", 1) This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE. - Example 1.15. sht_print usage + Example 1.16. sht_print usage ... sht_print(); ... @@ -482,7 +516,7 @@ sht_print(); This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE. - Example 1.16. sht_rm_name_re usage + Example 1.17. sht_rm_name_re usage ... sht_rm_name_re("ha=>.*"); ... @@ -495,7 +529,7 @@ sht_rm_name_re("ha=>.*"); This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE. - Example 1.17. sht_rm_value_re usage + Example 1.18. sht_rm_value_re usage ... sht_rm_value_re("ha=>.*"); ... @@ -506,7 +540,7 @@ sht_rm_value_re("ha=>.*"); This function can be used from ANY_ROUTE. - Example 1.18. sht_lock usage + Example 1.19. sht_lock usage ... sht_lock("ha=>test"); ... @@ -517,7 +551,7 @@ sht_lock("ha=>test"); This function can be used from ANY_ROUTE. - Example 1.19. sht_unlock usage + Example 1.20. sht_unlock usage ... sht_lock("ha=>test"); $sht(ha=>test) = $sht(ha=>test) + 10; diff --git a/modules/htable/doc/htable_admin.xml b/modules/htable/doc/htable_admin.xml index 815d16b..3279738 100644 --- a/modules/htable/doc/htable_admin.xml +++ b/modules/htable/doc/htable_admin.xml @@ -31,6 +31,10 @@ be adjusted per itme via assignment operation at runtime. </para> <para> + Replication between multiple servers is performed automatically (if + enabled) via the DMQ module. + </para> + <para> You can read more about hash tables at: http://en.wikipedia.org/wiki/Hash_table. </para> @@ -121,7 +125,7 @@ if(is_present_hf("Authorization")) <itemizedlist> <listitem> <para> - <emphasis>No dependencies on other &kamailio; modules</emphasis>. + <emphasis>If DMQ replication is enabled, the DMQ module must be loaded first.</emphasis>. </para> </listitem> </itemizedlist> @@ -272,6 +276,11 @@ if(is_present_hf("Authorization")) <emphasis>updateexpire</emphasis> - if set to 1 (default), the time until expiration of an item is reset when that item is updated. Certain uses of htable may dictate that updates should not reset the expiration timeout, however, in which case this attribute can be set to 0. </para> </listitem> + <listitem> + <para> + <emphasis>dmqreplicate</emphasis> - if set to 1, any actions (set, update, delete etc.) performed upon entries in this table will be replicated to other nodes (htable peers). Please note, module parameter "enable_dmq" must also be set in order for this to apply (see below). Default is 0 (no replication). + </para> + </listitem> </itemizedlist> <para> <emphasis> @@ -284,7 +293,7 @@ if(is_present_hf("Authorization")) ... modparam("htable", "htable", "a=>size=4;autoexpire=7200;dbtable=htable_a;") modparam("htable", "htable", "b=>size=5;") -modparam("htable", "htable", "c=>size=4;autoexpire=7200;initval=1;") +modparam("htable", "htable", "c=>size=4;autoexpire=7200;initval=1;dmqreplicate=1;") ... </programlisting> </example> @@ -504,6 +513,33 @@ modparam("htable", "db_expires", 1) </programlisting> </example> </section> + <section> + <title><varname>enable_dmq</varname> (integer)</title> + <para> + If set to 1, will enable DMQ replication of actions performed upon + entries in all tables having "dmqreplicate" parameter set. Any update + action performed via psuedo-variables, MI and RPC commands will be + repeated on all other nodes. Therefore, it is important to ensure the + table definition (size, autoexpire etc.) is identical across all instances. + </para> + <para> + Currently, values are not replicated on load from DB as it is expected + that in these cases, all servers will load their values from the same DB. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>enable_dmq</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("htable", "enable_dmq", 1) +... +</programlisting> + </example> + </section> </section> <section> <title>Functions</title>

1 0

git:master: htable: initial dmq integration
by Charles Chance 07 Oct '13

07 Oct '13

Module: sip-router Branch: master Commit: 6a20bf80ae014801667c5a23782b33af5467c409 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6a20bf8… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: Mon Oct 7 07:44:38 2013 +0100 htable: initial dmq integration --- modules/htable/Makefile | 1 + modules/htable/api.c | 20 ++++ modules/htable/ht_api.c | 12 ++- modules/htable/ht_api.h | 3 +- modules/htable/ht_dmq.c | 282 +++++++++++++++++++++++++++++++++++++++++++++++ modules/htable/ht_dmq.h | 48 ++++++++ modules/htable/ht_var.c | 18 +++ modules/htable/htable.c | 44 +++++++- 8 files changed, 422 insertions(+), 6 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=6a2…

1 0

Freezing development for Kamailio v4.1.0
by Daniel-Constantin Mierla 07 Oct '13

07 Oct '13

Hello, discussed last week during IRC development meeting, we are approaching the time for getting out a new major release - to be numbered v4.1.x. I would proposed October 7 as the last day do accept new features for v4.1.0. That gives another three weeks to push new code. As a reminder, those that have personal branches with new feature, should merge asap, too. If the date is a constraint for some immediate plans, you can propose another date and we will see which fits better. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Trainings - Berlin, Oct 21-24; Miami, Nov 11-13, 2013 - more details about Kamailio trainings at http://www.asipto.com -

3 10

git:tteras/mohqueue: mohqueue: remove handwritten .sql, it is now autogenerated
by Timo Teras 07 Oct '13

07 Oct '13

Module: sip-router Branch: tteras/mohqueue Commit: 24f66ecc72064c9bf40deeb324e666b6b95dfa83 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=24f66ec… Author: Timo Teräs <timo.teras(a)iki.fi> Committer: Timo Teräs <timo.teras(a)iki.fi> Date: Mon Oct 7 08:41:37 2013 +0300 mohqueue: remove handwritten .sql, it is now autogenerated --- modules/mohqueue/mohqueue.sql | 23 ----------------------- 1 files changed, 0 insertions(+), 23 deletions(-) diff --git a/modules/mohqueue/mohqueue.sql b/modules/mohqueue/mohqueue.sql deleted file mode 100644 index 583ba06..0000000 --- a/modules/mohqueue/mohqueue.sql +++ /dev/null @@ -1,23 +0,0 @@ -INSERT INTO version (table_name, table_version) values ('mohqueues','1'); -CREATE TABLE mohqueues ( - id SERIAL PRIMARY KEY NOT NULL, - name VARCHAR(25), - uri VARCHAR(100) NOT NULL, - mohdir VARCHAR(100), - mohfile VARCHAR(100) NOT NULL, - debug INTEGER NOT NULL, - CONSTRAINT mohqueue_uri_idx UNIQUE (uri), - CONSTRAINT mohqueue_name_idx UNIQUE (name) -); - -INSERT INTO version (table_name, table_version) values ('mohqcalls','1'); -CREATE TABLE mohqcalls ( - id SERIAL PRIMARY KEY NOT NULL, - mohq_id INTEGER NOT NULL, - call_id VARCHAR(100) NOT NULL, - call_status INTEGER NOT NULL, - call_from VARCHAR(100) NOT NULL, - call_contact VARCHAR(100), - call_time TIMESTAMP WITHOUT TIME ZONE NOT NULL, - CONSTRAINT mohqcalls_idx UNIQUE (call_id) -); \ No newline at end of file

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
26
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2013