sr-dev June 2023

sr-dev@lists.kamailio.org

10 participants
311 discussions

git:master:7d7e6dfc: pdb: docs for ll_info mod param
by Daniel-Constantin Mierla 12 Jun '23

12 Jun '23

Module: kamailio Branch: master Commit: 7d7e6dfcdaf21cae4b98ca5520e667b4f8f09145 URL: https://github.com/kamailio/kamailio/commit/7d7e6dfcdaf21cae4b98ca5520e667b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-12T13:54:34+02:00 pdb: docs for ll_info mod param --- Modified: src/modules/pdb/doc/pdb_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7d7e6dfcdaf21cae4b98ca5520e667b… Patch: https://github.com/kamailio/kamailio/commit/7d7e6dfcdaf21cae4b98ca5520e667b… --- diff --git a/src/modules/pdb/doc/pdb_admin.xml b/src/modules/pdb/doc/pdb_admin.xml index da2ecb3a01e..19b00bd99d8 100644 --- a/src/modules/pdb/doc/pdb_admin.xml +++ b/src/modules/pdb/doc/pdb_admin.xml @@ -94,6 +94,27 @@ modparam("pdb", "timeout", 10) <programlisting format="linespecific"> ... modparam("pdb", "server", "localhost:10001,host.name:10001,192.168.1.7:10002") +... + </programlisting> + </example> + </section> + <section> + <title><varname>ll_info</varname> (int)</title> + <para> + Local log level (per module) for specific INFO messages. It has to + be a valid log level value (see xlog() function from xlog module for + more details). + </para> + <para> + <emphasis> + Default value is <quote>2</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>ll_info</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("pdb", "ll_info", 3) ... </programlisting> </example>

1 0

git:master:88d8c466: Makefile.modules: define MOD_NAMEID to module name without quotes
by Daniel-Constantin Mierla 12 Jun '23

12 Jun '23

Module: kamailio Branch: master Commit: 88d8c46603f6e45ba90c51b7c8d80acae7fb400a URL: https://github.com/kamailio/kamailio/commit/88d8c46603f6e45ba90c51b7c8d80ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-12T13:48:31+02:00 Makefile.modules: define MOD_NAMEID to module name without quotes --- Modified: src/Makefile.modules --- Diff: https://github.com/kamailio/kamailio/commit/88d8c46603f6e45ba90c51b7c8d80ac… Patch: https://github.com/kamailio/kamailio/commit/88d8c46603f6e45ba90c51b7c8d80ac… --- diff --git a/src/Makefile.modules b/src/Makefile.modules index 7c3722d03e1..3521d44a93d 100644 --- a/src/Makefile.modules +++ b/src/Makefile.modules @@ -58,7 +58,7 @@ override static_modules_path= # INCLUDES += -I$(COREPATH) # temporary def (visible only in the module, not exported) -DEFS += -DMOD_NAME='"$(MOD_NAME)"' +DEFS += -DMOD_NAME='"$(MOD_NAME)"' -DMOD_NAMEID='$(MOD_NAME)' ifneq ($(makefile_defs_included),1)

1 0

git:master:e818baa1: pdb: use local log level for an info log message
by Daniel-Constantin Mierla 12 Jun '23

12 Jun '23

Module: kamailio Branch: master Commit: e818baa1b21249529c93990ef0340dd8b56b26cf URL: https://github.com/kamailio/kamailio/commit/e818baa1b21249529c93990ef0340dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-12T13:47:18+02:00 pdb: use local log level for an info log message - new mod param to allow remapping local log level for info - related to GH #3296 --- Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/e818baa1b21249529c93990ef0340dd… Patch: https://github.com/kamailio/kamailio/commit/e818baa1b21249529c93990ef0340dd… --- diff --git a/src/modules/pdb/pdb.c b/src/modules/pdb/pdb.c index 75013cccb7a..2cb54de8372 100644 --- a/src/modules/pdb/pdb.c +++ b/src/modules/pdb/pdb.c @@ -48,6 +48,7 @@ static int timeoutlogs = -10; /*!< for aggregating timeout logs */ static int *active = NULL; static uint16_t *global_id = NULL; +ksr_loglevels_t _ksr_loglevels_pdb = KSR_LOGLEVELS_DEFAULTS; /*! * Generic parameter that holds a string, an int or a pseudo-variable @@ -103,9 +104,15 @@ static cmd_export_t cmds[] = { {0, 0, 0, 0, 0, 0}}; -static param_export_t params[] = {{"server", PARAM_STRING, &modp_server}, - {"timeout", INT_PARAM, &timeout}, {0, 0, 0}}; +/* clang-format off */ +static param_export_t params[] = { + {"server", PARAM_STRING, &modp_server}, + {"timeout", PARAM_INT, &timeout}, + {"ll_info", PARAM_INT, &_ksr_loglevels_pdb.ll_info}, + {0, 0, 0} +}; +/* clang-format on */ struct module_exports exports = { "pdb", /* module name */ @@ -429,7 +436,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, timeoutlogs = -10; } if(gettimeofday(&tnow, NULL) == 0) { - LM_INFO("got an answer in %f ms\n", + LLM_INFO("got an answer in %f ms\n", ((double)(tnow.tv_usec - tstart.tv_usec + (tnow.tv_sec - tstart.tv_sec) * 1000000)) / 1000);

1 0

git:master:03203d1b: core: new log macros allowing to use local log levels per module
by Daniel-Constantin Mierla 12 Jun '23

12 Jun '23

Module: kamailio Branch: master Commit: 03203d1baa5f185db8743a90f889e5483e90e911 URL: https://github.com/kamailio/kamailio/commit/03203d1baa5f185db8743a90f889e54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-12T13:43:31+02:00 core: new log macros allowing to use local log levels per module - a variable has to be defined inside module like: ksr_loglevels_t _ksr_loglevels_MODNAME = KSR_LOGLEVELS_DEFAULTS; - for example, for pdb module: ksr_loglevels_t _ksr_loglevels_pdb = KSR_LOGLEVELS_DEFAULTS; - then use LLM_XYZ() macro instead of LM_XYZ() - for example, use LLM_INFO() instead of LM_INFO() --- Modified: src/core/dprint.h --- Diff: https://github.com/kamailio/kamailio/commit/03203d1baa5f185db8743a90f889e54… Patch: https://github.com/kamailio/kamailio/commit/03203d1baa5f185db8743a90f889e54… --- diff --git a/src/core/dprint.h b/src/core/dprint.h index 993a6ebb826..13957b269c9 100644 --- a/src/core/dprint.h +++ b/src/core/dprint.h @@ -109,6 +109,22 @@ #define LOG2SYSLOG_LEVEL(level) \ (log_level_info[(level) - (L_ALERT)].syslog_level) +/** + * + */ +typedef struct ksr_loglevels { + int ll_alert; + int ll_bug; + int ll_crit; + int ll_err; + int ll_warn; + int ll_notice; + int ll_info; + int ll_dbg; +} ksr_loglevels_t; + +#define KSR_LOGLEVELS_DEFAULTS {L_ALERT, L_BUG, L_CRIT2, L_ERR, L_WARN, \ + L_NOTICE, L_INFO, L_DBG} /** * data fileds used for structured logging */ @@ -406,6 +422,21 @@ void log_prefix_init(void); /* obsolete, do not use */ #define DEBUG(...) DBG(__VA_ARGS__) +/* use local log level mapping (not implemented for sun) */ +#define LLM_ALERT(...) LOG(L_ALERT, __VA_ARGS__) +#define LLM_BUG(...) LOG(L_BUG, __VA_ARGS__) +#define LLM_ERR(...) LOG(L_ERR, __VA_ARGS__) +#define LLM_WARN(...) LOG(L_WARN, __VA_ARGS__) +#define LLM_NOTICE(...) LOG(L_NOTICE, __VA_ARGS__) +#define LLM_INFO(...) LOG(L_INFO, __VA_ARGS__) +#define LLM_CRIT(...) LOG(L_CRIT2, __VA_ARGS__) + +#ifdef NO_DEBUG +#define LLM_DBG(...) +#else +#define LLM_DBG(...) LOG(L_DBG, __VA_ARGS__) +#endif + #else /* ! __SUNPRO_C */ #define NPRL(fmt, args...) LOG(L_NPRL, fmt, ##args) #define ALERT(fmt, args...) LOG(L_ALERT, fmt, ##args) @@ -425,6 +456,29 @@ void log_prefix_init(void); /* obsolete, do not use */ #define DEBUG(fmt, args...) DBG(fmt, ##args) +#ifdef MOD_NAMEID + +#define KSR_LLMODVAR_COMBINEZ(X,Y) X##Y +#define KSR_LLMODVAR_COMBINE(X,Y) KSR_LLMODVAR_COMBINEZ(X,Y) +#define KSR_LLMODVAR KSR_LLMODVAR_COMBINE(_ksr_loglevels_,MOD_NAMEID) + +/* use local log level mapping */ +#define LLM_ALERT(fmt, args...) LOG(KSR_LLMODVAR.alert, fmt, ##args) +#define LLM_BUG(fmt, args...) LOG(KSR_LLMODVAR.buf, fmt, ##args) +#define LLM_ERR(fmt, args...) LOG(KSR_LLMODVAR.bug, fmt, ##args) +#define LLM_WARN(fmt, args...) LOG(KSR_LLMODVAR.warn, fmt, ##args) +#define LLM_NOTICE(fmt, args...) LOG(KSR_LLMODVAR.notice, fmt, ##args) +#define LLM_INFO(fmt, args...) LOG(KSR_LLMODVAR.ll_info, fmt, ##args) +#define LLM_CRIT(fmt, args...) LOG(KSR_LLMODVAR.crit, fmt, ##args) + +#ifdef NO_DEBUG +#define LLM_DBG(fmt, args...) +#else +#define LLM_DBG(fmt, args...) LOG(KSR_LLMODVAR.ll_dbg, fmt, ##args) +#endif + +#endif /* MOD_NAMEID */ + #endif /* __SUNPRO_C */

1 0

git:master:e55851ee: kamcmd: clang-format the source code for kamcmd tool
by Henning Westerholt 12 Jun '23

12 Jun '23

Module: kamailio Branch: master Commit: e55851ee7dfb7a60f0a9288d810b84cf3bcd0f19 URL: https://github.com/kamailio/kamailio/commit/e55851ee7dfb7a60f0a9288d810b84c… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-06-12T10:02:43Z kamcmd: clang-format the source code for kamcmd tool --- Modified: utils/kamcmd/kamcmd.c Modified: utils/kamcmd/license.h Modified: utils/kamcmd/parse_listen_id.c Modified: utils/kamcmd/parse_listen_id.h --- Diff: https://github.com/kamailio/kamailio/commit/e55851ee7dfb7a60f0a9288d810b84c… Patch: https://github.com/kamailio/kamailio/commit/e55851ee7dfb7a60f0a9288d810b84c…

1 0

git:master:efa436bc: modules: readme files regenerated - jansson ... [skip ci]
by Kamailio Dev 12 Jun '23

12 Jun '23

Module: kamailio Branch: master Commit: efa436bc228af99cfd1466b5ea1be2fc596f18b8 URL: https://github.com/kamailio/kamailio/commit/efa436bc228af99cfd1466b5ea1be2f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-06-12T12:01:34+02:00 modules: readme files regenerated - jansson ... [skip ci] --- Modified: src/modules/jansson/README Modified: src/modules/lcr/README Modified: src/modules/lost/README Modified: src/modules/lrkproxy/README Modified: src/modules/presence/README Modified: src/modules/rtpproxy/README Modified: src/modules/tmrec/README Modified: src/modules/tmx/README Modified: src/modules/topos/README Modified: src/modules/tsilo/README Modified: src/modules/uac/README Modified: src/modules/uac_redirect/README Modified: src/modules/uid_auth_db/README Modified: src/modules/uid_domain/README Modified: src/modules/userblocklist/README --- Diff: https://github.com/kamailio/kamailio/commit/efa436bc228af99cfd1466b5ea1be2f… Patch: https://github.com/kamailio/kamailio/commit/efa436bc228af99cfd1466b5ea1be2f…

1 0

[kamailio/kamailio] presence: Add htable_db_restore RPC command. (PR #3462)
by Jake Greene 12 Jun '23

12 Jun '23

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Needed a way to sync the publ_cache with changes made to the presentity table when using publ_cache modes 1 or 2. This seems pretty simple, and works for me. Beneficial when adding numerous "message-summary" event entries from an external Voicemail application to the 'presentity' table. Usage: `kamcmd presence.htable_db_restore` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3462 -- Commit Summary -- * presence: Add htable_db_restore RPC command. -- File Changes -- M src/modules/presence/doc/presence_admin.xml (21) M src/modules/presence/presence.c (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3462.patch https://github.com/kamailio/kamailio/pull/3462.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3462 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3462(a)github.com>

3 12

git:master:ebf1aa6d: presence: Add OK response to publish_cache_sync RPC command.
by Daniel-Constantin Mierla 12 Jun '23

12 Jun '23

Module: kamailio Branch: master Commit: ebf1aa6dbfeca30d93c63291751417186f9100cd URL: https://github.com/kamailio/kamailio/commit/ebf1aa6dbfeca30d93c632917514171… Author: Jake Greene <jacobgreene1991(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-12T11:49:27+02:00 presence: Add OK response to publish_cache_sync RPC command. --- Modified: src/modules/presence/doc/presence_admin.xml Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/ebf1aa6dbfeca30d93c632917514171… Patch: https://github.com/kamailio/kamailio/commit/ebf1aa6dbfeca30d93c632917514171… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index 22b20f1d46d..c3c86d4ee7a 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -1287,7 +1287,7 @@ pres_update_watchers("sip:test@kamailio.org", "presence"); <section> <section id="presence.r.publish_cache_sync"> - <title>presence.htable_db_restore</title> + <title>presence.publish_cache_sync</title> <para> Synchronize changes made to the presentity table with the publish cache. </para> diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index 4471f809dc1..688b6dfeb3b 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -1860,7 +1860,9 @@ void rpc_presence_publish_cache_sync(rpc_t *rpc, void *ctx) LM_DBG("Synchronizing presentity table with the publish cache.\n"); if (pres_htable_db_restore() == -1 ) { rpc->fault(ctx, 500, "Failed to sync presinity table with the publish cache."); - }; + } else { + rpc->rpl_printf(ctx, "OK"); + } return; }

1 0

git:master:07f86a52: Presence: semantical improvments to docs & rpc command name
by Daniel-Constantin Mierla 12 Jun '23

12 Jun '23

Module: kamailio Branch: master Commit: 07f86a52271920bc36db3a32c6ffa18434372ebf URL: https://github.com/kamailio/kamailio/commit/07f86a52271920bc36db3a32c6ffa18… Author: Jake Greene <jacobgreene1991(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-12T11:49:27+02:00 Presence: semantical improvments to docs & rpc command name --- Modified: src/modules/presence/doc/presence_admin.xml Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/07f86a52271920bc36db3a32c6ffa18… Patch: https://github.com/kamailio/kamailio/commit/07f86a52271920bc36db3a32c6ffa18… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index 41546d87d5b..22b20f1d46d 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -1286,13 +1286,13 @@ pres_update_watchers("sip:test@kamailio.org", "presence"); </section> <section> - <section id="presence.r.htable_db_restore"> + <section id="presence.r.publish_cache_sync"> <title>presence.htable_db_restore</title> <para> - Manually apply changes to the presenity table to the publ_cache. + Synchronize changes made to the presentity table with the publish cache. </para> <para> - Name: <emphasis>presence.htable_db_restore</emphasis> + Name: <emphasis>presence.publish_cache_sync</emphasis> </para> <para>Parameters: <emphasis>none</emphasis></para> <para> @@ -1300,7 +1300,7 @@ pres_update_watchers("sip:test@kamailio.org", "presence"); </para> <programlisting format="linespecific"> ... -&kamcmd; presence.htable_db_restore +&kamcmd; presence.publish_cache_sync ... </programlisting> </section> diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index bb4fc98a66c..4471f809dc1 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -1855,15 +1855,17 @@ static const char *rpc_presence_cleanup_doc[3] = { 0}; -void rpc_presence_htable_db_restore(rpc_t *rpc, void *c) +void rpc_presence_publish_cache_sync(rpc_t *rpc, void *ctx) { - LM_DBG("Restoring presence publ cache from database.\n"); - pres_htable_db_restore(); + LM_DBG("Synchronizing presentity table with the publish cache.\n"); + if (pres_htable_db_restore() == -1 ) { + rpc->fault(ctx, 500, "Failed to sync presinity table with the publish cache."); + }; return; } -static const char *rpc_presence_htable_db_restore_doc[4] = { - "Sync publ_cache from database. Syncs changes made to presentity table with the publ_cache.", +static const char *rpc_presence_publish_cache_sync_doc[4] = { + "Syncs changes made to presentity table with the publish cache.", 0 }; @@ -2133,8 +2135,8 @@ static const char *rpc_presence_watcher_list_doc[2] = { rpc_export_t presence_rpc[] = { - {"presence.htable_db_restore", rpc_presence_htable_db_restore, - rpc_presence_htable_db_restore_doc, 0}, + {"presence.publish_cache_sync", rpc_presence_publish_cache_sync, + rpc_presence_publish_cache_sync_doc, 0}, {"presence.cleanup", rpc_presence_cleanup, rpc_presence_cleanup_doc, 0}, {"presence.refreshWatchers", rpc_presence_refresh_watchers, rpc_presence_refresh_watchers_doc, 0},

1 0

git:master:5197e7b4: presence: Add htable_db_restore RPC command.
by Daniel-Constantin Mierla 12 Jun '23

12 Jun '23

Module: kamailio Branch: master Commit: 5197e7b41dd5d08451b7a7906177fc04e1c3ce8b URL: https://github.com/kamailio/kamailio/commit/5197e7b41dd5d08451b7a7906177fc0… Author: Jake Greene <jacobgreene1991(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-12T11:49:27+02:00 presence: Add htable_db_restore RPC command. - Introduced `htable_db_restore` RPC command to load updates from the 'presentity' table into the 'publ_cache' specifically for 'publ_cache' modes 1 or 2. - update docs for htable_db_restore RPC command --- Modified: src/modules/presence/doc/presence_admin.xml Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/5197e7b41dd5d08451b7a7906177fc0… Patch: https://github.com/kamailio/kamailio/commit/5197e7b41dd5d08451b7a7906177fc0… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index dbad0acf65a..41546d87d5b 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -1284,6 +1284,27 @@ pres_update_watchers("sip:test@kamailio.org", "presence"); ... </programlisting> </section> + +<section> + <section id="presence.r.htable_db_restore"> + <title>presence.htable_db_restore</title> + <para> + Manually apply changes to the presenity table to the publ_cache. + </para> + <para> + Name: <emphasis>presence.htable_db_restore</emphasis> + </para> + <para>Parameters: <emphasis>none</emphasis></para> + <para> + RPC Command Format: + </para> + <programlisting format="linespecific"> +... +&kamcmd; presence.htable_db_restore +... +</programlisting> + </section> + <section id="presence.r.refreshWatchers"> <title>presence.refreshWatchers</title> <para> diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index 254315aebbb..bb4fc98a66c 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -1854,6 +1854,20 @@ static const char *rpc_presence_cleanup_doc[3] = { "presentity, and watchers tables.", 0}; + +void rpc_presence_htable_db_restore(rpc_t *rpc, void *c) +{ + LM_DBG("Restoring presence publ cache from database.\n"); + pres_htable_db_restore(); + return; +} + +static const char *rpc_presence_htable_db_restore_doc[4] = { + "Sync publ_cache from database. Syncs changes made to presentity table with the publ_cache.", + 0 +}; + + /*! \brief * Build the rpc response for listing presentity records * - imode - output attributes control @@ -2119,6 +2133,8 @@ static const char *rpc_presence_watcher_list_doc[2] = { rpc_export_t presence_rpc[] = { + {"presence.htable_db_restore", rpc_presence_htable_db_restore, + rpc_presence_htable_db_restore_doc, 0}, {"presence.cleanup", rpc_presence_cleanup, rpc_presence_cleanup_doc, 0}, {"presence.refreshWatchers", rpc_presence_refresh_watchers, rpc_presence_refresh_watchers_doc, 0},

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 June 2023