sr-dev December 2009

sr-dev@lists.kamailio.org

26 participants
157 discussions

by Daniel-Constantin Mierla

Hello, I plan to release Kamailio 3.0, hopefully today, if no outstanding issue out there. Ending of last week, I managed to get debian packaging working (tested on Ubuntu) using Andrei's new Makefile system, with module groups. If you are aware of issues you want fixed before 3.0RC3, drop an email. This is supposed to be latest RC before full 3.0.0 release. Cheers, Daniel -- Daniel-Constantin Mierla * http://www.asipto.com/

14 years, 11 months

git:kamailio_3.0: dbschema: regenerate db creation scripts

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 0586447a736900832b116f3a3826ba01d9969b6a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0586447… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 14 10:22:25 2009 +0100 dbschema: regenerate db creation scripts - get the updates to permissions and lcr tables --- utils/kamctl/db_berkeley/kamailio/version | 2 +- utils/kamctl/dbtext/kamailio/version | 2 +- utils/kamctl/mysql/lcr-create.sql | 3 ++- utils/kamctl/mysql/permissions-create.sql | 4 ++-- utils/kamctl/oracle/lcr-create.sql | 3 ++- utils/kamctl/oracle/permissions-create.sql | 4 ++-- utils/kamctl/postgres/lcr-create.sql | 3 ++- utils/kamctl/postgres/permissions-create.sql | 4 ++-- 8 files changed, 14 insertions(+), 11 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index d977706..e03028f 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -79,7 +79,7 @@ speed_dial|2 subscriber| subscriber|6 trusted| -trusted|4 +trusted|5 uri| uri|1 userblacklist| diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index 2822a7a..5b9b49d 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -34,7 +34,7 @@ silo:5 sip_trace:2 speed_dial:2 subscriber:6 -trusted:4 +trusted:5 uri:1 userblacklist:1 usr_preferences:2 diff --git a/utils/kamctl/mysql/lcr-create.sql b/utils/kamctl/mysql/lcr-create.sql index 1c6db01..63d72be 100644 --- a/utils/kamctl/mysql/lcr-create.sql +++ b/utils/kamctl/mysql/lcr-create.sql @@ -14,7 +14,8 @@ CREATE TABLE gw ( 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) + CONSTRAINT lcr_id_grp_id_gw_name_idx UNIQUE (lcr_id, grp_id, gw_name), + CONSTRAINT lcr_id_grp_id_ip_addr_idx UNIQUE (lcr_id, grp_id, ip_addr) ) ENGINE=MyISAM; INSERT INTO version (table_name, table_version) values ('lcr','3'); diff --git a/utils/kamctl/mysql/permissions-create.sql b/utils/kamctl/mysql/permissions-create.sql index ecc92e8..f3be981 100644 --- a/utils/kamctl/mysql/permissions-create.sql +++ b/utils/kamctl/mysql/permissions-create.sql @@ -1,10 +1,10 @@ -INSERT INTO version (table_name, table_version) values ('trusted','4'); +INSERT INTO version (table_name, table_version) values ('trusted','5'); CREATE TABLE trusted ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, src_ip VARCHAR(50) NOT NULL, proto VARCHAR(4) NOT NULL, from_pattern VARCHAR(64) DEFAULT NULL, - tag VARCHAR(32) + tag VARCHAR(64) ) ENGINE=MyISAM; CREATE INDEX peer_idx ON trusted (src_ip); diff --git a/utils/kamctl/oracle/lcr-create.sql b/utils/kamctl/oracle/lcr-create.sql index 1dc954a..075af32 100644 --- a/utils/kamctl/oracle/lcr-create.sql +++ b/utils/kamctl/oracle/lcr-create.sql @@ -14,7 +14,8 @@ CREATE TABLE gw ( weight NUMBER(10), flags NUMBER(10) DEFAULT 0 NOT NULL, defunct NUMBER(10) DEFAULT NULL, - CONSTRAINT gw_lcr_id_gw_name_idx UNIQUE (lcr_id, gw_name) + CONSTRAINT gw_lcr_id_grp_id_gw_name_idx UNIQUE (lcr_id, grp_id, gw_name), + CONSTRAINT gw_lcr_id_grp_id_ip_addr_idx UNIQUE (lcr_id, grp_id, ip_addr) ); CREATE OR REPLACE TRIGGER gw_tr diff --git a/utils/kamctl/oracle/permissions-create.sql b/utils/kamctl/oracle/permissions-create.sql index 4153147..c6045d0 100644 --- a/utils/kamctl/oracle/permissions-create.sql +++ b/utils/kamctl/oracle/permissions-create.sql @@ -1,10 +1,10 @@ -INSERT INTO version (table_name, table_version) values ('trusted','4'); +INSERT INTO version (table_name, table_version) values ('trusted','5'); CREATE TABLE trusted ( id NUMBER(10) PRIMARY KEY, src_ip VARCHAR2(50), proto VARCHAR2(4), from_pattern VARCHAR2(64) DEFAULT NULL, - tag VARCHAR2(32) + tag VARCHAR2(64) ); CREATE OR REPLACE TRIGGER trusted_tr diff --git a/utils/kamctl/postgres/lcr-create.sql b/utils/kamctl/postgres/lcr-create.sql index 834ea08..e23e7f7 100644 --- a/utils/kamctl/postgres/lcr-create.sql +++ b/utils/kamctl/postgres/lcr-create.sql @@ -14,7 +14,8 @@ CREATE TABLE gw ( weight INTEGER, flags INTEGER DEFAULT 0 NOT NULL, defunct INTEGER DEFAULT NULL, - CONSTRAINT gw_lcr_id_gw_name_idx UNIQUE (lcr_id, gw_name) + CONSTRAINT gw_lcr_id_grp_id_gw_name_idx UNIQUE (lcr_id, grp_id, gw_name), + CONSTRAINT gw_lcr_id_grp_id_ip_addr_idx UNIQUE (lcr_id, grp_id, ip_addr) ); INSERT INTO version (table_name, table_version) values ('lcr','3'); diff --git a/utils/kamctl/postgres/permissions-create.sql b/utils/kamctl/postgres/permissions-create.sql index 886ec12..5514ef5 100644 --- a/utils/kamctl/postgres/permissions-create.sql +++ b/utils/kamctl/postgres/permissions-create.sql @@ -1,10 +1,10 @@ -INSERT INTO version (table_name, table_version) values ('trusted','4'); +INSERT INTO version (table_name, table_version) values ('trusted','5'); CREATE TABLE trusted ( id SERIAL PRIMARY KEY NOT NULL, src_ip VARCHAR(50) NOT NULL, proto VARCHAR(4) NOT NULL, from_pattern VARCHAR(64) DEFAULT NULL, - tag VARCHAR(32) + tag VARCHAR(64) ); CREATE INDEX trusted_peer_idx ON trusted (src_ip);

14 years, 11 months

git:kamailio_3.0: perl: install Perl libs along with module

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 256423a131e3cf71f20591f3f9066b30bd036726 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=256423a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 14 10:19:38 2009 +0100 perl: install Perl libs along with module --- modules_k/perl/Makefile | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules_k/perl/Makefile b/modules_k/perl/Makefile index 28f5154..1fe65ed 100644 --- a/modules_k/perl/Makefile +++ b/modules_k/perl/Makefile @@ -52,8 +52,8 @@ perlpod: doc/perl_pod.sgml doc/perl_pod.sgml: openserxs.xs cat $(PODFILES) | pod2docbook --doctype=chapter --title='OpenSER Perl API' --no-header - doc/perl_pod.sgml -install_module_custom: - echo "installing Perl OpenSER packages ..." +install-perl-scripts: + echo "installing Perl Kamailio (OpenSER) packages ..." mkdir -p $(modules_prefix)/$(lib_dir)/perl $(INSTALL_CFG) lib/perl/*.pm $(modules_prefix)/$(lib_dir)/perl mkdir -p $(modules_prefix)/$(lib_dir)/perl/OpenSER @@ -72,3 +72,5 @@ install_module_custom: $(INSTALL_CFG) lib/perl/OpenSER/VDB/Adapter/*.pm \ $(modules_prefix)/$(lib_dir)/perl/OpenSER/VDB/Adapter +install-scripts: install-perl-scripts +

14 years, 11 months

git:kamailio_3.0: debian(k): packaging for 3.0

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 72692ea1af122b12e1071e364063fcc1a182cbd0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=72692ea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 11 23:09:29 2009 +0100 debian(k): packaging for 3.0 - updated deb packaging specs for 3.0 - use SR makefile groups to build the packages - all module packages are named kamailio-*-modules - kamailio-dbg not packaged for now --- pkg/kamailio/debian/changelog | 14 + pkg/kamailio/debian/control | 81 ++-- pkg/kamailio/debian/patches/00list | 3 - .../debian/patches/10_no_lib64_on_64_bits.dpatch | 27 -- pkg/kamailio/debian/patches/11_always_smp.dpatch | 24 - pkg/kamailio/debian/rules | 467 +++++++------------- 6 files changed, 202 insertions(+), 414 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=726…

14 years, 11 months

git:kamailio_3.0: db_berkely: install kamctl files

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 1daa56fbec81034affeaadcfa97a1373413c68ea URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1daa56f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 11 23:05:27 2009 +0100 db_berkely: install kamctl files --- modules/db_berkeley/Makefile | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/modules/db_berkeley/Makefile b/modules/db_berkeley/Makefile index 617c3c3..55b304f 100644 --- a/modules/db_berkeley/Makefile +++ b/modules/db_berkeley/Makefile @@ -20,3 +20,13 @@ SERLIBPATH=../../lib SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 $(SERLIBPATH)/srdb1/srdb1 $(SERLIBPATH)/kmi/kmi include ../../Makefile.modules + +ifeq ($(INSTALL_FLAVOUR),kamailio) +# extra install for kamailio + +install-berkeley-scripts: $(bin_prefix)/$(bin_dir) + BERKELEYDBON=yes make -C ../../utils/kamctl/ install-modules + +install-scripts: install-berkeley-scripts + +endif # INSTALL_FLAVOUR

14 years, 11 months

git:kamailio_3.0: db_postgres: install kamctl files

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 7922ddd9442e27028afae8e9d342bb31e383f624 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7922ddd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 11 23:04:49 2009 +0100 db_postgres: install kamctl files --- modules/db_postgres/Makefile | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/modules/db_postgres/Makefile b/modules/db_postgres/Makefile index 9c578b9..03e8c27 100644 --- a/modules/db_postgres/Makefile +++ b/modules/db_postgres/Makefile @@ -35,3 +35,13 @@ SERLIBPATH=../../lib SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 $(SERLIBPATH)/srdb1/srdb1 include ../../Makefile.modules + +ifeq ($(INSTALL_FLAVOUR),kamailio) +# extra install for kamailio + +install-pgsql-scripts: $(bin_prefix)/$(bin_dir) + PGSQLON=yes make -C ../../utils/kamctl/ install-modules + +install-scripts: install-pgsql-scripts + +endif # INSTALL_FLAVOUR

14 years, 11 months

git:kamailio_3.0: kamctl: install of berkeley and oracle tools

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 5b46bc809a5bc970f7ad7334be33bf0db723807b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5b46bc8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 11 23:08:44 2009 +0100 kamctl: install of berkeley and oracle tools --- utils/kamctl/Makefile | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/utils/kamctl/Makefile b/utils/kamctl/Makefile index 6f5b2a8..61bcee0 100644 --- a/utils/kamctl/Makefile +++ b/utils/kamctl/Makefile @@ -181,7 +181,8 @@ install-modules: $(bin_prefix)/$(bin_dir) $(data_prefix)/$(data_dir)/oracle/admin/`basename "$$FILE"` ; \ fi ;\ done ; \ - $(INSTALL_BIN) utils/db_oracle/kamailio_orasel $(bin-prefix)/$(bin-dir) ; \ + make -C ../db_oracle/ ; \ + $(INSTALL_BIN) ../db_oracle/kamailio_orasel $(bin_prefix)/$(bin_dir) ; \ fi # install Berkeley database stuff if [ "$(BERKELEYDBON)" = "yes" ]; then \ @@ -205,7 +206,8 @@ install-modules: $(bin_prefix)/$(bin_dir) $(data_prefix)/$(data_dir)/db_berkeley/kamailio/`basename "$$FILE"` ; \ fi ;\ done ; \ - $(INSTALL_BIN) utils/db_berkeley/kambdb_recover $(bin-prefix)/$(bin-dir) ; \ + make -C ../db_berkeley/ ; \ + $(INSTALL_BIN) ../db_berkeley/kambdb_recover $(bin_prefix)/$(bin_dir) ; \ fi # install dbtext stuff if [ "$(DBTEXTON)" = "yes" ]; then \

14 years, 11 months

git:kamailio_3.0: db_oracle: install kamctl files

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 669e52df21b5fe54d1968db94628859c5291681a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=669e52d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 11 23:06:35 2009 +0100 db_oracle: install kamctl files --- modules_k/db_oracle/Makefile | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/modules_k/db_oracle/Makefile b/modules_k/db_oracle/Makefile index 55e7b0d..bcceb9e 100644 --- a/modules_k/db_oracle/Makefile +++ b/modules_k/db_oracle/Makefile @@ -66,3 +66,13 @@ DEFS+=-DOPENSER_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 include ../../Makefile.modules + +ifeq ($(INSTALL_FLAVOUR),kamailio) +# extra install for kamailio + +install-oracle-scripts: $(bin_prefix)/$(bin_dir) + ORACLEON=yes make -C ../../utils/kamctl/ install-modules + +install-scripts: install-oracle-scripts + +endif # INSTALL_FLAVOUR

14 years, 11 months

git:kamailio_3.0: tls: name the certificates based on $MAIN_NAME

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 6ecc6c13f63dab04083f61aa1b7ee767f9441ee0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6ecc6c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 11 23:07:27 2009 +0100 tls: name the certificates based on $MAIN_NAME --- modules/tls/Makefile | 2 +- modules/tls/sip-router_cert.sh | 22 ++++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/modules/tls/Makefile b/modules/tls/Makefile index f3970a4..0c3aa30 100644 --- a/modules/tls/Makefile +++ b/modules/tls/Makefile @@ -23,6 +23,6 @@ include ../../Makefile.modules install-tls-cert: $(cfg_prefix)/$(cfg_dir) - ./$(SCR_NAME)_cert.sh -d $(cfg_prefix)/$(cfg_dir) + MAIN_NAME=$(MAIN_NAME) ./$(SCR_NAME)_cert.sh -d $(cfg_prefix)/$(cfg_dir) install-cfg: install-tls-cert diff --git a/modules/tls/sip-router_cert.sh b/modules/tls/sip-router_cert.sh index df08caa..9e1cd7f 100755 --- a/modules/tls/sip-router_cert.sh +++ b/modules/tls/sip-router_cert.sh @@ -3,18 +3,20 @@ # $Id$ # # This script generates a self-signed TLS/SSL certificate that can be -# immediately used with the TLS module of SER. The file was inspired +# immediately used with the TLS module of SIP Router. The file was inspired # by a script from Debian's uw-imapd package. # ############################################################################# # Configuration variables ############################################################################# -DEFAULT_DIR="/usr/local/etc/ser" +NAME=$MAIN_NAME +if [ -z "$NAME" ] ; then NAME="sip-router"; fi; +DEFAULT_DIR="/usr/local/etc/$NAME" DEFAULT_DAYS=365 -DEFAULT_INFO="Self-signed certificate for SER" -DEFAULT_CERT_FILENAME="ser-selfsigned.pem" -DEFAULT_KEY_FILENAME="ser-selfsigned.key" +DEFAULT_INFO="Self-signed certificate for $NAME" +DEFAULT_CERT_FILENAME="$NAME-selfsigned.pem" +DEFAULT_KEY_FILENAME="$NAME-selfsigned.key" DEFAULT_OPENSSL='openssl' @@ -50,19 +52,19 @@ longopts() { usage() { cat <<EOF NAME - $COMMAND - Generate a self-signed TLS/SSL certificate for use with SER. + $COMMAND - Generate a self-signed TLS/SSL certificate for use with $NAME. SYNOPSIS $COMMAND [options] DESCRIPTION This is a simple shell script that generates a self signed TLS/SSL - certificate (and private key) for use with the tls module of SER. The + certificate (and private key) for use with the tls module of $NAME. The self-signed certificate is suitable for testing and/or private setups. You are encouraged to create a proper authorized one if needed. Both certificate and key files are by default stored in the directory - containing the configuration file of SER (unless you change it using + containing the configuration file of $NAME (unless you change it using the options below). OPTIONS @@ -100,7 +102,7 @@ AUTHOR Written by Jan Janak <jan(a)iptel.org> REPORTING BUGS - Report bugs to <ser-bugs(a)iptel.org> + Report bugs to <sr-dev(a)sip-router.org> EOF } #usage @@ -175,7 +177,7 @@ if [ $? != 0 ] ; then exit 1 fi -echo "Creating a new SER self-signed certificate for '$FQDN'" \ +echo "Creating a new $NAME self-signed certificate for '$FQDN'" \ "valid for $DAYS days." openssl req -new -x509 -days "$DAYS" -nodes -out "$DIR/$CERT_FILENAME" \ -keyout "$DIR/$KEY_FILENAME" > /dev/null 2>&1 <<+

14 years, 11 months

git:kamailio_3.0: kamctl: mysql specific files installed by db_mysql module

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: c79057fb794171b5acb46c2811b97dc22158dbf2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c79057f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 11 22:13:45 2009 +0100 kamctl: mysql specific files installed by db_mysql module --- utils/kamctl/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/utils/kamctl/Makefile b/utils/kamctl/Makefile index e9cef17..6f5b2a8 100644 --- a/utils/kamctl/Makefile +++ b/utils/kamctl/Makefile @@ -87,7 +87,7 @@ install-man: $(man_prefix)/$(man_dir)/man8 $(man_prefix)/$(man_dir)/man5 chmod 644 $(man_prefix)/$(man_dir)/man8/kamdbctl.8 -MYSQLON?=yes +# MYSQLON?=yes install-modules: $(bin_prefix)/$(bin_dir) # install MySQL stuff

14 years, 11 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2009