sr-dev August 2010

sr-dev@lists.kamailio.org

26 participants
346 discussions

git:andrei/tcp_tls_changes: tls: added debug log level modparam
by Andrei Pelinescu-Onciul 15 Aug '10

15 Aug '10

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 */

1 0

git:andrei/tcp_tls_changes: tls: doc - notes about enabling debugging
by Andrei Pelinescu-Onciul 15 Aug '10

15 Aug '10

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…

1 0

git:andrei/tcp_tls_changes: tls: doc - new & async related config options
by Andrei Pelinescu-Onciul 15 Aug '10

15 Aug '10

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…

1 0

modules_k: nathelper split
by Ovidiu Sas 15 Aug '10

15 Aug '10

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

3 4

git:master: core: fix unclosed comment
by Andrei Pelinescu-Onciul 13 Aug '10

13 Aug '10

Module: sip-router Branch: master Commit: b4f7c405a7c15a950ce50561a5a61fb36d59bc28 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b4f7c40… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Aug 13 22:25:34 2010 +0200 core: fix unclosed comment --- io_wait.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/io_wait.c b/io_wait.c index 62cdee9..dcc6cd5 100644 --- a/io_wait.c +++ b/io_wait.c @@ -396,7 +396,7 @@ enum poll_types choose_poll_method() /* all DragonFly versions have kqueque */ #ifndef __OS_dragonfly if (_os_ver>=0x0401) /* if ver >= 4.1 */ - #endif /**__OS_dragonfly + #endif /**__OS_dragonfly */ #elif defined (__OS_netbsd) if (_os_ver>=0x020000) /* if ver >= 2.0 */ #elif defined (__OS_openbsd)

1 0

git:master: Merge remote branch 'origin/andrei/cancel_reason'
by Andrei Pelinescu-Onciul 13 Aug '10

13 Aug '10

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

1 0

git:andrei/cancel_reason: tm: no reason modparams if compiled with no cancelr. support
by Andrei Pelinescu-Onciul 13 Aug '10

13 Aug '10

Module: sip-router Branch: andrei/cancel_reason Commit: 8165147e32e08032cc20826c8dfad2757d8558d0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8165147… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Aug 13 21:39:03 2010 +0200 tm: no reason modparams if compiled with no cancelr. support Don't register cancel_reason modparams and script functions if compiled with -DNO_CANCEL_REASON_SUPPORT. --- modules/tm/h_table.h | 2 ++ modules/tm/t_lookup.c | 2 ++ modules/tm/tm.c | 8 ++++++++ 3 files changed, 12 insertions(+), 0 deletions(-) diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index 6622e8c..03f587b 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -284,7 +284,9 @@ struct totag_elem { #define T_DISABLE_6xx (1<<8) /* treat 6xx as a normal reply */ #define T_DISABLE_FAILOVER (1<<9) /* don't perform dns failover */ +#ifdef CANCEL_REASON_SUPPORT #define T_NO_E2E_CANCEL_REASON (1<<10) /* don't propagate CANCEL Reason */ +#endif /* CANCEL_REASON_SUPPORT */ #define T_DONT_FORK (T_CANCELED|T_6xx) /* unsigned short should be enough for a retr. timer: max. 65535 ticks => diff --git a/modules/tm/t_lookup.c b/modules/tm/t_lookup.c index 01f6a82..3a15580 100644 --- a/modules/tm/t_lookup.c +++ b/modules/tm/t_lookup.c @@ -1265,8 +1265,10 @@ static inline void init_new_t(struct cell *new_cell, struct sip_msg *p_msg) (!cfg_get(tm, tm_cfg, tm_auto_inv_100) -1); new_cell->flags|=T_DISABLE_6xx & (!cfg_get(tm, tm_cfg, disable_6xx) -1); +#ifdef CANCEL_REASON_SUPPORT new_cell->flags|=T_NO_E2E_CANCEL_REASON & (!!cfg_get(tm, tm_cfg, e2e_cancel_reason) -1); +#endif /* CANCEL_REASON_SUPPORT */ /* reset flags */ new_cell->flags &= (~ get_msgid_val(user_cell_reset_flags, p_msg->id, int)); diff --git a/modules/tm/tm.c b/modules/tm/tm.c index 221be3b..6dff2ca 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -284,8 +284,10 @@ static int w_t_reset_max_lifetime(struct sip_msg* msg, char* foo, char* bar); static int t_set_auto_inv_100(struct sip_msg* msg, char* on_off, char* foo); static int t_set_disable_6xx(struct sip_msg* msg, char* on_off, char* foo); static int t_set_disable_failover(struct sip_msg* msg, char* on_off, char* f); +#ifdef CANCEL_REASON_SUPPORT static int t_set_no_e2e_cancel_reason(struct sip_msg* msg, char* on_off, char* f); +#endif /* CANCEL_REASON_SUPPORT */ static int t_branch_timeout(struct sip_msg* msg, char*, char*); static int t_branch_replied(struct sip_msg* msg, char*, char*); static int t_any_timeout(struct sip_msg* msg, char*, char*); @@ -431,6 +433,7 @@ static cmd_export_t cmds[]={ REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, {"t_set_disable_failover", t_set_disable_failover, 1, fixup_var_int_1, REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, +#ifdef CANCEL_REASON_SUPPORT {"t_set_no_e2e_cancel_reason", t_set_no_e2e_cancel_reason, 1, fixup_var_int_1, REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, @@ -438,6 +441,7 @@ static cmd_export_t cmds[]={ {"t_disable_e2e_cancel_reason", t_set_no_e2e_cancel_reason, 1, fixup_var_int_1, REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, +#endif /* CANCEL_REASON_SUPPORT */ {"t_branch_timeout", t_branch_timeout, 0, 0, FAILURE_ROUTE}, {"t_branch_replied", t_branch_replied, 0, 0, FAILURE_ROUTE}, {"t_any_timeout", t_any_timeout, 0, 0, @@ -545,8 +549,10 @@ static param_export_t params[]={ {"contacts_avp", PARAM_STRING, &contacts_avp_param }, {"disable_6xx_block", PARAM_INT, &default_tm_cfg.disable_6xx }, {"local_ack_mode", PARAM_INT, &default_tm_cfg.local_ack_mode }, +#ifdef CANCEL_REASON_SUPPORT {"local_cancel_reason", PARAM_INT, &default_tm_cfg.local_cancel_reason }, {"e2e_cancel_reason", PARAM_INT, &default_tm_cfg.e2e_cancel_reason }, +#endif /* CANCEL_REASON_SUPPORT */ {0,0,0} }; @@ -1748,8 +1754,10 @@ T_SET_FLAG_GEN_FUNC(t_set_disable_6xx, T_DISABLE_6xx) T_SET_FLAG_GEN_FUNC(t_set_disable_failover, T_DISABLE_FAILOVER) +#ifdef CANCEL_REASON_SUPPORT /* disable/enable e2e cancel reason copy for the current transaction */ T_SET_FLAG_GEN_FUNC(t_set_no_e2e_cancel_reason, T_NO_E2E_CANCEL_REASON) +#endif /* CANCEL_REASON_SUPPORT */ /* script function, FAILURE_ROUTE only, returns true if the

1 0

git:master: sms(k): delete after merge with the module from ser
by Henning Westerholt 13 Aug '10

13 Aug '10

Module: sip-router Branch: master Commit: 2bf60e6b6639909db8a64f9b4419ab9159c9814b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2bf60e6… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Aug 13 18:07:48 2010 +0200 sms(k): delete after merge with the module from ser --- modules_k/sms/Makefile | 17 - modules_k/sms/README | 348 ----------------- modules_k/sms/doc/Makefile | 4 - modules_k/sms/doc/sms.xml | 49 --- modules_k/sms/doc/sms_admin.xml | 481 ------------------------ modules_k/sms/doc/sms_devel.xml | 20 - modules_k/sms/libsms_charset.c | 60 --- modules_k/sms/libsms_charset.h | 22 -- modules_k/sms/libsms_getsms.c | 546 --------------------------- modules_k/sms/libsms_modem.c | 417 --------------------- modules_k/sms/libsms_modem.h | 55 --- modules_k/sms/libsms_putsms.c | 250 ------------- modules_k/sms/libsms_sms.h | 44 --- modules_k/sms/sms.c | 646 -------------------------------- modules_k/sms/sms_funcs.c | 786 --------------------------------------- modules_k/sms/sms_funcs.h | 117 ------ modules_k/sms/sms_report.c | 352 ----------------- modules_k/sms/sms_report.h | 44 --- 18 files changed, 0 insertions(+), 4258 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=2bf…

1 0

git:master: sms: adapt user agent string
by Henning Westerholt 13 Aug '10

13 Aug '10

Module: sip-router Branch: master Commit: 9bb32f81085336a0374d364e9f0a48f8bedeb1e2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9bb32f8… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Aug 13 18:05:22 2010 +0200 sms: adapt user agent string --- modules/sms/sms_funcs.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/sms/sms_funcs.h b/modules/sms/sms_funcs.h index 7b9c2d5..29c7b95 100644 --- a/modules/sms/sms_funcs.h +++ b/modules/sms/sms_funcs.h @@ -48,7 +48,7 @@ #define SMS_HDR_BF_ADDR_LEN (sizeof(SMS_HDR_BF_ADDR)-1) #define SMS_HDR_AF_ADDR " (if you reply DO NOT remove it)\r\n\r\n" #define SMS_HDR_AF_ADDR_LEN (sizeof(SMS_HDR_AF_ADDR)-1) -#define SMS_FOOTER "\r\n\r\n[IPTEL.ORG]" +#define SMS_FOOTER "\r\n\r\n[SIP-ROUTER.ORG]" #define SMS_FOOTER_LEN (sizeof(SMS_FOOTER)-1) #define SMS_EDGE_PART "( / )" #define SMS_EDGE_PART_LEN (sizeof(SMS_EDGE_PART)-1)

1 0

git:master: sms(s): delete after copy to common directory
by Henning Westerholt 13 Aug '10

13 Aug '10

Module: sip-router Branch: master Commit: d64f5e1f8f291342080e395041b453c0c4ad18a0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d64f5e1… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Aug 13 18:05:57 2010 +0200 sms(s): delete after copy to common directory --- modules_s/sms/Makefile | 15 - modules_s/sms/README | 413 ----------------- modules_s/sms/doc/Makefile | 4 - modules_s/sms/doc/functions.xml | 88 ---- modules_s/sms/doc/params.xml | 304 ------------- modules_s/sms/doc/sms.xml | 125 ------ modules_s/sms/etc/ser.cfg | 88 ---- modules_s/sms/libsms_charset.c | 60 --- modules_s/sms/libsms_charset.h | 22 - modules_s/sms/libsms_getsms.c | 545 ----------------------- modules_s/sms/libsms_modem.c | 413 ----------------- modules_s/sms/libsms_modem.h | 55 --- modules_s/sms/libsms_putsms.c | 250 ----------- modules_s/sms/libsms_sms.h | 49 -- modules_s/sms/sms.c | 702 ----------------------------- modules_s/sms/sms_funcs.c | 937 --------------------------------------- modules_s/sms/sms_funcs.h | 128 ------ modules_s/sms/sms_report.c | 382 ---------------- modules_s/sms/sms_report.h | 49 -- 19 files changed, 0 insertions(+), 4629 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=d64…

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2010