sr-dev October 2009

sr-dev@lists.kamailio.org

30 participants
468 discussions

git:master: Documentation updates
by Olle E. Johansson 20 Oct '09

20 Oct '09

Module: sip-router Branch: master Commit: 2cd87deddef30739c981a07c1ca60a4841f2e7e1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2cd87de… Author: oej <oej(a)edvina.net> Committer: oej <oej(a)edvina.net> Date: Tue Oct 20 22:03:16 2009 +0200 Documentation updates --- docbook/entities.xml | 1 + modules_k/ldap/README | 19 +++--- modules_k/ldap/doc/ldap_admin.xml | 130 +++++++++++++++++++++++++------------ modules_k/ldap/doc/ldap_devel.xml | 64 +++++++++++++----- modules_k/ldap/etc/ldap.cfg | 2 +- 5 files changed, 146 insertions(+), 70 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=2cd…

1 0

git:master: Documentation updates
by Olle E. Johansson 20 Oct '09

20 Oct '09

Module: sip-router Branch: master Commit: cb92b8d599dd39ae1c469cb755c42adb1d5fdbda URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cb92b8d… Author: oej <oej(a)edvina.net> Committer: oej <oej(a)edvina.net> Date: Tue Oct 20 21:11:51 2009 +0200 Documentation updates --- modules_k/purple/README | 155 +++++++++++++++++++-------------- modules_k/purple/doc/purple_admin.xml | 29 +++--- 2 files changed, 105 insertions(+), 79 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=cb9…

1 0

SF.net SVN: openser:[5940] branches/1.4/modules/seas
by Elias Baixas 20 Oct '09

20 Oct '09

Revision: 5940 http://openser.svn.sourceforge.net/openser/?rev=5940&view=rev Author: eliasbaixas Date: 2009-10-20 20:02:42 +0000 (Tue, 20 Oct 2009) Log Message: ----------- Changed GNU-propietary calls to dprintf for standard fprintf. changed fd args for FILE*. Modified Paths: -------------- branches/1.4/modules/seas/encode_allow.c branches/1.4/modules/seas/encode_allow.h branches/1.4/modules/seas/encode_contact.c branches/1.4/modules/seas/encode_contact.h branches/1.4/modules/seas/encode_content_disposition.h branches/1.4/modules/seas/encode_content_length.c branches/1.4/modules/seas/encode_content_length.h branches/1.4/modules/seas/encode_content_type.c branches/1.4/modules/seas/encode_content_type.h branches/1.4/modules/seas/encode_cseq.c branches/1.4/modules/seas/encode_cseq.h branches/1.4/modules/seas/encode_digest.c branches/1.4/modules/seas/encode_digest.h branches/1.4/modules/seas/encode_expires.c branches/1.4/modules/seas/encode_expires.h branches/1.4/modules/seas/encode_header.c branches/1.4/modules/seas/encode_header.h branches/1.4/modules/seas/encode_msg.c branches/1.4/modules/seas/encode_msg.h branches/1.4/modules/seas/encode_parameters.c branches/1.4/modules/seas/encode_parameters.h branches/1.4/modules/seas/encode_route.c branches/1.4/modules/seas/encode_route.h branches/1.4/modules/seas/encode_to_body.c branches/1.4/modules/seas/encode_to_body.h branches/1.4/modules/seas/encode_uri.c branches/1.4/modules/seas/encode_uri.h branches/1.4/modules/seas/encode_via.c branches/1.4/modules/seas/encode_via.h branches/1.4/modules/seas/utils.c branches/1.4/modules/seas/utils.h This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

git:master: sr-oob.cfg: Automatic reload of global attributes.
by Jan Janak 20 Oct '09

20 Oct '09

Module: sip-router Branch: master Commit: 6351694a00c4b305bdfe80a33b9597a09c727bcc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6351694… Author: Jan Janak <jan(a)ryngle.com> Committer: Jan Janak <jan(a)ryngle.com> Date: Tue Oct 20 21:45:04 2009 +0200 sr-oob.cfg: Automatic reload of global attributes. This patch creates a new attribute called gattr_timestamp. The attribute is stored in global_attrs table and contains the timestamp of the last modification of the contents of the table. It can be updated by applications like serweb whenever they update any of the attributes in that table. In the configuration file sr-oob.cfg we check the value stored in that attribute and if its value indicates that it has been modified within last two minutes, the script initiates a reload of the global_attr memory cache. The mechanism is the same as for the domain_attrs table reload that is present in the same route section. This patch also contains an unrelated small fix that correct the path to the root directory in lib/srdb2/schema/Makefile. The root path there was incorrect as result of the merge. --- etc/sip-router-oob.cfg | 9 ++++++++ lib/srdb2/schema/Makefile | 2 +- lib/srdb2/schema/global_attrs.xml | 7 ++++++ scripts/dbtext/ser_db/global_attrs | 1 + scripts/mysql/my_create.sql | 38 ++++++++++++++++++------------------ scripts/mysql/my_data.sql | 2 + scripts/oracle/or_data.sql | 2 + scripts/postgres/pg_data.sql | 2 + 8 files changed, 43 insertions(+), 20 deletions(-) diff --git a/etc/sip-router-oob.cfg b/etc/sip-router-oob.cfg index 145541f..2d593b3 100644 --- a/etc/sip-router-oob.cfg +++ b/etc/sip-router-oob.cfg @@ -512,6 +512,7 @@ modparam("timer", "declare_timer", # -- db_ops -- modparam("db_ops", "declare_handle", "reload") +modparam("db_ops", "declare_handle", "gattr_reload") # ------------------------- Request Routing Logic -------------------------- @@ -1575,5 +1576,13 @@ route[ON_1MIN_TIMER] { exec_msg("sercmd domain.reload"); } db_close("reload"); + + # Reload global attributes (they are cached in memory) if the contents of + # the global_attrs table has been changed recently. + db_query("select value from global_attrs where name='gattr_timestamp' and type=0 and cast(value as unsigned int) between unix_timestamp(now())-120 and unix_timestamp(now())", "gattr_reload"); + if (@db.fetch.gattr_reload.count=="1") { + exec_msg("sercmd global.reload"); + } + db_close("gattr_reload"); } diff --git a/lib/srdb2/schema/Makefile b/lib/srdb2/schema/Makefile index f6b8d76..f501031 100644 --- a/lib/srdb2/schema/Makefile +++ b/lib/srdb2/schema/Makefile @@ -5,7 +5,7 @@ # File containing SER database description DOC_ROOT = ser.xml -ROOT=../.. +ROOT=../../.. STYLESHEETS=$(ROOT)/doc/stylesheets/dbschema/xsl # Stylesheet used to generate MySQL database schema diff --git a/lib/srdb2/schema/global_attrs.xml b/lib/srdb2/schema/global_attrs.xml index 96f9bb3..1d1beb3 100644 --- a/lib/srdb2/schema/global_attrs.xml +++ b/lib/srdb2/schema/global_attrs.xml @@ -224,6 +224,13 @@ <value col="global_attrs.value">0</value> <value col="global_attrs.flags">33</value> </row> + + <row vendor-controlled="1"> + <value col="global_attrs.name">gattr_timestamp</value> + <value col="global_attrs.type">0</value> + <value col="global_attrs.value">0</value> + <value col="global_attrs.flags">33</value> + </row> <row> <value col="global_attrs.name">sw_show_status</value> diff --git a/scripts/dbtext/ser_db/global_attrs b/scripts/dbtext/ser_db/global_attrs index 91711ef..91a514e 100644 --- a/scripts/dbtext/ser_db/global_attrs +++ b/scripts/dbtext/ser_db/global_attrs @@ -4,6 +4,7 @@ sw_credential_default_flags:0:33:32 sw_uri_default_flags:0:57:32 sw_uname_assign_mode:2:fcfs:32 domain_data_version:0:0:33 +gattr_timestamp:0:0:33 sw_show_status:0:1:32 sw_require_conf:0:1:32 lang:2:en:33 diff --git a/scripts/mysql/my_create.sql b/scripts/mysql/my_create.sql index fc27798..45f38e7 100644 --- a/scripts/mysql/my_create.sql +++ b/scripts/mysql/my_create.sql @@ -204,31 +204,31 @@ CREATE TABLE phonebook ( ); CREATE TABLE gw ( - id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, - lcr_id SMALLINT UNSIGNED NOT NULL DEFAULT 1, gw_name VARCHAR(128) NOT NULL, - grp_id INT UNSIGNED NOT NULL, - ip_addr VARCHAR(15) NOT NULL, - hostname VARCHAR(64), + ip_addr INT UNSIGNED NOT NULL, port SMALLINT UNSIGNED, uri_scheme TINYINT UNSIGNED, - transport TINYINT UNSIGNED, - strip TINYINT UNSIGNED, - tag VARCHAR(16) DEFAULT NULL, - weight INT UNSIGNED, - flags INT UNSIGNED DEFAULT 0 NOT NULL, - defunct INT UNSIGNED DEFAULT NULL, - CONSTRAINT lcr_id_gw_name_idx UNIQUE (lcr_id, gw_name) + transport SMALLINT UNSIGNED, + prefix VARCHAR(16) NOT NULL, + grp_id INT NOT NULL, + UNIQUE KEY gw_idx1 (gw_name), + KEY gw_idx2 (grp_id) +); + +CREATE TABLE gw_grp ( + grp_id INT AUTO_INCREMENT NOT NULL, + grp_name VARCHAR(64) NOT NULL, + UNIQUE KEY gwgrp_idx (grp_id) ); CREATE TABLE lcr ( - id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, - lcr_id SMALLINT UNSIGNED NOT NULL DEFAULT 1, - prefix VARCHAR(16) DEFAULT NULL, - from_uri VARCHAR(64) DEFAULT NULL, - grp_id INT UNSIGNED NOT NULL, - priority TINYINT UNSIGNED NOT NULL, - INDEX lcr_id_idx (lcr_id) + prefix VARCHAR(16) NOT NULL, + from_uri VARCHAR(255) NOT NULL DEFAULT '%', + grp_id INT, + priority INT, + KEY lcr_idx1 (prefix), + KEY lcr_idx2 (from_uri), + KEY lcr_idx3 (grp_id) ); CREATE TABLE grp ( diff --git a/scripts/mysql/my_data.sql b/scripts/mysql/my_data.sql index 682852d..57cb18f 100644 --- a/scripts/mysql/my_data.sql +++ b/scripts/mysql/my_data.sql @@ -87,6 +87,8 @@ DELETE FROM global_attrs WHERE name='sw_uname_assign_mode'; INSERT IGNORE INTO global_attrs (name, type, value, flags) VALUES ('sw_uname_assign_mode', '2', 'fcfs', '32'); DELETE FROM global_attrs WHERE name='domain_data_version'; INSERT IGNORE INTO global_attrs (name, type, value, flags) VALUES ('domain_data_version', '0', '0', '33'); +DELETE FROM global_attrs WHERE name='gattr_timestamp'; +INSERT IGNORE INTO global_attrs (name, type, value, flags) VALUES ('gattr_timestamp', '0', '0', '33'); INSERT IGNORE INTO global_attrs (name, type, value, flags) VALUES ('sw_show_status', '0', '1', '32'); INSERT IGNORE INTO global_attrs (name, type, value, flags) VALUES ('sw_require_conf', '0', '1', '32'); INSERT IGNORE INTO global_attrs (name, type, value, flags) VALUES ('lang', '2', 'en', '33'); diff --git a/scripts/oracle/or_data.sql b/scripts/oracle/or_data.sql index 6085ea4..83f3dff 100644 --- a/scripts/oracle/or_data.sql +++ b/scripts/oracle/or_data.sql @@ -87,6 +87,8 @@ DELETE FROM global_attrs WHERE name='sw_uname_assign_mode'; INSERT IGNORE INTO global_attrs (name, type, value, flags) VALUES ('sw_uname_assign_mode', '2', 'fcfs', '32'); DELETE FROM global_attrs WHERE name='domain_data_version'; INSERT IGNORE INTO global_attrs (name, type, value, flags) VALUES ('domain_data_version', '0', '0', '33'); +DELETE FROM global_attrs WHERE name='gattr_timestamp'; +INSERT IGNORE INTO global_attrs (name, type, value, flags) VALUES ('gattr_timestamp', '0', '0', '33'); INSERT IGNORE INTO global_attrs (name, type, value, flags) VALUES ('sw_show_status', '0', '1', '32'); INSERT IGNORE INTO global_attrs (name, type, value, flags) VALUES ('sw_require_conf', '0', '1', '32'); INSERT IGNORE INTO global_attrs (name, type, value, flags) VALUES ('lang', '2', 'en', '33'); diff --git a/scripts/postgres/pg_data.sql b/scripts/postgres/pg_data.sql index 2c3d8cd..fc1585d 100644 --- a/scripts/postgres/pg_data.sql +++ b/scripts/postgres/pg_data.sql @@ -87,6 +87,8 @@ DELETE FROM global_attrs WHERE name='sw_uname_assign_mode'; INSERT INTO global_attrs (name, type, value, flags) VALUES ('sw_uname_assign_mode', '2', 'fcfs', '32'); DELETE FROM global_attrs WHERE name='domain_data_version'; INSERT INTO global_attrs (name, type, value, flags) VALUES ('domain_data_version', '0', '0', '33'); +DELETE FROM global_attrs WHERE name='gattr_timestamp'; +INSERT INTO global_attrs (name, type, value, flags) VALUES ('gattr_timestamp', '0', '0', '33'); INSERT INTO global_attrs (name, type, value, flags) VALUES ('sw_show_status', '0', '1', '32'); INSERT INTO global_attrs (name, type, value, flags) VALUES ('sw_require_conf', '0', '1', '32'); INSERT INTO global_attrs (name, type, value, flags) VALUES ('lang', '2', 'en', '33');

1 0

git:master: Merge branch 'master' of ssh://oej@git.sip-router.org/ sip-router
by Olle E. Johansson 20 Oct '09

20 Oct '09

Module: sip-router Branch: master Commit: 45d180e6d773838958682eb72bace572dcb43b82 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=45d180e… Author: oej <oej(a)edvina.net> Committer: oej <oej(a)edvina.net> Date: Tue Oct 20 21:00:03 2009 +0200 Merge branch 'master' of ssh://oej@git.sip-router.org/sip-router * 'master' of ssh://oej@git.sip-router.org/sip-router: avp_db: Removes a spurious error message. ---

1 0

git:master: - Adding another example for db URLs
by Olle E. Johansson 20 Oct '09

20 Oct '09

Module: sip-router Branch: master Commit: 73cc86aba0c4c9d60ca000294d29fc768ff97765 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=73cc86a… Author: oej <oej(a)edvina.net> Committer: oej <oej(a)edvina.net> Date: Tue Oct 20 20:58:50 2009 +0200 - Adding another example for db URLs - README doc updates, spelling errors - Changing serctl fifo command to sercmd rpc command in db_flatstore docs - doxygen updates --- docbook/entities.xml | 1 + modules/db_flatstore/doc/flatstore.xml | 60 ++-- modules/misc_radius/README | 304 +++++++------ modules/misc_radius/doc/misc_radius_admin.xml | 9 +- modules_k/domainpolicy/README | 505 +++++++++++---------- modules_k/domainpolicy/doc/domainpolicy_admin.xml | 16 +- modules_k/xlog/README | 2 +- modules_k/xlog/doc/xlog_admin.xml | 2 +- 8 files changed, 479 insertions(+), 420 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=73c…

1 0

git:master: Explaining why we have two modules with the same name. Please review.
by Olle E. Johansson 20 Oct '09

20 Oct '09

Module: sip-router Branch: master Commit: 2e75d8245bf639bfb405418ec2b99c424186d220 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2e75d82… Author: oej <oej(a)edvina.net> Committer: oej <oej(a)edvina.net> Date: Tue Oct 20 21:04:34 2009 +0200 Explaining why we have two modules with the same name. Please review. --- README-MODULES | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/README-MODULES b/README-MODULES index 5bcc9ee..7498850 100644 --- a/README-MODULES +++ b/README-MODULES @@ -35,6 +35,14 @@ A module providers up to three different APIs: A single module may provide a selection of this, maybe only one of them. +Why do we have two modules with the same name? +============================================== +Some modules exists both in modules_k and modules_s - like xlog. If you are +upgrading from Kamailio, we recommend using the one in modules_k for backwards +compatibility, if you are using SER then select the one in modules_s. +In the future the development team will try to integrate modules that are +split like this into one integrated module. + Core modules ------------ auth_identity

2 1

xlog (modules_k)
by Olle E. Johansson 20 Oct '09

20 Oct '09

Couple of questions: 1) Why is this useful module still hidden in modules_k? 2) The docs mentions changes compared with "previous versions of Kamailio" which feels kind of outdated. Can we remove that part now? I know I'm asking a lot of naive and propably stupid questions, but I'm trying to look at this as ONE product and a product that we're going to release soon to people who hasn't been involved in the process and maybe not even used either SER or Kamailio.. Have patience and please help me :-) /O

3 5

git:master: - Doxygen updates on core files
by Olle E. Johansson 20 Oct '09

20 Oct '09

Module: sip-router Branch: master Commit: 5a03489e539be9a42994533e55026cc7710d131c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5a03489… Author: oej <oej(a)edvina.net> Committer: oej <oej(a)edvina.net> Date: Mon Oct 19 22:35:43 2009 +0200 - Doxygen updates on core files - Add project name to doxygen in Makefile --- Makefile.rules | 1 + action.c | 1 + action.h | 7 ++ atomic_ops.h | 12 +++- atomic_ops_init.h | 17 +++-- basex.c | 2 +- basex.h | 158 +++++++++++++++++++++++------------------------ bit_scan.h | 32 ++++++---- cfg_core.c | 81 +++++++++++------------- cfg_core.h | 27 +++++--- cfg_parser.c | 102 +++++++++++++++++++------------ cfg_parser.h | 79 +++++++++++++---------- clist.h | 28 ++++++--- compiler_opt.h | 25 +++++--- config.h | 121 ++++++++++++++++-------------------- core_cmd.c | 12 +--- core_cmd.h | 7 ++ crc.c | 14 ++--- daemonize.c | 29 ++++----- daemonize.h | 11 +--- data_lump.c | 11 +--- doc/doxygen/ser.doxygen | 4 +- 22 files changed, 419 insertions(+), 362 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=5a0…

4 9

setting $du in branch route has no effect
by Juha Heinanen 20 Oct '09

20 Oct '09

my testing on sr is currently in full stop due to the problem that i mentioned two days ago, i.e., setting of $du in branch route has no effect. i didn't get any comments on this on the mailing list. am i the only one who is experiencing this? -- juha

3 2

← Newer
1
...
15
16
17
18
19
20
21
...
47
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 2009