sr-dev

sr-dev@lists.kamailio.org

15 participants
44229 discussions

Permissions module + database crash bug?

by Alex Balashov

Greetings, I've run into a bug in Kamailio 1.4.4 where, if using the permissions module with db_mysql the database becomes unavailable, Kamailio will crash (SIGSEGV) somewhat arbitrarily after about 30-45 seconds. The process is a little random; sometimes it can take longer. At first, I suspected the problem may be with 1.4.x, but got the exact same effect when trying 1.5.2. I also assumed the problem may be with db_mysql or even libmysqlclient, but when I remove the permissions functionality from the configuration the process does not crash. This is a configuration from the 1.4.x era with a lot of custom DB queries via avp_db_query() (pre-sqlops); when the database disappears, Kamailio will complain loudly in the logs, of course, but it will not crash unless I am calling allow_trusted() as part of the configuration and am using the permissions module with database backing. The test system is CentOS 4.7 64-bit, but I've reproduced the problem on Debian lenny and unstable just as easily with libmysqlclient15. Here are my steps for producing the bug: 1) Initialise Kamailio (the only modules that use database are permissions and avpops); 2) Firewall MySQL database off or shut it down; 3) Place a call - even one will do; 4) Kamailio will not crash immediately; it usually takes several request retransmissions or successive attempts to contact the database for this to happen, and it can take close to a minute. Eventually, though, there is a segfault that appears to be bubbling up from allow_trusted() in the call stack. Here is the backtrace. IP addresses and phone numbers are sanitised to protect confidentiality, but have been substituted consistently: (gdb) where 0 0x00000030eba21b70 in mysql_real_escape_string () from /usr/lib64/mysql/libmysqlclient.so.15 1 0x0000002a95be64c1 in db_mysql_val2str (_c=0x686e60, _v=0x7fbfffd900, _s=0x6331a7 "222.22.222.22'", _len=0x7fbfffd2cc) at val.c:233 0000002 0x00000000004b2f14 in db_print_where (_c=0x686e60, _b=0x63319f "src_ip='222.22.222.22'", _l=65473, _k=0x7fbfffd440, _o=0x0, _v=0x7fbfffd900, _n=1, val2str=0x2a95be62ca <db_mysql_val2str>) at db/db_ut.c:275 0000003 0x00000000004affb8 in db_do_query (_h=0x686e60, _k=0x7fbfffd440, _op=0x0, _v=0x7fbfffd900, _c=Variable "_c" is not available. ) at db/db_query.c:78 0000004 0x0000002a95be2dbf in db_mysql_query (_h=0x0, _k=0x6331a7, _op=0x2a962492a0, _v=0xe, _c=0x7fbfffd900, _n=6844000, _nc=0, _o=0x0, _r=0x0) at dbase.c:249 0000005 0x0000002a961428c0 in allow_trusted (msg=0x687038, src_ip=0x2a962492a0 "222.22.223.23", proto=1) at trusted.c:422 0000006 0x0000002a96143356 in allow_trusted_0 (_msg=0x687038, str1=Variable "str1" is not available. ) at ../../parser/../ip_addr.h:398 0000007 0x000000000040d4df in do_action (a=0x6566f8, msg=0x687038) at action.c:850 0000008 0x000000000040ec2b in run_action_list (a=Variable "a" is not available. ) at action.c:138 0000009 0x00000000004523dc in eval_expr (e=0x6567c8, msg=0x687038, val=0x0) at route.c:1116 0000010 0x00000000004527c2 in eval_expr (e=0x656810, msg=0x687038, val=0x0) at route.c:1429 11 0x0000000000452159 in eval_expr (e=0x656858, msg=0x687038, val=0x0) at route.c:1434 12 0x000000000040c933 in do_action (a=0x656e70, msg=0x687038) at action.c:705 13 0x000000000040ec2b in run_action_list (a=Variable "a" is not available. ) at action.c:138 14 0x000000000040e95f in do_action (a=0x657f00, msg=0x687038) at action.c:728 15 0x000000000040ec2b in run_action_list (a=Variable "a" is not available. ) at action.c:138 16 0x000000000040e95f in do_action (a=0x657fd0, msg=0x687038) at action.c:728 17 0x000000000040ec2b in run_action_list (a=Variable "a" is not available. ) at action.c:138 18 0x000000000040ef30 in run_top_route (a=0x651008, msg=0x687038) at action.c:118 ---Type <return> to continue, or q <return> to quit--- 19 0x00000000004467ef in receive_msg ( buf=0x622ac0 "INVITE sip:8005551212@123.132.132.7:5060;transport=udp SIP/2.0\r\nRecord-Route: <sip:222.22.223.23;lr;rpdicor=VPSF506071629460;vsf=AAAAAB0GDgULBQIABgJ3AW4CFhgKGwIbARoJNDg->\r\nRecord-Route: <sip:90.148.216.254"..., len=922, rcv_info=0x7fbffff700) at receive.c:165 0000020 0x0000000000480c44 in udp_rcv_loop () at udp_server.c:449 21 0x0000000000422b4f in main (argc=Variable "argc" is not available. ) at main.c:692 -- Alex Balashov - Principal Evariste Systems Web : http://www.evaristesys.com/ Tel : (+1) (678) 954-0670 Direct : (+1) (678) 954-0671

15 years, 3 months

SF.net SVN: openser:[5927] branches/1.5/modules/dialog/dlg_handlers.c

by Daniel-Constantin Mierla

Revision: 5927 http://openser.svn.sourceforge.net/openser/?rev=5927&view=rev Author: miconda Date: 2009-10-01 19:03:04 +0000 (Thu, 01 Oct 2009) Log Message: ----------- - set dlg context after pre script callbacks of timeout route, where is reset - reported by Nathan Angelacos Modified Paths: -------------- branches/1.5/modules/dialog/dlg_handlers.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 3 months

how do i re-generate tools/kamctl/mysql files?

by jh＠tutpro.com

i made some fixes to lib/srdb1/gw.xml file. how do i regenerate corresponding tools/kamctl/mysql (and other db) files? earlier 'make dbschema' did it, but doesn't exit anymore. -- juha

15 years, 3 months

make dbschema for kamailio modules

by Henning Westerholt

Hi, its now possible to use "make dbschema" in the top level directory to re- generate the database scheme files for the modules that originates from kamailio. This command also already generates the "tables.sgml" file in doc/databases/kamailio. One piece that is still missing from the kamailio state is the support to actually generate the different documentation (html, pdf, txt) from the source file, i'll hope to finish this next week. Henning

15 years, 3 months

git:master: db schema(k): add XSL files, as the ones from sr not work for us (extensions etc..)

by Henning Westerholt

Module: sip-router Branch: master Commit: 9113fae618d347a8b1689e14dd94a1e7d314d85a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9113fae… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Oct 1 18:33:20 2009 +0200 db schema(k): add XSL files, as the ones from sr not work for us (extensions etc..) --- doc/stylesheets/dbschema_k/bookinfo.xml | 35 +++ doc/stylesheets/dbschema_k/dtd/dbschema.dtd | 72 +++++ doc/stylesheets/dbschema_k/xsl/common.xsl | 227 +++++++++++++++ doc/stylesheets/dbschema_k/xsl/db_berkeley.xsl | 233 +++++++++++++++ doc/stylesheets/dbschema_k/xsl/dbdoc.xsl | 116 ++++++++ .../dbschema_k/xsl/dbschema2docbook.xsl | 302 ++++++++++++++++++++ doc/stylesheets/dbschema_k/xsl/dbtext.xsl | 126 ++++++++ doc/stylesheets/dbschema_k/xsl/docbook.xsl | 54 ++++ doc/stylesheets/dbschema_k/xsl/modules_c.xsl | 240 ++++++++++++++++ doc/stylesheets/dbschema_k/xsl/modules_h.xsl | 187 ++++++++++++ doc/stylesheets/dbschema_k/xsl/mysql.xsl | 140 +++++++++ doc/stylesheets/dbschema_k/xsl/oracle.xsl | 221 ++++++++++++++ doc/stylesheets/dbschema_k/xsl/postgres.xsl | 135 +++++++++ doc/stylesheets/dbschema_k/xsl/sql.xsl | 258 +++++++++++++++++ 14 files changed, 2346 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=911…

15 years, 3 months

git:master: dialog(k): use the version from (old) trunk, the ones from 1. 5 is also old

by Henning Westerholt

Module: sip-router Branch: master Commit: 72f1a207344cd5fab981086a2c7bb0aef6883304 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=72f1a20… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Oct 1 18:41:57 2009 +0200 dialog(k): use the version from (old) trunk, the ones from 1.5 is also old --- lib/srdb1/schema/dialog.xml | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/lib/srdb1/schema/dialog.xml b/lib/srdb1/schema/dialog.xml index 3eaf631..cb0f931 100644 --- a/lib/srdb1/schema/dialog.xml +++ b/lib/srdb1/schema/dialog.xml @@ -162,6 +162,7 @@ <name>timeout</name> <type>unsigned int</type> <size>10</size> + <default>0</default> <description>The timestamp (unix time) when the dialog will expire. </description> </column> @@ -170,6 +171,7 @@ <name>sflags</name> <type>unsigned int</type> <size>10</size> + <default>0</default> <description>The flags to set for dialog and usable from config file. </description> </column> @@ -178,6 +180,7 @@ <name>toroute</name> <type>unsigned int</type> <size>10</size> + <default>0</default> <description>The route to be executed at dialog timeout. </description> </column>

15 years, 3 months

git:master: lcr: regenerate database tables

by Henning Westerholt

Module: sip-router Branch: master Commit: e09ace60ef5b9db270e25e6b27d27e894a71d338 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e09ace6… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Oct 1 18:42:54 2009 +0200 lcr: regenerate database tables --- tools/kamctl/db_berkeley/kamailio/gw | 6 +++--- tools/kamctl/db_berkeley/kamailio/lcr | 6 +++--- tools/kamctl/db_berkeley/kamailio/version | 4 ++-- tools/kamctl/dbtext/kamailio/gw | 2 +- tools/kamctl/dbtext/kamailio/lcr | 2 +- tools/kamctl/dbtext/kamailio/version | 4 ++-- tools/kamctl/mysql/lcr-create.sql | 16 +++++++--------- tools/kamctl/oracle/lcr-create.sql | 16 +++++++--------- tools/kamctl/postgres/lcr-create.sql | 16 +++++++--------- 9 files changed, 33 insertions(+), 39 deletions(-) diff --git a/tools/kamctl/db_berkeley/kamailio/gw b/tools/kamctl/db_berkeley/kamailio/gw index b4383ed..d847ca8 100644 --- a/tools/kamctl/db_berkeley/kamailio/gw +++ b/tools/kamctl/db_berkeley/kamailio/gw @@ -1,10 +1,10 @@ METADATA_COLUMNS -id(int) gw_name(str) grp_id(int) ip_addr(str) hostname(str) port(int) uri_scheme(int) transport(int) strip(int) tag(str) weight(int) ping(int) flags(int) +id(int) lcr_id(int) gw_name(str) grp_id(int) ip_addr(str) hostname(str) port(int) uri_scheme(int) transport(int) strip(int) tag(str) weight(int) flags(int) defunct(int) METADATA_KEY -1 +2 METADATA_READONLY 0 METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NULL|NIL|0|0 +NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NULL|NIL|0|NULL diff --git a/tools/kamctl/db_berkeley/kamailio/lcr b/tools/kamctl/db_berkeley/kamailio/lcr index b096dd0..6741a3a 100644 --- a/tools/kamctl/db_berkeley/kamailio/lcr +++ b/tools/kamctl/db_berkeley/kamailio/lcr @@ -1,10 +1,10 @@ METADATA_COLUMNS -id(int) prefix(str) from_uri(str) grp_id(int) priority(int) +id(int) lcr_id(int) prefix(str) from_uri(str) grp_id(int) priority(int) METADATA_KEY -1 +2 METADATA_READONLY 0 METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|NULL|NULL|NIL|NIL +NIL|NIL|NULL|NULL|NIL|NIL diff --git a/tools/kamctl/db_berkeley/kamailio/version b/tools/kamctl/db_berkeley/kamailio/version index 71c794a..d977706 100644 --- a/tools/kamctl/db_berkeley/kamailio/version +++ b/tools/kamctl/db_berkeley/kamailio/version @@ -43,7 +43,7 @@ globalblacklist|1 grp| grp|2 gw| -gw|9 +gw|10 htable| htable|1 imc_members| @@ -51,7 +51,7 @@ imc_members|1 imc_rooms| imc_rooms|1 lcr| -lcr|2 +lcr|3 location| location|1004 missed_calls| diff --git a/tools/kamctl/dbtext/kamailio/gw b/tools/kamctl/dbtext/kamailio/gw index dbfec36..9ec1033 100644 --- a/tools/kamctl/dbtext/kamailio/gw +++ b/tools/kamctl/dbtext/kamailio/gw @@ -1 +1 @@ -id(int,auto) gw_name(string) grp_id(int) ip_addr(string) hostname(string,null) port(int,null) uri_scheme(int,null) transport(int,null) strip(int,null) tag(string,null) weight(int,null) ping(int) flags(int) +id(int,auto) lcr_id(int) gw_name(string) grp_id(int) ip_addr(string) hostname(string,null) port(int,null) uri_scheme(int,null) transport(int,null) strip(int,null) tag(string,null) weight(int,null) flags(int) defunct(int,null) diff --git a/tools/kamctl/dbtext/kamailio/lcr b/tools/kamctl/dbtext/kamailio/lcr index 559eb0b..60d2d39 100644 --- a/tools/kamctl/dbtext/kamailio/lcr +++ b/tools/kamctl/dbtext/kamailio/lcr @@ -1 +1 @@ -id(int,auto) prefix(string,null) from_uri(string,null) grp_id(int) priority(int) +id(int,auto) lcr_id(int) prefix(string,null) from_uri(string,null) grp_id(int) priority(int) diff --git a/tools/kamctl/dbtext/kamailio/version b/tools/kamctl/dbtext/kamailio/version index 56bcea1..2822a7a 100644 --- a/tools/kamctl/dbtext/kamailio/version +++ b/tools/kamctl/dbtext/kamailio/version @@ -16,11 +16,11 @@ domain_name:1 domainpolicy:2 globalblacklist:1 grp:2 -gw:9 +gw:10 htable:1 imc_members:1 imc_rooms:1 -lcr:2 +lcr:3 location:1004 missed_calls:3 pdt:1 diff --git a/tools/kamctl/mysql/lcr-create.sql b/tools/kamctl/mysql/lcr-create.sql index e9ef511..1c6db01 100644 --- a/tools/kamctl/mysql/lcr-create.sql +++ b/tools/kamctl/mysql/lcr-create.sql @@ -1,6 +1,7 @@ -INSERT INTO version (table_name, table_version) values ('gw','9'); +INSERT INTO version (table_name, table_version) values ('gw','10'); CREATE TABLE gw ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, + lcr_id SMALLINT UNSIGNED NOT NULL, gw_name VARCHAR(128) NOT NULL, grp_id INT UNSIGNED NOT NULL, ip_addr VARCHAR(15) NOT NULL, @@ -11,23 +12,20 @@ CREATE TABLE gw ( strip TINYINT UNSIGNED, tag VARCHAR(16) DEFAULT NULL, weight INT UNSIGNED, - ping TINYINT UNSIGNED DEFAULT 0 NOT NULL, flags INT UNSIGNED DEFAULT 0 NOT NULL, - CONSTRAINT gw_name_idx UNIQUE (gw_name) + defunct INT UNSIGNED DEFAULT NULL, + CONSTRAINT lcr_id_gw_name_idx UNIQUE (lcr_id, gw_name) ) ENGINE=MyISAM; -CREATE INDEX grp_id_idx ON gw (grp_id); - -INSERT INTO version (table_name, table_version) values ('lcr','2'); +INSERT INTO version (table_name, table_version) values ('lcr','3'); CREATE TABLE lcr ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, + lcr_id SMALLINT UNSIGNED NOT NULL, prefix VARCHAR(16) DEFAULT NULL, from_uri VARCHAR(64) DEFAULT NULL, grp_id INT UNSIGNED NOT NULL, priority TINYINT UNSIGNED NOT NULL ) ENGINE=MyISAM; -CREATE INDEX prefix_idx ON lcr (prefix); -CREATE INDEX from_uri_idx ON lcr (from_uri); -CREATE INDEX grp_id_idx ON lcr (grp_id); +CREATE INDEX lcr_id_idx ON lcr (lcr_id); diff --git a/tools/kamctl/oracle/lcr-create.sql b/tools/kamctl/oracle/lcr-create.sql index 0b2915e..1dc954a 100644 --- a/tools/kamctl/oracle/lcr-create.sql +++ b/tools/kamctl/oracle/lcr-create.sql @@ -1,6 +1,7 @@ -INSERT INTO version (table_name, table_version) values ('gw','9'); +INSERT INTO version (table_name, table_version) values ('gw','10'); CREATE TABLE gw ( id NUMBER(10) PRIMARY KEY, + lcr_id NUMBER(5), gw_name VARCHAR2(128), grp_id NUMBER(10), ip_addr VARCHAR2(15), @@ -11,9 +12,9 @@ CREATE TABLE gw ( strip NUMBER(5), tag VARCHAR2(16) DEFAULT NULL, weight NUMBER(10), - ping NUMBER(5) DEFAULT 0 NOT NULL, flags NUMBER(10) DEFAULT 0 NOT NULL, - CONSTRAINT gw_gw_name_idx UNIQUE (gw_name) + defunct NUMBER(10) DEFAULT NULL, + CONSTRAINT gw_lcr_id_gw_name_idx UNIQUE (lcr_id, gw_name) ); CREATE OR REPLACE TRIGGER gw_tr @@ -24,11 +25,10 @@ END gw_tr; / BEGIN map2users('gw'); END; / -CREATE INDEX gw_grp_id_idx ON gw (grp_id); - -INSERT INTO version (table_name, table_version) values ('lcr','2'); +INSERT INTO version (table_name, table_version) values ('lcr','3'); CREATE TABLE lcr ( id NUMBER(10) PRIMARY KEY, + lcr_id NUMBER(5), prefix VARCHAR2(16) DEFAULT NULL, from_uri VARCHAR2(64) DEFAULT NULL, grp_id NUMBER(10), @@ -43,7 +43,5 @@ END lcr_tr; / BEGIN map2users('lcr'); END; / -CREATE INDEX lcr_prefix_idx ON lcr (prefix); -CREATE INDEX lcr_from_uri_idx ON lcr (from_uri); -CREATE INDEX lcr_grp_id_idx ON lcr (grp_id); +CREATE INDEX lcr_lcr_id_idx ON lcr (lcr_id); diff --git a/tools/kamctl/postgres/lcr-create.sql b/tools/kamctl/postgres/lcr-create.sql index 4ee6971..834ea08 100644 --- a/tools/kamctl/postgres/lcr-create.sql +++ b/tools/kamctl/postgres/lcr-create.sql @@ -1,6 +1,7 @@ -INSERT INTO version (table_name, table_version) values ('gw','9'); +INSERT INTO version (table_name, table_version) values ('gw','10'); CREATE TABLE gw ( id SERIAL PRIMARY KEY NOT NULL, + lcr_id SMALLINT NOT NULL, gw_name VARCHAR(128) NOT NULL, grp_id INTEGER NOT NULL, ip_addr VARCHAR(15) NOT NULL, @@ -11,23 +12,20 @@ CREATE TABLE gw ( strip SMALLINT, tag VARCHAR(16) DEFAULT NULL, weight INTEGER, - ping SMALLINT DEFAULT 0 NOT NULL, flags INTEGER DEFAULT 0 NOT NULL, - CONSTRAINT gw_gw_name_idx UNIQUE (gw_name) + defunct INTEGER DEFAULT NULL, + CONSTRAINT gw_lcr_id_gw_name_idx UNIQUE (lcr_id, gw_name) ); -CREATE INDEX gw_grp_id_idx ON gw (grp_id); - -INSERT INTO version (table_name, table_version) values ('lcr','2'); +INSERT INTO version (table_name, table_version) values ('lcr','3'); CREATE TABLE lcr ( id SERIAL PRIMARY KEY NOT NULL, + lcr_id SMALLINT NOT NULL, prefix VARCHAR(16) DEFAULT NULL, from_uri VARCHAR(64) DEFAULT NULL, grp_id INTEGER NOT NULL, priority SMALLINT NOT NULL ); -CREATE INDEX lcr_prefix_idx ON lcr (prefix); -CREATE INDEX lcr_from_uri_idx ON lcr (from_uri); -CREATE INDEX lcr_grp_id_idx ON lcr (grp_id); +CREATE INDEX lcr_lcr_id_idx ON lcr (lcr_id);

15 years, 3 months

git:master: sr: add 'make dbschema' target, compatibility to kamailio

by Henning Westerholt

Module: sip-router Branch: master Commit: 1f36a7beaaac6eacdc5bebd76e0830aba9af7f55 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1f36a7b… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Oct 1 18:32:34 2009 +0200 sr: add 'make dbschema' target, compatibility to kamailio --- Makefile | 6 +++++ lib/srdb1/schema/Makefile | 47 +++++++++++++++++++++++---------------------- 2 files changed, 30 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index dfe5ea3..3a399a6 100644 --- a/Makefile +++ b/Makefile @@ -949,3 +949,9 @@ clean_cfg clean-cfg: .PHONY: clean_modules_cfg clean-modules-cfg clean_modules_cfg clean-modules-cfg: rm -f modules.lst + +.PHONY: dbschema +dbschema: + -@echo "Build database schemas" + $(MAKE) -C lib/srdb1/schema + -@echo "Done" diff --git a/lib/srdb1/schema/Makefile b/lib/srdb1/schema/Makefile index 05cbae1..354bb4e 100644 --- a/lib/srdb1/schema/Makefile +++ b/lib/srdb1/schema/Makefile @@ -5,8 +5,9 @@ # Kamailio database descriptions for modules TABLES := $(patsubst kamailio-%.xml,%,$(wildcard kamailio-*.xml)) -ROOT=../.. -STYLESHEETS=$(ROOT)/doc/dbschema/xsl +ROOT=../../../ +STYLESHEETS=$(ROOT)/doc/stylesheets/dbschema_k/xsl +SCHEME=$(ROOT)/tools/kamctl/ # Stylesheet used to generate MySQL database schema MYSQL_XSL = $(STYLESHEETS)/mysql.xsl @@ -42,7 +43,7 @@ VALIDATE = 0 VERBOSE = 0 # XML Catalog used to resolve entities -CATALOG = $(ROOT)/doc/dbschema/catalog.xml +CATALOG = $(ROOT)/docbook/catalog.xml XSLTPROC = /usr/bin/xsltproc XSLTPROC_FLAGS = --xinclude @@ -61,56 +62,56 @@ all: mysql postgres dbtext db_berkeley docbook oracle #modules dbdoc mysql: for FILE in $(TABLES); do \ XML_CATALOG_FILES=$(CATALOG) $(XSLTPROC) $(XSLTPROC_FLAGS) \ - --stringparam dir "$(ROOT)/scripts/mysql" \ + --stringparam dir "$(SCHEME)/mysql" \ --stringparam prefix "$$FILE-" \ --stringparam db "mysql" \ $(MYSQL_XSL) kamailio-"$$FILE".xml ; \ done mysql_clean: - -@rm -f $(ROOT)/scripts/mysql/* + -@rm -f $(SCHEME)/mysql/* .PHONY: postgres postgres_clean postgres: for FILE in $(TABLES); do \ XML_CATALOG_FILES=$(CATALOG) $(XSLTPROC) $(XSLTPROC_FLAGS) \ - --stringparam dir "$(ROOT)/scripts/postgres" \ + --stringparam dir "$(SCHEME)/postgres" \ --stringparam prefix "$$FILE-" \ --stringparam db "postgres" \ $(POSTGRES_XSL) kamailio-"$$FILE".xml ; \ done postgres_clean: - -@rm -f $(ROOT)/scripts/postgres/* + -@rm -f $(SCHEME)/postgres/* .PHONY: oracle oracle_clean oracle: for FILE in $(TABLES); do \ XML_CATALOG_FILES=$(CATALOG) $(XSLTPROC) $(XSLTPROC_FLAGS) \ - --stringparam dir "$(ROOT)/scripts/oracle" \ + --stringparam dir "$(SCHEME)/oracle" \ --stringparam prefix "$$FILE-" \ --stringparam db "oracle" \ $(ORACLE_XSL) kamailio-"$$FILE".xml ; \ done oracle_clean: - -@rm -f $(ROOT)/scripts/oracle/*.sql + -@rm -f $(SCHEME)/oracle/*.sql .PHONY: dbtext dbtext_clean dbtext: for FILE in $(TABLES); do \ XML_CATALOG_FILES=$(CATALOG) $(XSLTPROC) $(XSLTPROC_FLAGS) \ - --stringparam dir "$(ROOT)/scripts/dbtext/kamailio" \ + --stringparam dir "$(SCHEME)/dbtext/kamailio" \ --stringparam prefix "" \ --stringparam db "dbtext" \ $(DBTEXT_XSL) kamailio-"$$FILE".xml ; \ done TMPFILE=`mktemp -t kamailio-test.XXXXXXXXXX` # small hack to create the version table entries, this is here easier as with XSL - for FILE in $(wildcard $(ROOT)/scripts/dbtext/kamailio/*) ; do \ + for FILE in $(wildcard $(SCHEME)/dbtext/kamailio/*) ; do \ if [ -f "$$FILE" ]; then \ - if [ "$$FILE" != "$(ROOT)/scripts/dbtext/kamailio/version" ]; then \ - tail -n 1 "$$FILE" >> "$(ROOT)/scripts/dbtext/kamailio/version" ; \ + if [ "$$FILE" != "$(SCHEME)/dbtext/kamailio/version" ]; then \ + tail -n 1 "$$FILE" >> "$(SCHEME)/dbtext/kamailio/version" ; \ head -n 1 "$$FILE" > $TMPFILE ; \ cp $TMPFILE "$$FILE" ; \ fi ; \ @@ -119,23 +120,23 @@ dbtext: rm -f $TMPFILE dbtext_clean: - -@rm -f $(ROOT)/scripts/dbtext/kamailio/* + -@rm -f $(SCHEME)/dbtext/kamailio/* .PHONY: db_berkeley db_berkeley_clean db_berkeley: for FILE in $(TABLES); do \ XML_CATALOG_FILES=$(CATALOG) $(XSLTPROC) $(XSLTPROC_FLAGS) \ - --stringparam dir "$(ROOT)/scripts/db_berkeley/kamailio" \ + --stringparam dir "$(SCHEME)/db_berkeley/kamailio" \ --stringparam prefix "" \ --stringparam db "db_berkeley" \ $(DB_BERKELEY_XSL) kamailio-"$$FILE".xml ; \ done TMPFILE=`mktemp -t kamailio-test.XXXXXXXXXX` # small hack to create the version table entries, this is here easier as with XSL - for FILE in $(wildcard $(ROOT)/scripts/db_berkeley/kamailio/*) ; do \ + for FILE in $(wildcard $(SCHEME)/db_berkeley/kamailio/*) ; do \ if [ -f "$$FILE" ]; then \ - if [ "$$FILE" != "$(ROOT)/scripts/db_berkeley/kamailio/version" ]; then \ - tail -n 2 "$$FILE" >> "$(ROOT)/scripts/db_berkeley/kamailio/version" ; \ + if [ "$$FILE" != "$(SCHEME)/db_berkeley/kamailio/version" ]; then \ + tail -n 2 "$$FILE" >> "$(SCHEME)/db_berkeley/kamailio/version" ; \ head -n 10 "$$FILE" > $TMPFILE ; \ cp $TMPFILE "$$FILE" ; \ fi ; \ @@ -144,7 +145,7 @@ db_berkeley: rm -f $TMPFILE db_berkeley_clean: - -@rm -f $(ROOT)/scripts/db_berkeley/kamailio/* + -@rm -f $(SCHEME)/db_berkeley/kamailio/* .PHONY: docbook docbook_clean @@ -168,7 +169,7 @@ docbook: echo " <!ENTITY % docentities SYSTEM \"../entities.xml\"> %docentities;" >> "$(ROOT)/doc/database/tables.sgml" ; \ echo "]>" >> "$(ROOT)/doc/database/tables.sgml" # add bookinfo - cat "$(ROOT)/doc/dbschema/bookinfo.xml" >> "$(ROOT)/doc/database/tables.sgml" + cat "$(ROOT)/doc/stylesheets/dbschema_k/bookinfo.xml" >> "$(ROOT)/doc/database/tables.sgml" # actually include the entities for FILE in $(wildcard $(ROOT)/doc/database/*.xml); do \ echo " &`basename "$$FILE" | sed -e 's#_#-#g'`" >> "$(ROOT)/doc/database/tables.sgml" ; \ @@ -183,7 +184,7 @@ docbook_clean: modules: for FILE in $(TABLES); do \ XML_CATALOG_FILES=$(CATALOG) $(XSLTPROC) $(XSLTPROC_FLAGS) \ - --stringparam dir "$(ROOT)/modules/$$FILE/" \ + --stringparam dir "$(ROOT)/modules_k/$$FILE/" \ --stringparam prefix "$$FILE" \ --stringparam db "modules" \ $(MODULES_H_XSL) kamailio-"$$FILE".xml ; \ @@ -191,7 +192,7 @@ modules: for FILE in $(TABLES); do \ XML_CATALOG_FILES=$(CATALOG) $(XSLTPROC) $(XSLTPROC_FLAGS) \ - --stringparam dir "$(ROOT)/modules/$$FILE/" \ + --stringparam dir "$(ROOT)/modules_k/$$FILE/" \ --stringparam prefix "$$FILE" \ --stringparam db "modules" \ $(MODULES_C_XSL) kamailio-"$$FILE".xml ; \ @@ -206,7 +207,7 @@ modules_clean: dbdoc: for FILE in $(TABLES); do \ XML_CATALOG_FILES=$(CATALOG) $(XSLTPROC) $(XSLTPROC_FLAGS) \ - --stringparam dir "$(ROOT)/modules/$$FILE/doc/" \ + --stringparam dir "$(ROOT)/modules_k/$$FILE/doc/" \ --stringparam prefix "$$FILE" \ --stringparam db "modules" \ $(DBDOC_XSL) kamailio-"$$FILE".xml ; \

15 years, 3 months

git:master: db docs(k): better to place this in the existing dir 'databases '

by Henning Westerholt

Module: sip-router Branch: master Commit: 677f0b3e53cc5fa26d332144b87098fc3c1da215 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=677f0b3… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Oct 1 18:40:07 2009 +0200 db docs(k): better to place this in the existing dir 'databases' --- lib/srdb1/schema/Makefile | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/srdb1/schema/Makefile b/lib/srdb1/schema/Makefile index 354bb4e..d5a5af1 100644 --- a/lib/srdb1/schema/Makefile +++ b/lib/srdb1/schema/Makefile @@ -152,33 +152,33 @@ db_berkeley_clean: docbook: for FILE in $(TABLES); do \ XML_CATALOG_FILES=$(CATALOG) $(XSLTPROC) $(XSLTPROC_FLAGS) \ - --stringparam dir "$(ROOT)/doc/database" \ + --stringparam dir "$(ROOT)/doc/databases/kamailio" \ --stringparam prefix "$$FILE-" \ $(DOCBOOK_XSL) kamailio-"$$FILE".xml ; \ done ; \ # link all documents to one file, to get nicer output - echo "<!DOCTYPE book PUBLIC \"-//OASIS//DTD DocBook V4.4//EN\" \"http://www.oasis-open.org/docbook/sgml/4.4/docbook.dtd\"[" > "$(ROOT)/doc/database/tables.sgml" + echo "<!DOCTYPE book PUBLIC \"-//OASIS//DTD DocBook V4.4//EN\" \"http://www.oasis-open.org/docbook/sgml/4.4/docbook.dtd\"[" > "$(ROOT)/doc/databases/kamailio/tables.sgml" # create entities, as xi:include is not available in sgml docbook # substitute '-' for '_', docbook smgl don't like this - for FILE in $(wildcard $(ROOT)/doc/database/*.xml); do \ - echo " <!ENTITY `basename "$$FILE" | sed -e 's#_#-#g'` SYSTEM \""$$FILE"\">" >> "$(ROOT)/doc/database/tables.sgml" ; \ + for FILE in $(wildcard $(ROOT)/doc/databases/kamailio/*.xml); do \ + echo " <!ENTITY `basename "$$FILE" | sed -e 's#_#-#g'` SYSTEM \""$$FILE"\">" >> "$(ROOT)/doc/databases/kamailio/tables.sgml" ; \ done ; \ #Include general documentation entities - echo " <!ENTITY % docentities SYSTEM \"../entities.xml\"> %docentities;" >> "$(ROOT)/doc/database/tables.sgml" ; \ - echo "]>" >> "$(ROOT)/doc/database/tables.sgml" + echo " <!ENTITY % docentities SYSTEM \"../entities.xml\"> %docentities;" >> "$(ROOT)/doc/databases/kamailio/tables.sgml" ; \ + echo "]>" >> "$(ROOT)/doc/databases/kamailio/tables.sgml" # add bookinfo - cat "$(ROOT)/doc/stylesheets/dbschema_k/bookinfo.xml" >> "$(ROOT)/doc/database/tables.sgml" + cat "$(ROOT)/doc/stylesheets/dbschema_k/bookinfo.xml" >> "$(ROOT)/doc/databases/kamailio/tables.sgml" # actually include the entities - for FILE in $(wildcard $(ROOT)/doc/database/*.xml); do \ - echo " &`basename "$$FILE" | sed -e 's#_#-#g'`" >> "$(ROOT)/doc/database/tables.sgml" ; \ + for FILE in $(wildcard $(ROOT)/doc/databases/kamailio/*.xml); do \ + echo " &`basename "$$FILE" | sed -e 's#_#-#g'`" >> "$(ROOT)/doc/databases/kamailio/tables.sgml" ; \ done ; \ - echo "</book>" >> "$(ROOT)/doc/database/tables.sgml" + echo "</book>" >> "$(ROOT)/doc/databases/kamailio/tables.sgml" docbook_clean: - -@rm -f $(ROOT)/doc/database/*.xml - -@rm -f $(ROOT)/doc/database/tables.sgml + -@rm -f $(ROOT)/doc/databases/kamailio/*.xml + -@rm -f $(ROOT)/doc/databases/kamailio/tables.sgml .PHONY: modules modules_clean modules:

15 years, 3 months

git:master: dialog(k): copy dialog table from 1.5 branch, the version in this tree is older

by Henning Westerholt

Module: sip-router Branch: master Commit: d0b60d5b967e9ea8df5c911c606ae1ddad490379 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d0b60d5… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Oct 1 18:26:17 2009 +0200 dialog(k): copy dialog table from 1.5 branch, the version in this tree is older --- lib/srdb1/schema/dialog.xml | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/lib/srdb1/schema/dialog.xml b/lib/srdb1/schema/dialog.xml index 1738786..3eaf631 100644 --- a/lib/srdb1/schema/dialog.xml +++ b/lib/srdb1/schema/dialog.xml @@ -9,7 +9,7 @@ <table id="dialog" xmlns:db="http://docbook.org/ns/docbook"> <name>dialog</name> - <version>2</version> + <version>3</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>Persistent dialog information for the dialog module. More @@ -166,6 +166,22 @@ </description> </column> + <column> + <name>sflags</name> + <type>unsigned int</type> + <size>10</size> + <description>The flags to set for dialog and usable from config file. + </description> + </column> + + <column> + <name>toroute</name> + <type>unsigned int</type> + <size>10</size> + <description>The route to be executed at dialog timeout. + </description> + </column> + <index> <name>hash_idx</name> <colref linkend="hash_entry"/>

15 years, 3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev