sr-dev

sr-dev@lists.kamailio.org

16 participants
45378 discussions

git:master:79d07fe0: modules: readme files regenerated - presence ... [skip ci]
by Kamailio Dev 20 Apr '20

20 Apr '20

Module: kamailio Branch: master Commit: 79d07fe00af8e30910a4e1b23b641ebcc96f0895 URL: https://github.com/kamailio/kamailio/commit/79d07fe00af8e30910a4e1b23b641eb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-20T17:31:14+02:00 modules: readme files regenerated - presence ... [skip ci] --- Modified: src/modules/presence/README --- Diff: https://github.com/kamailio/kamailio/commit/79d07fe00af8e30910a4e1b23b641eb… Patch: https://github.com/kamailio/kamailio/commit/79d07fe00af8e30910a4e1b23b641eb… --- diff --git a/src/modules/presence/README b/src/modules/presence/README index d0f3e6fa1a..c4ba8ca1b1 100644 --- a/src/modules/presence/README +++ b/src/modules/presence/README @@ -604,12 +604,18 @@ modparam("presence", "subs_db_mode", 1) 3.19. publ_cache (int) - To improve performance, the presence module holds by default a publish - cache that says if a certain publication exists in database. This is - only a list of URI + event, so it does not use much memory. The cache - is used when a Subscription is received to check if there is any - published state in database. This way unnecessary queries in presentity - table are avoided. + To improve performance, the presence module can operate in a couple of + modes related to how PUBLISH data is stored. If publ_cache is 0, then + no information is store in memory. + + If publ_cache is 1, then the module keeps in memory an index of the + records stored in database, In this mode it keeps only the list of URIs + and events, so it does not use much memory. The cache is used when a + Subscription is received to check if there is any published state in + database. This way unnecessary queries in presentity table are avoided. + + If publ_cache is 2, then the module keeps everything related to PUBLISH + requests in memory, not storing anything in the database. Setting this parameter to 0 will disable the usage of the publish cache. This is desirable when you have more servers sharing the same

1 0

git:master:6aafae5d: presence: updated docs for publ_cache parameter
by Daniel-Constantin Mierla 20 Apr '20

20 Apr '20

Module: kamailio Branch: master Commit: 6aafae5d2803387abe4d634c7d0e740386ca20b4 URL: https://github.com/kamailio/kamailio/commit/6aafae5d2803387abe4d634c7d0e740… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-20T17:21:08+02:00 presence: updated docs for publ_cache parameter --- Modified: src/modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6aafae5d2803387abe4d634c7d0e740… Patch: https://github.com/kamailio/kamailio/commit/6aafae5d2803387abe4d634c7d0e740… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index 8f65c394e2..850e929f67 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -525,12 +525,20 @@ modparam("presence", "subs_db_mode", 1) <section id="presence.p.publ_cache"> <title><varname>publ_cache</varname> (int)</title> <para> - To improve performance, the presence module holds by default a - publish cache that says if a certain publication exists in database. - This is only a list of URI + event, so it does not use much memory. - The cache is used when a Subscription is received to check if there - is any published state in database. This way unnecessary queries in - presentity table are avoided. + To improve performance, the presence module can operate in a couple of + modes related to how PUBLISH data is stored. If publ_cache is 0, + then no information is store in memory. + </para> + <para> + If publ_cache is 1, then the module keeps in memory an index of the + records stored in database, In this mode it keeps only the list of URIs + and events, so it does not use much memory. The cache is used when a + Subscription is received to check if there is any published state in + database. This way unnecessary queries in presentity table are avoided. + </para> + <para> + If publ_cache is 2, then the module keeps everything related to PUBLISH + requests in memory, not storing anything in the database. </para> <para> Setting this parameter to 0 will disable the usage of the publish

1 0

git:master:59ca0190: presence: do not init db connection when everything is stored in memory
by Daniel-Constantin Mierla 20 Apr '20

20 Apr '20

Module: kamailio Branch: master Commit: 59ca0190d2341cfeb3cf88db6ea7423f279a460a URL: https://github.com/kamailio/kamailio/commit/59ca0190d2341cfeb3cf88db6ea7423… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-20T17:21:08+02:00 presence: do not init db connection when everything is stored in memory --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/59ca0190d2341cfeb3cf88db6ea7423… Patch: https://github.com/kamailio/kamailio/commit/59ca0190d2341cfeb3cf88db6ea7423…

1 0

git:master:be088c53: presence: handle publish with full records stored in cache
by Daniel-Constantin Mierla 20 Apr '20

20 Apr '20

Module: kamailio Branch: master Commit: be088c5305d4e32e1d6c4db65d57e86f9fabc081 URL: https://github.com/kamailio/kamailio/commit/be088c5305d4e32e1d6c4db65d57e86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-20T17:21:08+02:00 presence: handle publish with full records stored in cache --- Modified: src/modules/presence/hash.c Modified: src/modules/presence/hash.h Modified: src/modules/presence/presence.c Modified: src/modules/presence/presentity.c Modified: src/modules/presence/publish.c Modified: src/modules/presence/publish.h --- Diff: https://github.com/kamailio/kamailio/commit/be088c5305d4e32e1d6c4db65d57e86… Patch: https://github.com/kamailio/kamailio/commit/be088c5305d4e32e1d6c4db65d57e86…

1 0

git:5.2:b6f40ec3: http_async_client: do not set global avp lists from t on async callback
by Federico Cabiddu 20 Apr '20

20 Apr '20

Module: kamailio Branch: 5.2 Commit: b6f40ec3016961d9e2f97b40bc6a05c752780b4f URL: https://github.com/kamailio/kamailio/commit/b6f40ec3016961d9e2f97b40bc6a05c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-20T09:51:59+02:00 http_async_client: do not set global avp lists from t on async callback - they are done by fake_env() used inside t_continue() - they were set without reset, living in the process context, resulting in invalid access when async callback was executed with faked_msg - related to #2286 (cherry picked from commit 1bc3bbd010705ee247345c1ed9b36210bb8d9ed1) --- Modified: src/modules/http_async_client/async_http.c --- Diff: https://github.com/kamailio/kamailio/commit/b6f40ec3016961d9e2f97b40bc6a05c… Patch: https://github.com/kamailio/kamailio/commit/b6f40ec3016961d9e2f97b40bc6a05c… --- diff --git a/src/modules/http_async_client/async_http.c b/src/modules/http_async_client/async_http.c index c459d564a8..2aa6681a7d 100644 --- a/src/modules/http_async_client/async_http.c +++ b/src/modules/http_async_client/async_http.c @@ -212,7 +212,7 @@ void async_http_cb(struct http_m_reply *reply, void *param) } strncpy(q_id, aq->id, strlen(aq->id)); - + q_id[strlen(aq->id)] = '\0'; cfg_update(); @@ -227,16 +227,10 @@ void async_http_cb(struct http_m_reply *reply, void *param) free_async_query(aq); return; } - // we bring the list of AVPs of the transaction to the current context - set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, &t->uri_avps_from); - set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, &t->uri_avps_to); - set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, &t->user_avps_from); - set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, &t->user_avps_to); - set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, &t->domain_avps_from); - set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, &t->domain_avps_to); - - if (t) + + if (t) { tmb.unref_cell(t); + } LM_DBG("resuming transaction (%d:%d)\n", tindex, tlabel);

1 0

git:5.3:ff48cc53: http_async_client: do not set global avp lists from t on async callback
by Federico Cabiddu 20 Apr '20

20 Apr '20

Module: kamailio Branch: 5.3 Commit: ff48cc5311d55176118ad57cf2d4417a2d229766 URL: https://github.com/kamailio/kamailio/commit/ff48cc5311d55176118ad57cf2d4417… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-20T09:51:42+02:00 http_async_client: do not set global avp lists from t on async callback - they are done by fake_env() used inside t_continue() - they were set without reset, living in the process context, resulting in invalid access when async callback was executed with faked_msg - related to #2286 (cherry picked from commit 1bc3bbd010705ee247345c1ed9b36210bb8d9ed1) --- Modified: src/modules/http_async_client/async_http.c --- Diff: https://github.com/kamailio/kamailio/commit/ff48cc5311d55176118ad57cf2d4417… Patch: https://github.com/kamailio/kamailio/commit/ff48cc5311d55176118ad57cf2d4417… --- diff --git a/src/modules/http_async_client/async_http.c b/src/modules/http_async_client/async_http.c index e468a955dc..5edf67ee5d 100644 --- a/src/modules/http_async_client/async_http.c +++ b/src/modules/http_async_client/async_http.c @@ -212,7 +212,7 @@ void async_http_cb(struct http_m_reply *reply, void *param) } strncpy(q_id, aq->id, strlen(aq->id)); - + q_id[strlen(aq->id)] = '\0'; cfg_update(); @@ -227,16 +227,10 @@ void async_http_cb(struct http_m_reply *reply, void *param) free_async_query(aq); return; } - // we bring the list of AVPs of the transaction to the current context - set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, &t->uri_avps_from); - set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, &t->uri_avps_to); - set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, &t->user_avps_from); - set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, &t->user_avps_to); - set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, &t->domain_avps_from); - set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, &t->domain_avps_to); - - if (t) + + if (t) { tmb.unref_cell(t); + } LM_DBG("resuming transaction (%d:%d)\n", tindex, tlabel);

1 0

[kamailio/kamailio] tls: add sel for tls verified cert chain (requires OpenSSL 1.1+) (#2289)
by Armen Babikyan 20 Apr '20

20 Apr '20

* New Feature * Changes Tested Locally This sel variable allows a kam script to get access to not just the peer certificate (at index 0), but when a certificate is successfully verified, the entire chain of certificates that were used to verify the peer certificate (at index 1, 2, 3, etc). This functionality is provided by OpenSSL's SSL_get0_verified_chain() function, which is only available in OpenSSL 1.1.0+ (which is why there is an #if for this feature) This is important when a server trusts many CAs - without this addition, I don't think that it is definitively possible to tell which CA signed the verified certificate, leading to security issues if one of the trusted CAs was compromised and was used to sign certificates that look like they were signed by another issuing CA. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2289 -- Commit Summary -- * tls: add sel for tls verified cert chain (requires OpenSSL 1.1+) -- File Changes -- M src/modules/tls/tls_select.c (121) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2289.patch https://github.com/kamailio/kamailio/pull/2289.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2289

2 3

git:master:94942eb7: tls: add sel for tls verified cert chain (requires OpenSSL 1.1+) (#2289)
by GitHub 20 Apr '20

20 Apr '20

Module: kamailio Branch: master Commit: 94942eb788872f00c2d77e7373fbb416af667a2b URL: https://github.com/kamailio/kamailio/commit/94942eb788872f00c2d77e7373fbb41… Author: Armen Babikyan <armenb(a)mit.edu> Committer: GitHub <noreply(a)github.com> Date: 2020-04-20T09:51:26+02:00 tls: add sel for tls verified cert chain (requires OpenSSL 1.1+) (#2289) * tls: add sel for tls verified cert chain (requires OpenSSL 1.1+) * remove extra tcpconn_put() call Co-authored-by: Armen Babikyan <armen(a)firespotter.com> --- Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/94942eb788872f00c2d77e7373fbb41… Patch: https://github.com/kamailio/kamailio/commit/94942eb788872f00c2d77e7373fbb41…

1 0

git:master:f2c65b4c: presence: define modes for publ_cache parameter
by Daniel-Constantin Mierla 20 Apr '20

20 Apr '20

Module: kamailio Branch: master Commit: f2c65b4cc919fe066e11e08b4739b786177557d7 URL: https://github.com/kamailio/kamailio/commit/f2c65b4cc919fe066e11e08b4739b78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-20T09:12:24+02:00 presence: define modes for publ_cache parameter --- Modified: src/modules/presence/notify.c Modified: src/modules/presence/presence.c Modified: src/modules/presence/presence.h Modified: src/modules/presence/presentity.c Modified: src/modules/presence/publish.c --- Diff: https://github.com/kamailio/kamailio/commit/f2c65b4cc919fe066e11e08b4739b78… Patch: https://github.com/kamailio/kamailio/commit/f2c65b4cc919fe066e11e08b4739b78…

1 0

git:master:ff174bb6: presence: init and destroy full presentity caching table
by Daniel-Constantin Mierla 20 Apr '20

20 Apr '20

Module: kamailio Branch: master Commit: ff174bb6432b3bb971f8b291c9420545c858ef19 URL: https://github.com/kamailio/kamailio/commit/ff174bb6432b3bb971f8b291c942054… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-20T09:12:24+02:00 presence: init and destroy full presentity caching table --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/ff174bb6432b3bb971f8b291c942054… Patch: https://github.com/kamailio/kamailio/commit/ff174bb6432b3bb971f8b291c942054… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index 779a6016fd..4100de87a1 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -406,12 +406,14 @@ static int mod_init(void) } } - if(publ_cache_mode==PS_PCACHE_HYBRID) { + if(publ_cache_mode==PS_PCACHE_HYBRID || publ_cache_mode==PS_PCACHE_RECORD) { if(phtable_size < 1) phtable_size = 256; else phtable_size = 1 << phtable_size; + } + if(publ_cache_mode==PS_PCACHE_HYBRID) { pres_htable = new_phtable(); if(pres_htable == NULL) { LM_ERR("initializing presentity hash table\n"); @@ -422,6 +424,10 @@ static int mod_init(void) LM_ERR("filling in presentity hash table from database\n"); goto dberror; } + } else if(publ_cache_mode==PS_PCACHE_RECORD) { + if(ps_ptable_init(phtable_size) < 0) { + goto dberror; + } } pres_startup_time = (int)time(NULL); @@ -594,19 +600,25 @@ static void destroy(void) timer_db_update(0, 0); } - if(subs_htable) + if(subs_htable) { destroy_shtable(subs_htable, shtable_size); + } - if(pres_htable) + if(pres_htable) { destroy_phtable(); + } - if(pa_db && pa_dbf.close) + if(pa_db && pa_dbf.close) { pa_dbf.close(pa_db); + } - if(pres_notifier_id != NULL) + if(pres_notifier_id != NULL) { shm_free(pres_notifier_id); + } destroy_evlist(); + + ps_ptable_destroy(); } static int fixup_presence(void **param, int param_no)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev