sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:master: modules/lcr: Simpler implementation of next_gw() function

by Juha Heinanen

Module: sip-router Branch: master Commit: 5af7ae813ca63452c571ea7528754dd0b759c019 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5af7ae8… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri May 28 15:54:51 2010 +0300 modules/lcr: Simpler implementation of next_gw() function - Based on recent changes related to Request-URI handling. --- modules/lcr/lcr_mod.c | 54 ++++++++++++------------------------------------ 1 files changed, 14 insertions(+), 40 deletions(-) diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c index add81d9..95d6c12 100644 --- a/modules/lcr/lcr_mod.c +++ b/modules/lcr/lcr_mod.c @@ -79,7 +79,6 @@ #include "../../resolve.h" #include "../../mod_fix.h" #include "../../socket_info.h" -#include "../../modules/tm/tm_load.h" #include "../../pvar.h" #include "../../mod_fix.h" #include "hash.h" @@ -149,9 +148,6 @@ static void free_shared_memory(void); * Type definitions */ -/* TMB Structure */ -struct tm_binds tmb; - struct gw_grp { unsigned int grp_id; unsigned int first; /* index to first gw of group in gw table */ @@ -242,7 +238,6 @@ struct gw_info **gwtp = (struct gw_info **)NULL; /* Pointer to lcr hash table pointer table */ struct lcr_info ***lcrtp = (struct lcr_info ***)NULL; - /* * Functions that are defined later */ @@ -403,6 +398,7 @@ static int mod_init(void) unsigned short avp_flags; unsigned int i; + /* Register RPC commands */ if (rpc_register_array(lcr_rpc)!=0) { LM_ERR("failed to register RPC commands\n"); return -1; @@ -1869,22 +1865,20 @@ static int defunct_gw(struct sip_msg* _m, char *_defunct_period, char *_s2) /* - * When called first time in route block, rewrites scheme, host, port, and + * When called first time, rewrites scheme, host, port, and * transport parts of R-URI based on first gw_uri_avp value, which is then * destroyed. Saves R-URI user to ruri_user_avp for later use. * - * On other calls appends a new branch to request, where scheme, host, port, + * On other calls, rewrites R-URI, where scheme, host, port, * and transport of URI are taken from the first gw_uri_avp value, - * which is then destroyed. URI user is taken either from R-URI (first - * call in failure route block) or from ruri_user_avp value saved earlier. + * which is then destroyed. URI user is taken either from ruri_user_avp + * value saved earlier. * * Returns 1 upon success and -1 upon failure. */ static int next_gw(struct sip_msg* _m, char* _s1, char* _s2) { int_str ruri_user_val, val; - struct action act; - struct run_act_ctx ra_ctx; struct usr_avp *ru_avp; int rval; str uri_str; @@ -1899,6 +1893,7 @@ static int next_gw(struct sip_msg* _m, char* _s1, char* _s2) /* First invocation either in route or failure route block. * Take Request-URI user from Request-URI and generate Request * and Destination URIs. */ + if (parse_sip_msg_uri(_m) < 0) { LM_ERR("parsing of R-URI failed\n"); return -1; @@ -1910,48 +1905,27 @@ static int next_gw(struct sip_msg* _m, char* _s1, char* _s2) /* Save Request-URI user into uri_user_avp for use in subsequent * invocations. */ + val.s = _m->parsed_uri.user; add_avp(ruri_user_avp_type|AVP_VAL_STR, ruri_user_avp, val); LM_DBG("added ruri_user_avp <%.*s>\n", val.s.len, val.s.s); } else { - /* Subsequent invocation either in route or failure route block. */ - - /* Take Request-URI user from ruri_user_avp and generate Request + /* Subsequent invocation either in route or failure route block. + * Take Request-URI user from ruri_user_avp and generate Request * and Destination URIs. */ + if (generate_uris(r_uri, &(ruri_user_val.s), &r_uri_len, dst_uri, &dst_uri_len, &addr, &flags) != 1) { return -1; } } - if ((is_route_type(REQUEST_ROUTE)) && (ru_avp == NULL)) { - - /* First invocation in route block => Rewrite Request URI. */ - memset(&act, '\0', sizeof(act)); - act.type = SET_URI_T; - act.val[0].type = STRING_ST; - act.val[0].u.string = r_uri; - init_run_actions_ctx(&ra_ctx); - rval = do_action(&ra_ctx, &act, _m); - if (rval != 1) { - LM_ERR("do_action failed with return value <%d>\n", rval); - return -1; - } - - } else { - - /* Subsequent invocation in route block or any invocation in - * failure route block => append new branch. */ - uri_str.s = r_uri; - uri_str.len = r_uri_len; - LM_DBG("appending branch <%.*s>\n", uri_str.len, uri_str.s); - if (append_branch(_m, &uri_str, 0, 0, Q_UNSPECIFIED, 0, 0) == -1) { - LM_ERR("when appending branch <%.*s>\n", uri_str.len, uri_str.s); - return -1; - } - } + /* Rewrite Request URI */ + uri_str.s = r_uri; + uri_str.len = r_uri_len; + rewrite_uri(_m, &uri_str); /* Set Destination URI if not empty */ if (dst_uri_len > 0) {

14 years, 8 months

[tracker] Task opened: acc report_ack doesn't work

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Savolainen Dmitri (snen) Attached to Project - sip-router Summary - acc report_ack doesn't work Task Type - Bug Report Category - Module Status - Unconfirmed Assigned To - Operating System - Linux Severity - Medium Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - in 3.0.2 kamailio revision. Trying to use modparam("acc", "report_ack", 1) and modparam("acc", "db_flag", 1) ACK records absent in acc table after dialog established... modules/tm/t_lookup.c:1464 unmatched_totag(t_ack, p_msg) return false; after changing defination of int unmatched_totag(struct cell *t, struct sip_msg *ack) from modules/tm/t_reply.c to old version (openser-1.2.0-notls for example) all work fine again More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=74 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.

14 years, 8 months

git:andrei/tcp_tls_changes: core: get_abs_pathname() uses now pkg_malloc()

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: e0726eab5ea489c8882a05673fe5b5016e7ab7ce URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e0726ea… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri May 28 12:30:39 2010 +0200 core: get_abs_pathname() uses now pkg_malloc() get_abs_pathname() used libc malloc() instead of pkg_malloc(), making it difficult to know which free to use in fixups. --- cfg_parser.c | 4 ++-- ut.c | 35 ++++++++++++++++++++++------------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/cfg_parser.c b/cfg_parser.c index 8a2c4e4..0827939 100644 --- a/cfg_parser.c +++ b/cfg_parser.c @@ -640,7 +640,7 @@ cfg_parser_t* cfg_parser_init(str* filename) goto error; } - free(pathname); + pkg_free(pathname); st->file = base; st->line = 1; @@ -653,7 +653,7 @@ cfg_parser_t* cfg_parser_init(str* filename) pkg_free(st); } if (base) pkg_free(base); - if (pathname) free(pathname); + if (pathname) pkg_free(pathname); return NULL; } diff --git a/ut.c b/ut.c index e323071..3a2e9ec 100644 --- a/ut.c +++ b/ut.c @@ -29,11 +29,10 @@ */ -/*! - * \file - * \brief SIP-router core :: - * \ingroup core - * Module: \ref core +/** various utility functions. + * @file ut.c + * @ingroup core + * Module: @ref core */ #include <sys/types.h> @@ -215,6 +214,16 @@ unsigned int get_sys_version(int* major, int* minor, int* minor2) } + +/** transform a relative pathname into an absolute one. + * @param base - base file, used to extract the absolute path prefix. + * Might be NULL, in which case the path of the ser.cfg is + * used. + * @param file - file path to be transformed. If it's already absolute + * (starts with '/') is left alone. If not the result will + * be `dirname base`/file. + * @return pkg allocated asciiz string or 0 on error. + */ char* get_abs_pathname(str* base, str* file) { str ser_cfg; @@ -241,8 +250,8 @@ char* get_abs_pathname(str* base, str* file) if (file->s[0] == '/') { /* This is an absolute pathname, make a zero terminated * copy and use it as it is */ - if ((res = malloc(file->len+1)) == NULL) { - ERR("get_abs_pathname: No memory left (malloc failed)\n"); + if ((res = pkg_malloc(file->len+1)) == NULL) { + ERR("get_abs_pathname: No memory left (pkg_malloc failed)\n"); } memcpy(res, file->s, file->len); res[file->len]=0; @@ -251,8 +260,8 @@ char* get_abs_pathname(str* base, str* file) * to the location of the base file */ /* Make a copy, function dirname may modify the string */ - if ((buf = malloc(base->len+1)) == NULL) { - ERR("get_abs_pathname: No memory left (malloc failed)\n"); + if ((buf = pkg_malloc(base->len+1)) == NULL) { + ERR("get_abs_pathname: No memory left (pkg_malloc failed)\n"); return NULL; } memcpy(buf, base->s, base->len); @@ -260,16 +269,16 @@ char* get_abs_pathname(str* base, str* file) dir = dirname(buf); len = strlen(dir); - if ((res = malloc(len + 1 + file->len + 1)) == NULL) { - ERR("get_abs_pathname: No memory left (malloc failed)\n"); - free(buf); + if ((res = pkg_malloc(len + 1 + file->len + 1)) == NULL) { + ERR("get_abs_pathname: No memory left (pkg_malloc failed)\n"); + pkg_free(buf); return NULL; } memcpy(res, dir, len); res[len] = '/'; memcpy(res + len + 1, file->s, file->len); res[len + 1 + file->len] = '\0'; - free(buf); + pkg_free(buf); } return res; }

14 years, 8 months

git:andrei/tcp_tls_changes: tls: added tls.options rpc

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: 7ac98ae71a7b0ffe157200362971df9006347986 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7ac98ae… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri May 28 13:18:57 2010 +0200 tls: added tls.options rpc - fixed ca list string initializer - removed fixups from read-only config variables - added a new tls.options rpc that dumps the entire tls config. E.g.: sercmd> tls.options { force_run: 0 method: TLSv1 verify_certificate: 0 verify_depth: 9 require_certificate: 0 private_key: /home/andrei/sr.git/modules/tls/sip-router-selfsigned.key ca_list: certificate: /home/andrei/sr.git/modules/tls/sip-router-selfsigned.pem cipher_list: session_cache: 0 session_id: sip-router-tls-3.1 config: log: 0 connection_timeout: 600 disable_compression: 1 ssl_release_buffers: 0 ssl_freelist_max: 0 ssl_max_send_fragment: -1 ssl_read_ahead: 1 low_mem_threshold1: 15204352 low_mem_threshold2: 7602176 } --- modules/tls/tls_cfg.c | 14 +++++++++----- modules/tls/tls_rpc.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 5 deletions(-) diff --git a/modules/tls/tls_cfg.c b/modules/tls/tls_cfg.c index 32c37a6..e3d7b00 100644 --- a/modules/tls/tls_cfg.c +++ b/modules/tls/tls_cfg.c @@ -40,7 +40,11 @@ struct cfg_group_tls default_tls_cfg = { 9, /* verify_depth */ 0, /* require_certificate */ STR_STATIC_INIT(TLS_PKEY_FILE), /* private_key */ +#if TLS_CA_FILE == 0 + STR_NULL, +#else STR_STATIC_INIT(TLS_CA_FILE), /* ca_list */ +#endif STR_STATIC_INIT(TLS_CERT_FILE), /* certificate */ STR_NULL, /* cipher_list */ 0, /* session_cache */ @@ -96,7 +100,7 @@ static int fix_rel_pathname(void* cfg_h, str* gname, str* name, void** val) static char path_buf[MAX_PATH_SIZE]; f = *val; - if (f && f->s) { + if (f && f->s && f->len) { new_f.s = get_abs_pathname(0, f); if (new_f.s == 0) return -1; @@ -130,12 +134,12 @@ cfg_def_t tls_cfg_def[] = { " verification go in the search for a trusted CA" }, {"require_certificate", CFG_VAR_INT | CFG_READONLY, 0, 1, 0, 0, "if enabled a certificate will be required from clients" }, - {"private_key", CFG_VAR_STR | CFG_READONLY, 0, 0, fix_rel_pathname, 0, + {"private_key", CFG_VAR_STR | CFG_READONLY, 0, 0, 0, 0, "name of the file containing the private key (pem format), if not" " contained in the certificate file" }, - {"ca_list", CFG_VAR_STR | CFG_READONLY, 0, 0, fix_rel_pathname, 0, + {"ca_list", CFG_VAR_STR | CFG_READONLY, 0, 0, 0, 0, "name of the file containing the trusted CA list (pem format)" }, - {"certificate", CFG_VAR_STR | CFG_READONLY, 0, 0, fix_rel_pathname, 0, + {"certificate", CFG_VAR_STR | CFG_READONLY, 0, 0, 0, 0, "name of the file containing the certificate (pem format)" }, {"cipher_list", CFG_VAR_STR | CFG_READONLY, 0, 0, 0, 0, "list of the accepted ciphers (strings separated by colons)" }, @@ -180,7 +184,7 @@ cfg_def_t tls_cfg_def[] = { static int fix_initial_pathname(str* path) { str new_path; - if (path->s) { + if (path->s && path->len) { new_path.s = get_abs_pathname(0, path); if (new_path.s == 0) return -1; new_path.len = strlen(new_path.s); diff --git a/modules/tls/tls_rpc.c b/modules/tls/tls_rpc.c index d5176ac..826f12c 100644 --- a/modules/tls/tls_rpc.c +++ b/modules/tls/tls_rpc.c @@ -161,10 +161,47 @@ static void tls_info(rpc_t* rpc, void* c) +static const char* tls_options_doc[2] = { + "Dumps all the tls config options.", + 0 }; + +static void tls_options(rpc_t* rpc, void* c) +{ + void* handle; + rpc->add(c, "{", &handle); + rpc->struct_add(handle, "dSdddSSSSdSSddddddddd", + "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), + + "verify_depth", cfg_get(tls, tls_cfg, verify_depth), + "require_certificate", cfg_get(tls, tls_cfg, require_cert), + "private_key", &cfg_get(tls, tls_cfg, private_key), + "ca_list", &cfg_get(tls, tls_cfg, ca_list), + "certificate", &cfg_get(tls, tls_cfg, certificate), + "cipher_list", &cfg_get(tls, tls_cfg, cipher_list), + "session_cache", cfg_get(tls, tls_cfg, session_cache), + "session_id", &cfg_get(tls, tls_cfg, session_id), + "config", &cfg_get(tls, tls_cfg, config_file), + "log", cfg_get(tls, tls_cfg, log), + "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), + "low_mem_threshold1", cfg_get(tls, tls_cfg, low_mem_threshold1), + "low_mem_threshold2", cfg_get(tls, tls_cfg, low_mem_threshold2) + ); +} + + + rpc_export_t tls_rpc[] = { {"tls.reload", tls_reload, tls_reload_doc, 0}, {"tls.list", tls_list, tls_list_doc, RET_ARRAY}, {"tls.info", tls_info, tls_info_doc, 0}, + {"tls.options",tls_options, tls_options_doc, 0}, {0, 0, 0, 0} };

14 years, 8 months

git:andrei/tcp_tls_changes: db_flatstore: updated get_abs_pathname use

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: 8a5f9abd13a9339ea9e4011676a041b6fb0b5b90 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8a5f9ab… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri May 28 12:33:33 2010 +0200 db_flatstore: updated get_abs_pathname use Use pkg_free() now for freeing the result of get_abs_pathname(). --- modules/db_flatstore/flat_uri.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_flatstore/flat_uri.c b/modules/db_flatstore/flat_uri.c index 05005f3..7c35f95 100644 --- a/modules/db_flatstore/flat_uri.c +++ b/modules/db_flatstore/flat_uri.c @@ -70,7 +70,7 @@ int flat_uri(db_uri_t* uri) error: if (furi) { - if (furi->path.s) free(furi->path.s); + if (furi->path.s) pkg_free(furi->path.s); db_drv_free(&furi->drv); pkg_free(furi); }

14 years, 8 months

git:andrei/tcp_tls_changes: tls: fix empty files treatment

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: 59f603ace872b2b4b05048b2e57b982b42f7aebe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=59f603a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri May 28 13:22:00 2010 +0200 tls: fix empty files treatment Empty filenames ("") are now treated as unset. --- modules/tls/tls_domain.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/tls/tls_domain.c b/modules/tls/tls_domain.c index 793bf58..762991a 100644 --- a/modules/tls/tls_domain.c +++ b/modules/tls/tls_domain.c @@ -336,7 +336,7 @@ static int load_cert(tls_domain_t* d) int i; int procs_no; - if (!d->cert_file.s) { + if (!d->cert_file.s || !d->cert_file.len) { DBG("%s: No certificate configured\n", tls_domain_str(d)); return 0; } @@ -363,7 +363,7 @@ static int load_ca_list(tls_domain_t* d) int i; int procs_no; - if (!d->ca_file.s) { + if (!d->ca_file.s || !d->ca_file.len) { DBG("%s: No CA list configured\n", tls_domain_str(d)); return 0; } @@ -697,7 +697,7 @@ static int load_private_key(tls_domain_t* d) int idx, ret_pwd, i; int procs_no; - if (!d->pkey_file.s) { + if (!d->pkey_file.s || !d->pkey_file.len) { DBG("%s: No private key specified\n", tls_domain_str(d)); return 0; }

14 years, 8 months

git:andrei/tcp_tls_changes: tls: s/tls_cfg/tls_domains_cfg

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: 36ed3b92b0e915249767be907d0e9f0c61f0bf7a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=36ed3b9… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 27 17:20:16 2010 +0200 tls: s/tls_cfg/tls_domains_cfg Internal variable and type name change: replaces tls_cfg with tls_domains_cfg. This frees up tls_cfg for use with the runtime configuration framework (by convention a module runtime configuration is named <module_name>_cfg and it would be very confusing to have an exception for the tls module). --- modules/tls/tls_config.c | 4 +- modules/tls/tls_config.h | 2 +- modules/tls/tls_domain.c | 49 +++++++++++++++++++++------------------- modules/tls/tls_domain.h | 18 ++++++++------ modules/tls/tls_init.c | 2 +- modules/tls/tls_init.h | 2 +- modules/tls/tls_mod.c | 56 +++++++++++++++++++++++---------------------- modules/tls/tls_mod.h | 6 ++-- modules/tls/tls_rpc.c | 19 +++++++++------ modules/tls/tls_server.c | 10 ++++---- modules/tls/tls_server.h | 4 +- modules/tls/tls_util.c | 10 ++++---- modules/tls/tls_util.h | 4 +- 13 files changed, 98 insertions(+), 88 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=36e…

14 years, 8 months

git:andrei/tcp_tls_changes: core: str.h - s/NULL/0/

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: 077552bdf8a3abeebaaf0b6f45104be694c98fc2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=077552b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 27 20:00:25 2010 +0200 core: str.h - s/NULL/0/ Replace NULL with 0 (saves an extra #include). --- str.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/str.h b/str.h index 10be113..452fd7d 100644 --- a/str.h +++ b/str.h @@ -93,7 +93,7 @@ typedef struct _str str; * \code str var = STR_NULL; \endcode * @sa STR_STATIC_INIT */ -#define STR_NULL {NULL, 0} +#define STR_NULL {0, 0} /** Formats ::str string for use in printf-like functions. * This is a macro that prepares a ::str string for use in functions which

14 years, 8 months

git:andrei/tcp_tls_changes: tls: added tls_info rpc

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: bdc512a7e5416fa30d9760f50cc949281d0e71a1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bdc512a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed May 26 15:53:33 2010 +0200 tls: added tls_info rpc The tls_info rpc should print various internal tls informations and statistics. For now it prints the overall amount of write-queued clear text. --- modules/tls/tls_rpc.c | 26 +++++++++++++++++++++----- modules/tls/tls_rpc.h | 14 ++++---------- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/modules/tls/tls_rpc.c b/modules/tls/tls_rpc.c index 542500d..8351439 100644 --- a/modules/tls/tls_rpc.c +++ b/modules/tls/tls_rpc.c @@ -23,11 +23,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/*! - * \file - * \brief SIP-router TLS support :: management interface - * \ingroup tls - * Module: \ref tls +/** tls module management interface (rpc). + * @file tls_rpc.c + * @ingroup tls + * Module: @ref tls */ @@ -40,6 +39,7 @@ #include "tls_config.h" #include "tls_util.h" #include "tls_server.h" +#include "tls_ct_wrq.h" #include "tls_rpc.h" static const char* tls_reload_doc[2] = { @@ -140,8 +140,24 @@ static void tls_list(rpc_t* rpc, void* c) +static const char* tls_info_doc[2] = { + "Returns internal tls related info.", + 0 }; + +static void tls_info(rpc_t* rpc, void* c) +{ + void* handle; + rpc->add(c, "{", &handle); + rpc->struct_add(handle, "d", + "clear_text_write_queued_bytes", tls_ct_wq_total_bytes()); +} + + + + rpc_export_t tls_rpc[] = { {"tls.reload", tls_reload, tls_reload_doc, 0}, {"tls.list", tls_list, tls_list_doc, RET_ARRAY}, + {"tls.info", tls_info, tls_info_doc, 0}, {0, 0, 0, 0} }; diff --git a/modules/tls/tls_rpc.h b/modules/tls/tls_rpc.h index d7154f2..b292de1 100644 --- a/modules/tls/tls_rpc.h +++ b/modules/tls/tls_rpc.h @@ -14,11 +14,6 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version * - * For a license to use the sip-router software under conditions - * other than those described here, or to purchase support for this - * software, please contact iptel.org by e-mail at the following addresses: - * info(a)iptel.org - * * sip-router is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -28,11 +23,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/*! - * \file - * \brief SIP-router TLS support :: Management interface - * \ingroup tls - * Module: \ref tls +/** tls module management interface (rpc). + * @file tls_rpc.h + * @ingroup tls + * Module: @ref tls */ #ifndef _TLS_RPC_H

14 years, 8 months

git:andrei/tcp_tls_changes: tls: doc - removed handshake_timeout and send_timeout

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: 4f247030923dbb8e433441a66c557d9438316ddc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4f24703… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 27 20:00:00 2010 +0200 tls: doc - removed handshake_timeout and send_timeout --- modules/tls/README | 26 +++++++++++--------------- modules/tls/doc/params.xml | 23 ++++++++++++----------- 2 files changed, 23 insertions(+), 26 deletions(-) diff --git a/modules/tls/README b/modules/tls/README index e2b0866..1532c9f 100644 --- a/modules/tls/README +++ b/modules/tls/README @@ -397,36 +397,32 @@ modparam("tls", "cipher_list", "HIGH") 1.8.9. send_timeout (int) - Sets the maximum interval of time after which SIP-router will give up - trying to send a message over TLS (time after a TLS send will be - aborted and the corresponding TLS connection closed). The value is in - seconds. - - The default value is 120 s. + This parameter is obsolete and cannot be used in newer TLS versions (> + sip-router 3.0). In these versions the send_timeout is replaced by + tcp_send_timeout (common with all the tcp connections). Example 10. Set send_timeout parameter ... -modparam("tls", "send_timeout", 1) +tls_send_timeout = 10 ... 1.8.10. handshake_timeout (int) - Sets the maximum interval of time after which SIP-router will give up - trying to accept a TLS connection or connect to a TLS peer. The value - is in seconds. - - The default value is 120 s. + This parameter is obsolete and cannot be used in newer TLS versions (> + sip-router 3.0). In these versions the handshake_timeout is replaced by + tcp_connect_timeout (common with all the tcp connections). Example 11. Set handshake_timeout parameter ... -modparam("tls", "handshake_timeout", 1) +tcp_connect_timeout = 60 ... 1.8.11. connection_timeout (int) Sets the amount of time after which an idle TLS connection will be - closed. This is similar to tcp_connection_lifetime. The value is - expressed in seconds. + closed, if no I/O ever occured after the initial open. If an I/O event + occurs, the timeout will be extended with tcp_connection_lifetime. The + value is expressed in seconds. The default value is 10 min. diff --git a/modules/tls/doc/params.xml b/modules/tls/doc/params.xml index b898dc5..a489243 100644 --- a/modules/tls/doc/params.xml +++ b/modules/tls/doc/params.xml @@ -201,16 +201,15 @@ modparam("tls", "cipher_list", "HIGH") <section id="send_timeout"> <title><varname>send_timeout</varname> (int)</title> <para> - Sets the maximum interval of time after which SIP-router will give up trying to send a message over TLS (time after a TLS send will be aborted and the corresponding TLS connection closed). The value is in seconds. - </para> - <para> - The default value is 120 s. + This parameter is obsolete and cannot be used in newer TLS versions + (> sip-router 3.0). In these versions the send_timeout is + replaced by tcp_send_timeout (common with all the tcp connections). </para> <example> <title>Set <varname>send_timeout</varname> parameter</title> <programlisting> ... -modparam("tls", "send_timeout", 1) +tls_send_timeout = 10 ... </programlisting> </example> @@ -219,16 +218,15 @@ modparam("tls", "send_timeout", 1) <section id="handshake_timeout"> <title><varname>handshake_timeout</varname> (int)</title> <para> - Sets the maximum interval of time after which SIP-router will give up trying to accept a TLS connection or connect to a TLS peer. The value is in seconds. - </para> - <para> - The default value is 120 s. + This parameter is obsolete and cannot be used in newer TLS versions + (> sip-router 3.0). In these versions the handshake_timeout is + replaced by tcp_connect_timeout (common with all the tcp connections). </para> <example> <title>Set <varname>handshake_timeout</varname> parameter</title> <programlisting> ... -modparam("tls", "handshake_timeout", 1) +tcp_connect_timeout = 60 ... </programlisting> </example> @@ -237,7 +235,10 @@ modparam("tls", "handshake_timeout", 1) <section id="connection_timeout"> <title><varname>connection_timeout</varname> (int)</title> <para> - Sets the amount of time after which an idle TLS connection will be closed. This is similar to tcp_connection_lifetime. The value is expressed in seconds. + Sets the amount of time after which an idle TLS connection will be + closed, if no I/O ever occured after the initial open. If an I/O event + occurs, the timeout will be extended with tcp_connection_lifetime. + The value is expressed in seconds. </para> <para> The default value is 10 min.

14 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