sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:andrei/tcp_tls_changes: tls: fix trailing space in new modparams

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: 0349cab6bdd01d762affcbd1c29e3bd683595ea3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0349cab… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Aug 16 01:02:19 2010 +0200 tls: fix trailing space in new modparams Fix typo (trailing space) in recently added modparams: con_ct_wq_max, ct_wq_max and ct_wq_blk_size. --- modules/tls/tls_mod.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/tls/tls_mod.c b/modules/tls/tls_mod.c index 19518f8..57618a8 100644 --- a/modules/tls/tls_mod.c +++ b/modules/tls/tls_mod.c @@ -207,9 +207,9 @@ static param_export_t params[] = { &default_tls_cfg.ssl_max_send_fragment}, {"ssl_read_ahead", PARAM_INT, &default_tls_cfg.ssl_read_ahead}, {"send_close_notify", PARAM_INT, &default_tls_cfg.send_close_notify}, - {"con_ct_wq_max ", PARAM_INT, &default_tls_cfg.con_ct_wq_max}, - {"ct_wq_max ", PARAM_INT, &default_tls_cfg.ct_wq_max}, - {"ct_wq_blk_size ", PARAM_INT, &default_tls_cfg.ct_wq_blk_size}, + {"con_ct_wq_max", PARAM_INT, &default_tls_cfg.con_ct_wq_max}, + {"ct_wq_max", PARAM_INT, &default_tls_cfg.ct_wq_max}, + {"ct_wq_blk_size", PARAM_INT, &default_tls_cfg.ct_wq_blk_size}, {"tls_force_run", PARAM_INT, &default_tls_cfg.force_run}, {"low_mem_threshold1", PARAM_INT, &default_tls_cfg.low_mem_threshold1}, {"low_mem_threshold2", PARAM_INT, &default_tls_cfg.low_mem_threshold2},

14 years, 5 months

git:andrei/tcp_tls_changes: tls: more config vars displayed by the tls. options RPC

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: cb90d8866c35c54d3b7d624edca7883f42300966 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cb90d88… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Aug 16 01:04:18 2010 +0200 tls: more config vars displayed by the tls.options RPC Added send_close_notify and debug to the list of displayed config options. --- modules/tls/tls_rpc.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules/tls/tls_rpc.c b/modules/tls/tls_rpc.c index 0013142..3fabcf6 100644 --- a/modules/tls/tls_rpc.c +++ b/modules/tls/tls_rpc.c @@ -203,7 +203,7 @@ static void tls_options(rpc_t* rpc, void* c) { void* handle; rpc->add(c, "{", &handle); - rpc->struct_add(handle, "dSdddSSSSdSSdddddddddddd", + rpc->struct_add(handle, "dSdddSSSSdSSdddddddddddddd", "force_run", cfg_get(tls, tls_cfg, force_run), "method", &cfg_get(tls, tls_cfg, method), "verify_certificate", cfg_get(tls, tls_cfg, verify_cert), @@ -218,12 +218,14 @@ static void tls_options(rpc_t* rpc, void* c) "session_id", &cfg_get(tls, tls_cfg, session_id), "config", &cfg_get(tls, tls_cfg, config_file), "log", cfg_get(tls, tls_cfg, log), + "debug", cfg_get(tls, tls_cfg, debug), "connection_timeout", TICKS_TO_S(cfg_get(tls, tls_cfg, con_lifetime)), "disable_compression", cfg_get(tls, tls_cfg, disable_compression), "ssl_release_buffers", cfg_get(tls, tls_cfg, ssl_release_buffers), "ssl_freelist_max", cfg_get(tls, tls_cfg, ssl_freelist_max), "ssl_max_send_fragment", cfg_get(tls, tls_cfg, ssl_max_send_fragment), "ssl_read_ahead", cfg_get(tls, tls_cfg, ssl_read_ahead), + "send_close_notify", cfg_get(tls, tls_cfg, send_close_notify), "low_mem_threshold1", cfg_get(tls, tls_cfg, low_mem_threshold1), "low_mem_threshold2", cfg_get(tls, tls_cfg, low_mem_threshold2), "ct_wq_max", cfg_get(tls, tls_cfg, ct_wq_max),

14 years, 5 months

git:andrei/tcp_tls_changes: tls: verbose debugging for SSL_ERROR_WANT_WRITE

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: 9318b4cbc6e78dd0f28860b0d89e649f9aa17125 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9318b4c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Aug 15 18:10:42 2010 +0200 tls: verbose debugging for SSL_ERROR_WANT_WRITE Debugging messages for partial write and SSL_ERROR_WANT_WRITE (enabled only if the tls module is compiled with -DTLS_WR_DEBUG and -DTLS_RD_DEBUG). --- modules/tls/tls_server.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/tls/tls_server.c b/modules/tls/tls_server.c index a910767..5ccf545 100644 --- a/modules/tls/tls_server.c +++ b/modules/tls/tls_server.c @@ -787,6 +787,10 @@ redo_wr: /* this function should be called again => disallow immediate closing of the connection */ send_flags->f &= ~SND_F_CON_CLOSE; + TLS_WR_TRACE("(%p) SSL_ERROR_WANT_WRITE partial write" + " (written %p , %d, rest_buf=%p" + " rest_len=%d))\n", c, buf, offs, + *rest_buf, *rest_len); } break; /* or goto end */ case SSL_ERROR_SSL: @@ -1157,6 +1161,8 @@ ssl_read_skipped: /* something was written => buffer not big enough to hold everything => reset buffer & retry (the tcp_write already happened if we are here) */ + TLS_RD_TRACE("(%p) SSL_ERROR_WANT_WRITE partial write" + " (written %d), retrying\n", c, wr.used); goto continue_ssl_read; } /* else write buffer too small, nothing written */

14 years, 5 months

git:andrei/tcp_tls_changes: tls: add lib64 to LIBS path

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: bb876db3f752ef463b3131e209d4d5e5ad8aa4e0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bb876db… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Aug 15 18:07:38 2010 +0200 tls: add lib64 to LIBS path Add default openssl install path on 64 bit systems ($(LOCALBASE)/ssl/lib64). --- modules/tls/Makefile | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/tls/Makefile b/modules/tls/Makefile index 0c3aa30..a04aea6 100644 --- a/modules/tls/Makefile +++ b/modules/tls/Makefile @@ -10,8 +10,10 @@ auto_gen= NAME=tls.so DEFS+= -I$(LOCALBASE)/ssl/include -LIBS+= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib -lssl -lcrypto \ - $(TLS_EXTRA_LIBS) +LIBS+= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib \ + -L$(LOCALBASE)/lib64 -L$(LOCALBASE)/ssl/lib64 \ + -lssl -lcrypto \ + $(TLS_EXTRA_LIBS) # NOTE: depending on the way in which libssl was compiled you might # have to add -lz -lkrb5 (zlib and kerberos5). # E.g.: make TLS_HOOKS=1 TLS_EXTRA_LIBS="-lz -lkrb5"

14 years, 5 months

git:andrei/tcp_tls_changes: tls: doc - notes about enabling debugging

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: 4b6a0f3dcbfddf2bc333284a9af6c4445ec557c6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4b6a0f3… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Aug 15 18:55:15 2010 +0200 tls: doc - notes about enabling debugging - notes about compiling with debugging enabled - document tls_debug modparam --- modules/tls/README | 239 +++++++++++++++++++++++++------------------- modules/tls/doc/params.xml | 35 ++++++- modules/tls/doc/tls.xml | 36 +++++++ 3 files changed, 208 insertions(+), 102 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=4b6…

14 years, 5 months

git:andrei/tcp_tls_changes: tls: added debug log level modparam

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: 6c4a531df862b46dadc62e679da091c07989ff46 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6c4a531… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Aug 15 18:51:38 2010 +0200 tls: added debug log level modparam The log level used for debug messages can now be configured via the new tls_debug modparam. It can be also changed at runtime (tls.debug). Note that for now debug messages will be logged only if tls is compiled with one of -DTLS_RD_DEBUG, -DTLS_WR_DEBUG or -DTLS_BIO_DEBUG. --- modules/tls/tls_bio.c | 7 +++++-- modules/tls/tls_cfg.c | 5 ++++- modules/tls/tls_cfg.h | 1 + modules/tls/tls_mod.c | 3 ++- modules/tls/tls_server.c | 6 ++++-- 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/modules/tls/tls_bio.c b/modules/tls/tls_bio.c index c9b4af0..1013bf7 100644 --- a/modules/tls/tls_bio.c +++ b/modules/tls/tls_bio.c @@ -32,6 +32,7 @@ #include "../../compiler_opt.h" #include "../../dprint.h" #include "../../ut.h" +#include "tls_cfg.h" /* 0xf2 should be unused (as of openssl 1.0.0 max. internal defined BIO is 23) */ @@ -44,10 +45,12 @@ #ifdef TLS_BIO_DEBUG #ifdef __SUNPRO_C #define TLS_BIO_DBG(...) \ - LOG_(DEFAULT_FACILITY, L_INFO, "tls_BIO: " LOC_INFO, __VA_ARGS__) + LOG_(DEFAULT_FACILITY, cfg_get(tls, tls_cfg, debug),\ + "tls_BIO: " LOC_INFO, __VA_ARGS__) #else #define TLS_BIO_DBG(args...) \ - LOG_(DEFAULT_FACILITY, L_INFO, "tls_BIO: " LOC_INFO, ## args) + LOG_(DEFAULT_FACILITY, cfg_get(tls, tls_cfg, debug),\ + "tls_BIO: " LOC_INFO, ## args) #endif /* __SUNPRO_c */ #else /* TLS_BIO_DEBUG */ #ifdef __SUNPRO_C diff --git a/modules/tls/tls_cfg.c b/modules/tls/tls_cfg.c index 88b9b0f..046e202 100644 --- a/modules/tls/tls_cfg.c +++ b/modules/tls/tls_cfg.c @@ -50,7 +50,8 @@ struct cfg_group_tls default_tls_cfg = { 0, /* session_cache */ STR_STATIC_INIT("sip-router-tls-3.1"), /* session_id */ STR_NULL, /* config_file */ - 3, /* log */ + 3, /* log (L_DBG)*/ + 3, /* debug (L_DBG) */ 600, /* con_lifetime (s)*/ 1, /* disable_compression */ #if OPENSSL_VERSION_NUMBER >= 0x01000000L @@ -164,6 +165,8 @@ cfg_def_t tls_cfg_def[] = { "tls config file name (used for the per domain options)" }, {"log", CFG_VAR_INT | CFG_ATOMIC, 0, 1000, 0, 0, "tls info messages log level" }, + {"debug", CFG_VAR_INT | CFG_ATOMIC, 0, 1000, 0, 0, + "tls debug messages log level" }, {"connection_timeout", CFG_VAR_INT | CFG_ATOMIC, -1, MAX_TLS_CON_LIFETIME, fix_con_lt, 0, "initial connection lifetime (in s) (obsolete)" }, diff --git a/modules/tls/tls_cfg.h b/modules/tls/tls_cfg.h index eea7292..9ec2570 100644 --- a/modules/tls/tls_cfg.h +++ b/modules/tls/tls_cfg.h @@ -54,6 +54,7 @@ struct cfg_group_tls { str session_id; str config_file; int log; + int debug; int con_lifetime; int disable_compression; /* release internal openssl read or write buffer when they are no longer diff --git a/modules/tls/tls_mod.c b/modules/tls/tls_mod.c index 895d18e..19518f8 100644 --- a/modules/tls/tls_mod.c +++ b/modules/tls/tls_mod.c @@ -194,7 +194,8 @@ static param_export_t params[] = { {"certificate", PARAM_STR, &default_tls_cfg.certificate }, {"cipher_list", PARAM_STR, &default_tls_cfg.cipher_list }, {"connection_timeout", PARAM_INT, &default_tls_cfg.con_lifetime }, - {"tls_log", PARAM_INT, &default_tls_cfg.log }, + {"tls_log", PARAM_INT, &default_tls_cfg.log }, + {"tls_debug", PARAM_INT, &default_tls_cfg.debug }, {"session_cache", PARAM_INT, &default_tls_cfg.session_cache}, {"session_id", PARAM_STR, &default_tls_cfg.session_id }, {"config", PARAM_STR, &default_tls_cfg.config_file }, diff --git a/modules/tls/tls_server.c b/modules/tls/tls_server.c index 122141e..a910767 100644 --- a/modules/tls/tls_server.c +++ b/modules/tls/tls_server.c @@ -90,11 +90,13 @@ #ifdef TLS_F_DEBUG #ifdef __SUNPRO_C #define TLS_F_TRACE(fmt, ...) \ - LOG_(DEFAULT_FACILITY, L_INFO, "TLS_TRACE: " LOC_INFO, " %s" fmt,\ + LOG_(DEFAULT_FACILITY, cfg_get(tls, tls_cfg, debug),\ + "TLS_TRACE: " LOC_INFO, " %s" fmt,\ _FUNC_NAME_, __VA_ARGS__) #else #define TLS_F_TRACE(fmt, args...) \ - LOG_(DEFAULT_FACILITY, L_INFO, "TLS_TRACE: " LOC_INFO, " %s" fmt,\ + LOG_(DEFAULT_FACILITY, cfg_get(tls, tls_cfg, debug),\ + "TLS_TRACE: " LOC_INFO, " %s" fmt,\ _FUNC_NAME_, ## args) #endif /* __SUNPRO_c */ #else /* TLS_F_DEBUG */

14 years, 5 months

git:andrei/tcp_tls_changes: tls: modparams for ct write queue params

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: 1418a15341736002f336463be795742bd5ae09a9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1418a15… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Aug 15 18:03:43 2010 +0200 tls: modparams for ct write queue params Added missing modparams for: con_ct_wq_max, ct_wq_max and ct_wq_blk_size (until now they were configurable only at runtime). --- modules/tls/tls_mod.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules/tls/tls_mod.c b/modules/tls/tls_mod.c index aff4815..895d18e 100644 --- a/modules/tls/tls_mod.c +++ b/modules/tls/tls_mod.c @@ -206,6 +206,9 @@ static param_export_t params[] = { &default_tls_cfg.ssl_max_send_fragment}, {"ssl_read_ahead", PARAM_INT, &default_tls_cfg.ssl_read_ahead}, {"send_close_notify", PARAM_INT, &default_tls_cfg.send_close_notify}, + {"con_ct_wq_max ", PARAM_INT, &default_tls_cfg.con_ct_wq_max}, + {"ct_wq_max ", PARAM_INT, &default_tls_cfg.ct_wq_max}, + {"ct_wq_blk_size ", PARAM_INT, &default_tls_cfg.ct_wq_blk_size}, {"tls_force_run", PARAM_INT, &default_tls_cfg.force_run}, {"low_mem_threshold1", PARAM_INT, &default_tls_cfg.low_mem_threshold1}, {"low_mem_threshold2", PARAM_INT, &default_tls_cfg.low_mem_threshold2},

14 years, 5 months

git:andrei/tcp_tls_changes: tls: doc - new & async related config options

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: cdfce2aca8a24b838194769d2d4c6f130b481636 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cdfce2a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Aug 15 17:47:17 2010 +0200 tls: doc - new & async related config options - document send_close_notify con_ct_wq_max, ct_wq_max and ct_wq_blk_size. - document runtime support for tls_log, low_mem_threshold1, low_mem_threshold2, connection_timeout and config - note about compression being now disabled by default - changed defaults for ssl_release_buffers, ssl_freelist_max_len and ssl_read_ahead. --- NEWS | 39 ++++++- modules/tls/README | 234 ++++++++++++++++++++++++++++++---------- modules/tls/doc/history.xml | 5 + modules/tls/doc/params.xml | 248 ++++++++++++++++++++++++++++++++++++------ modules/tls/doc/tls.xml | 23 +++-- 5 files changed, 444 insertions(+), 105 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=cdf…

14 years, 5 months

modules_k: nathelper split

by Ovidiu Sas

Hello all, I would like to propose a split of the k nathelper module in two: - nathelper module - will keep functionality related only to NAT handling; - rtpproxy module - a new module that will handle rtpproxy protocol communication between kamailio and rtpproxy. The config will require the load of the new rtpproxy module and all the rtpproxy config params will be moved from nathelper to rtpproxy. All functions will remain the same inside the routing blocks. Before proceeding with this task, I would like to know if there are any objections to this split. Regards, Ovidiu Sas

14 years, 5 months

git:master: Merge remote branch 'origin/andrei/cancel_reason'

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: c16a8388b124a3070c14ef4f3e5b8d73ec0f724c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c16a838… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Aug 13 21:44:36 2010 +0200 Merge remote branch 'origin/andrei/cancel_reason' CANCEL Reason support, according to RFC 3326. The Reason headers are added both for CANCELs generated due to a received final reply and hop by hop CANCELs generated because of a received CANCEL. Both cases can be turned on/off individually. * origin/andrei/cancel_reason: tm: no reason modparams if compiled with no cancelr. support tm: option to compile without reason support tm: docs: reason header modparams and script function tm: improved Reason support for E2E CANCELs tm: fix Reason generation for on-the-fly branch CANCELs tm: CANCEL reason header on/off switches tm: Reason header copy for received CANCELs tm: Reason header generation for local CANCELs ---

14 years, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev