sr-dev October 2023

sr-dev@lists.kamailio.org

15 participants
286 discussions

[kamailio/kamailio] Typos at https://www.kamailio.org/docs/modules/devel/ (Issue #3596)

by Дилян Палаузов

At https://www.kamailio.org/docs/modules/devel/ is spelled CALL_CONTROL | Conector to call_control application -- | -- EVREXEC | Execut event routes at startup on dedicated processes It shall be co**NN**ector and execut**E**. Likewise for https://www.kamailio.org/docs/modules/5.8.x/ , https://www.kamailio.org/docs/modules/5.7.x/, https://www.kamailio.org/docs/modules/5.6.x/ … -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3596 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3596(a)github.com>

1 year, 1 month

[kamailio/kamailio] smsops: avoid c99 error (PR #3597)

by mtryfoss

#### 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 - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Small adjustment to avoid C99 error from older compiler. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3597 -- Commit Summary -- * smsops: avoid c99 error -- File Changes -- M src/modules/smsops/smsops_impl.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3597.patch https://github.com/kamailio/kamailio/pull/3597.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3597 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3597(a)github.com>

1 year, 1 month

git:master:65ccf80c: smsops: avoid c99 error (#3597)

by GitHub

Module: kamailio Branch: master Commit: 65ccf80c90e007d7636e973009d8cb2446cd8821 URL: https://github.com/kamailio/kamailio/commit/65ccf80c90e007d7636e973009d8cb2… Author: mtryfoss <morten(a)tryfoss.no> Committer: GitHub <noreply(a)github.com> Date: 2023-10-10T14:01:38+02:00 smsops: avoid c99 error (#3597) --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/65ccf80c90e007d7636e973009d8cb2… Patch: https://github.com/kamailio/kamailio/commit/65ccf80c90e007d7636e973009d8cb2… --- diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index 485a814774c..c8ccc2df4e1 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -511,8 +511,9 @@ int ucs2_to_utf8(char *ucs2, int ucs2_len, char *utf8) uint16_t high_surrogate, low_surrogate; uint32_t codepoint; uint16_t ucs2_char; + size_t ucs2_index; - for(size_t ucs2_index = 0; ucs2_index < ucs2_len; ucs2_index += 2) { + for(ucs2_index = 0; ucs2_index < ucs2_len; ucs2_index += 2) { ucs2_char = (unsigned char)ucs2[ucs2_index]; ucs2_char = (ucs2_char << 8) | (unsigned char)ucs2[ucs2_index + 1]; if(ucs2_char <= 0x7F) {

1 year, 1 month

git:master:8f3d76e9: corex: rpc command to print shm status report to file based on filter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8f3d76e9808024bff1d816acddeb81667e1df0d2 URL: https://github.com/kamailio/kamailio/commit/8f3d76e9808024bff1d816acddeb816… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-09T13:51:47+02:00 corex: rpc command to print shm status report to file based on filter --- Modified: src/modules/corex/corex_rpc_shm.c --- Diff: https://github.com/kamailio/kamailio/commit/8f3d76e9808024bff1d816acddeb816… Patch: https://github.com/kamailio/kamailio/commit/8f3d76e9808024bff1d816acddeb816… --- diff --git a/src/modules/corex/corex_rpc_shm.c b/src/modules/corex/corex_rpc_shm.c index 6230f1b129d..02fa08f8a36 100644 --- a/src/modules/corex/corex_rpc_shm.c +++ b/src/modules/corex/corex_rpc_shm.c @@ -115,13 +115,41 @@ static void corex_rpc_shm_report(rpc_t *rpc, void *ctx) mrep.min_used_frag_line); } +/*clang-format off*/ +static const char *corex_rpc_shm_rprint_doc[2] = { + "Print shm status report to file matching the filter", 0}; +/*clang-format on*/ + +/* + * RPC command to print the shm status report + */ +static void corex_rpc_shm_rprint(rpc_t *rpc, void *ctx) +{ + char *fname = NULL; + str fmatch = STR_NULL; + FILE *fp = NULL; + + if(rpc->scan(ctx, "ss", &fname, &fmatch) < 2) { + rpc->fault(ctx, 400, "Filename and filter not provided"); + return; + } + fp = fopen(fname, "w"); + if(fp == NULL) { + LM_ERR("cannot open file: %s\n", fname); + rpc->fault(ctx, 500, "Cannot open file"); + return; + } + shm_status_filter(&fmatch, fp); + fclose(fp); +} + /*clang-format off*/ rpc_export_t corex_rpc_shm_cmds[] = { - {"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} -}; + {"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}, + {"shm.rprint", corex_rpc_shm_rprint, corex_rpc_shm_rprint_doc, 0}, + {0, 0, 0, 0}}; /*clang-format on*/ /**

1 year, 1 month

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

by Kamailio Dev

Module: kamailio Branch: master Commit: a86db7b642feaf4bb7367280463a9b22e33ffae5 URL: https://github.com/kamailio/kamailio/commit/a86db7b642feaf4bb7367280463a9b2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-10-09T14:16:24+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/a86db7b642feaf4bb7367280463a9b2… Patch: https://github.com/kamailio/kamailio/commit/a86db7b642feaf4bb7367280463a9b2… --- diff --git a/src/modules/corex/README b/src/modules/corex/README index 7d0f6f06082..f50a1287bd8 100644 --- a/src/modules/corex/README +++ b/src/modules/corex/README @@ -76,6 +76,7 @@ Muhammad Shahzad Shafi 5.7. corex.shm.info 5.8. corex.shm.report 5.9. corex.shm.stats + 5.10. corex.shm.rprint 6. Event Routes @@ -180,6 +181,7 @@ Chapter 1. Admin Guide 5.7. corex.shm.info 5.8. corex.shm.report 5.9. corex.shm.stats + 5.10. corex.shm.rprint 6. Event Routes @@ -800,6 +802,7 @@ route[reply] { 5.7. corex.shm.info 5.8. corex.shm.report 5.9. corex.shm.stats + 5.10. corex.shm.rprint 5.1. corex.debug @@ -873,6 +876,18 @@ route[reply] { Example: kamcli rpc shm.stats +5.10. corex.shm.rprint + + Shared memory usage status report printed to file upon filter match + with the file of allocation. + + It takes two parameters: the path to file where to write the report; + the string to match the allocation file (the match is done as value + included in the path fo the allocation file). + + Example: + kamcli rpc shm.rprint /tmp/kamailioshm.txt dns_cache.c + 6. Event Routes 6.1. event_route[network:msg]

1 year, 1 month

git:master:6e025217: corex: docs for shm.rprint rpc command

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6e02521739992a4e7dde0ebfae71186b8e866624 URL: https://github.com/kamailio/kamailio/commit/6e02521739992a4e7dde0ebfae71186… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-09T14:07:28+02:00 corex: docs for shm.rprint rpc command --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6e02521739992a4e7dde0ebfae71186… Patch: https://github.com/kamailio/kamailio/commit/6e02521739992a4e7dde0ebfae71186… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index 6b60cbbf445..29aaa8ccbe8 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -1105,6 +1105,26 @@ route[reply] { <programlisting format="linespecific"> &kamcli; rpc shm.stats </programlisting> + </section> + <section id="corex.rpc.shm.rprint"> + <title> + <function moreinfo="none">corex.shm.rprint</function> + </title> + <para> + Shared memory usage status report printed to file upon filter match + with the file of allocation. + </para> + <para> + It takes two parameters: the path to file where to write the report; + the string to match the allocation file (the match is done as value + included in the path fo the allocation file). + </para> + <para> + Example: + </para> + <programlisting format="linespecific"> + &kamcli; rpc shm.rprint /tmp/kamailioshm.txt dns_cache.c + </programlisting> </section> </section>

1 year, 1 month

git:master:2b899606: core: mem - qm_status_filter - change filter from start-with to include

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2b899606dd56b841d57eb5bbd94725bd6e5c184d URL: https://github.com/kamailio/kamailio/commit/2b899606dd56b841d57eb5bbd94725b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-09T13:48:33+02:00 core: mem - qm_status_filter - change filter from start-with to include --- Modified: src/core/mem/q_malloc.c Modified: src/core/mem/shm.h --- Diff: https://github.com/kamailio/kamailio/commit/2b899606dd56b841d57eb5bbd94725b… Patch: https://github.com/kamailio/kamailio/commit/2b899606dd56b841d57eb5bbd94725b… --- diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index b6c88b0ec55..5d05af88f9e 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -970,6 +970,26 @@ void qm_status(void *qmp) } +static void *qm_strnstr(const void *b1, int l1, const void *b2, int l2) +{ + char *sp = (char *)b1; + char *pp = (char *)b2; + char *eos = sp + l1 - l2; + + if(!(b1 && b2 && l1 && l2)) + return NULL; + + while(sp <= eos) { + if(*sp == *pp) + if(memcmp(sp, pp, l2) == 0) + return sp; + + sp++; + } + + return NULL; +} + void qm_status_filter(void *qmp, str *fmatch, FILE *fp) { struct qm_block *qm; @@ -996,8 +1016,9 @@ void qm_status_filter(void *qmp, str *fmatch, FILE *fp) #ifdef DBG_QM_MALLOC if((fmatch == NULL) || (fmatch->len == 0) || ((strlen(f->file) >= fmatch->len) - && (strncmp(f->file, fmatch->s, fmatch->len) - == 0))) { + && (qm_strnstr(f->file, strlen(f->file), fmatch->s, + fmatch->len) + != NULL))) { fprintf(fp, " %3d. %c address=%p frag=%p size=%lu used=%d\n", i, (f->u.is_free) ? 'A' : 'N', (char *)f + sizeof(struct qm_frag), f, f->size, @@ -1033,11 +1054,17 @@ void qm_status_filter(void *qmp, str *fmatch, FILE *fp) if(!FRAG_WAS_USED(f)) { unused++; #ifdef DBG_QM_MALLOC - fprintf(fp, - "unused fragm.: hash = %3d, fragment %p," - " address %p size %lu, created from %s: %s(%lu)\n", - h, f, (char *)f + sizeof(struct qm_frag), f->size, - f->file, f->func, f->line); + if((fmatch == NULL) || (fmatch->len == 0) + || ((strlen(f->file) >= fmatch->len) + && (qm_strnstr(f->file, strlen(f->file), + fmatch->s, fmatch->len) + != NULL))) { + fprintf(fp, + "unused fragm.: hash = %3d, fragment %p," + " address %p size %lu, created from %s: %s(%lu)\n", + h, f, (char *)f + sizeof(struct qm_frag), f->size, + f->file, f->func, f->line); + } #endif } } diff --git a/src/core/mem/shm.h b/src/core/mem/shm.h index 6d3a855fa7c..9ea31d53131 100644 --- a/src/core/mem/shm.h +++ b/src/core/mem/shm.h @@ -94,7 +94,7 @@ extern sr_shm_api_t _shm_root; } else { \ LM_ERR("shm status with filter not implemented\n"); \ } \ - while(0) + } while(0) #define shm_info(mi) _shm_root.xinfo(_shm_root.mem_block, mi) #define shm_report(mr) _shm_root.xreport(_shm_root.mem_block, mr) #define shm_available() _shm_root.xavailable(_shm_root.mem_block)

1 year, 1 month

git:5.7:bfbabc34: pkg/kamailio/scripts: wrap param around quotes to avoid invalid syntax on empty

by S-P Chan

Module: kamailio Branch: 5.7 Commit: bfbabc3407b984028fd47afdfde5217aef3d6fe5 URL: https://github.com/kamailio/kamailio/commit/bfbabc3407b984028fd47afdfde5217… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2023-10-07T09:38:01+08:00 pkg/kamailio/scripts: wrap param around quotes to avoid invalid syntax on empty Cherry-pick from 18b23187dd --- Modified: pkg/kamailio/scripts/create-src-rpm.sh Modified: pkg/kamailio/scripts/git-archive-all.sh --- Diff: https://github.com/kamailio/kamailio/commit/bfbabc3407b984028fd47afdfde5217… Patch: https://github.com/kamailio/kamailio/commit/bfbabc3407b984028fd47afdfde5217… --- diff --git a/pkg/kamailio/scripts/create-src-rpm.sh b/pkg/kamailio/scripts/create-src-rpm.sh index ebe792a22bb..febe3b118fb 100755 --- a/pkg/kamailio/scripts/create-src-rpm.sh +++ b/pkg/kamailio/scripts/create-src-rpm.sh @@ -8,8 +8,8 @@ usage() { # creates a src.rpm for mock VER=$1 REL=$2 -[[ -n $VER ]] || { echo "Version not specified"; usage; exit 1; } -[[ -n $REL ]] || { echo "Release not specified"; usage; exit 2; } +[[ -n "$VER" ]] || { echo "Version not specified"; usage; exit 1; } +[[ -n "$REL" ]] || { echo "Release not specified"; usage; exit 2; } git submodule update --init diff --git a/pkg/kamailio/scripts/git-archive-all.sh b/pkg/kamailio/scripts/git-archive-all.sh index 4c85ca83cc4..d0ca6338d71 100755 --- a/pkg/kamailio/scripts/git-archive-all.sh +++ b/pkg/kamailio/scripts/git-archive-all.sh @@ -6,13 +6,13 @@ usage() { echo Usage: pkg/kamailio/scripts/git-archive-all.sh kamailio-5.8.0 ../output/kamailio-5.8.0_src } -if [ -z $1 ]; then +if [ -z "$1" ]; then echo "You must specify a prefix name." usage exit 1 fi -if [ -z $2 ]; then +if [ -z "$2" ]; then echo "You must specify a super-archive name." usage exit 1

1 year, 1 month

git:5.7:42f20356: pkg: RPM - add mock config for EL8/EL9 based on alma+epel-(8|9)-x86_64

by S-P Chan

Module: kamailio Branch: 5.7 Commit: 42f203569bc3dd2e4a6adb56803f34290f581c08 URL: https://github.com/kamailio/kamailio/commit/42f203569bc3dd2e4a6adb56803f342… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2023-10-07T09:37:42+08:00 pkg: RPM - add mock config for EL8/EL9 based on alma+epel-(8|9)-x86_64 This mock config can be used to build RPM packages from a kamailio src.rpm. - update pkg/kamailio/obs/README -> README.md to include mock instructions - add script create-src-rpm.sh to create src.rpm for package building Cherry-pick from 9de780b8a7 --- Added: pkg/kamailio/obs/README.md Added: pkg/kamailio/obs/kamailio-8-x86_64.cfg Added: pkg/kamailio/obs/kamailio-9-x86_64.cfg Added: pkg/kamailio/scripts/create-src-rpm.sh Added: pkg/kamailio/scripts/git-archive-all.sh Removed: pkg/kamailio/obs/README Removed: pkg/scripts/git-archive-all.sh --- Diff: https://github.com/kamailio/kamailio/commit/42f203569bc3dd2e4a6adb56803f342… Patch: https://github.com/kamailio/kamailio/commit/42f203569bc3dd2e4a6adb56803f342…

1 year, 1 month

git:5.7:04ef5978: pkg: add example script to create tarball with submodules instantiated

by S-P Chan

Module: kamailio Branch: 5.7 Commit: 04ef5978df1937a8b23f245edb5f51a0bf544cae URL: https://github.com/kamailio/kamailio/commit/04ef5978df1937a8b23f245edb5f51a… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2023-10-07T09:37:10+08:00 pkg: add example script to create tarball with submodules instantiated In preparation for packaging of tls_wolfssl, add an example script to create source tarball with submodule code. Cherry-pick from aed35ddb6a --- Added: pkg/scripts/git-archive-all.sh --- Diff: https://github.com/kamailio/kamailio/commit/04ef5978df1937a8b23f245edb5f51a… Patch: https://github.com/kamailio/kamailio/commit/04ef5978df1937a8b23f245edb5f51a… --- diff --git a/pkg/scripts/git-archive-all.sh b/pkg/scripts/git-archive-all.sh new file mode 100755 index 00000000000..71bacc7d896 --- /dev/null +++ b/pkg/scripts/git-archive-all.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash +# packaging script to include submodules +# modified from: https://gist.github.com/arteymix/03702e3eb05c2c161a86b49d4626d21f +# Usage: pkg/scripts/git-archive-all.sh kamailio-5.8.0 ../output/kamailio-5.8.0_src + +usage() { + echo Usage: pkg/scripts/git-archive-all.sh kamailio-5.8.0 ../output/kamailio-5.8.0_src +} + +if [ -z $1 ]; then + echo "You must specify a prefix name." + usage + exit 1 +fi + +if [ -z $2 ]; then + echo "You must specify a super-archive name." + usage + exit 1 +fi + +git archive --prefix "$1/" -o "$2.tar" HEAD +git submodule foreach --recursive "git archive --prefix=$1/\$sm_path/ --output=\$sha1.tar HEAD && tar --concatenate --file=$(pwd)/$2.tar \$sha1.tar && rm \$sha1.tar" + +gzip "$2.tar"

1 year, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2023