sr-dev January 2015

sr-dev@lists.kamailio.org

38 participants
530 discussions

git:master:1b334f5e: debugger: improve README

by Klaus Darilion

Module: kamailio Branch: master Commit: 1b334f5e91e3c2f09a753833cc28b31f2f31bc7d URL: https://github.com/kamailio/kamailio/commit/1b334f5e91e3c2f09a753833cc28b31… Author: Klaus Darilion <klaus.mailinglists(a)pernau.at> Committer: Klaus Darilion <klaus.mailinglists(a)pernau.at> Date: 2015-01-26T09:56:05Z debugger: improve README --- Modified: modules/debugger/README Modified: modules/debugger/doc/debugger_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1b334f5e91e3c2f09a753833cc28b31… Patch: https://github.com/kamailio/kamailio/commit/1b334f5e91e3c2f09a753833cc28b31…

9 years, 10 months

git:master:513a6d8b: kamctl: fix variable assignment

by Klaus Darilion

Module: kamailio Branch: master Commit: 513a6d8bf8d270b0a4fa9743daab5263c9688447 URL: https://github.com/kamailio/kamailio/commit/513a6d8bf8d270b0a4fa9743daab526… Author: Klaus Darilion <klaus.mailinglists(a)pernau.at> Committer: Klaus Darilion <klaus.mailinglists(a)pernau.at> Date: 2015-01-26T09:56:05Z kamctl: fix variable assignment There must not be a space before and after the = assignment operator. --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/513a6d8bf8d270b0a4fa9743daab526… Patch: https://github.com/kamailio/kamailio/commit/513a6d8bf8d270b0a4fa9743daab526… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 9fcd170..39e89eb 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -2491,7 +2491,7 @@ usrloc() { fi if [ -z "$DEFAULT_Q" ] ; then - DEFAULT_Q = "1.0" + DEFAULT_Q="1.0" fi $CTLCMD ul_add "$USRLOC_TABLE" "$OSERUSER@$OSERDOMAIN" "$2" \

9 years, 10 months

git:master:7aeac620: sst remove history, remove SVN ID

by Olle E. Johansson

Module: kamailio Branch: master Commit: 7aeac62063b130ad956a76364b122b318fbe1e53 URL: https://github.com/kamailio/kamailio/commit/7aeac62063b130ad956a76364b122b3… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-01-25T20:46:28+01:00 sst remove history, remove SVN ID --- Modified: modules/sst/Makefile Modified: modules/sst/sst.c Modified: modules/sst/sst_handlers.c Modified: modules/sst/sst_handlers.h Modified: modules/sst/sst_mi.c Modified: modules/sst/sst_mi.h --- Diff: https://github.com/kamailio/kamailio/commit/7aeac62063b130ad956a76364b122b3… Patch: https://github.com/kamailio/kamailio/commit/7aeac62063b130ad956a76364b122b3…

9 years, 10 months

git:master:ddbff735: db2_ops Remove svn id, change "ser" => "kamailio"

by Olle E. Johansson

Module: kamailio Branch: master Commit: ddbff735938903e8c2405a63463601f3d7ca12af URL: https://github.com/kamailio/kamailio/commit/ddbff735938903e8c2405a63463601f… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-01-25T20:43:32+01:00 db2_ops Remove svn id, change "ser" => "kamailio" --- Modified: modules/db2_ops/db2_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/ddbff735938903e8c2405a63463601f… Patch: https://github.com/kamailio/kamailio/commit/ddbff735938903e8c2405a63463601f… --- diff --git a/modules/db2_ops/db2_ops.c b/modules/db2_ops/db2_ops.c index 96deacd..a90af0a 100644 --- a/modules/db2_ops/db2_ops.c +++ b/modules/db2_ops/db2_ops.c @@ -1,21 +1,14 @@ /* - * $Id$ - * * Copyright (C) 2006 iptelorg GmbH * - * This file is part of ser, a free SIP server. + * This file is part of Kamailio, a free SIP server. * - * ser is free software; you can redistribute it and/or modify + * Kamailio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version * - * For a license to use the ser 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 - * - * ser is distributed in the hope that it will be useful, + * Kamailio 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 * GNU General Public License for more details.

9 years, 10 months

git:master:d739c627: jsonrpc-c Update Todo

by Olle E. Johansson

Module: kamailio Branch: master Commit: d739c6273a4aca3dfe14218074f0a1ea88f19756 URL: https://github.com/kamailio/kamailio/commit/d739c6273a4aca3dfe14218074f0a1e… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-01-25T20:42:02+01:00 jsonrpc-c Update Todo --- Modified: modules/jsonrpc-c/TODO --- Diff: https://github.com/kamailio/kamailio/commit/d739c6273a4aca3dfe14218074f0a1e… Patch: https://github.com/kamailio/kamailio/commit/d739c6273a4aca3dfe14218074f0a1e… --- diff --git a/modules/jsonrpc-c/TODO b/modules/jsonrpc-c/TODO index 0c7cefe..f0e1915 100644 --- a/modules/jsonrpc-c/TODO +++ b/modules/jsonrpc-c/TODO @@ -1 +1,2 @@ * "Reliable" Notifications (implement using requests, and failover on error; ignore non-error responses) ? +* Implement timout for non-Linux systems

9 years, 10 months

git:4.1:79c8abb5: dialog: remove inline for destroy_dlg() to make clang linker work

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.1 Commit: 79c8abb59e7b845b00f720b91628b8999103f94f URL: https://github.com/kamailio/kamailio/commit/79c8abb59e7b845b00f720b91628b89… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-25T18:46:07+01:00 dialog: remove inline for destroy_dlg() to make clang linker work --- Modified: modules/dialog/dlg_hash.c Modified: modules/dialog/dlg_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/79c8abb59e7b845b00f720b91628b89… Patch: https://github.com/kamailio/kamailio/commit/79c8abb59e7b845b00f720b91628b89… --- diff --git a/modules/dialog/dlg_hash.c b/modules/dialog/dlg_hash.c index b9ed0e9..c9689c7 100644 --- a/modules/dialog/dlg_hash.c +++ b/modules/dialog/dlg_hash.c @@ -347,7 +347,7 @@ int init_dlg_table(unsigned int size) * \brief Destroy a dialog, run callbacks and free memory * \param dlg destroyed dialog */ -inline void destroy_dlg(struct dlg_cell *dlg) +void destroy_dlg(struct dlg_cell *dlg) { int ret = 0; struct dlg_var *var; diff --git a/modules/dialog/dlg_hash.h b/modules/dialog/dlg_hash.h index 6fd0086..e2a4f98 100644 --- a/modules/dialog/dlg_hash.h +++ b/modules/dialog/dlg_hash.h @@ -213,7 +213,7 @@ static inline void unlink_unsafe_dlg(dlg_entry_t *d_entry, dlg_cell_t *dlg) * \brief Destroy a dialog, run callbacks and free memory * \param dlg destroyed dialog */ -inline void destroy_dlg(dlg_cell_t *dlg); +void destroy_dlg(dlg_cell_t *dlg); /*!

9 years, 10 months

git:master:f04dec82: db_postgress: disable initialization of libssl if tls is loaded

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f04dec82e90ec7a3e6aea4ea8e9ed23b06b165c6 URL: https://github.com/kamailio/kamailio/commit/f04dec82e90ec7a3e6aea4ea8e9ed23… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-25T11:00:28+01:00 db_postgress: disable initialization of libssl if tls is loaded - based on the note from docs to avoid double attempt to init the ssl library - http://www.postgresql.org/docs/9.4/static/libpq-ssl.html --- Modified: modules/db_postgres/km_pg_con.c --- Diff: https://github.com/kamailio/kamailio/commit/f04dec82e90ec7a3e6aea4ea8e9ed23… Patch: https://github.com/kamailio/kamailio/commit/f04dec82e90ec7a3e6aea4ea8e9ed23… --- diff --git a/modules/db_postgres/km_pg_con.c b/modules/db_postgres/km_pg_con.c index 77998d8..d053c55 100644 --- a/modules/db_postgres/km_pg_con.c +++ b/modules/db_postgres/km_pg_con.c @@ -30,6 +30,7 @@ #include "../../mem/mem.h" #include "../../dprint.h" #include "../../ut.h" +#include "../../tls_hooks_init.h" #include <string.h> #include <time.h> #include <netinet/in.h> @@ -98,6 +99,9 @@ struct pg_con* db_postgres_new_connection(struct db_id* id) keywords[i] = values[i] = NULL; + /* don't attempt to re-init openssl if done already */ + if(tls_loaded()) PQinitSSL(0); + ptr->con = PQconnectdbParams(keywords, values, 1); LM_DBG("PQconnectdbParams(%p)\n", ptr->con);

9 years, 10 months

git:master:f7124341: tls: implemented tls hook for pre-mod init execution

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f71243410d5e051def1a47cc73adb6caeeadd1cd URL: https://github.com/kamailio/kamailio/commit/f71243410d5e051def1a47cc73adb6c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-25T10:59:07+01:00 tls: implemented tls hook for pre-mod init execution - do openssl init at this callback --- Modified: modules/tls/tls_init.c Modified: modules/tls/tls_init.h Modified: modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f71243410d5e051def1a47cc73adb6c… Patch: https://github.com/kamailio/kamailio/commit/f71243410d5e051def1a47cc73adb6c… --- diff --git a/modules/tls/tls_init.c b/modules/tls/tls_init.c index 6812f42..58684d8 100644 --- a/modules/tls/tls_init.c +++ b/modules/tls/tls_init.c @@ -61,6 +61,7 @@ #include "tls_cfg.h" /* will be set to 1 when the TLS env is initialized to make destroy safe */ +static int tls_mod_preinitialized = 0; static int tls_mod_initialized = 0; #if OPENSSL_VERSION_NUMBER < 0x00907000L @@ -469,6 +470,7 @@ static int init_tls_compression(void) /** * tls pre-init function + * - executed when module is loaded */ int tls_pre_init(void) { @@ -493,6 +495,23 @@ int tls_pre_init(void) return 0; } +/** + * tls mod pre-init function + * - executed before any mod_init() + */ +int tls_mod_pre_init_h(void) +{ + if(tls_mod_preinitialized==1) { + LM_DBG("already mod pre-initialized\n"); + return 0; + } + DBG("============= :preparing tls env for modules initialization\n"); + SSL_library_init(); + SSL_load_error_strings(); + tls_mod_preinitialized=1; + return 0; +} + /* * First step of TLS initialization */ @@ -511,6 +530,12 @@ int init_tls_h(void) str s; cfg_ctx_t* cfg_ctx; + if(tls_mod_initialized == 1) { + LM_DBG("already initialized\n"); + return 0; + } + DBG("initializing tls system\n"); + #if OPENSSL_VERSION_NUMBER < 0x00907000L WARN("You are using an old version of OpenSSL (< 0.9.7). Upgrade!\n"); #endif @@ -657,8 +682,6 @@ int init_tls_h(void) } } - SSL_library_init(); - SSL_load_error_strings(); init_ssl_methods(); tls_mod_initialized = 1; return 0; @@ -693,7 +716,7 @@ int tls_check_sockets(tls_domains_cfg_t* cfg) void destroy_tls_h(void) { DBG("tls module final tls destroy\n"); - if(tls_mod_initialized > 0) + if(tls_mod_preinitialized > 0) ERR_free_strings(); /* TODO: free all the ctx'es */ tls_destroy_cfg(); diff --git a/modules/tls/tls_init.h b/modules/tls/tls_init.h index 412fa49..eb28398 100644 --- a/modules/tls/tls_init.h +++ b/modules/tls/tls_init.h @@ -53,8 +53,13 @@ extern const SSL_METHOD* ssl_methods[]; */ int tls_pre_init(void); +/** + * just once, prepare for init of all modules + */ +int tls_mod_pre_init_h(void); + /* - * just once, initialize the tls subsystem + * just once, initialize the tls subsystem after all mod inits */ int init_tls_h(void); diff --git a/modules/tls/tls_mod.c b/modules/tls/tls_mod.c index 356b494..b02e1a1 100644 --- a/modules/tls/tls_mod.c +++ b/modules/tls/tls_mod.c @@ -231,7 +231,8 @@ static struct tls_hooks tls_h = { tls_h_close, tls_h_init_si, init_tls_h, - destroy_tls_h + destroy_tls_h, + tls_mod_pre_init_h, }; @@ -253,12 +254,21 @@ static tls_domains_cfg_t* tls_use_modparams(void) int mod_register(char *path, int *dlflags, void *p1, void *p2) { + if (tls_disable) { + LOG(L_WARN, "tls support is disabled " + "(set enable_tls=1 in the config to enable it)\n"); + return 0; + } + /* shm is used, be sure it is initialized */ if(!shm_initialized() && init_shm()<0) return -1; if(tls_pre_init()<0) return -1; + + register_tls_hooks(&tls_h); + return 0; } @@ -267,7 +277,7 @@ static int mod_init(void) int method; if (tls_disable){ - LOG(L_WARN, "WARNING: tls: mod_init: tls support is disabled " + LOG(L_WARN, "tls support is disabled " "(set enable_tls=1 in the config to enable it)\n"); return 0; } @@ -306,7 +316,6 @@ static int mod_init(void) } *tls_domains_cfg = NULL; - register_tls_hooks(&tls_h); register_select_table(tls_sel); /* register the rpc interface */ if (rpc_register_array(tls_rpc)!=0) {

9 years, 10 months

git:master:4700831f: core: tls hooks can execute a callback before modules init function is executed

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4700831fa0f2dc52e296ce647711b03d1406497a URL: https://github.com/kamailio/kamailio/commit/4700831fa0f2dc52e296ce647711b03… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-25T10:57:00+01:00 core: tls hooks can execute a callback before modules init function is executed - useful to prepare tls environment before a module might access it - executed after modparam but before mod_init --- Modified: main.c Modified: tls_hooks.c Modified: tls_hooks.h Modified: tls_hooks_init.h --- Diff: https://github.com/kamailio/kamailio/commit/4700831fa0f2dc52e296ce647711b03… Patch: https://github.com/kamailio/kamailio/commit/4700831fa0f2dc52e296ce647711b03… --- diff --git a/main.c b/main.c index 3899422..892ead0 100644 --- a/main.c +++ b/main.c @@ -2445,6 +2445,24 @@ int main(int argc, char** argv) if (real_time&4) set_rt_prio(rt_prio, rt_policy); +#ifdef USE_TCP +#ifdef USE_TLS + if (!tls_disable){ + if (!tls_loaded()){ + LM_WARN("tls support enabled, but no tls engine " + " available (forgot to load the tls module?)\n"); + LM_WARN("disabling tls...\n"); + tls_disable=1; + } else { + LM_DBG("=============================\n"); + if (pre_init_tls()<0){ + LM_CRIT("could not pre-initialize tls, exiting...\n"); + goto error; + } + } + } +#endif /* USE_TLS */ +#endif /* USE_TCP */ if (init_modules() != 0) { fprintf(stderr, "ERROR: error while initializing modules\n"); diff --git a/tls_hooks.c b/tls_hooks.c index 37ae42d..92e709f 100644 --- a/tls_hooks.c +++ b/tls_hooks.c @@ -28,7 +28,7 @@ #ifdef TLS_HOOKS -struct tls_hooks tls_hook= {0, 0, 0, 0, 0 ,0 ,0}; +struct tls_hooks tls_hook= {0,0,0,0,0,0,0,0}; static int tls_hooks_loaded=0; @@ -62,6 +62,13 @@ int init_tls() return 0; } +int pre_init_tls() +{ + if (tls_hook.pre_init) + return tls_hook.pre_init(); + return 0; +} + void destroy_tls() { if (tls_hook.destroy) diff --git a/tls_hooks.h b/tls_hooks.h index 3f08f2f..3ac5bd2 100644 --- a/tls_hooks.h +++ b/tls_hooks.h @@ -64,15 +64,18 @@ struct tls_hooks{ void (*tcpconn_clean)(struct tcp_connection* c); void (*tcpconn_close)(struct tcp_connection*c , int fd); - /* per listening socket init, called on ser startup (after modules, + /* per listening socket init, called on kamailio startup (after modules, * process table, init() and udp socket initialization)*/ int (*init_si)(struct socket_info* si); - /* generic init function (called at ser init, after module initialization + /* generic init function (called at kamailio init, after module initialization * and process table creation)*/ int (*init)(void); /* destroy function, called after the modules are destroyed, and * after destroy_tcp() */ void (*destroy)(void); + /* generic pre-init function (called at kamailio start, before module + * initialization (after modparams) */ + int (*pre_init)(void); }; diff --git a/tls_hooks_init.h b/tls_hooks_init.h index 21d464c..3657769 100644 --- a/tls_hooks_init.h +++ b/tls_hooks_init.h @@ -44,6 +44,7 @@ int tls_has_init_si(void); /*returns true if a handle for tls_init is registered int tls_init(struct socket_info* si); int init_tls(void); void destroy_tls(void); +int pre_init_tls(void); #endif /* TLS_HOOKS */ #endif

9 years, 10 months

git:master:e47018b0: tls: updated the default tls session id string

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e47018b0a65a5e26ea47d789f0bc6d471aa3a117 URL: https://github.com/kamailio/kamailio/commit/e47018b0a65a5e26ea47d789f0bc6d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-24T22:37:43+01:00 tls: updated the default tls session id string --- Modified: modules/tls/tls_cfg.c --- Diff: https://github.com/kamailio/kamailio/commit/e47018b0a65a5e26ea47d789f0bc6d4… Patch: https://github.com/kamailio/kamailio/commit/e47018b0a65a5e26ea47d789f0bc6d4… --- diff --git a/modules/tls/tls_cfg.c b/modules/tls/tls_cfg.c index 69e96fe..d6e1048 100644 --- a/modules/tls/tls_cfg.c +++ b/modules/tls/tls_cfg.c @@ -44,7 +44,7 @@ struct cfg_group_tls default_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_STATIC_INIT("kamailio-tls-4.x.y"), /* session_id */ STR_NULL, /* config_file */ 3, /* log (L_DBG)*/ 3, /* debug (L_DBG) */

9 years, 10 months

← Newer
1
...
8
9
10
11
12
13
14
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2015