sr-dev April 2015

sr-dev@lists.kamailio.org

36 participants
248 discussions

[kamailio] dialog: add new flag for expired dialogs (#129)

by mikomarrache

The new flag will be accessible using $dlg(dflags). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/129 -- Commit Summary -- * dialog: add new flag for expired dialogs * dialog: set DLG_FLAG_EXPIRED flag when timeout -- File Changes -- M modules/dialog/dlg_handlers.c (3) M modules/dialog/dlg_hash.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/129.patch https://github.com/kamailio/kamailio/pull/129.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/129

9 years, 1 month

git:master:3b8aa156: modules: ims_registrar_scscf: Added support to receive RTR on Cx/Dx interface

by Richard Good

Module: kamailio Branch: master Commit: 3b8aa15602a11cd67d8101f84016d55969c05e27 URL: https://github.com/kamailio/kamailio/commit/3b8aa15602a11cd67d8101f84016d55… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: 2015-04-15T15:42:22+02:00 modules: ims_registrar_scscf: Added support to receive RTR on Cx/Dx interface --- Modified: modules/ims_registrar_scscf/cxdx_callbacks.c Modified: modules/ims_registrar_scscf/cxdx_callbacks.h Modified: modules/ims_registrar_scscf/cxdx_sar.c Modified: modules/ims_registrar_scscf/reg_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3b8aa15602a11cd67d8101f84016d55… Patch: https://github.com/kamailio/kamailio/commit/3b8aa15602a11cd67d8101f84016d55…

9 years, 1 month

git:master:077c4002: modules:ims_usrloc_scscf: added new API method to expire contact

by Richard Good

Module: kamailio Branch: master Commit: 077c4002025188a49475fa6bd3f279a680b870f5 URL: https://github.com/kamailio/kamailio/commit/077c4002025188a49475fa6bd3f279a… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: 2015-04-15T15:41:32+02:00 modules:ims_usrloc_scscf: added new API method to expire contact --- Modified: modules/ims_usrloc_scscf/ucontact.c Modified: modules/ims_usrloc_scscf/ucontact.h Modified: modules/ims_usrloc_scscf/usrloc.c Modified: modules/ims_usrloc_scscf/usrloc.h --- Diff: https://github.com/kamailio/kamailio/commit/077c4002025188a49475fa6bd3f279a… Patch: https://github.com/kamailio/kamailio/commit/077c4002025188a49475fa6bd3f279a…

9 years, 1 month

git:master:c178f442: tls: updated to use shm_available_safe()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c178f4427af82d6d33101677835c60de1c343073 URL: https://github.com/kamailio/kamailio/commit/c178f4427af82d6d33101677835c60d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-15T11:25:18+02:00 tls: updated to use shm_available_safe() --- Modified: modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/c178f4427af82d6d33101677835c60d… Patch: https://github.com/kamailio/kamailio/commit/c178f4427af82d6d33101677835c60d… --- diff --git a/modules/tls/tls_server.c b/modules/tls/tls_server.c index be020ec..3f87fc8 100644 --- a/modules/tls/tls_server.c +++ b/modules/tls/tls_server.c @@ -59,10 +59,10 @@ int tls_run_event_routes(struct tcp_connection *c); /* low memory treshold for openssl bug #1491 workaround */ #define LOW_MEM_NEW_CONNECTION_TEST() \ (cfg_get(tls, tls_cfg, low_mem_threshold1) && \ - (safe_shm_available() < cfg_get(tls, tls_cfg, low_mem_threshold1))) + (shm_available_safe() < cfg_get(tls, tls_cfg, low_mem_threshold1))) #define LOW_MEM_CONNECTED_TEST() \ (cfg_get(tls, tls_cfg, low_mem_threshold2) && \ - (safe_shm_available() < cfg_get(tls, tls_cfg, low_mem_threshold2))) + (shm_available_safe() < cfg_get(tls, tls_cfg, low_mem_threshold2))) #define TLS_RD_MBUF_SZ 65536 #define TLS_WR_MBUF_SZ 65536

9 years, 1 month

git:master:c4d48f3a: tls: removed inline specifier and renamed safe_shm_available()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c4d48f3ae363fb6f6a7d789a0f32b28eb60c2404 URL: https://github.com/kamailio/kamailio/commit/c4d48f3ae363fb6f6a7d789a0f32b28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-15T11:22:36+02:00 tls: removed inline specifier and renamed safe_shm_available() - became shm_available_safe() to have the shm_ prefix which common for shm functions - declaring inline in c header file and implementing in c source file makes clang throw compile warnings --- Modified: mem/shm_mem.c Modified: mem/shm_mem.h --- Diff: https://github.com/kamailio/kamailio/commit/c4d48f3ae363fb6f6a7d789a0f32b28… Patch: https://github.com/kamailio/kamailio/commit/c4d48f3ae363fb6f6a7d789a0f32b28… --- diff --git a/mem/shm_mem.c b/mem/shm_mem.c index 5b6a0cf..c85cac0 100644 --- a/mem/shm_mem.c +++ b/mem/shm_mem.c @@ -254,7 +254,7 @@ void shm_mem_destroy(void) #endif } -inline unsigned long safe_shm_available() +unsigned long shm_available_safe() { unsigned long ret; shm_lock(); diff --git a/mem/shm_mem.h b/mem/shm_mem.h index 97032d4..2f75b23 100644 --- a/mem/shm_mem.h +++ b/mem/shm_mem.h @@ -314,7 +314,7 @@ do{\ /* multi-process safe version of shm_available() */ -inline unsigned long safe_shm_available(); +unsigned long shm_available_safe(); #endif /* shm_mem_h */

9 years, 1 month

git:master:6b078c89: Merge pull request #126 from kamailio/coudot/tls_shm_available_bug

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6b078c89facce89cfcd1e8cd8148f419b63ac5af URL: https://github.com/kamailio/kamailio/commit/6b078c89facce89cfcd1e8cd8148f41… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-15T11:19:09+02:00 Merge pull request #126 from kamailio/coudot/tls_shm_available_bug fix race condition in tls module when checking available memory limits --- Modified: mem/shm_mem.c Modified: mem/shm_mem.h Modified: modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/6b078c89facce89cfcd1e8cd8148f41… Patch: https://github.com/kamailio/kamailio/commit/6b078c89facce89cfcd1e8cd8148f41… --- diff --git a/mem/shm_mem.c b/mem/shm_mem.c index de78213..5b6a0cf 100644 --- a/mem/shm_mem.c +++ b/mem/shm_mem.c @@ -254,5 +254,13 @@ void shm_mem_destroy(void) #endif } +inline unsigned long safe_shm_available() +{ + unsigned long ret; + shm_lock(); + ret = shm_available(); + shm_unlock(); + return ret; +} #endif diff --git a/mem/shm_mem.h b/mem/shm_mem.h index eadccb5..97032d4 100644 --- a/mem/shm_mem.h +++ b/mem/shm_mem.h @@ -312,6 +312,11 @@ do{\ #endif /* ! SHM_SAFE_MALLOC */ +/* multi-process safe version of shm_available() + */ +inline unsigned long safe_shm_available(); + + #endif /* shm_mem_h */ #endif /* SHM_MEM */ diff --git a/modules/tls/tls_server.c b/modules/tls/tls_server.c index 1d86140..be020ec 100644 --- a/modules/tls/tls_server.c +++ b/modules/tls/tls_server.c @@ -59,10 +59,10 @@ int tls_run_event_routes(struct tcp_connection *c); /* low memory treshold for openssl bug #1491 workaround */ #define LOW_MEM_NEW_CONNECTION_TEST() \ (cfg_get(tls, tls_cfg, low_mem_threshold1) && \ - (shm_available() < cfg_get(tls, tls_cfg, low_mem_threshold1))) + (safe_shm_available() < cfg_get(tls, tls_cfg, low_mem_threshold1))) #define LOW_MEM_CONNECTED_TEST() \ (cfg_get(tls, tls_cfg, low_mem_threshold2) && \ - (shm_available() < cfg_get(tls, tls_cfg, low_mem_threshold2))) + (safe_shm_available() < cfg_get(tls, tls_cfg, low_mem_threshold2))) #define TLS_RD_MBUF_SZ 65536 #define TLS_WR_MBUF_SZ 65536

9 years, 1 month

git:master:1fe36fa9: tls: use multiprocess-safe shm_available()

by Camille Oudot

Module: kamailio Branch: master Commit: 1fe36fa983b8f271165750977120d758faf84d01 URL: https://github.com/kamailio/kamailio/commit/1fe36fa983b8f271165750977120d75… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-04-14T19:41:38+02:00 tls: use multiprocess-safe shm_available() under high load, the values returned by shm_available() can be inconsistent. Use safe_shm_available() instead. --- Modified: modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/1fe36fa983b8f271165750977120d75… Patch: https://github.com/kamailio/kamailio/commit/1fe36fa983b8f271165750977120d75… --- diff --git a/modules/tls/tls_server.c b/modules/tls/tls_server.c index 1d86140..be020ec 100644 --- a/modules/tls/tls_server.c +++ b/modules/tls/tls_server.c @@ -59,10 +59,10 @@ int tls_run_event_routes(struct tcp_connection *c); /* low memory treshold for openssl bug #1491 workaround */ #define LOW_MEM_NEW_CONNECTION_TEST() \ (cfg_get(tls, tls_cfg, low_mem_threshold1) && \ - (shm_available() < cfg_get(tls, tls_cfg, low_mem_threshold1))) + (safe_shm_available() < cfg_get(tls, tls_cfg, low_mem_threshold1))) #define LOW_MEM_CONNECTED_TEST() \ (cfg_get(tls, tls_cfg, low_mem_threshold2) && \ - (shm_available() < cfg_get(tls, tls_cfg, low_mem_threshold2))) + (safe_shm_available() < cfg_get(tls, tls_cfg, low_mem_threshold2))) #define TLS_RD_MBUF_SZ 65536 #define TLS_WR_MBUF_SZ 65536

9 years, 1 month

git:master:51e263de: mem: add a multiprocess-safe shm_available()

by Camille Oudot

Module: kamailio Branch: master Commit: 51e263de80532e297546f17d2f2ed528ffe9731b URL: https://github.com/kamailio/kamailio/commit/51e263de80532e297546f17d2f2ed52… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-04-14T19:38:14+02:00 mem: add a multiprocess-safe shm_available() new safe_shm_available() function secured with shm_lock() --- Modified: mem/shm_mem.c Modified: mem/shm_mem.h --- Diff: https://github.com/kamailio/kamailio/commit/51e263de80532e297546f17d2f2ed52… Patch: https://github.com/kamailio/kamailio/commit/51e263de80532e297546f17d2f2ed52… --- diff --git a/mem/shm_mem.c b/mem/shm_mem.c index de78213..5b6a0cf 100644 --- a/mem/shm_mem.c +++ b/mem/shm_mem.c @@ -254,5 +254,13 @@ void shm_mem_destroy(void) #endif } +inline unsigned long safe_shm_available() +{ + unsigned long ret; + shm_lock(); + ret = shm_available(); + shm_unlock(); + return ret; +} #endif diff --git a/mem/shm_mem.h b/mem/shm_mem.h index eadccb5..97032d4 100644 --- a/mem/shm_mem.h +++ b/mem/shm_mem.h @@ -312,6 +312,11 @@ do{\ #endif /* ! SHM_SAFE_MALLOC */ +/* multi-process safe version of shm_available() + */ +inline unsigned long safe_shm_available(); + + #endif /* shm_mem_h */ #endif /* SHM_MEM */

9 years, 1 month

[kamailio] fix race condition in tls module when checking available memory limits (#126)

by Camille Oudot

Under high load, the value returned by `shm_available()` can be total garbage, because it is not multiprocess safe. In the tls module, it makes the tests against the `low_mem_thresholdX` limits randomly return false positives, with errors such as: ``` ERROR: tls [tls_server.c:273]: tls_fix_connection(): tls: ssl bug #1491 workaround: not enough memory for safe operation: 88 ``` although there is plenty of free shm memory. This patch solves the issue by adding a safe version of the function. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/126 -- Commit Summary -- * mem: add a multiprocess-safe shm_available() * tls: use multiprocess-safe shm_available() -- File Changes -- M mem/shm_mem.c (8) M mem/shm_mem.h (5) M modules/tls/tls_server.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/126.patch https://github.com/kamailio/kamailio/pull/126.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/126

9 years, 1 month

[kamailio] usrloc: change level of log (#123)

by mikomarrache

When a non local socket is found, the entry is not ignored and the message should be for debugging purpose only. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/123 -- Commit Summary -- * usrloc: change level of log -- File Changes -- M modules/usrloc/udomain.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/123.patch https://github.com/kamailio/kamailio/pull/123.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/123

9 years, 1 month

← Newer
1
...
15
16
17
18
19
20
21
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2015