Module: sip-router
Branch: sr_3.0
Commit: 2abd1340af64526f859741741693a66131fb52be
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2abd134…
Author: Juha Heinanen <jh(a)tutpro.com>
Committer: Juha Heinanen <jh(a)tutpro.com>
Date: Sat Dec 26 16:00:55 2009 +0200
Merge branch 'sr_3.0' of ssh://jh@git.sip-router.org/sip-router into sr_3.0
* 'sr_3.0' of ssh://jh@git.sip-router.org/sip-router:
tm: safer handling for local transactions and drop_replies!=0
sctp: stats: don't increment ASSOC_SHUTDOWN on COMM_LOST
sctp: SCTP_STATS_ASSOC_SHUTDOWN
tm doc: local_ack_mode documentation
tm: new param: local_ack_mode
makefile: fix make bin & basedir
core: fix parsing for avps with the same name as a pv class
---
Module: sip-router
Branch: sr_3.0
Commit: 5fa3a6acad0f43785e536a2afe2beb2b555ee88b
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5fa3a6a…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Juha Heinanen <jh(a)tutpro.com>
Date: Fri Dec 11 23:07:27 2009 +0100
tls: name the certificates based on $MAIN_NAME
(cherry picked from commit 6ecc6c13f63dab04083f61aa1b7ee767f9441ee0)
---
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 <<+
Have error
authorize.c:153: error: conflicting types for 'find_credentials'
authorize.h:49: error: previous declaration of 'find_credentials' was here
authorize.c:153: error: conflicting types for 'find_credentials'
authorize.h:49: error: previous declaration of 'find_credentials' was here
make[1]: *** [authorize.o] Error 1
make[1]: Leaving directory
`/soft/kamailio-3.0.0-rc3/modules_k/auth_diameter'
make: *** [modules_k] Error 1
i use
centos 4.5
make version 8.1
gcc version 3.4.6 20060404 (Red Hat 3.4.6-8)
Thanks.
Hi everybody,
before you leave the computers and go on holidays, I want to thank you
all for the good work and support of the Kamailio and SIP Router projects.
I wish you a Merry Christmas and a Happy New Year!
As the project name is a Hawaiian word - the "Kamailian" greeting is:
"Mele Kalikimaka me ka Hau'oli Makahiki Hou!"
How would it be in your language?
May the new year bring you joy, peace, good health and prosperity! Enjoy
the winter holidays!
Ramona
On 12/24/09 5:14 AM, Alex Balashov wrote:
> One of the impediments to using mediaproxy2 is that AG does not seem
> interested in maintaining or supporting long-term fundamental
> compatibility with Kamailio/SR, as an OpenSIPS partisan. Perhaps I am
> mistaken on that, but that is the impression that I get.
>
> A good approach is likely to be possible soon in Kamailio 3.x/SR with
> the use of the kernel-bound RTP proxy that was built into SER,
>
> I do not exactly know how well it works at this point, but seems to me
> like a better approach if my perception of political difficulties with
> mediaproxy2 is accurate:
>
> http://www.kamailio.org/docs/modules/3.0.x/modules/iptrtpproxy.html
AFAIK iptrtpproxy is very stable and deployed on some public voip
services. Perhaps the authors can give more feedback (therefore I cc-ed
sr-dev). I plan to start using it with Kamailio 3.0.
Along with this, I want to bring in attention another alternative, that
opens the service to more media-oriented features (e.g., like in call
audio messages): using a light weight media server in back-to-back user
agent mode, like SEMS (of course it could be very-stripped-down config
of asterisk or freeswitch). Network architecture would be:
[caller] ====== [kamailio] ====== [sems] ====== [kamailio] ====== [callee]
The over-all performances are comparable (when no transcoding happens)
with today's cpu power.
Cheers,
Daniel
--
Daniel-Constantin Mierla
* http://www.asipto.com/
THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY.
The following task has a new comment added:
FS#21 - Crash at t_reply.c:668
User who did this - Andrey 'Krieger' Utkin (andrey.utkin.2)
----------
Does not crash any more, indeed.
Thanks a lot.
----------
More information can be found at the following URL:
http://sip-router.org/tracker/index.php?do=details&task_id=21#comment15
You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.