sr-dev September 2018

sr-dev@lists.kamailio.org

24 participants
331 discussions

git:master:ee8c58e7: tls: docs about using db table with kamcli

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ee8c58e727261ea66096950b3f5bb1a0e7d73646 URL: https://github.com/kamailio/kamailio/commit/ee8c58e727261ea66096950b3f5bb1a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-29T08:55:14+02:00 tls: docs about using db table with kamcli --- Modified: src/modules/tls/doc/tls.xml --- Diff: https://github.com/kamailio/kamailio/commit/ee8c58e727261ea66096950b3f5bb1a… Patch: https://github.com/kamailio/kamailio/commit/ee8c58e727261ea66096950b3f5bb1a… --- diff --git a/src/modules/tls/doc/tls.xml b/src/modules/tls/doc/tls.xml index 8147208f70..ba8d4b2ac9 100644 --- a/src/modules/tls/doc/tls.xml +++ b/src/modules/tls/doc/tls.xml @@ -315,6 +315,40 @@ event_route[tls:connection-out] { </section> </section> + <section id="tls.dbstorage"> + <title>TLS With Database Backend</title> + <para> + The module does not connect to database to fetch the values for the + TLS profile attributes. However the 'kamcli' tool can generate the tls.cfg + from a database table. Once generated, the 'tls.cfg' can be reloaded with + an RPC command. + </para> + <para> + The kamcli tool can be found at <ulink url="https://github.com/kamailio/kamcli">https://github.com/kamailio/kamcli</ulink>. + </para> + <para> + The schema to create the database table can be seen with the command: "kamcli tls sqlprint". + The default name for database table is 'tlscfg'. + </para> + <para> + The most of the column names matches the corresponding attribute names + from a TLS profile. + </para> + <para> + The profile id in 'tls.cfg' is generated from '[profile_type:profile_name]'. + The 'profile_type' has to be 'server' or 'client'. The 'profile_name' + can be 'default', 'any' or the pair of IP address and port like 'ipaddr:port'. + </para> + <para> + The 'file_type' is specifying if the values for 'certificate', 'private_key', + 'ca_list' and 'crl' are path to files on disc (when is set to 0) or the + content of the files (when set to 1). If 'file_type' is 1, then 'kamcli' + will create new files on disc and store the values from the database in + them. The target folder for 'tls.cfg' and the certificates related files + can be set via command options for 'kamcli tls', for more details see + the output of 'kamcli tls --help' and 'kamcli tls cfgprint --help'. + </para> + </section> </chapter> </book>

6 years, 2 months

git:master:6daafa0c: db_redis: fix reconnection failure bug

by Richard Fuchs

Module: kamailio Branch: master Commit: 6daafa0c83a55db4064e3f816d224283f5c0c563 URL: https://github.com/kamailio/kamailio/commit/6daafa0c83a55db4064e3f816d22428… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2018-09-28T17:42:11-04:00 db_redis: fix reconnection failure bug --- Modified: src/modules/db_redis/redis_connection.c Modified: src/modules/db_redis/redis_connection.h --- Diff: https://github.com/kamailio/kamailio/commit/6daafa0c83a55db4064e3f816d22428… Patch: https://github.com/kamailio/kamailio/commit/6daafa0c83a55db4064e3f816d22428… --- diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index 2720c2753d..e030472d9e 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -392,7 +392,7 @@ void db_redis_free_reply(redisReply **reply) { void db_redis_consume_replies(km_redis_con_t *con) { redisReply *reply = NULL; redis_key_t *query; - while (con->append_counter > 0 && !con->con->err) { + while (con->append_counter > 0 && con->con && !con->con->err) { LM_DBG("consuming outstanding reply %u", con->append_counter); db_redis_get_reply(con, (void**)&reply); if (reply) { diff --git a/src/modules/db_redis/redis_connection.h b/src/modules/db_redis/redis_connection.h index 7b6a836b5e..b137d80e6b 100644 --- a/src/modules/db_redis/redis_connection.h +++ b/src/modules/db_redis/redis_connection.h @@ -39,6 +39,8 @@ if (!(reply)) { \ LM_ERR("Failed to fetch type entry: %s\n", \ (con)->con->errstr); \ + redisFree((con)->con); \ + (con)->con = NULL; \ goto err; \ } \ if ((reply)->type == REDIS_REPLY_ERROR) { \

6 years, 2 months