sr-dev

sr-dev@lists.kamailio.org

11 participants
44179 discussions

by Iñaki Baz Castillo

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>

15 years, 8 months

git:master: tls (common):Revert "Replace TCP_BUF_SIZE with a cfg_get(..)."

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: dcf7195d5dc28097f88b0e6841aa7c805244c22b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dcf7195… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Apr 23 13:09:40 2009 +0200 tls (common):Revert "Replace TCP_BUF_SIZE with a cfg_get(..)." This reverts commit 29b0138a7ce09cab1024e25ac457cb8915a973da. (bad fix) --- modules/tls/tls_server.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/modules/tls/tls_server.c b/modules/tls/tls_server.c index 6795dec..32d8b28 100644 --- a/modules/tls/tls_server.c +++ b/modules/tls/tls_server.c @@ -45,7 +45,6 @@ #include "../../timer.h" #include "../../globals.h" #include "../../pt.h" -#include "../../tcp_options.h" #include "tls_init.h" #include "tls_domain.h" @@ -814,7 +813,7 @@ int tls_h_read(struct tcp_connection * c) SSL* ssl; r = &c->req; - bytes_free = cfg_get(tcp, tcp_cfg, rd_buf_size) - (int)(r->pos - r->buf); + bytes_free = TCP_BUF_SIZE - (int)(r->pos - r->buf); if (bytes_free == 0) { ERR("Buffer overrun, dropping\n");

15 years, 8 months

git:master: tls: ser_cert.sh portability fixes

by Andrei Pelinescu-Onciul

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 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"

15 years, 8 months

git:master: tls: fixed missing TCP_BUF_SIZE

by Andrei Pelinescu-Onciul

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/tls_server.c | 58 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 57 insertions(+), 1 deletions(-) diff --git a/modules/tls/tls_server.c b/modules/tls/tls_server.c index 32d8b28..1054438 100644 --- a/modules/tls/tls_server.c +++ b/modules/tls/tls_server.c @@ -799,6 +799,62 @@ again: } + +/* nonblocking version */ +int tls_h_nonblocking_write(struct tcp_connection *c, int fd, const char *buf, + unsigned int len) +{ + int err, n; + + n = 0; + if (tls_update_fd(c, fd) < 0) goto error; +again: + err = 0; + if (c->state == S_CONN_CONNECT) { + if (tls_connect(c, &err) < 0) goto error; + } else if (c->state == S_CONN_ACCEPT) { + if (tls_accept(c, &err) < 0) goto error; + } + if (c->state!=S_CONN_CONNECT && c->state!=S_CONN_ACCEPT){ + n = tls_write(c, buf, len, &err); + if (n < 0) { + DBG("tls_write error %d (ssl %d)\n", n, err); + goto error; + } else if (n==len){ + goto end; + }else{ + DBG("%ld bytes still need to be written\n", + (long)(len - n)); + } + }else + n=0; /* no bytes written */ + + switch(err){ + /* TODO: set some flag: WANT_READ, WANT_WRITE */ + case 0: + case SSL_ERROR_WANT_WRITE: + break; + case SSL_ERROR_WANT_READ: + break; +#if OPENSSL_VERSION_NUMBER >= 0x00907000L /*0.9.7*/ + case SSL_ERROR_WANT_ACCEPT: +#endif + case SSL_ERROR_WANT_CONNECT: + DBG("re-trying accept/connect\n"); + break; + default: + BUG("Unhandled SSL error %d\n", err); + goto error; + } + +error: + return -1; +end: + return n; +} + + + /* * called only when a connection is in S_CONN_OK, we do not have to care * about accepting or connecting here, each modification of ssl data @@ -813,7 +869,7 @@ int tls_h_read(struct tcp_connection * c) SSL* ssl; r = &c->req; - bytes_free = TCP_BUF_SIZE - (int)(r->pos - r->buf); + bytes_free = c->req.b_size - (int)(r->pos - r->buf); if (bytes_free == 0) { ERR("Buffer overrun, dropping\n");

15 years, 8 months

git:master: tls: don't start if tcp is in async mode

by Andrei Pelinescu-Onciul

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 an error message (tls does not support yet tcp async mode). --- modules/tls/tls_mod.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/tls/tls_mod.c b/modules/tls/tls_mod.c index 436785f..7f79ce8 100644 --- a/modules/tls/tls_mod.c +++ b/modules/tls/tls_mod.c @@ -308,6 +308,12 @@ static int mod_init(void) "(set enable_tls=1 in the config to enable it)\n"); return 0; } + + if (cfg_get(tcp, tcp_cfg, async) && !tls_force_run){ + ERR("tls does not support tcp in async mode, please use" + " tcp_async=no in the config file\n"); + return -1; + } /* Convert tls_method parameter to integer */ method = tls_parse_method(&tls_method); if (method < 0) {

15 years, 8 months

git:master: tls (common): don't use TLS servername if openssl < 1.0.0

by Andrei Pelinescu-Onciul

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. --- modules/tls/tls_init.c | 5 +++++ modules/tls/tls_init.h | 5 +++++ modules/tls/tls_select.c | 3 ++- 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/modules/tls/tls_init.c b/modules/tls/tls_init.c index 4d78e66..b0f07f9 100644 --- a/modules/tls/tls_init.c +++ b/modules/tls/tls_init.c @@ -84,6 +84,11 @@ to compile on the _target_ system)" #endif /* OPENSSL_VERSION_NUMBER */ #endif /* TLS_KSSL_WORKARROUND */ +/* openssl < 1. 0 */ +#if OPENSSL_VERSION_NUMBER < 0x01000000L +# warning "openssl < 1.0: no TLS extensions or server name support" +#endif /* OPENSSL_VERION < 1.0 */ + #ifndef OPENSSL_NO_COMP diff --git a/modules/tls/tls_init.h b/modules/tls/tls_init.h index 4e3f8f8..43e5f49 100644 --- a/modules/tls/tls_init.h +++ b/modules/tls/tls_init.h @@ -36,6 +36,11 @@ #include "../../ip_addr.h" #include "tls_domain.h" +/* openssl < 1. 0 */ +#if OPENSSL_VERSION_NUMBER < 0x01000000L +/* alternative: check ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME */ +#define OPENSSL_NO_TLSEXT +#endif /* OPENSSL_VERION < 1.0 */ #ifndef OPENSSL_NO_KRB5 /* enable workarround for openssl kerberos wrong malloc bug * (kssl code uses libc malloc/free/calloc instead of OPENSSL_malloc & diff --git a/modules/tls/tls_select.c b/modules/tls/tls_select.c index d6efe93..85d4ca4 100644 --- a/modules/tls/tls_select.c +++ b/modules/tls/tls_select.c @@ -39,6 +39,7 @@ #include "tls_server.h" #include "tls_select.h" #include "tls_mod.h" +#include "tls_init.h" /* features macros */ enum { CERT_LOCAL = 1, /* Select local certificate */ @@ -932,7 +933,7 @@ static int sel_cert(str* res, select_t* s, struct sip_msg* msg) #ifdef OPENSSL_NO_TLSEXT -static int get_tlsext_sn(str* res, int type, sip_msg_t* msg) +static int get_tlsext_sn(str* res, sip_msg_t* msg) { ERR("TLS extension 'server name' is not available! " "please install openssl with TLS extension support and recompile "

15 years, 8 months

[Fwd: [Kamailio-Devel] race condition]

by Klaus Darilion

Hi guys! In Kamilio we had (have?) the problem described here. Maybe the problem still applies to ser-tm too, then it needs this fix too. regards klaus -------- Original-Nachricht -------- Betreff: [Kamailio-Devel] race condition Datum: Thu, 23 Apr 2009 10:34:26 +0200 Von: Zappasodi Daniele <Daniele.Zappasodi(a)seltatel.it> An: <devel(a)lists.kamailio.org> Referenzen: <mailman.9.1240394401.8388.devel(a)lists.kamailio.org> Hello, I have a problem with a race condition with the reply and retransmission. Sometimes Openser (I'm still working with 1.3.x version) ignores the provisional reply and tears down the call after the fr_timer. This happens only in a particulary conditions: I have a short value for fr_timer (5 sec); the reply arrives very fast (I have gateway and proxy on the same box). In this situation can happen that a child sends the INVITE (SEND_BUFFER in t_forward_nonack) and it is suspended by the scheduler before it can execute start_retr. Another child get the reply. When the first child executes start_retr it sends immediately a retransmission for the INVITE and after 5 seconds (the fr_timer) it tears down the call with CANCEL, because it ignores the reply. I know that this is a very improbable condition (even if I encountered it), but if you want to fix it, it should be easy to solve: in t_forward_nonack, before start_retr, it should be tested if another child has already received a reply. Something like this (t_fwd.c on head): @@ -719,7 +719,10 @@ -p_msg->REQ_METHOD); } - start_retr( &t->uac[i].request ); + if(p_msg->REQ_METHOD==METHOD_INVITE && t->uac[i].last_received>=100) + LM_DBG("Last received %d\n",t->uac[i].last_received); + else + start_retr( &t->uac[i].request ); set_kr(REQ_FWDED); } }

15 years, 8 months

git:master: Merge branch 'master' of ssh://ramona@git.sip-router.org/ sip-router

by Elena-Ramona Modroiu

Module: sip-router Branch: master Commit: 61fad306dab7aef72a1a7b976e33054fa17964dd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=61fad30… Author: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Committer: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Date: Thu Apr 23 14:22:37 2009 +0300 Merge branch 'master' of ssh://ramona@git.sip-router.org/sip-router * 'master' of ssh://ramona@git.sip-router.org/sip-router: tls: don't start if tcp is in async mode tls: fixed missing TCP_BUF_SIZE ---

15 years, 8 months

git:master: siptrace(k): register exported statistics from mod_init

by Elena-Ramona Modroiu

Module: sip-router Branch: master Commit: 51c1fe92ea71db3e418e146fe48fe9c93f18181f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=51c1fe9… Author: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Committer: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Date: Thu Apr 23 13:53:31 2009 +0300 siptrace(k): register exported statistics from mod_init - k statistics API is now in kcore library, SR core doesn't register stats from module_exports --- modules_k/siptrace/siptrace.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/modules_k/siptrace/siptrace.c b/modules_k/siptrace/siptrace.c index c7c9e8a..421f6b5 100644 --- a/modules_k/siptrace/siptrace.c +++ b/modules_k/siptrace/siptrace.c @@ -190,6 +190,14 @@ static int mod_init(void) { pv_spec_t avp_spec; +#ifdef STATISTICS + /* register statistics */ + if (register_module_stats( exports.name, siptrace_stats)!=0 ) { + LM_ERR("failed to register core statistics\n"); + return -1; + } +#endif + if(register_mi_mod(exports.name, mi_cmds)!=0) { LM_ERR("failed to register MI commands\n");

15 years, 8 months

git:master: registrar(k): register exported statistics from mod_init

by Elena-Ramona Modroiu

Module: sip-router Branch: master Commit: 93154d273d234a2958a364faa8fcfe546daf5c28 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=93154d2… Author: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Committer: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Date: Thu Apr 23 13:50:34 2009 +0300 registrar(k): register exported statistics from mod_init - k statistics API is now in kcore library, SR core doesn't register stats from module_exports --- modules_k/registrar/reg_mod.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/modules_k/registrar/reg_mod.c b/modules_k/registrar/reg_mod.c index 5986867..f80d901 100644 --- a/modules_k/registrar/reg_mod.c +++ b/modules_k/registrar/reg_mod.c @@ -249,6 +249,15 @@ static int mod_init(void) str s; bind_usrloc_t bind_usrloc; + +#ifdef STATISTICS + /* register statistics */ + if (register_module_stats( exports.name, mod_stats)!=0 ) { + LM_ERR("failed to register core statistics\n"); + return -1; + } +#endif + /* load the SL API */ if (load_sl_api(&slb)!=0) { LM_ERR("can't load SL API\n");

15 years, 8 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev