sr-dev August 2010

sr-dev@lists.kamailio.org

26 participants
346 discussions

git:master: kamctl: fix make use and make install
by Andrei Pelinescu-Onciul 11 Aug '10

11 Aug '10

Module: sip-router Branch: master Commit: 91ce090529ac1a1c6285f387e57013cad5598def URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=91ce090… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 19:49:09 2010 +0200 kamctl: fix make use and make install - use $(MAKE) instead of directly using make. - added targets for the install dirs (create bin_dir, cfg_dir and man_dirs if missing). This fixes make -C utils/kamctl install (allows installing only kamctl). --- utils/kamctl/Makefile | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/utils/kamctl/Makefile b/utils/kamctl/Makefile index 57677a0..0f2643b 100644 --- a/utils/kamctl/Makefile +++ b/utils/kamctl/Makefile @@ -191,7 +191,7 @@ install-modules: $(bin_prefix)/$(bin_dir) $(data_prefix)/$(data_dir)/oracle/admin/`basename "$$FILE"` ; \ fi ;\ done ; \ - make -C ../db_oracle/ ; \ + $(MAKE) -C ../db_oracle/ ; \ $(INSTALL_BIN) ../db_oracle/kamailio_orasel $(bin_prefix)/$(bin_dir) ; \ fi # install Berkeley database stuff @@ -216,7 +216,7 @@ install-modules: $(bin_prefix)/$(bin_dir) $(data_prefix)/$(data_dir)/db_berkeley/kamailio/`basename "$$FILE"` ; \ fi ;\ done ; \ - make -C ../db_berkeley/ ; \ + $(MAKE) -C ../db_berkeley/ ; \ $(INSTALL_BIN) ../db_berkeley/kambdb_recover $(bin_prefix)/$(bin_dir) ; \ fi # install dbtext stuff @@ -246,3 +246,15 @@ install-modules: $(bin_prefix)/$(bin_dir) done ;\ fi + +$(cfg_prefix)/$(cfg_dir): + mkdir -p $(cfg_prefix)/$(cfg_dir) + +$(bin_prefix)/$(bin_dir): + mkdir -p $(bin_prefix)/$(bin_dir) + +$(man_prefix)/$(man_dir)/man8: + mkdir -p $(man_prefix)/$(man_dir)/man8 + +$(man_prefix)/$(man_dir)/man5: + mkdir -p $(man_prefix)/$(man_dir)/man5

1 0

git:master: presence_dialoginfo(k): fix bsd compilation
by Andrei Pelinescu-Onciul 11 Aug '10

11 Aug '10

Module: sip-router Branch: master Commit: 850a7b31de86056fc9223d809dfae54b0e490c5f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=850a7b3… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 19:31:14 2010 +0200 presence_dialoginfo(k): fix bsd compilation On FreeBSD don't define _XOPEN_SOURCE (define it only on linux). It's not needed for strptime() and worse will cause some other defines to be missing, like INADDR_LOOPBACK ( if_XOPEN_SOURCE is defined, __BSD_VISIBLE will be undefined => lots of missing defines). Reported-by: Reported-by: Olle E. Johansson oej edvina net --- modules_k/presence_dialoginfo/pidf.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_k/presence_dialoginfo/pidf.c b/modules_k/presence_dialoginfo/pidf.c index 9285d2b..d90de4c 100644 --- a/modules_k/presence_dialoginfo/pidf.c +++ b/modules_k/presence_dialoginfo/pidf.c @@ -36,12 +36,12 @@ * use 600 for 'Single UNIX Specification, Version 3' * _XOPEN_SOURCE creates conflict in header definitions in Solaris */ -#ifndef __OS_solaris - #define _XOPEN_SOURCE 600 /* glibc2 on linux, bsd */ +#ifdef __OS_linux + #define _XOPEN_SOURCE 600 /* glibc2 on linux */ #define _BSD_SOURCE 1 /* needed on linux to "fix" the effect of the above define on features.h/unistd.h syscall() */ -#else +#elif defined __OS_solaris #define _XOPEN_SOURCE_EXTENDED 1 /* solaris */ #endif

1 0

git:master: xmlrpc: fix includes and libs
by Andrei Pelinescu-Onciul 11 Aug '10

11 Aug '10

Module: sip-router Branch: master Commit: ecc9fcf9fe61cb355864bf8142e65b8dd9d8658b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ecc9fcf… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 18:56:57 2010 +0200 xmlrpc: fix includes and libs Reported-by: Olle E. Johansson oej edvina net --- modules/xmlrpc/Makefile | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/xmlrpc/Makefile b/modules/xmlrpc/Makefile index efcbf38..485d12a 100644 --- a/modules/xmlrpc/Makefile +++ b/modules/xmlrpc/Makefile @@ -6,8 +6,9 @@ include ../../Makefile.defs auto_gen= NAME=xmlrpc.so -DEFS += -I/usr/include/libxml2 -I/usr/local/include/libxml2 -I/usr/local/include -LIBS +=-lxml2 +INCLUDES += -I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ + -I$(LOCALBASE)/include +LIBS += -L$(LOCALBASE)/lib -L/usr/pkg/lib -lxml2 DEFS+=-DSER_MOD_INTERFACE

1 0

git:master: sercmd: fix LIBS - don't link -lresolv if not needed
by Andrei Pelinescu-Onciul 11 Aug '10

11 Aug '10

Module: sip-router Branch: master Commit: e5978c182e4bd5d5c1d723d00e9f54ea958816c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e5978c1… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 18:51:09 2010 +0200 sercmd: fix LIBS - don't link -lresolv if not needed - link with libresolv only on linux, solaris and darwin - on solaris link also witl -lxnet and -lnsl (bugs introduced in b0f00c3348b9) --- utils/sercmd/Makefile | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/utils/sercmd/Makefile b/utils/sercmd/Makefile index 7072a7d..bc03b74 100644 --- a/utils/sercmd/Makefile +++ b/utils/sercmd/Makefile @@ -29,14 +29,29 @@ DEFS:= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' \ # from a module Makefile) #LIBS:=$(filter-out -lfl -ldl -lpthread -lssl -lcrypto, $(LIBS)) +ifeq ($(OS), linux) + LIBS:= -lresolv +endif +ifeq ($(OS), solaris) + LIBS:= -lresolv -L$(LOCALBASE)/lib -lxnet -lnsl +endif +ifeq ($(OS), freebsd) + LIBS:= +endif ifeq ($(OS), dragonfly) LIBS:= -L$(LOCALBASE)/lib -else +endif +ifeq ($(OS), openbsd) + LIBS:= +endif +ifeq ($(OS), netbsd) + LIBS:= +endif +ifeq ($(OS), darwin) LIBS:= -lresolv endif - -ifeq ($(OS), solaris) - LIBS+= -L$(LOCALBASE)/lib -lxnet -lnsl +ifneq (,$(findstring cygwin, $(OS))) + LIBS:= -lresolv endif ifeq ($(use_readline),)

1 0

git:andrei/rve_f_params: NEWS: notes about expressions in function parameters
by Andrei Pelinescu-Onciul 11 Aug '10

11 Aug '10

Module: sip-router Branch: andrei/rve_f_params Commit: c06ba275405db446df6a3fd1f19f66c7bcd263dc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c06ba27… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 16:16:54 2010 +0200 NEWS: notes about expressions in function parameters --- NEWS | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index 5f193c4..7e2e8d3 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,15 @@ $Id$ sip-router 3.1 chages core: + - lots of module functions automatically support now expressions or + variables in function parameters. This applies to all the module + functions declared without a fixup, with a fixup and the corresponding + free_fixup function or with a compatible ser or kamailio style standard + fixup (declared in sr_module.h or mod_fix.h). + E.g.: f($a, "b = " + $b); t_set_fr($v + 2 + $x). + t_set_fr($foo) (equivalent now with t_set_fr("$foo")). + - all the module functions can now be called with any constant expression + as parameters. E.g.: f("7 *" +" 6 = " + 7 * 6); - onreply_route {...} is now equivalent with onreply_route[0] {...} - global, per protocol blacklist ignore masks (via extended send_flags). See dst_blacklist_udp_imask a.s.o (dst_blacklist_*_imask).

2 2

git:master: NEWS: notes about Dragonfly BSD support
by Andrei Pelinescu-Onciul 11 Aug '10

11 Aug '10

Module: sip-router Branch: master Commit: f6b240d51684040572c75555b1f767df0100d970 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f6b240d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 17:04:14 2010 +0200 NEWS: notes about Dragonfly BSD support --- INSTALL | 20 +++++++++++--------- NEWS | 1 + 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/INSTALL b/INSTALL index d1731e3..9a8c0cd 100644 --- a/INSTALL +++ b/INSTALL @@ -10,18 +10,18 @@ $Id$ =========================================== Welcome to the SIP router! This is an amazingly flexible, robust - and secure SIP server built on years of experience in several Open + and secure SIP server built on years of experience in several Open Source projects. It's a merge of the SIP Express Router and the OpenSER/Kamailio products produced by a joint development team. This memo gives you hints how to set up SIP Router quickly. To understand how SIP Router works and how to configure it properly, - please read the admin's guide available from the SIP Router website. + please read the admin's guide available from the SIP Router website. - We also urge you to read latest ISSUES (available from SIP Router website + We also urge you to read latest ISSUES (available from SIP Router website too) and check for potential problems in this release. - Users of previous releases are encouraged to read NEWS to learn how to move to - this new SIP Router version. + Users of previous releases are encouraged to read NEWS to learn how to move + to this new SIP Router version. Table of Contents @@ -41,11 +41,13 @@ Table of Contents 1. Supported Architectures and Requirements ------------------------------------------- -Supported operating systems: Linux, FreeBSD, NetBSD, OpenBSD, Solaris, OS/X Darwin -Partially supported: Windows+Cygwin (core + static modules only, no IPv6, no TCP, -no dynamic modules) +Supported operating systems: Linux, FreeBSD, NetBSD, OpenBSD, Solaris, OS/X +Darwin, Dragonfly BSD. +Partially supported: Windows+Cygwin (core + static modules only, no IPv6, no +TCP, no dynamic modules) -Supported architectures: i386, x86_64 (amd64), armv4l, sparc64, powerpc, powerpc64 +Supported architectures: i386, x86_64 (amd64), armv4l, sparc64, powerpc, +powerpc64 Experimental architectures: mips1, mips2, sparc32, alpha (for other architectures the Makefiles might need to be edited) diff --git a/NEWS b/NEWS index 1173aae..bab7fac 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,7 @@ $Id$ sip-router 3.1 chages core: + - Dragonfly BSD support - statistics / counters support for tcp and sctp (enable by default) - statistics / counters api - networks addresses support in ip comparisons (src_ip, dst_ip, to_ip)

1 0

git:master: sercmd: Patch to add Dragonfly BSD support (makefile)
by Andrei Pelinescu-Onciul 11 Aug '10

11 Aug '10

Module: sip-router Branch: master Commit: c39dd933973ba24b449c2b35756c593c093d5f4f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c39dd93… Author: Vincent Stemen <vince.lists(a)ngtek.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 16:49:40 2010 +0200 sercmd: Patch to add Dragonfly BSD support (makefile) Signed-off-by: Andrei Pelinescu-Onciul <andrei(a)iptel.org> --- utils/sercmd/Makefile | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/utils/sercmd/Makefile b/utils/sercmd/Makefile index fbf616d..7072a7d 100644 --- a/utils/sercmd/Makefile +++ b/utils/sercmd/Makefile @@ -29,7 +29,12 @@ DEFS:= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' \ # from a module Makefile) #LIBS:=$(filter-out -lfl -ldl -lpthread -lssl -lcrypto, $(LIBS)) -LIBS:= -lresolv +ifeq ($(OS), dragonfly) + LIBS:= -L$(LOCALBASE)/lib +else + LIBS:= -lresolv +endif + ifeq ($(OS), solaris) LIBS+= -L$(LOCALBASE)/lib -lxnet -lnsl endif

2 1

git:master: makefile: Dragonfly BSD support
by Andrei Pelinescu-Onciul 11 Aug '10

11 Aug '10

Module: sip-router Branch: master Commit: 7d27010d3aa8ead2d9fec4155c5146d4329b7c35 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7d27010… Author: Vincent Stemen <vince.lists(a)ngtek.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 16:58:04 2010 +0200 makefile: Dragonfly BSD support This also simplifies the platform directory path settings so that the ifeq() statements are not nested 5 levels deep. Signed-off-by: Andrei Pelinescu-Onciul <andrei(a)iptel.org> --- Makefile.defs | 89 ++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 75 insertions(+), 14 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 0efd157..1120419 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -228,45 +228,54 @@ share_dir = share/$(MAIN_NAME)/ # lib/$(MAIN_NAME)/modules , lib/$(MAIN_NAME)/modules-s, lib/$(MAIN_NAME)/modules-k modules_dir = lib/$(MAIN_NAME)/ lib_dir = lib/$(MAIN_NAME)/ + +doc_dir = doc/$(MAIN_NAME)/ +man_dir = man/ +data_dir = $(MAIN_NAME)/ + ifeq ($(OS), linux) doc_dir = share/doc/$(MAIN_NAME)/ man_dir = share/man/ data_dir = share/$(MAIN_NAME)/ LOCALBASE ?= /usr/local -else +endif + ifeq ($(OS), freebsd) doc_dir = share/doc/$(MAIN_NAME)/ man_dir = man/ data_dir = share/$(MAIN_NAME)/ LOCALBASE ?= /usr/local -else +endif + ifeq ($(OS), openbsd) doc_dir = share/doc/$(MAIN_NAME)/ man_dir = man/ data_dir = share/$(MAIN_NAME)/ LOCALBASE ?= /usr/local -else +endif + ifeq ($(OS), netbsd) doc_dir = share/doc/$(MAIN_NAME)/ man_dir = man/ data_dir = share/$(MAIN_NAME)/ LOCALBASE ?= /usr/pkg -else -ifeq ($(OS), darwin) +endif + +ifeq ($(OS), dragonfly) doc_dir = share/doc/$(MAIN_NAME)/ man_dir = man/ data_dir = share/$(MAIN_NAME)/ - LOCALBASE ?= /usr/local -else - doc_dir = doc/$(MAIN_NAME)/ + LOCALBASE ?= /usr/pkg +endif + +ifeq ($(OS), darwin) + doc_dir = share/doc/$(MAIN_NAME)/ man_dir = man/ - data_dir = $(MAIN_NAME)/ + data_dir = share/$(MAIN_NAME)/ LOCALBASE ?= /usr/local endif -endif -endif -endif -endif + +LOCALBASE ?= /usr/local # Doxygen directory doxygen_dir=doc/doxygen @@ -617,10 +626,18 @@ $(info target architecture <$(ARCH)>, host architecture <$(HOST_ARCH)>) # adds support for Application Server interface # Sometimes is needes correct non-quoted $OS. HACK: gcc translates known OS to number ('linux'), so there is added underscore +# Tell it that dragonflybsd is equivalent to compiling for freebsd. +# This will cause __OS_freebsd to be defined below. +ifeq ($(OS), dragonfly) + EQUIV_OS := freebsd +else + EQUIV_OS := $(OS) +endif + C_DEFS= $(extra_defs) \ -DNAME='"$(MAIN_NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \ -DOS='$(OS)_' -DOS_QUOTED='"$(OS)"' -DCOMPILER='"$(CC_VER)"'\ - -D__CPU_$(ARCH) -D__OS_$(OS) \ + -D__CPU_$(ARCH) -D__OS_$(EQUIV_OS) \ -DSER_VER=$(SER_VER) \ -DCFG_DIR='"$(cfg_target)"'\ -DPKG_MALLOC \ @@ -1791,6 +1808,50 @@ $(info "old freebsd version (>= 7.0 needed) -- sctp disabled") endif # SCTP endif +ifeq ($(OS), dragonfly) + C_DEFS+=-DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN \ + -DHAVE_SCHED_YIELD -DHAVE_MSGHDR_MSG_CONTROL \ + -DHAVE_CONNECT_ECONNRESET_BUG -DHAVE_TIMEGM \ + -DHAVE_NETINET_IN_SYSTM + ifneq ($(found_lock_method), yes) + C_DEFS+= -DUSE_PTHREAD_MUTEX # try pthread sems + found_lock_method=yes + LIBS+= -pthread #dlopen is in libc + else + LIBS= #dlopen is in libc + endif + # check for ver >= 4.1 + ifeq ($(shell [ $(OSREL_N) -gt 4001 ] && echo has_kqueue), has_kqueue) + ifeq ($(NO_KQUEUE),) + C_DEFS+=-DHAVE_KQUEUE + endif + endif + ifeq ($(NO_SELECT),) + C_DEFS+=-DHAVE_SELECT + endif + YACC=yacc + # sctp support + ifeq ($(SCTP),1) + # test to see if the devfiles and lib are installed + sctp_dev_locations := /usr/include/netinet/sctp.h \ + $(LOCALBASE)/include/netinet/sctp.h + sctp_dev_path := $(wildcard $(sctp_dev_locations)) + ifeq ($(sctp_dev_path),) +$(info "sctp development files not installed -- sctp disabled") + override SCTP := + endif + ifeq ($(shell [ $(OSREL_N) -lt 7000 ] && echo sctp), sctp) +$(info "old freebsd version (>= 7.0 needed) -- sctp disabled") + override SCTP := + endif + + ifeq ($(SCTP),1) + C_DEFS+=-DUSE_SCTP + LIBS+= # no extra libs needed on freebsd + endif + endif # SCTP +endif + ifeq ($(OS), openbsd) C_DEFS+=-DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 \ -DHAVE_UNION_SEMUN -DHAVE_MSGHDR_MSG_CONTROL \

1 0

git:master: db_text(k) makefile: fix make use
by Andrei Pelinescu-Onciul 11 Aug '10

11 Aug '10

Module: sip-router Branch: master Commit: 5d8552087be74332c1a7812ffb01d8298060cc62 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5d85520… Author: Vincent Stemen <vince.lists(a)ngtek.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 16:45:05 2010 +0200 db_text(k) makefile: fix make use This fixes a bug. It called make directly which breaks on platforms where it is being compiled under gmake. Signed-off-by: Andrei Pelinescu-Onciul <andrei(a)iptel.org> --- modules_k/db_text/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/db_text/Makefile b/modules_k/db_text/Makefile index dd35b11..36bc48b 100644 --- a/modules_k/db_text/Makefile +++ b/modules_k/db_text/Makefile @@ -24,7 +24,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio) # extra install for kamailio install-dbtext-scripts: $(bin_prefix)/$(bin_dir) - DBTEXTON=yes make -C ../../utils/kamctl/ install-modules + DBTEXTON=yes $(MAKE) -C ../../utils/kamctl/ install-modules install-scripts: install-dbtext-scripts

1 0

git:master: makefile: fix $DESTDIR
by Andrei Pelinescu-Onciul 11 Aug '10

11 Aug '10

Module: sip-router Branch: master Commit: bef528185d7b2e6bfa4ae5ec4bfd4808e1dcf28f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bef5281… Author: Vincent Stemen <vince.lists(a)ngtek.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 16:40:41 2010 +0200 makefile: fix $DESTDIR This fixes Makefile.defs to properly handle $DESTDIR as a base installation directory for packaging, etc (equivalent to BASEDIR). Signed-off-by: Andrei Pelinescu-Onciul <andrei(a)iptel.org> --- Makefile.defs | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index f6bf2c4..0efd157 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -271,9 +271,8 @@ endif # Doxygen directory doxygen_dir=doc/doxygen - # install location -DESTDIR ?= $(LOCALBASE) -PREFIX ?= $(DESTDIR) +# install location +PREFIX ?= $(LOCALBASE) prefix = $(PREFIX) # install path is $(basedir) $(prefix) # example: @@ -281,7 +280,7 @@ prefix = $(PREFIX) # basedir=/tmp # prefix=/usr/local -BASEDIR ?= +BASEDIR ?= $(DESTDIR) basedir = $(BASEDIR) # install prefixes for various stuff cfg_prefix = $(basedir)$(prefix)

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2010