sr-dev

sr-dev@lists.kamailio.org

15 participants
44239 discussions

git:kamailio_3.0: nat_traversal: link with lib kcore

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 7c6600c007be55263b48ea1114cbecab86347076 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7c6600c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 14 20:50:17 2009 +0100 nat_traversal: link with lib kcore - include lib/kcore/statistics.h - fix undefined symbol for register_module_stats - reported by Ricardo Martinez --- modules_k/nat_traversal/Makefile | 3 +++ modules_k/nat_traversal/nat_traversal.c | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules_k/nat_traversal/Makefile b/modules_k/nat_traversal/Makefile index 932620a..8f21003 100644 --- a/modules_k/nat_traversal/Makefile +++ b/modules_k/nat_traversal/Makefile @@ -12,5 +12,8 @@ LIBS= DEFS+=-DOPENSER_MOD_INTERFACE +SERLIBPATH=../../lib +SER_LIBS+=$(SERLIBPATH)/kcore/kcore + include ../../Makefile.modules diff --git a/modules_k/nat_traversal/nat_traversal.c b/modules_k/nat_traversal/nat_traversal.c index 119c592..0a04f78 100644 --- a/modules_k/nat_traversal/nat_traversal.c +++ b/modules_k/nat_traversal/nat_traversal.c @@ -49,6 +49,7 @@ #include "../../parser/parse_uri.h" #include "../../parser/parse_expires.h" #include "../../parser/contact/parse_contact.h" +#include "../../lib/kcore/statistics.h" #include "../dialog/dlg_load.h" #include "../../modules/tm/tm_load.h" #include "../sl/sl_cb.h"

15 years, 1 month

git:kamailio_3.0: core: fix parsing for avps with the same name as a pv class

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: a1b15f1289db84bdf8e3da11fa33af9ae0501f3c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a1b15f1… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 14 13:00:07 2009 +0100 core: fix parsing for avps with the same name as a pv class When a pv lookup fails, sometimes the pvspec is partially filled which, if not clean might mess-up the avp flags in the lval union. E.g.: $avp="..." caused problems (avp was marked as RE name). --- cfg.y | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/cfg.y b/cfg.y index 2c488a2..0062b0e 100644 --- a/cfg.y +++ b/cfg.y @@ -2435,6 +2435,10 @@ avp_pvar: AVP_OR_PVAR { s_tmp.s=$1; s_tmp.len=strlen(s_tmp.s); if (pv_parse_spec2(&s_tmp, &lval_tmp->lv.pvs, 1)==0){ /* not a pvar, try avps */ + /* lval_tmp might be partially filled by the failed + pv_parse_spec2() (especially if the avp name is the + same as a pv class) => clean it again */ + memset(lval_tmp, 0, sizeof(*lval_tmp)); lval_tmp->lv.avps.type|= AVP_NAME_STR; lval_tmp->lv.avps.name.s.s = s_tmp.s+1; lval_tmp->lv.avps.name.s.len = s_tmp.len-1;

15 years, 1 month

git:sr_3.0: core: fix parsing for avps with the same name as a pv class

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 9354d82c043b0fef64ad671505071ce64fc501b4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9354d82… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Dec 14 13:00:07 2009 +0100 core: fix parsing for avps with the same name as a pv class When a pv lookup fails, sometimes the pvspec is partially filled which, if not clean might mess-up the avp flags in the lval union. E.g.: $avp="..." caused problems (avp was marked as RE name). --- cfg.y | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/cfg.y b/cfg.y index bfe45e4..234b2d0 100644 --- a/cfg.y +++ b/cfg.y @@ -2435,6 +2435,10 @@ avp_pvar: AVP_OR_PVAR { s_tmp.s=$1; s_tmp.len=strlen(s_tmp.s); if (pv_parse_spec2(&s_tmp, &lval_tmp->lv.pvs, 1)==0){ /* not a pvar, try avps */ + /* lval_tmp might be partially filled by the failed + pv_parse_spec2() (especially if the avp name is the + same as a pv class) => clean it again */ + memset(lval_tmp, 0, sizeof(*lval_tmp)); lval_tmp->lv.avps.type|= AVP_NAME_STR; lval_tmp->lv.avps.name.s.s = s_tmp.s+1; lval_tmp->lv.avps.name.s.len = s_tmp.len-1;

15 years, 1 month

preparing RC3 for kamailio 3.0

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/

15 years, 1 month

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);

15 years, 1 month

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 +

15 years, 1 month

git:kamailio_3.0: db_mysql: install kamctl files

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: f90750795260e753051e75f1918e0fd0ede1212f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f907507… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 11 23:03:21 2009 +0100 db_mysql: install kamctl files - done only for kamailio flavor --- modules/db_mysql/Makefile | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/modules/db_mysql/Makefile b/modules/db_mysql/Makefile index d47fd9a..c6458e0 100644 --- a/modules/db_mysql/Makefile +++ b/modules/db_mysql/Makefile @@ -42,4 +42,12 @@ install-mysql-script: $(bin_prefix)/$(bin_dir) install-scripts: install-mysql-script +else ifeq ($(INSTALL_FLAVOUR),kamailio) +# extra install for kamailio + +install-mysql-scripts: $(bin_prefix)/$(bin_dir) + MYSQLON=yes make -C ../../utils/kamctl/ install-modules + +install-scripts: install-mysql-scripts + endif # INSTALL_FLAVOUR

15 years, 1 month

git:kamailio_3.0: use pkg/$NAME/debian to generate deb

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 5ad4520bfdec47b6e3a85f9e120095b00eeb2aca URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5ad4520… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 11 20:08:01 2009 +0100 use pkg/$NAME/debian to generate deb - priority over pkg/debian - good for generating debs per distro name --- Makefile | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 9e7dc9f..16f3dbb 100644 --- a/Makefile +++ b/Makefile @@ -791,6 +791,10 @@ bin: deb: -@if [ -d debian ]; then \ dpkg-buildpackage -rfakeroot -tc; \ + elif [ -d pkg/$(MAIN_NAME)/debian ]; then \ + ln -s pkg/$(MAIN_NAME)/debian debian; \ + dpkg-buildpackage -rfakeroot -tc; \ + rm debian; \ else \ ln -s pkg/debian debian; \ dpkg-buildpackage -rfakeroot -tc; \

15 years, 1 month

git:kamailio_3.0: version set to 3.0.0-rc3

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: b40bf31bcaa3c285687ce7d272f2e65810b4de9b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b40bf31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 11 14:32:09 2009 +0100 version set to 3.0.0-rc3 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index dfd40bc..8d94e2c 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -145,7 +145,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 3 PATCHLEVEL = 0 SUBLEVEL = 0 -EXTRAVERSION = -rc2 +EXTRAVERSION = -rc3 SER_VER = $(shell expr $(VERSION) \* 1000000 + $(PATCHLEVEL) \* 1000 + \ $(SUBLEVEL) )

15 years, 1 month

git:kamailio_3.0: db_text: install kamctl files

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: b3d47d4912dd8b64c5bce56be574aafe2340605b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b3d47d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 11 23:06:15 2009 +0100 db_text: install kamctl files --- modules_k/db_text/Makefile | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/modules_k/db_text/Makefile b/modules_k/db_text/Makefile index 850e75c..dd35b11 100644 --- a/modules_k/db_text/Makefile +++ b/modules_k/db_text/Makefile @@ -19,3 +19,13 @@ SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 SER_LIBS+=$(SERLIBPATH)/kcore/kcore include ../../Makefile.modules + +ifeq ($(INSTALL_FLAVOUR),kamailio) +# extra install for kamailio + +install-dbtext-scripts: $(bin_prefix)/$(bin_dir) + DBTEXTON=yes make -C ../../utils/kamctl/ install-modules + +install-scripts: install-dbtext-scripts + +endif # INSTALL_FLAVOUR

15 years, 1 month

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev