sr-dev April 2020

sr-dev@lists.kamailio.org

33 participants
420 discussions

Re: [sr-dev] [kamailio/kamailio] presence: functions to keep presentity records in memory (f917318)

by Daniel-Constantin Mierla

@eschmidbauer - can you help testing somehow? Not having the possibility to test properly here, working mainly from home these days I can't use many devices. First would be to make sure existing your existing config is still working fine. I tried to be very non-intrusive as much as possible in the old code and operation mode. Then, to test in-memory only presentity records, set: ``` modparam("presence", "publ_cache", 2) ``` You have to use latest master branch. I did basic tests with baresip for handling the PUBLISH requests and I could see they are in database presentity table if publ_cache!=2 as well as in memory via rpc command if publ_cache==2. You can set also subscription records in memory with: ``` modparam("presence", "subs_db_mode", 0) ``` -- 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/commit/f917318c1e5fefa4106eaaf46123506…

4 years, 5 months

git:master:58bb516e: presence: docs for rpc command presence.presentity_list

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 58bb516e4fe1b098bc574d75bef32af9d2ae61b8 URL: https://github.com/kamailio/kamailio/commit/58bb516e4fe1b098bc574d75bef32af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-21T10:04:49+02:00 presence: docs for rpc command presence.presentity_list --- Modified: src/modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/58bb516e4fe1b098bc574d75bef32af… Patch: https://github.com/kamailio/kamailio/commit/58bb516e4fe1b098bc574d75bef32af… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index 850e929f67..32b67d6c6b 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -1346,6 +1346,33 @@ pres_update_watchers("sip:test@kamailio.org", "presence"); ... </programlisting> </section> + <section id="presence.rpc.presentity_list"> + <title>presence.presentity_list</title> + <para> + List the presentity records stored in memory. + </para> + <para> + Name: <emphasis>presence.presentity_list</emphasis> + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem> + <para>mode - (optional) it can be 'full' to print all the + fields of presentity record. If missine, only a selected + set of fields are printed in the response.</para> + </listitem> + </itemizedlist> + <para> + RPC Command Format: + </para> + <programlisting format="linespecific"> +... +kamctl rpc presence.presentity_list +kamctl rpc presence.presentity_list full +... + </programlisting> + </section> + </section> <section>

4 years, 5 months

git:master:c62e411b: presence: implemented rpc command to list presententy records in memory

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c62e411b116db7f9b9227b9decd37866e62f4378 URL: https://github.com/kamailio/kamailio/commit/c62e411b116db7f9b9227b9decd3786… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-21T09:57:30+02:00 presence: implemented rpc command to list presententy records in memory - presence.presentity_list [mode] - mode is optional and can be 'full' to print all attributes of the presentity record --- Modified: src/modules/presence/hash.c Modified: src/modules/presence/hash.h Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/c62e411b116db7f9b9227b9decd3786… Patch: https://github.com/kamailio/kamailio/commit/c62e411b116db7f9b9227b9decd3786… --- diff --git a/src/modules/presence/hash.c b/src/modules/presence/hash.c index 7a58fe5309..6d868e165d 100644 --- a/src/modules/presence/hash.c +++ b/src/modules/presence/hash.c @@ -705,6 +705,11 @@ int update_phtable(presentity_t *presentity, str *pres_uri, str *body) static ps_ptable_t *_ps_ptable = NULL; +ps_ptable_t *ps_ptable_get(void) +{ + return _ps_ptable; +} + #define PS_PRESENTITY_FIELD_COPY(field) do { \ if (pt->field.s) { \ ptn->field.s = p; \ @@ -945,6 +950,7 @@ void ps_ptable_destroy(void) } for(i=0; i<_ps_ptable->ssize; i++) { lock_destroy(&_ps_ptable->slots[i].lock); + pt = _ps_ptable->slots[i].plist; while(pt!=NULL) { ptn = pt->next; ps_presentity_free(pt, 0); diff --git a/src/modules/presence/hash.h b/src/modules/presence/hash.h index 96621efe5b..45732426f5 100644 --- a/src/modules/presence/hash.h +++ b/src/modules/presence/hash.h @@ -180,5 +180,6 @@ int ps_ptable_remove(ps_presentity_t *pt); ps_presentity_t *ps_ptable_get_list(str *user, str *domain); ps_presentity_t *ps_ptable_get_item(str *user, str *domain, str *event, str *etag); ps_presentity_t *ps_ptable_get_expired(int eval); +ps_ptable_t *ps_ptable_get(void); #endif diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index c0e1912ecd..84997b4230 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -1847,6 +1847,83 @@ static const char *rpc_presence_cleanup_doc[3] = { 0 }; +/*! \brief + * rpc cmd: presence.presentity_list + * \mode - output attributes control + * * */ +void rpc_presence_presentity_list(rpc_t *rpc, void *ctx) +{ + str omode = {0, 0}; + int imode = 0; + int i = 0; + ps_ptable_t *ptb = NULL; + ps_presentity_t *ptn = NULL; + void* th = NULL; + str pempty = str_init(""); + + LM_DBG("listing in memory presentity records\n"); + + imode = rpc->scan(ctx, "*S", &omode); + if(imode < 1) { + imode = 0; + } else { + if(omode.len == 4 && strncmp(omode.s, "full", 4)==0) { + imode = 1; + } else { + imode = 0; + } + } + ptb = ps_ptable_get(); + if(ptb == NULL) { + return; + } + + for(i=0; i<ptb->ssize; i++) { + lock_get(&ptb->slots[i].lock); + ptn = ptb->slots[i].plist; + while(ptn!=NULL) { + /* add record node */ + if (rpc->add(ctx, "{", &th) < 0) { + rpc->fault(ctx, 500, "Internal error creating rpc"); + lock_release(&ptb->slots[i].lock); + return; + } + /* add common fields */ + if(rpc->struct_add(th, "SSSSSd", + "user", &ptn->user, + "domain", &ptn->domain, + "event", &ptn->event, + "etag", &ptn->etag, + "sender", (ptn->sender.s)?&ptn->sender:&pempty, + "expires", ptn->expires)<0) { + rpc->fault(ctx, 500, "Internal error adding item"); + lock_release(&ptb->slots[i].lock); + return; + } + if(imode==1) { + /* add extra fields */ + if(rpc->struct_add(th, "ddSSd", + "received_time", ptn->received_time, + "priority", ptn->priority, + "ruid", (ptn->ruid.s)?&ptn->ruid:&pempty, + "body", (ptn->body.s)?&ptn->body:&pempty, + "hashid", ptn->hashid)<0) { + rpc->fault(ctx, 500, "Internal error adding item"); + lock_release(&ptb->slots[i].lock); + return; + } + } + ptn = ptn->next; + } + lock_release(&ptb->slots[i].lock); + } + return; +} + +static const char *rpc_presence_presentity_list_doc[2] = { + "Trigger update of watchers", + 0 +}; rpc_export_t presence_rpc[] = { {"presence.cleanup", rpc_presence_cleanup, rpc_presence_cleanup_doc, 0}, @@ -1854,6 +1931,8 @@ rpc_export_t presence_rpc[] = { rpc_presence_refresh_watchers_doc, 0}, {"presence.updateWatchers", rpc_presence_update_watchers, rpc_presence_update_watchers_doc, 0}, + {"presence.presentity_list", rpc_presence_presentity_list, + rpc_presence_presentity_list_doc, 0}, {0, 0, 0, 0} };

4 years, 5 months

git:master:318c6a06: presence: increased the array size for rpc cleanup doc

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 318c6a068916b478f16702c6f05b16eb8b64ac20 URL: https://github.com/kamailio/kamailio/commit/318c6a068916b478f16702c6f05b16e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-21T09:15:48+02:00 presence: increased the array size for rpc cleanup doc - reformatted the static structure for coherence --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/318c6a068916b478f16702c6f05b16e… Patch: https://github.com/kamailio/kamailio/commit/318c6a068916b478f16702c6f05b16e… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index dd9b43f3ea..c0e1912ecd 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -1780,7 +1780,9 @@ void rpc_presence_refresh_watchers(rpc_t *rpc, void *ctx) } static const char *rpc_presence_refresh_watchers_doc[2] = { - "Trigger refresh of watchers", 0}; + "Trigger refresh of watchers", + 0 +}; /*! \brief * rpc cmd: presence.updateWatchers @@ -1822,7 +1824,9 @@ void rpc_presence_update_watchers(rpc_t *rpc, void *ctx) } static const char *rpc_presence_update_watchers_doc[2] = { - "Trigger update of watchers", 0}; + "Trigger update of watchers", + 0 +}; void rpc_presence_cleanup(rpc_t *rpc, void *c) @@ -1837,18 +1841,21 @@ void rpc_presence_cleanup(rpc_t *rpc, void *c) return; } -static const char *rpc_presence_cleanup_doc[2] = { - "Manually triggers the cleanup functions for the active_watchers, " - "presentity, and watchers tables.", - 0}; +static const char *rpc_presence_cleanup_doc[3] = { + "Manually triggers the cleanup functions for the active_watchers, " + "presentity, and watchers tables.", + 0 +}; + rpc_export_t presence_rpc[] = { - {"presence.cleanup", rpc_presence_cleanup, rpc_presence_cleanup_doc, 0}, - {"presence.refreshWatchers", rpc_presence_refresh_watchers, - rpc_presence_refresh_watchers_doc, 0}, - {"presence.updateWatchers", rpc_presence_update_watchers, - rpc_presence_update_watchers_doc, 0}, - {0, 0, 0, 0}}; + {"presence.cleanup", rpc_presence_cleanup, rpc_presence_cleanup_doc, 0}, + {"presence.refreshWatchers", rpc_presence_refresh_watchers, + rpc_presence_refresh_watchers_doc, 0}, + {"presence.updateWatchers", rpc_presence_update_watchers, + rpc_presence_update_watchers_doc, 0}, + {0, 0, 0, 0} +}; static int presence_init_rpc(void) {

4 years, 5 months

[kamailio/kamailio] TLS module compiled with outdated OpenSSL version for Ubuntu bionic (#2) (#2288)

by Jeremy Kister

### Description Much of this issue is repeated from [#2018](https://github.com/kamailio/kamailio/issues/2018). Since it's closed and has no activity, I'm opening this issue. Kamailio 5.3.3 won't start when using `kamailio-tls-modules` on Ubuntu/18.04.4 unless `tls_force_run` is set in kamailio.cfg ``` $ grep CRITICAL /var/log/kamailio/kamailio Apr 14 17:18:39 kam-01 /usr/sbin/kamailio[22073]: CRITICAL: tls [tls_init.c:677]: init_tls_h(): installed openssl library version is too different from the library the kamailio tls module was compiled with: installed "OpenSSL 1.1.1 11 Sep 2018" (0x1010100f), compiled "OpenSSL 1.1.0g 2 Nov 2017" (0x1010007f).#012 Please make sure a compatible version is used (tls_force_run in kamailio.cfg will override this check) Apr 14 17:18:39 kam-01 /usr/sbin/kamailio[22073]: CRITICAL: <core> [main.c:2768]: main(): could not initialize tls, exiting... ``` ``` $ cat /etc/apt/sources.list.d/kamailio.list deb http://deb.kamailio.org/kamailio53 bionic main deb-src http://deb.kamailio.org/kamailio53 bionic main $ $ dpkg -l | awk '/kam/ { print $2 " " $3 }' kamailio 5.3.3+bionic kamailio-extra-modules:amd64 5.3.3+bionic kamailio-mysql-modules:amd64 5.3.3+bionic kamailio-snmpstats-modules:amd64 5.3.3+bionic kamailio-tls-modules:amd64 5.3.3+bionic kamailio-websocket-modules:amd64 5.3.3+bionic $ $ /usr/sbin/kamailio -v version: kamailio 5.3.3 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 7.3.0 $ $ /usr/bin/openssl version OpenSSL 1.1.1 11 Sep 2018 ``` -- 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

4 years, 5 months

git:master:0b873ae9: presence: correct value for PS_PCACHE_RECORD

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0b873ae96063b7f7b5da834fd634874b02a01b32 URL: https://github.com/kamailio/kamailio/commit/0b873ae96063b7f7b5da834fd634874… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> 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/0b873ae96063b7f7b5da834fd634874… Patch: https://github.com/kamailio/kamailio/commit/0b873ae96063b7f7b5da834fd634874… --- 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;

4 years, 5 months

git:master:79d07fe0: modules: readme files regenerated - presence ... [skip ci]

by Kamailio Dev

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

4 years, 5 months

git:master:59ca0190: presence: do not init db connection when everything is stored in memory

by Daniel-Constantin Mierla

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…

4 years, 5 months

git:master:6aafae5d: presence: updated docs for publ_cache parameter

by Daniel-Constantin Mierla

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

4 years, 5 months

git:master:be088c53: presence: handle publish with full records stored in cache

by Daniel-Constantin Mierla

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…

4 years, 5 months

← Newer
1
...
18
19
20
21
22
23
24
...
42
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2020