Re: [sr-dev] [kamailio/kamailio] TLS module compiled with outdated OpenSSL version for Ubuntu bionic (#2) (#2288)
@linuxmaniac ^ -- 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/issues/2288#issuecomment-616780514___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:0b873ae9: presence: correct value for PS_PCACHE_RECORD
Module: kamailio Branch: master Commit: 0b873ae96063b7f7b5da834fd634874b02a01b32 URL: https://github.com/kamailio/kamailio/commit/0b873ae96063b7f7b5da834fd634874b02a01b32 Author: Daniel-Constantin Mierla Committer: Daniel-Constantin Mierla Date: 2020-04-20T18:00:04+02:00 presence: correct value for PS_PCACHE_RECORD --- Modified: src/modules/presence/presence.h --- Diff: https://github.com/kamailio/kamailio/commit/0b873ae96063b7f7b5da834fd634874b02a01b32.diff Patch: https://github.com/kamailio/kamailio/commit/0b873ae96063b7f7b5da834fd634874b02a01b32.patch --- diff --git a/src/modules/presence/presence.h b/src/modules/presence/presence.h index f5713898d5..e0e3495be6 100644 --- a/src/modules/presence/presence.h +++ b/src/modules/presence/presence.h @@ -54,7 +54,7 @@ #define PS_PCACHE_NONE 0 #define PS_PCACHE_HYBRID 1 -#define PS_PCACHE_RECORD 1 +#define PS_PCACHE_RECORD 2 /** TM bind */ extern struct tm_binds tmb; ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:79d07fe0: modules: readme files regenerated - presence ... [skip ci]
Module: kamailio
Branch: master
Commit: 79d07fe00af8e30910a4e1b23b641ebcc96f0895
URL:
https://github.com/kamailio/kamailio/commit/79d07fe00af8e30910a4e1b23b641ebcc96f0895
Author: Kamailio Dev
Committer: Kamailio Dev
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/79d07fe00af8e30910a4e1b23b641ebcc96f0895.diff
Patch:
https://github.com/kamailio/kamailio/commit/79d07fe00af8e30910a4e1b23b641ebcc96f0895.patch
---
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
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:59ca0190: presence: do not init db connection when everything is stored in memory
Module: kamailio Branch: master Commit: 59ca0190d2341cfeb3cf88db6ea7423f279a460a URL: https://github.com/kamailio/kamailio/commit/59ca0190d2341cfeb3cf88db6ea7423f279a460a Author: Daniel-Constantin Mierla Committer: Daniel-Constantin Mierla 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/59ca0190d2341cfeb3cf88db6ea7423f279a460a.diff Patch: https://github.com/kamailio/kamailio/commit/59ca0190d2341cfeb3cf88db6ea7423f279a460a.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:6aafae5d: presence: updated docs for publ_cache parameter
Module: kamailio
Branch: master
Commit: 6aafae5d2803387abe4d634c7d0e740386ca20b4
URL:
https://github.com/kamailio/kamailio/commit/6aafae5d2803387abe4d634c7d0e740386ca20b4
Author: Daniel-Constantin Mierla
Committer: Daniel-Constantin Mierla
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/6aafae5d2803387abe4d634c7d0e740386ca20b4.diff
Patch:
https://github.com/kamailio/kamailio/commit/6aafae5d2803387abe4d634c7d0e740386ca20b4.patch
---
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)
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
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:be088c53: presence: handle publish with full records stored in cache
Module: kamailio Branch: master Commit: be088c5305d4e32e1d6c4db65d57e86f9fabc081 URL: https://github.com/kamailio/kamailio/commit/be088c5305d4e32e1d6c4db65d57e86f9fabc081 Author: Daniel-Constantin Mierla Committer: Daniel-Constantin Mierla 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/be088c5305d4e32e1d6c4db65d57e86f9fabc081.diff Patch: https://github.com/kamailio/kamailio/commit/be088c5305d4e32e1d6c4db65d57e86f9fabc081.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Add iteration by all DNS NAPTR records (#2290)
Thanks! It will be reviewed and merged manually, because the commit message doesn't follow the contributing guidelines: * https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md#commit-message-rules Have them in mind for the next contributions. -- 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/2290#issuecomment-616376049___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.2:b6f40ec3: http_async_client: do not set global avp lists from t on async callback
Module: kamailio
Branch: 5.2
Commit: b6f40ec3016961d9e2f97b40bc6a05c752780b4f
URL:
https://github.com/kamailio/kamailio/commit/b6f40ec3016961d9e2f97b40bc6a05c752780b4f
Author: Daniel-Constantin Mierla
Committer: Federico Cabiddu
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/b6f40ec3016961d9e2f97b40bc6a05c752780b4f.diff
Patch:
https://github.com/kamailio/kamailio/commit/b6f40ec3016961d9e2f97b40bc6a05c752780b4f.patch
---
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, >uri_avps_from);
- set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, >uri_avps_to);
- set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER,
>user_avps_from);
- set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, >user_avps_to);
- set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN,
>domain_avps_from);
- set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN,
>domain_avps_to);
-
- if (t)
+
+ if (t) {
tmb.unref_cell(t);
+ }
LM_DBG("resuming transaction (%d:%d)\n", tindex, tlabel);
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.3:ff48cc53: http_async_client: do not set global avp lists from t on async callback
Module: kamailio
Branch: 5.3
Commit: ff48cc5311d55176118ad57cf2d4417a2d229766
URL:
https://github.com/kamailio/kamailio/commit/ff48cc5311d55176118ad57cf2d4417a2d229766
Author: Daniel-Constantin Mierla
Committer: Federico Cabiddu
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/ff48cc5311d55176118ad57cf2d4417a2d229766.diff
Patch:
https://github.com/kamailio/kamailio/commit/ff48cc5311d55176118ad57cf2d4417a2d229766.patch
---
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, >uri_avps_from);
- set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, >uri_avps_to);
- set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER,
>user_avps_from);
- set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, >user_avps_to);
- set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN,
>domain_avps_from);
- set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN,
>domain_avps_to);
-
- if (t)
+
+ if (t) {
tmb.unref_cell(t);
+ }
LM_DBG("resuming transaction (%d:%d)\n", tindex, tlabel);
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] tls: add sel for tls verified cert chain (requires OpenSSL 1.1+) (#2289)
Merged #2289 into master. -- 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#event-3250517816___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:94942eb7: tls: add sel for tls verified cert chain (requires OpenSSL 1.1+) (#2289)
Module: kamailio Branch: master Commit: 94942eb788872f00c2d77e7373fbb416af667a2b URL: https://github.com/kamailio/kamailio/commit/94942eb788872f00c2d77e7373fbb416af667a2b Author: Armen Babikyan Committer: GitHub 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 --- Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/94942eb788872f00c2d77e7373fbb416af667a2b.diff Patch: https://github.com/kamailio/kamailio/commit/94942eb788872f00c2d77e7373fbb416af667a2b.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] async_http_client crash (#2286)
@grumvalski - you can backport to the branches relevant fo the fix. If not, I will do it before next releases. -- You are receiving this because you commented. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2286#issuecomment-616373328___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:ff174bb6: presence: init and destroy full presentity caching table
Module: kamailio
Branch: master
Commit: ff174bb6432b3bb971f8b291c9420545c858ef19
URL:
https://github.com/kamailio/kamailio/commit/ff174bb6432b3bb971f8b291c9420545c858ef19
Author: Daniel-Constantin Mierla
Committer: Daniel-Constantin Mierla
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/ff174bb6432b3bb971f8b291c9420545c858ef19.diff
Patch:
https://github.com/kamailio/kamailio/commit/ff174bb6432b3bb971f8b291c9420545c858ef19.patch
---
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)
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:f2c65b4c: presence: define modes for publ_cache parameter
Module: kamailio Branch: master Commit: f2c65b4cc919fe066e11e08b4739b786177557d7 URL: https://github.com/kamailio/kamailio/commit/f2c65b4cc919fe066e11e08b4739b786177557d7 Author: Daniel-Constantin Mierla Committer: Daniel-Constantin Mierla 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/f2c65b4cc919fe066e11e08b4739b786177557d7.diff Patch: https://github.com/kamailio/kamailio/commit/f2c65b4cc919fe066e11e08b4739b786177557d7.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
