sr-dev April 2009

sr-dev@lists.kamailio.org

13 participants
230 discussions

git:master: Removing postgres module from modules_s
by Jan Janak 23 Apr '09

23 Apr '09

Module: sip-router Branch: master Commit: 92414af97afb0f7652209b28e506f83ad01ba76c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=92414af… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Apr 24 01:25:01 2009 +0200 Removing postgres module from modules_s The module has already been merged with kamailio db_postgres and the new module is in modules directory --- modules_s/postgres/Makefile | 21 - modules_s/… [View More]

1 0

git:master: * Modules: presence
by Juha Heinanen 23 Apr '09

23 Apr '09

Module: sip-router Branch: master Commit: 9c73b883ea0d30cd1f51933179404c5123b5429f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9c73b88… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Apr 23 20:12:57 2009 +0300 * Modules: presence Changed an INFO log into DBG log and improved logged information. --- modules_k/presence/presence.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --… [View More]

1 0

git:master: makefiles: added Makefile.utils
by Andrei Pelinescu-Onciul 23 Apr '09

23 Apr '09

Module: sip-router Branch: master Commit: c6f75a7e56f02abd271649797d2fa1db91ee1b16 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c6f75a7… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Apr 23 15:44:41 2009 +0200 makefiles: added Makefile.utils - added Makefile.utils - updated utils/{gen_ha1,sercmd} to use it --- Makefile.utils | 81 ++++++++++++++++++++++++++++++++++… [View More]++++++++++++++ utils/gen_ha1/Makefile | 6 +--- utils/sercmd/Makefile | 9 ++--- 3 files changed, 86 insertions(+), 10 deletions(-) diff --git a/Makefile.utils b/Makefile.utils new file mode 100644 index 0000000..8c31594 --- /dev/null +++ b/Makefile.utils @@ -0,0 +1,81 @@ +# +# $Id$ +# +# utils Makefile +#(to be included from each util/ subdirectory) +# +# History: +# -------- +# 2009-04-23 initial version derived from Makefile.modules (andrei) + + +# default path to the core makefiles +COREPATH ?=../.. + +ALLDEP=Makefile $(COREPATH)/Makefile.sources $(COREPATH)/Makefile.rules \ + $(COREPATH)/Makefile.utils $(COREPATH)/Makefile.dirs $(COREPATH)/config.mak + +#override modules value, an util cannot have submodules +override modules= +override static_modules= +override static_modules_path= + +ifneq ($(makefile_defs_included),1) +$(error "the local makefile does not include Makefile.defs!") +endif + +ifeq ($(MAKELEVEL), 0) +# make called directly in the module dir! + +else +# called by the main Makefile + +ALLDEP+=$(COREPATH)/Makefile + +endif + +include $(COREPATH)/Makefile.sources + + +# if config was not loaded (makefile_defs!=1) ignore +# the rest of makefile and try only to remake the config +ifeq ($(makefile_defs),1) + + +include $(COREPATH)/Makefile.dirs +include $(COREPATH)/Makefile.targets +include $(COREPATH)/Makefile.rules + +modules: + +# README build rules +ifneq (,$(wildcard doc/Makefile)) +#doc/Makefile present => we can generate README + +README: doc/*.xml + $(MAKE) -C doc $(MOD_NAME).txt + mv doc/$(MOD_NAME).txt $@ + +else +# do nothing + +README: +endif + +#man page build rules +ifneq (,$(wildcard $(MOD_NAME).xml)) + +$(MOD_NAME).7: $(MOD_NAME).xml + docbook2x-man -s ../../doc/stylesheets/serdoc2man.xsl $< + +man: $(MOD_NAME).7 + +else + +man: + +endif + +endif # ifeq($(makefile_defs),1) + +include $(COREPATH)/Makefile.cfg diff --git a/utils/gen_ha1/Makefile b/utils/gen_ha1/Makefile index 92c3553..79e4d58 100644 --- a/utils/gen_ha1/Makefile +++ b/utils/gen_ha1/Makefile @@ -10,8 +10,4 @@ NAME=gen_ha1 LIBS=../../md5.o -include ../../Makefile.sources -include ../../Makefile.targets -include ../../Makefile.rules - -modules: +include ../../Makefile.utils diff --git a/utils/sercmd/Makefile b/utils/sercmd/Makefile index a70260d..b762ab6 100644 --- a/utils/sercmd/Makefile +++ b/utils/sercmd/Makefile @@ -1,7 +1,7 @@ # $Id$ - -include ../../Makefile.defs -include ../../Makefile.targets +COREPATH=../.. +include $(COREPATH)/Makefile.defs +include $(COREPATH)/Makefile.targets auto_gen= NAME=sercmd @@ -43,8 +43,7 @@ ifeq ($(use_readline),1) endif -include ../../Makefile.sources -include ../../Makefile.rules +include $(COREPATH)/Makefile.utils ifeq (,$(quiet)) ifeq ($(use_readline),1) [View Less]

1 0

git:master: Merge commit 'origin/ser_core_cvs'
by Andrei Pelinescu-Onciul 23 Apr '09

23 Apr '09

Module: sip-router Branch: master Commit: 69f3a24eea65fb7663a0910f63239787327c3488 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=69f3a24… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Apr 23 14:33:37 2009 +0200 Merge commit 'origin/ser_core_cvs' * commit 'origin/ser_core_cvs': tcp: added missing blacklist on write pollerr makefiles: minor fix (use COREPATH in Makefile.… [View More]

1 0

git:master: makefiles: minor COREPATH fixes
by Andrei Pelinescu-Onciul 23 Apr '09

23 Apr '09

Module: sip-router Branch: master Commit: 3514d04ce924dbb536ddd598f4df0c81cd561dec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3514d04… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Apr 23 15:45:39 2009 +0200 makefiles: minor COREPATH fixes - COREPATH must now be always defined because of the longer makefile include chain. --- Makefile | 2 +- Makefile.doc | 3 … [View More]

1 0

SR-Users-ES maillist
by Iñaki Baz Castillo 23 Apr '09

23 Apr '09

Hi, for the spanish speakers community there is a maillist about Sip-Router: http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-users-es This maillist has been merged with the previous Kamailio Users-es maillist, so the maillist history remains. Best regards. -- Iñaki Baz Castillo <ibc(a)aliax.net>

1 0

git:master: tls (common): don't use TLS servername if openssl < 1.0.0
by Andrei Pelinescu-Onciul 23 Apr '09

23 Apr '09

Module: sip-router Branch: master Commit: 0705191bec675f931a7a906dffcac6c2b7d25c75 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0705191… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Apr 23 13:35:42 2009 +0200 tls (common): don't use TLS servername if openssl < 1.0.0 - TLS extensions and more specifically server_name support have appeared between openssl 0.9.8l and 1.0.0.… [View More]

1 0

git:master: tls: don't start if tcp is in async mode
by Andrei Pelinescu-Onciul 23 Apr '09

23 Apr '09

Module: sip-router Branch: master Commit: 024a23ebba44e94f2e6fe588bb06ef5a84740304 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=024a23e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Apr 20 14:22:54 2009 +0000 tls: don't start if tcp is in async mode - added check for tcp async mode on startup. If tcp is in async mode and tls_force_run is not set, refuse to start and print … [View More]

1 0

git:master: tls: fixed missing TCP_BUF_SIZE
by Andrei Pelinescu-Onciul 23 Apr '09

23 Apr '09

Module: sip-router Branch: master Commit: b8c2f391dad82675340b99df64ab9c10e67ac003 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b8c2f39… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Apr 20 14:16:02 2009 +0000 tls: fixed missing TCP_BUF_SIZE - updated to the dynamic buffers used now for the tcp connections Reported-by: Alfred E. Heggestad, aeh at db org --- modules/tls/… [View More]

1 0

git:master: tls: ser_cert.sh portability fixes
by Andrei Pelinescu-Onciul 23 Apr '09

23 Apr '09

Module: sip-router Branch: master Commit: 8843ff67a4714b735fd8d00a770671a5e7f950c3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8843ff6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Apr 3 13:37:27 2009 +0000 tls: ser_cert.sh portability fixes - check if hostname supports -f, before trying it (else fallback to hostname without parameters). - check if getops supports long … [View More]options (bsd and darwin versions do not). If not use only short options. --- modules/tls/ser_cert.sh | 51 +++++++++++++++++++++++++++++++++++++--------- 1 files changed, 41 insertions(+), 10 deletions(-) diff --git a/modules/tls/ser_cert.sh b/modules/tls/ser_cert.sh index 046f1c6..4bfb8fc 100755 --- a/modules/tls/ser_cert.sh +++ b/modules/tls/ser_cert.sh @@ -19,8 +19,33 @@ DEFAULT_KEY_FILENAME="ser-selfsigned.key" DEFAULT_OPENSSL='openssl' HOSTNAME=`hostname -s` -FQDN=`hostname -f` -MAILNAME=`cat /etc/mailname 2> /dev/null || hostname -f` +if hostname -f >/dev/null 2>/dev/null ; then + FQDN=`hostname -f` +else + FQDN=`hostname` +fi +MAILNAME=`cat /etc/mailname 2> /dev/null || echo $FQDN` + +# test if we have the normal or enhanced getopt +getopt -T >/dev/null +if [ $? == 4 ]; then + LONGOPTS_SUPPORTED=1 +fi + +longopts() { + if [ -z "${LONGOPTS_SUPPORTED}"]; then + exit; + fi + case "$1" in + -h) echo ', --help';; + -d) echo ', --dir' ;; + -c) echo ', --certificate';; + -k) echo ', --key';; + -e) echo ', --expires';; + -i) echo ', --info';; + -o) echo ', --overwrite' ;; + esac +} usage() { cat <<EOF @@ -41,30 +66,30 @@ DESCRIPTION the options below). OPTIONS - -h, --help + -h`longopts -h` Display this help text. - -d, --dir=DIRECTORY + -d`longopts -d` The path to the directory where cert and key files will be stored. (Default value is '$DEFAULT_DIR') - -c, --certificate=FILENAME + -c`longopts -c` The name of the file where the certificate will be stored. (Default value is '$DEFAULT_CERT_FILENAME') - -k, --key=FILENAME + -k`longopts -k` The name of the file where the private key will be stored. (Default value is '$DEFAULT_KEY_FILENAME') - -e, --expires=DAYS + -e`longopts -e` Number of days for which the certificate will be valid. (Default value is '$DEFAULT_DAYS') - -i, --info=TEXT + -i`longopts -i` The description text to be embedded in the certificate. (Default value is '$DEFAULT_INFO') - -o, --overwrite + -o`longopts -o` Overwrite certificate and key files if they exist already. (By default they will be not overwritten.) @@ -88,7 +113,13 @@ if [ -z "$CERT_FILENAME" ] ; then CERT_FILENAME=$DEFAULT_CERT_FILENAME; fi; if [ -z "$KEY_FILENAME" ] ; then KEY_FILENAME=$DEFAULT_KEY_FILENAME; fi; if [ -z "$OPENSSL" ] ; then OPENSSL=$DEFAULT_OPENSSL; fi; -TEMP=`getopt -o hd:c:k:e:i:o --long help,dir:,certificate:,key:,expires:,info:,overwrite -n $COMMAND -- "$@"` +if [ -n "${LONGOPTS_SUPPORTED}" ]; then + # enhanced version + TEMP=`getopt -o hd:c:k:e:i:o --long help,dir:,certificate:,key:,expires:,info:,overwrite -n $COMMAND -- "$@"` +else + # basic version + TEMP=`getopt hd:c:k:e:i:o "$@"` +fi if [ $? != 0 ] ; then exit 1; fi eval set -- "$TEMP" [View Less]

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2009