sr-dev March 2022

sr-dev@lists.kamailio.org

10 participants
242 discussions

git:5.5:67d888c8: cplc: manage case where TZ environment variable is not set.

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 67d888c80f5c9e96da72a1dab234f2a70782f635 URL: https://github.com/kamailio/kamailio/commit/67d888c80f5c9e96da72a1dab234f2a… Author: frederic <frederic.gaisnon(a)mmtt.fr> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-09T09:09:38+01:00 cplc: manage case where TZ environment variable is not set. (cherry picked from commit 2ea56a4cf40045bb92b1f17f5a0b8c172da4f866) --- Modified: src/modules/cplc/cpl_switches.h --- Diff: https://github.com/kamailio/kamailio/commit/67d888c80f5c9e96da72a1dab234f2a… Patch: https://github.com/kamailio/kamailio/commit/67d888c80f5c9e96da72a1dab234f2a… --- diff --git a/src/modules/cplc/cpl_switches.h b/src/modules/cplc/cpl_switches.h index c3c8572f4c..e2d15bfbb3 100644 --- a/src/modules/cplc/cpl_switches.h +++ b/src/modules/cplc/cpl_switches.h @@ -815,7 +815,7 @@ static inline char *run_time_switch( struct cpl_interpreter *intr ) /* does the recv_time match the specified interval? */ j = cpl_check_tmrec( &trt, &att, 0); /* restore the orig TZ */ - if ( flags&(1<<7) ) + if ((flags&(1<<7)) && cpl_env.orig_tz.s && (cpl_env.orig_tz.len > 3)) set_TZ(cpl_env.orig_tz.s); /* reset flags */ flags &= (1<<7); @@ -850,7 +850,7 @@ static inline char *run_time_switch( struct cpl_interpreter *intr ) cpl_tmrec_free( &trt ); return DEFAULT_ACTION; runtime_error: - if ( flags&(1<<7) ) + if ((flags&(1<<7)) && cpl_env.orig_tz.s && (cpl_env.orig_tz.len > 3)) set_TZ(cpl_env.orig_tz.s); cpl_ac_tm_free( &att ); cpl_tmrec_free( &trt ); @@ -859,7 +859,7 @@ static inline char *run_time_switch( struct cpl_interpreter *intr ) LM_ERR("error parsing attr [%d][%s]\n", attr_name,attr_str?(char*)attr_str:"NULL"); script_error: - if ( flags&(1<<7) ) + if ((flags&(1<<7)) && cpl_env.orig_tz.s && (cpl_env.orig_tz.len > 3)) set_TZ(cpl_env.orig_tz.s); cpl_ac_tm_free( &att ); cpl_tmrec_free( &trt );

2 years, 1 month

git:master:3719888c: modules: readme files regenerated - p_usrloc ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 3719888c2d6df492e48a07e04682930abba07e71 URL: https://github.com/kamailio/kamailio/commit/3719888c2d6df492e48a07e04682930… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-03-07T14:16:19+01:00 modules: readme files regenerated - p_usrloc ... [skip ci] --- Modified: src/modules/p_usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/3719888c2d6df492e48a07e04682930… Patch: https://github.com/kamailio/kamailio/commit/3719888c2d6df492e48a07e04682930… --- diff --git a/src/modules/p_usrloc/README b/src/modules/p_usrloc/README index 84a7c37eba..e9039e5341 100644 --- a/src/modules/p_usrloc/README +++ b/src/modules/p_usrloc/README @@ -53,6 +53,7 @@ Patric Marschall 3.26. db_update_as_insert (string) 3.27. default_db_url(str) 3.28. matching_mode(int) + 3.29. UTC_timestamps(int) 4. Changes from usrloc module @@ -124,8 +125,9 @@ Patric Marschall 1.26. Set db_update_as_insert parameter 1.27. Set default_db_type parameter 1.28. Set matching_mode parameter - 1.29. Set db_mode parameter - 1.30. Example database content - reg_table (locdb) table + 1.29. Set UTC_timestamps parameter + 1.30. Set db_mode parameter + 1.31. Example database content - reg_table (locdb) table Chapter 1. User's Guide @@ -167,6 +169,7 @@ Chapter 1. User's Guide 3.26. db_update_as_insert (string) 3.27. default_db_url(str) 3.28. matching_mode(int) + 3.29. UTC_timestamps(int) 4. Changes from usrloc module @@ -285,6 +288,7 @@ Warning 3.26. db_update_as_insert (string) 3.27. default_db_url(str) 3.28. matching_mode(int) + 3.29. UTC_timestamps(int) 3.1. write_db_url (string) @@ -680,6 +684,17 @@ modparam("p_usrloc", "matching_mode", 2) kamcmd cfg.set_now_int p_usrloc matching_mode 2 kamcmd cfg.get p_usrloc matching_mode +3.29. UTC_timestamps(int) + + Enables UTC timestamps for expires and last_modified columns. + + Default value is 0 (disabled). + + Example 1.29. Set UTC_timestamps parameter +... +modparam("p_usrloc", "UTC_timestamps", 1) +... + 4. Changes from usrloc module 4.1. db_mode (integer) @@ -702,7 +717,7 @@ kamcmd cfg.get p_usrloc matching_mode Default value is 3. - Example 1.29. Set db_mode parameter + Example 1.30. Set db_mode parameter ... modparam("p_usrloc", "db_mode", 2) ... @@ -736,7 +751,7 @@ modparam("p_usrloc", "db_mode", 2) complete database documentation on the project webpage, https://www.kamailio.org/docs/db-tables/kamailio-db-devel.html. - Example 1.30. Example database content - reg_table (locdb) table + Example 1.31. Example database content - reg_table (locdb) table ... +----+----+------+--------+--------+---------------------+-------+----+ | id | no | url | status | errors | failover | spare | rg |

2 years, 2 months

[kamailio/kamailio] p_usrloc: add UTC_timestamps parameter (PR #3036)

by Stefan Mititelu

#### 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  Enable UTC time format for expires and last_modified columns. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3036 -- Commit Summary -- * p_usrloc: add UTC_timestamps parameter -- File Changes -- M src/modules/p_usrloc/doc/p_usrloc_admin.xml (22) M src/modules/p_usrloc/p_usrloc_mod.c (18) M src/modules/p_usrloc/p_usrloc_mod.h (4) M src/modules/p_usrloc/ucontact.c (12) M src/modules/p_usrloc/udomain.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3036.patch https://github.com/kamailio/kamailio/pull/3036.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3036 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3036(a)github.com>

2 years, 2 months

git:master:4e26551f: p_usrloc: add UTC_timestamps parameter

by Stefan Mititelu

Module: kamailio Branch: master Commit: 4e26551f3529876beafd318f30ffc5f0cf92cda1 URL: https://github.com/kamailio/kamailio/commit/4e26551f3529876beafd318f30ffc5f… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)govoip.ro> Date: 2022-03-07T15:11:15+02:00 p_usrloc: add UTC_timestamps parameter --- Modified: src/modules/p_usrloc/doc/p_usrloc_admin.xml Modified: src/modules/p_usrloc/p_usrloc_mod.c Modified: src/modules/p_usrloc/p_usrloc_mod.h Modified: src/modules/p_usrloc/ucontact.c Modified: src/modules/p_usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/4e26551f3529876beafd318f30ffc5f… Patch: https://github.com/kamailio/kamailio/commit/4e26551f3529876beafd318f30ffc5f…

2 years, 2 months

git:master:96efbdad: snmpstats: fix build, update memory field

by Victor Seva

Module: kamailio Branch: master Commit: 96efbdad0e9ed320657f56c3a0b4a5e54b1cdd5c URL: https://github.com/kamailio/kamailio/commit/96efbdad0e9ed320657f56c3a0b4a5e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-07T09:20:39+01:00 snmpstats: fix build, update memory field > CC (gcc) [M snmpstats.so] kamailioServer.o > kamailioServer.c: In function 'handle_kamailioSrvFreeMemory': > kamailioServer.c:193:37: error: 'struct mem_info' has no member named 'free' > 193 | int freememory = (int)_stats_shm_mi.free; > | ^ > make[2]: *** [../../Makefile.rules:100: kamailioServer.o] Error 1 > make[1]: *** [Makefile:511: modules] Error 1 changes introduced at fb8727b3e1b9fc4f4278809ef9cdea93e96ae77a --- Modified: src/modules/snmpstats/kamailioServer.c --- Diff: https://github.com/kamailio/kamailio/commit/96efbdad0e9ed320657f56c3a0b4a5e… Patch: https://github.com/kamailio/kamailio/commit/96efbdad0e9ed320657f56c3a0b4a5e… --- diff --git a/src/modules/snmpstats/kamailioServer.c b/src/modules/snmpstats/kamailioServer.c index 1bd7e70854..163c73f8b0 100644 --- a/src/modules/snmpstats/kamailioServer.c +++ b/src/modules/snmpstats/kamailioServer.c @@ -190,7 +190,7 @@ int handle_kamailioSrvFreeMemory(netsnmp_mib_handler *handler, netsnmp_agent_request_info *reqinfo, netsnmp_request_info *requests) { stats_shm_update(); - int freememory = (int)_stats_shm_mi.free; + int freememory = (int)_stats_shm_mi.free_size; switch(reqinfo->mode) {

2 years, 2 months

git:master:fffcfdf8: modules: readme files regenerated - corex ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: fffcfdf86aa8bd6ea417b593f9a5af2892cd6d1a URL: https://github.com/kamailio/kamailio/commit/fffcfdf86aa8bd6ea417b593f9a5af2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-03-04T13:31:34+01:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/fffcfdf86aa8bd6ea417b593f9a5af2… Patch: https://github.com/kamailio/kamailio/commit/fffcfdf86aa8bd6ea417b593f9a5af2… --- diff --git a/src/modules/corex/README b/src/modules/corex/README index dc28b471ec..b3bc69a9fd 100644 --- a/src/modules/corex/README +++ b/src/modules/corex/README @@ -72,7 +72,8 @@ Muhammad Shahzad Shafi 5.5. corex.shm_summary 5.6. corex.pkg_summary 5.7. corex.shm.info - 5.8. corex.shm.stats + 5.8. corex.shm.report + 5.9. corex.shm.stats 6. Event Routes @@ -171,7 +172,8 @@ Chapter 1. Admin Guide 5.5. corex.shm_summary 5.6. corex.pkg_summary 5.7. corex.shm.info - 5.8. corex.shm.stats + 5.8. corex.shm.report + 5.9. corex.shm.stats 6. Event Routes @@ -751,7 +753,8 @@ event_route[dispatcher:dst-down] { 5.5. corex.shm_summary 5.6. corex.pkg_summary 5.7. corex.shm.info - 5.8. corex.shm.stats + 5.8. corex.shm.report + 5.9. corex.shm.stats 5.1. corex.debug @@ -811,7 +814,14 @@ event_route[dispatcher:dst-down] { Example: kamcli rpc shm.info -5.8. corex.shm.stats +5.8. corex.shm.report + + Return shared memory manager usage report. + + Example: + kamcli rpc shm.report + +5.9. corex.shm.stats Return shared memory statistics (values are in bytes).

2 years, 2 months

git:master:8a58717c: corex: docs for shm.report rpc command

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8a58717c5d81989e835a7c30bd6a1e5954c59a0b URL: https://github.com/kamailio/kamailio/commit/8a58717c5d81989e835a7c30bd6a1e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-04T13:27:57+01:00 corex: docs for shm.report rpc command --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8a58717c5d81989e835a7c30bd6a1e5… Patch: https://github.com/kamailio/kamailio/commit/8a58717c5d81989e835a7c30bd6a1e5… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index 6a1b94e021..da9d8ea101 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -1020,6 +1020,20 @@ event_route[dispatcher:dst-down] { <programlisting format="linespecific"> &kamcli; rpc shm.info </programlisting> + </section> + <section id="corex.rpc.shm.report"> + <title> + <function moreinfo="none">corex.shm.report</function> + </title> + <para> + Return shared memory manager usage report. + </para> + <para> + Example: + </para> + <programlisting format="linespecific"> + &kamcli; rpc shm.report + </programlisting> </section> <section id="corex.rpc.shm.stats"> <title>

2 years, 2 months

git:master:2d9de91d: corex: add shm.report rpc command

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2d9de91df94ca686968a307d18902f51d59a9c18 URL: https://github.com/kamailio/kamailio/commit/2d9de91df94ca686968a307d18902f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-04T13:20:46+01:00 corex: add shm.report rpc command --- Modified: src/modules/corex/corex_rpc_shm.c --- Diff: https://github.com/kamailio/kamailio/commit/2d9de91df94ca686968a307d18902f5… Patch: https://github.com/kamailio/kamailio/commit/2d9de91df94ca686968a307d18902f5… --- diff --git a/src/modules/corex/corex_rpc_shm.c b/src/modules/corex/corex_rpc_shm.c index 4c1d3c820c..490aaadc83 100644 --- a/src/modules/corex/corex_rpc_shm.c +++ b/src/modules/corex/corex_rpc_shm.c @@ -79,9 +79,45 @@ static void corex_rpc_shm_stats(rpc_t* rpc, void* c) ); } +static const char* corex_rpc_shm_report_doc[2] = { + "Return shared memory report", + 0 +}; + +/* + * RPC command to return shm report + */ +static void corex_rpc_shm_report(rpc_t* rpc, void* ctx) +{ + mem_report_t mrep; + void *th; + + if(_shm_root.xreport==NULL) { + rpc->fault(ctx, 500, "No report callback function"); + return; + } + shm_report(&mrep); + rpc->add(ctx, "{", &th); + rpc->struct_add(th, "jjjjjjjjjjjj", + "total_size", mrep.total_size, + "free_size_s", mrep.free_size_s, + "used_size_s", mrep.used_size_s, + "real_used_s", mrep.real_used_s, + "max_used_s", mrep.max_used_s, + "free_frags", mrep.free_frags, + "used_frags", mrep.used_frags, + "total_frags", mrep.total_frags, + "max_free_frag_size", mrep.max_free_frag_size, + "max_used_frag_size", mrep.max_used_frag_size, + "min_free_frag_size", mrep.min_free_frag_size, + "min_used_frag_size", mrep.min_used_frag_size + ); +} + rpc_export_t corex_rpc_shm_cmds[] = { - {"shm.info", corex_rpc_shm_info, corex_rpc_shm_info_doc, 0}, - {"shm.stats", corex_rpc_shm_stats, corex_rpc_shm_stats_doc, 0}, + {"shm.info", corex_rpc_shm_info, corex_rpc_shm_info_doc, 0}, + {"shm.report", corex_rpc_shm_report, corex_rpc_shm_report_doc, 0}, + {"shm.stats", corex_rpc_shm_stats, corex_rpc_shm_stats_doc, 0}, {0, 0, 0, 0} };

2 years, 2 months

git:master:72a4e0e9: core: mem - added api function for getting usage report for qm manager

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 72a4e0e90e95e2088b995bbe49bad5324edd9b09 URL: https://github.com/kamailio/kamailio/commit/72a4e0e90e95e2088b995bbe49bad53… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-04T13:18:58+01:00 core: mem - added api function for getting usage report for qm manager - combine internal memory manager stats with metrics computed on the fly by walking all memory fragments --- Modified: src/core/mem/memapi.h Modified: src/core/mem/meminfo.h Modified: src/core/mem/pkg.c Modified: src/core/mem/pkg.h Modified: src/core/mem/q_malloc.c Modified: src/core/mem/shm.c Modified: src/core/mem/shm.h --- Diff: https://github.com/kamailio/kamailio/commit/72a4e0e90e95e2088b995bbe49bad53… Patch: https://github.com/kamailio/kamailio/commit/72a4e0e90e95e2088b995bbe49bad53…

2 years, 2 months

git:master:fb8727b3: kex: updated memory info fields

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fb8727b3e1b9fc4f4278809ef9cdea93e96ae77a URL: https://github.com/kamailio/kamailio/commit/fb8727b3e1b9fc4f4278809ef9cdea9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-04T09:44:21+01:00 kex: updated memory info fields --- Modified: src/modules/kex/core_stats.c Modified: src/modules/kex/pkg_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/fb8727b3e1b9fc4f4278809ef9cdea9… Patch: https://github.com/kamailio/kamailio/commit/fb8727b3e1b9fc4f4278809ef9cdea9… --- diff --git a/src/modules/kex/core_stats.c b/src/modules/kex/core_stats.c index ec543d1b60..565ce4e77d 100644 --- a/src/modules/kex/core_stats.c +++ b/src/modules/kex/core_stats.c @@ -869,7 +869,7 @@ unsigned long shm_stats_get_size(void) unsigned long shm_stats_get_used(void) { stats_shm_update(); - return _stats_shm_rpc.used; + return _stats_shm_rpc.used_size; } unsigned long shm_stats_get_rused(void) @@ -887,7 +887,7 @@ unsigned long shm_stats_get_mused(void) unsigned long shm_stats_get_free(void) { stats_shm_update(); - return _stats_shm_rpc.free; + return _stats_shm_rpc.free_size; } unsigned long shm_stats_get_frags(void) diff --git a/src/modules/kex/pkg_stats.c b/src/modules/kex/pkg_stats.c index 102442f1e9..15ce1dcf2c 100644 --- a/src/modules/kex/pkg_stats.c +++ b/src/modules/kex/pkg_stats.c @@ -99,8 +99,8 @@ int pkg_proc_stats_myinit(int rank) /* init pkg usage values */ pkg_info(&info); - _pkg_proc_stats_list[process_no].available = info.free; - _pkg_proc_stats_list[process_no].used = info.used; + _pkg_proc_stats_list[process_no].available = info.free_size; + _pkg_proc_stats_list[process_no].used = info.used_size; _pkg_proc_stats_list[process_no].real_used = info.real_used; _pkg_proc_stats_list[process_no].total_size = info.total_size; _pkg_proc_stats_list[process_no].total_frags = info.total_frags; @@ -132,8 +132,8 @@ static int pkg_proc_update_stats(sr_event_param_t *evp) if(unlikely(process_no>=_pkg_proc_stats_no)) return -1; pkg_info(&info); - _pkg_proc_stats_list[process_no].available = info.free; - _pkg_proc_stats_list[process_no].used = info.used; + _pkg_proc_stats_list[process_no].available = info.free_size; + _pkg_proc_stats_list[process_no].used = info.used_size; _pkg_proc_stats_list[process_no].real_used = info.real_used; _pkg_proc_stats_list[process_no].total_frags = info.total_frags; return 0;

2 years, 2 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2022