[sr-dev] git:master:d6fb5dd1: Merge pull request #519 from phil-lavin/tls-threshold-logging

Module: kamailio Branch: master Commit: d6fb5dd11642b70b29d356a59620ee065e1538c3 URL: https://github.com/kamailio/kamailio/commit/d6fb5dd11642b70b29d356a59620ee0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-01T08:47:23+01:00 Merge pull request #519 from phil-lavin/tls-threshold-logging tls: enhance the logging of ssl bug #1491 workaround --- Modified: modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/d6fb5dd11642b70b29d356a59620ee0… Patch: https://github.com/kamailio/kamailio/commit/d6fb5dd11642b70b29d356a59620ee0… --- diff --git a/modules/tls/tls_server.c b/modules/tls/tls_server.c index e5f838d..880fae2 100644 --- a/modules/tls/tls_server.c +++ b/modules/tls/tls_server.c @@ -186,7 +186,8 @@ static int tls_complete_init(struct tcp_connection* c) if (LOW_MEM_NEW_CONNECTION_TEST()){ ERR("tls: ssl bug #1491 workaround: not enough memory for safe" - " operation: %lu\n", shm_available()); + " operation: shm=%lu threshold1=%d\n", shm_available_safe(), + cfg_get(tls, tls_cfg, low_mem_threshold1)); goto error2; } /* Get current TLS configuration and increase reference @@ -294,7 +295,8 @@ static int tls_fix_connection_unsafe(struct tcp_connection* c) } }else if (unlikely(LOW_MEM_CONNECTED_TEST())){ ERR("tls: ssl bug #1491 workaround: not enough memory for safe" - " operation: %lu\n", shm_available()); + " operation: shm=%lu threshold2=%d\n", shm_available_safe(), + cfg_get(tls, tls_cfg, low_mem_threshold2)); return -1; } return 0; @@ -324,7 +326,8 @@ static int tls_fix_connection(struct tcp_connection* c) } if (unlikely(LOW_MEM_CONNECTED_TEST())){ ERR("tls: ssl bug #1491 workaround: not enough memory for safe" - " operation: %lu\n", shm_available()); + " operation: shm=%lu threshold2=%d\n", shm_available_safe(), + cfg_get(tls, tls_cfg, low_mem_threshold2)); return -1; } return 0; @@ -527,7 +530,8 @@ static int tls_shutdown(struct tcp_connection *c) return 0; if (unlikely(LOW_MEM_CONNECTED_TEST())){ ERR("tls: ssl bug #1491 workaround: not enough memory for safe" - " operation: %lu\n", shm_available()); + " operation: shm=%lu threshold2=%d\n", shm_available_safe(), + cfg_get(tls, tls_cfg, low_mem_threshold2)); goto err; }