sr-dev July 2010

sr-dev@lists.kamailio.org

29 participants
223 discussions

git:master: Fix minor typo
by Timo Reimann 13 Jul '10

13 Jul '10

Module: sip-router Branch: master Commit: d4c63b7f3e7be5a2a86c929d013f19d6c8cbb4eb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d4c63b7… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Tue Jul 13 14:46:54 2010 +0200 Fix minor typo --- modules_k/dialog/dlg_hash.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index 72b7fec..6df21e3 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -132,7 +132,7 @@ inline void destroy_dlg(struct dlg_cell *dlg) { int ret = 0; - LM_DBG("destroing dialog %p\n",dlg); + LM_DBG("destroying dialog %p\n",dlg); ret = remove_dialog_timer(&dlg->tl); if (ret < 0) {

1 0

SF.net SVN: openser:[6017] branches/1.5/modules/dialog/dlg_req_within.c
by timoreimann＠users.sourceforge.net 13 Jul '10

13 Jul '10

Revision: 6017 http://openser.svn.sourceforge.net/openser/?rev=6017&view=rev Author: timoreimann Date: 2010-07-13 11:49:39 +0000 (Tue, 13 Jul 2010) Log Message: ----------- modules/dialog: Do not send BYE request for non-confirmed dialogs (not supported) Modified Paths: -------------- branches/1.5/modules/dialog/dlg_req_within.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

git:kamailio_3.0: modules/dialog: Do not send BYE request for non-confirmed dialogs
by Timo Reimann 13 Jul '10

13 Jul '10

Module: sip-router Branch: kamailio_3.0 Commit: 983411fa3db60fd3f5735dc026ee9bf8946e9253 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=983411f… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Tue Jul 13 13:21:40 2010 +0200 modules/dialog: Do not send BYE request for non-confirmed dialogs (not supported). (cherry picked from commit 4a84c8c410ce45d9e5443eb52ac4c79e47ab5f3c) --- modules_k/dialog/dlg_req_within.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules_k/dialog/dlg_req_within.c b/modules_k/dialog/dlg_req_within.c index 9be5c51..aae12fd 100644 --- a/modules_k/dialog/dlg_req_within.c +++ b/modules_k/dialog/dlg_req_within.c @@ -236,6 +236,12 @@ error: */ static inline int send_bye(struct dlg_cell * cell, int dir, str *hdrs) { + /* do not send BYE request for non-confirmed dialogs (not supported) */ + if (cell->state != DLG_STATE_CONFIRMED_NA && cell->state != DLG_STATE_CONFIRMED) { + LM_ERR("terminating non-confirmed dialogs not supported\n"); + return -1; + } + /*verify direction*/ uac_req_t uac_r; dlg_t* dialog_info;

1 0

git:master: modules/dialog: Do not send BYE request for non-confirmed dialogs
by Timo Reimann 13 Jul '10

13 Jul '10

Module: sip-router Branch: master Commit: 4a84c8c410ce45d9e5443eb52ac4c79e47ab5f3c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4a84c8c… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Tue Jul 13 13:21:40 2010 +0200 modules/dialog: Do not send BYE request for non-confirmed dialogs (not supported). --- modules_k/dialog/dlg_req_within.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules_k/dialog/dlg_req_within.c b/modules_k/dialog/dlg_req_within.c index 9be5c51..aae12fd 100644 --- a/modules_k/dialog/dlg_req_within.c +++ b/modules_k/dialog/dlg_req_within.c @@ -236,6 +236,12 @@ error: */ static inline int send_bye(struct dlg_cell * cell, int dir, str *hdrs) { + /* do not send BYE request for non-confirmed dialogs (not supported) */ + if (cell->state != DLG_STATE_CONFIRMED_NA && cell->state != DLG_STATE_CONFIRMED) { + LM_ERR("terminating non-confirmed dialogs not supported\n"); + return -1; + } + /*verify direction*/ uac_req_t uac_r; dlg_t* dialog_info;

1 0

git:andrei/tcp_tls_changes: tls: enable PARTIAL_WRITE by default
by Andrei Pelinescu-Onciul 09 Jul '10

09 Jul '10

Module: sip-router Branch: andrei/tcp_tls_changes Commit: d950e1dfaa6b13867bf469a76a0c33fa7eb54f4d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d950e1d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Jul 9 20:20:51 2010 +0200 tls: enable PARTIAL_WRITE by default Set SSL_MODE_ENABLE_PARTIAL_WRITE and SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER on startup. --- modules/tls/tls_domain.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/modules/tls/tls_domain.c b/modules/tls/tls_domain.c index 762991a..97dc942 100644 --- a/modules/tls/tls_domain.c +++ b/modules/tls/tls_domain.c @@ -851,6 +851,22 @@ int tls_fix_domains_cfg(tls_domains_cfg_t* cfg, tls_domain_t* srv_defaults, ERR("invalid ssl_read_ahead value (%d)\n", ssl_read_ahead); return -1; } + /* set options for SSL_write: + SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER - needed when queueing + clear text for a future write (WANTS_READ). In this case the + buffer address will change for the repeated SSL_write() and + without this option it will trigger the openssl sanity checks. + SSL_MODE_ENABLE_PARTIAL_WRITE - needed to deal with potentially + huge multi-record writes that don't fit in the default buffer + (the default buffer must have space for at least 1 record) */ + if (tls_foreach_CTX_in_cfg(cfg, tls_ssl_ctx_mode, + SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER | + SSL_MODE_ENABLE_PARTIAL_WRITE, + 0) < 0) { + ERR("could not set SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER and" + " SSL_MODE_ENABLE_PARTIAL_WRITE\n"); + return -1; + } return 0; }

1 0

git:andrei/tcp_tls_changes: tls: don't report SSL protocol errors as bugs
by Andrei Pelinescu-Onciul 09 Jul '10

09 Jul '10

Module: sip-router Branch: andrei/tcp_tls_changes Commit: e536c71c072c3c74b1b89a58e996b347a583255a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e536c71… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Jul 9 20:01:41 2010 +0200 tls: don't report SSL protocol errors as bugs Report SSL protocol level error at a L_ERR level and not as bugs. --- modules/tls/tls_server.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/modules/tls/tls_server.c b/modules/tls/tls_server.c index cc065c5..8d45b53 100644 --- a/modules/tls/tls_server.c +++ b/modules/tls/tls_server.c @@ -514,6 +514,7 @@ static int tls_shutdown(struct tcp_connection *c) } goto err; + case SSL_ERROR_SSL: default: TLS_ERR("SSL error:"); goto err; @@ -786,6 +787,10 @@ redo_wr: send_flags->f &= ~SND_F_CON_CLOSE; } break; /* or goto end */ + case SSL_ERROR_SSL: + /* protocol level error */ + TLS_ERR(err_src); + goto error; #if OPENSSL_VERSION_NUMBER >= 0x00907000L /*0.9.7*/ case SSL_ERROR_WANT_CONNECT: /* only if the underlying BIO is not yet connected @@ -1150,6 +1155,10 @@ ssl_read_skipped: BUG("write buffer too small (%d/%d bytes)\n", wr.used, wr.size); goto bug; + case SSL_ERROR_SSL: + /* protocol level error */ + TLS_ERR(err_src); + goto error; #if OPENSSL_VERSION_NUMBER >= 0x00907000L /*0.9.7*/ case SSL_ERROR_WANT_CONNECT: /* only if the underlying BIO is not yet connected

1 0

git:andrei/tcp_tls_changes: tls: partial SSL_write support when reading ( tls_read_f)
by Andrei Pelinescu-Onciul 09 Jul '10

09 Jul '10

Module: sip-router Branch: andrei/tcp_tls_changes Commit: 813284bad28a11c985cbd4ce370fdee98c815e88 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=813284b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Jul 9 20:03:45 2010 +0200 tls: partial SSL_write support when reading (tls_read_f) When writing-on-read (due to queued send data waiting for a renegotiation to complete), retry the write if it did not have enough buffer space to complete (after freeing the buffer space by tcp_send-ing its content). --- modules/tls/tls_server.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/tls/tls_server.c b/modules/tls/tls_server.c index 8d45b53..122141e 100644 --- a/modules/tls/tls_server.c +++ b/modules/tls/tls_server.c @@ -1151,9 +1151,15 @@ ssl_read_skipped: } goto end; /* no more data to read */ case SSL_ERROR_WANT_WRITE: - /* write buffer too small, nothing written */ + if (wr.used) { + /* something was written => buffer not big enough to hold + everything => reset buffer & retry (the tcp_write already + happened if we are here) */ + goto continue_ssl_read; + } + /* else write buffer too small, nothing written */ BUG("write buffer too small (%d/%d bytes)\n", - wr.used, wr.size); + wr.used, wr.size); goto bug; case SSL_ERROR_SSL: /* protocol level error */

1 0

git:master: modules/dialplan: added check that database string value is not null
by Juha Heinanen 09 Jul '10

09 Jul '10

Module: sip-router Branch: master Commit: cada1734897f1d108fb80ea1ce306432397b0846 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cada173… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Jul 9 12:54:01 2010 +0300 modules/dialplan: added check that database string value is not null - Added NULL check to GET_STR_VALUE macro. - Credits to Bogdan-Andrei Iancu. --- modules/dialplan/dp_db.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules/dialplan/dp_db.c b/modules/dialplan/dp_db.c index 3f50e78..62a64e4 100644 --- a/modules/dialplan/dp_db.c +++ b/modules/dialplan/dp_db.c @@ -61,6 +61,11 @@ static db_func_t dp_dbf; #define GET_STR_VALUE(_res, _values, _index)\ do{\ + if ( VAL_NULL((_values)+ (_index)) ) { \ + LM_ERR(" values %d is NULL - not allowed\n",_index);\ + (_res).s = 0; (_res).len = 0;\ + goto err;\ + } \ (_res).s = VAL_STR((_values)+ (_index)).s;\ (_res).len = strlen(VAL_STR((_values)+ (_index)).s);\ }while(0);

1 0

[tracker] Task closed: Registrar module don't save data to location mysql table.
by sip-router 09 Jul '10

09 Jul '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#79 - Registrar module don't save data to location mysql table. User who did this - Andrei Pelinescu-Onciul (andrei) Reason for closing: Not a bug More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=79 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.

1 0

[Fwd: Re: [SR-Users] Kamailio 1.5 stops processing messages]
by marius zbihlei 09 Jul '10

09 Jul '10

Forwarded the message from sr-users to sr-dev list Cheers Marius

3 9

← Newer
1
...
13
14
15
16
17
18
19
...
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 July 2010