sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:master: tls: relative file path support & license changes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 629cba2015ecf837a972070a55c5f02bdefed107 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=629cba2… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 7 17:43:26 2010 +0200 tls: relative file path support & license changes - support relative path for private_key, ca_list and certificate. If the filename starts with '.' or '..' the path will be considered to be relative to the working directory (otherwise if it does not start with '/' it will be relative to the main ser.cfg file directory). The relative path is supported both for modparam and for value loaded from the tls.cfg file. - BSDed and removed FSF (c) from tls_domain.[ch] (the only code remaining somewhat similar with the tls experimental module is 1 typedef). --- modules/tls/tls_cfg.c | 16 ++++++- modules/tls/tls_config.c | 5 ++- modules/tls/tls_domain.c | 102 +++++++++++++++++++++++++++++++--------------- modules/tls/tls_domain.h | 39 ++++++----------- 4 files changed, 100 insertions(+), 62 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=629…

14 years, 5 months

git:master: iptrtpproxy: cfg_parser api update

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 0a4f422278f2807c955e0613af09f05d4c0d51c2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0a4f422… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 7 17:10:44 2010 +0200 iptrtpproxy: cfg_parser api update Update cfg_parser_init() usage. --- modules/iptrtpproxy/iptrtpproxy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/iptrtpproxy/iptrtpproxy.c b/modules/iptrtpproxy/iptrtpproxy.c index 3f9fb7a..670285b 100644 --- a/modules/iptrtpproxy/iptrtpproxy.c +++ b/modules/iptrtpproxy/iptrtpproxy.c @@ -1046,7 +1046,7 @@ skip: static int parse_iptrtpproxy_cfg() { cfg_parser_t* parser = NULL; struct switchboard_item *si; - if ((parser = cfg_parser_init(&iptrtpproxy_cfg_filename)) == NULL) { + if ((parser = cfg_parser_init(0, &iptrtpproxy_cfg_filename)) == NULL) { ERR(MODULE_NAME"parse_iptrtpproxy_cfg: Error while initializing configuration file parser.\n"); return -1; }

14 years, 5 months

git:master: ldap(s): cfg_parser api update

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 14d6f347f72515e88f790fe11906c86af35a20f9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=14d6f34… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 7 17:09:35 2010 +0200 ldap(s): cfg_parser api update Update cfg_parser_init() use. --- modules_s/ldap/ld_cfg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_s/ldap/ld_cfg.c b/modules_s/ldap/ld_cfg.c index e442758..7c8bf23 100644 --- a/modules_s/ldap/ld_cfg.c +++ b/modules_s/ldap/ld_cfg.c @@ -484,7 +484,7 @@ int ld_load_cfg(str* filename) cfg_parser_t* parser; cfg = NULL; - if ((parser = cfg_parser_init(filename)) == NULL) { + if ((parser = cfg_parser_init(0, filename)) == NULL) { ERR("ldap: Error while initializing configuration file parser.\n"); return -1; }

14 years, 5 months

git:master: tls: fix default file names startup bug

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: b8c939b440682de3da29f91d71ae07d5ff0fd93f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b8c939b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 7 16:51:29 2010 +0200 tls: fix default file names startup bug When the default file names for private_key, ca_list and certificate were not changed, the tls module crashed on startup when attempting to free() the static default values (when attempting to replace them with absolute paths). Reported-by: Daniel-Constantin Mierla <miconda(a)gmail.com> --- modules/tls/tls_cfg.c | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) diff --git a/modules/tls/tls_cfg.c b/modules/tls/tls_cfg.c index 046e202..a75769f 100644 --- a/modules/tls/tls_cfg.c +++ b/modules/tls/tls_cfg.c @@ -39,14 +39,10 @@ struct cfg_group_tls default_tls_cfg = { 0, /* verify_certificate */ 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 */ + STR_NULL, /* private_key (default value set in fix_tls_cfg) */ + STR_NULL, /* ca_list (default value set in fix_tls_cfg) */ + STR_NULL, /* certificate (default value set in fix_tls_cfg) */ + STR_NULL, /* cipher_list (default value set in fix_tls_cfg) */ 0, /* session_cache */ STR_STATIC_INIT("sip-router-tls-3.1"), /* session_id */ STR_NULL, /* config_file */ @@ -216,7 +212,7 @@ cfg_def_t tls_cfg_def[] = { /* to be used on start-up, with pkg_alloc'ed path names (path->s)*/ -static int fix_initial_pathname(str* path) +static int fix_initial_pathname(str* path, char* def) { str new_path; if (path->s && path->len) { @@ -225,6 +221,14 @@ static int fix_initial_pathname(str* path) new_path.len = strlen(new_path.s); pkg_free(path->s); *path = new_path; + } else if (path->s == 0 && def) { + /* use defaults */ + new_path.len = strlen(def); + new_path.s = def; + new_path.s = get_abs_pathname(0, &new_path); + if (new_path.s == 0) return -1; + new_path.len = strlen(new_path.s); + *path = new_path; } return 0; } @@ -243,13 +247,13 @@ int fix_tls_cfg(struct cfg_group_tls* cfg) * pathnames will be converted to absolute and the directory of the main * SER configuration file will be used as reference. */ - if (fix_initial_pathname(&cfg->config_file) < 0) + if (fix_initial_pathname(&cfg->config_file, 0) < 0) return -1; - if (fix_initial_pathname(&cfg->private_key) < 0) + if (fix_initial_pathname(&cfg->private_key, TLS_PKEY_FILE) < 0) return -1; - if (fix_initial_pathname(&cfg->ca_list) < 0 ) + if (fix_initial_pathname(&cfg->ca_list, TLS_CA_FILE) < 0 ) return -1; - if (fix_initial_pathname(&cfg->certificate) < 0) + if (fix_initial_pathname(&cfg->certificate, TLS_CERT_FILE) < 0) return -1; return 0;

14 years, 5 months

git:master: tls: fix wrong string variable length overwrite

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: e63610186803cfcc0ff14d8871df8ae70df83103 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e636101… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 7 16:57:33 2010 +0200 tls: fix wrong string variable length overwrite Some per-domain config string variables (cert_file, ca_file, pkey_file & cipher_list) had their length truncated to that of the corresponding variable in the parent domain. Mostly invisible since the string length was in general ignored (asciiz strings). --- modules/tls/tls_domain.c | 37 +++++++++++++++++++++++-------------- 1 files changed, 23 insertions(+), 14 deletions(-) diff --git a/modules/tls/tls_domain.c b/modules/tls/tls_domain.c index 34fc23a..cbb1306 100644 --- a/modules/tls/tls_domain.c +++ b/modules/tls/tls_domain.c @@ -172,7 +172,7 @@ char* tls_domain_str(tls_domain_t* d) /* * Initialize parameters that have not been configured from - * parent domain (usualy one of default domains + * parent domain (usually one of default domains */ static int fill_missing(tls_domain_t* d, tls_domain_t* parent) { @@ -184,27 +184,36 @@ static int fill_missing(tls_domain_t* d, tls_domain_t* parent) return -1; } - if (!d->cert_file.s && - shm_asciiz_dup(&d->cert_file.s, parent->cert_file.s) < 0) return -1; - d->cert_file.len = parent->cert_file.len; + if (!d->cert_file.s) { + if (shm_asciiz_dup(&d->cert_file.s, parent->cert_file.s) < 0) + return -1; + d->cert_file.len = parent->cert_file.len; + } LOG(L_INFO, "%s: certificate='%s'\n", tls_domain_str(d), d->cert_file.s); - if (!d->ca_file.s && - shm_asciiz_dup(&d->ca_file.s, parent->ca_file.s) < 0) return -1; - d->ca_file.len = parent->ca_file.len; + if (!d->ca_file.s){ + if (shm_asciiz_dup(&d->ca_file.s, parent->ca_file.s) < 0) + return -1; + d->ca_file.len = parent->ca_file.len; + } LOG(L_INFO, "%s: ca_list='%s'\n", tls_domain_str(d), d->ca_file.s); if (d->require_cert == -1) d->require_cert = parent->require_cert; - LOG(L_INFO, "%s: require_certificate=%d\n", tls_domain_str(d), d->require_cert); + LOG(L_INFO, "%s: require_certificate=%d\n", tls_domain_str(d), + d->require_cert); - if (!d->cipher_list.s && - shm_asciiz_dup(&d->cipher_list.s, parent->cipher_list.s) < 0) return -1; - d->cipher_list.len = parent->cipher_list.len; + if (!d->cipher_list.s) { + if ( shm_asciiz_dup(&d->cipher_list.s, parent->cipher_list.s) < 0) + return -1; + d->cipher_list.len = parent->cipher_list.len; + } LOG(L_INFO, "%s: cipher_list='%s'\n", tls_domain_str(d), d->cipher_list.s); - if (!d->pkey_file.s && - shm_asciiz_dup(&d->pkey_file.s, parent->pkey_file.s) < 0) return -1; - d->pkey_file.len = parent->pkey_file.len; + if (!d->pkey_file.s) { + if (shm_asciiz_dup(&d->pkey_file.s, parent->pkey_file.s) < 0) + return -1; + d->pkey_file.len = parent->pkey_file.len; + } LOG(L_INFO, "%s: private_key='%s'\n", tls_domain_str(d), d->pkey_file.s); if (d->verify_cert == -1) d->verify_cert = parent->verify_cert;

14 years, 5 months

[tracker] Comment added: make install fails with a bash syntax error

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#87 - make install fails with a bash syntax error User who did this - Daniel-Constantin Mierla (miconda) ---------- What is the change? Just moving the 'do' on a new line? There are many such 'for' statements, did you get error only here? What is the error message? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=87#comment117 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, 5 months

[tracker] Comment added: make install fails with a bash syntax error (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#87 - make install fails with a bash syntax error User who did this - Dmitry Goncharov (Dmitry) ---------- The first patch is bit defective. It wont work if C_INSTALL_CFGS is not empty. Please, consider this patch. ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=87#comment116 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, 5 months

git:master: kamailio.cfg: listen on TLS available via define

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: b7f00e7b0223840c8bd622607f5afee8dd762b59 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b7f00e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 7 00:31:15 2010 +0200 kamailio.cfg: listen on TLS available via define - use #!define WITH_TLS to start listening on tls --- etc/kamailio.cfg | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 9d33ec0..a7dd259 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -55,6 +55,10 @@ # - enable mysql # - define WITH_MULTIDOMAIN # +# *** To enable TLS support execute: +# - adjust CFGDIR/tls.cfg as needed +# - define WITH_TLS +# # *** To enhance accounting execute: # - enable mysql # - define WITH_ACCDB @@ -113,12 +117,17 @@ children=4 /* add local domain aliases */ #alias="sip.mydomain.com" -port=5060 - /* uncomment and configure the following line if you want Kamailio to bind on a specific interface/port/proto (default bind on all available) */ #listen=udp:10.0.0.10:5060 +/* port to listen to + * - can be specified more than once if needed to listen on many ports */ +port=5060 + +#!ifdef WITH_TLS +enable_tls=yes +#!endif ####### Custom Parameters ######### @@ -194,6 +203,10 @@ loadmodule "nathelper.so" loadmodule "rtpproxy.so" #!endif +#!ifdef WITH_TLS +loadmodule "tls.so" +#!endif + # ----------------- setting module-specific parameters --------------- @@ -209,6 +222,7 @@ modparam("tm", "fr_timer", 30000) # default invite retransmission timeout after 1xx: 120sec modparam("tm", "fr_inv_timer", 120000) + # ----- rr params ----- # add value to ;lr param to cope with most of the UAs modparam("rr", "enable_full_lr", 1) @@ -323,6 +337,13 @@ modparam("nathelper|registrar", "received_avp", "$avp(RECEIVED)") modparam("usrloc", "nat_bflag", 6) #!endif + +#!ifdef WITH_TLS +# ----- tls params ----- +modparam("tls", "config", "/usr/local/etc/kamailio/tls.cfg") +#!endif + + ####### Routing Logic ########

14 years, 5 months

git:master: kamailio.cfg: alias_db lookup enabled by define

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 2d9a8454fe6f5874973fceb1751d2ec1fad2bb07 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2d9a845… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 6 22:34:36 2010 +0200 kamailio.cfg: alias_db lookup enabled by define - replaced the alias_db related comments with defines - lookup in db-aliases can be enabled now by #!define WITH_ALIASDB --- etc/kamailio.cfg | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 5bff832..c74a7d4 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -47,6 +47,10 @@ # - set the value of pstn.gw_ip # - check route[PSTN] for regexp routing condition # +# *** To enable database aliases lookup execute: +# - enable mysql +# - define WITH_ALIASDB +# # *** To enhance accounting execute: # - enable mysql # - define WITH_ACCDB @@ -160,9 +164,11 @@ loadmodule "auth_db.so" loadmodule "permissions.so" #!endif #!endif -/* uncomment next line for aliases support - NOTE: a DB (like db_mysql) module must be also loaded */ -#loadmodule "alias_db.so" + +#!ifdef WITH_ALIASDB +loadmodule "alias_db.so" +#!endif + /* uncomment next line for multi-domain support NOTE: a DB (like db_mysql) module must be also loaded NOTE: be sure and enable multi-domain support in all used modules @@ -262,10 +268,9 @@ modparam("permissions", "db_mode", 1) #!endif # ----- alias_db params ----- -/* uncomment the following lines if you want to enable the DB based - aliases */ -#modparam("alias_db", "db_url", DBURL) - +#!ifdef WITH_ALIASDB +modparam("alias_db", "db_url", DBURL) +#!endif # ----- domain params ----- /* uncomment the following lines to enable multi-domain detection @@ -460,8 +465,11 @@ route[REGISTRAR] { # USER location service route[LOCATION] { - # apply DB based aliases (uncomment to enable) - ##alias_db_lookup("dbaliases"); + +#!ifdef WITH_ALIASDB + # search in DB-based aliases + alias_db_lookup("dbaliases"); +#!endif if (!lookup("location")) { switch ($rc) {

14 years, 5 months

git:master: Makefile: update path to cfg dir at install

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 73619b560620a1dc6cb50bbbf0cdfbaa975f4ffe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=73619b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 7 00:28:50 2010 +0200 Makefile: update path to cfg dir at install - in case some parameters use absolute path to cfg dir, they are updated with $cfg_target value --- Makefile | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 1a3650f..c4cc1a9 100644 --- a/Makefile +++ b/Makefile @@ -889,8 +889,9 @@ install-cfg: $(cfg_prefix)/$(cfg_dir) @if [ -f etc/$(CFG_NAME).cfg ]; then \ sed $(foreach m,$(modules_dirs),\ -e "s#/usr/[^:]*lib/$(CFG_NAME)/$(m)$[:/\"]$#$($(m)_target)\1#g") \ - < etc/$(CFG_NAME).cfg > \ - $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg.sample; \ + -e "s#/usr/local/etc/$(CFG_NAME)/#$(cfg_target)#g" \ + < etc/$(CFG_NAME).cfg \ + > $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg.sample; \ chmod 644 $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg.sample; \ if [ -z "${skip_cfg_install}" -a \ ! -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg ]; then \ @@ -901,8 +902,9 @@ install-cfg: $(cfg_prefix)/$(cfg_dir) @if [ -f etc/$(CFG_NAME)-basic.cfg ]; then \ sed $(foreach m,$(modules_dirs),\ -e "s#/usr/[^:]*lib/$(CFG_NAME)/$(m)$[:/\"]$#$($(m)_target)\1#g") \ - < etc/$(CFG_NAME)-basic.cfg > \ - $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-basic.cfg.sample; \ + -e "s#/usr/local/etc/$(CFG_NAME)/#$(cfg_target)#g" \ + < etc/$(CFG_NAME)-basic.cfg \ + > $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-basic.cfg.sample; \ chmod 644 $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-basic.cfg.sample; \ if [ -z "${skip_cfg_install}" -a \ ! -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-basic.cfg ]; then \ @@ -912,7 +914,8 @@ install-cfg: $(cfg_prefix)/$(cfg_dir) fi @if [ -f etc/$(CFG_NAME)-oob.cfg ]; then \ sed $(foreach m,$(modules_dirs),\ - -e "s#/usr/[^:]*lib/$(CFG_NAME)/$(m)$[:/\"]$#$($(m)_target)\1#g") \ + -e "s#/usr/[^:]*lib/$(CFG_NAME)/$(m)$[:/\"]$#$($(m)_target)\1#g") \ + -e "s#/usr/local/etc/$(CFG_NAME)/#$(cfg_target)#g" \ < etc/$(CFG_NAME)-oob.cfg \ > $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg.sample; \ chmod 644 $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg.sample; \

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