sr-dev October 2023

sr-dev@lists.kamailio.org

15 participants
291 discussions

git:master:6e025217: corex: docs for shm.rprint rpc command
by Daniel-Constantin Mierla 09 Oct '23

09 Oct '23

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 0

git:master:2b899606: core: mem - qm_status_filter - change filter from start-with to include
by Daniel-Constantin Mierla 09 Oct '23

09 Oct '23

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 0

git:5.7:bfbabc34: pkg/kamailio/scripts: wrap param around quotes to avoid invalid syntax on empty
by S-P Chan 07 Oct '23

07 Oct '23

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 0

git:5.7:42f20356: pkg: RPM - add mock config for EL8/EL9 based on alma+epel-(8|9)-x86_64
by S-P Chan 07 Oct '23

07 Oct '23

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 0

git:5.7:04ef5978: pkg: add example script to create tarball with submodules instantiated
by S-P Chan 07 Oct '23

07 Oct '23

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 0

git:master:18b23187: pkg/kamailio/scripts: wrap param around quotes to avoid invalid syntax on empty
by Daniel-Constantin Mierla 06 Oct '23

06 Oct '23

Module: kamailio Branch: master Commit: 18b23187dd89e3b36c0dd95d4796484bef3d2e62 URL: https://github.com/kamailio/kamailio/commit/18b23187dd89e3b36c0dd95d4796484… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-06T13:48:42+02:00 pkg/kamailio/scripts: wrap param around quotes to avoid invalid syntax on empty --- Modified: pkg/kamailio/scripts/create-src-rpm.sh Modified: pkg/kamailio/scripts/git-archive-all.sh --- Diff: https://github.com/kamailio/kamailio/commit/18b23187dd89e3b36c0dd95d4796484… Patch: https://github.com/kamailio/kamailio/commit/18b23187dd89e3b36c0dd95d4796484… --- 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 0

git:master:f16ec35f: kamdbctl: check if kamctlrc is readable
by Daniel-Constantin Mierla 06 Oct '23

06 Oct '23

Module: kamailio Branch: master Commit: f16ec35fa448d03613e6bbbff4c354012f56073e URL: https://github.com/kamailio/kamailio/commit/f16ec35fa448d03613e6bbbff4c3540… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-06T12:33:08+02:00 kamdbctl: check if kamctlrc is readable --- Modified: utils/kamctl/kamdbctl --- Diff: https://github.com/kamailio/kamailio/commit/f16ec35fa448d03613e6bbbff4c3540… Patch: https://github.com/kamailio/kamailio/commit/f16ec35fa448d03613e6bbbff4c3540… --- diff --git a/utils/kamctl/kamdbctl b/utils/kamctl/kamdbctl index 4f3f407f040..5a89a9540cd 100755 --- a/utils/kamctl/kamdbctl +++ b/utils/kamctl/kamdbctl @@ -35,13 +35,13 @@ if [ -n "$KAMCTLFULLPATH" ] ; then fi # check for rc file at standard locations -if [ -f /etc/kamailio/kamctlrc ]; then +if [ -f /etc/kamailio/kamctlrc -a -r /etc/kamailio/kamctlrc ]; then . /etc/kamailio/kamctlrc fi -if [ -f /usr/local/etc/kamailio/kamctlrc ]; then +if [ -f /usr/local/etc/kamailio/kamctlrc -a -r /usr/local/etc/kamailio/kamctlrc ]; then . /usr/local/etc/kamailio/kamctlrc fi -if [ -f ~/.kamctlrc ]; then +if [ -f ~/.kamctlrc -a -r ~/.kamctlrc ]; then . ~/.kamctlrc fi

1 0

git:master:0518410e: pkg/docker: submodule update [skip ci]
by Victor Seva 06 Oct '23

06 Oct '23

Module: kamailio Branch: master Commit: 0518410eea14f8949260faec5fb70c97badaa74e URL: https://github.com/kamailio/kamailio/commit/0518410eea14f8949260faec5fb70c9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-06T12:25:08+02:00 pkg/docker: submodule update [skip ci] --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/0518410eea14f8949260faec5fb70c9… Patch: https://github.com/kamailio/kamailio/commit/0518410eea14f8949260faec5fb70c9… --- diff --git a/pkg/docker b/pkg/docker index 5c45c0f8871..524fa4769d3 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 5c45c0f8871ceebb1a8f5308653bca924afb0d6f +Subproject commit 524fa4769d3b48add204c2bbd8303f60dfde2d61

1 0

[kamailio/kamailio] pkg: add example script to create tarball with submodules instantiated (PR #3590)
by space88man 06 Oct '23

06 Oct '23

In preparation for packaging of tls_wolfssl, add an example script to create source tarball with submodule code. #### 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 In preparation for packaging tls_wolfssl the distributed source tarballs need to have the submodule instantiated and tar'ed together with the primary source code. This is an example script to package submodule code with the main code. It can be used in CI/CD to prepare the tarball. Subsequently I will update the pkg/ scripts to enable packaging of tls_wolfssl. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3590 -- Commit Summary -- * pkg: add example script to create tarball with submodules instantiated -- File Changes -- A pkg/scripts/git-archive-all.sh (25) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3590.patch https://github.com/kamailio/kamailio/pull/3590.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3590 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3590(a)github.com>

2 12

git:master:9de780b8: pkg: RPM - add mock config for EL8/EL9 based on alma+epel-(8|9)-x86_64
by Daniel-Constantin Mierla 06 Oct '23

06 Oct '23

Module: kamailio Branch: master Commit: 9de780b8a7a1ac4c3a936b86d324c9a5f1527e3d URL: https://github.com/kamailio/kamailio/commit/9de780b8a7a1ac4c3a936b86d324c9a… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-06T08:31:35+02: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 --- 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/9de780b8a7a1ac4c3a936b86d324c9a… Patch: https://github.com/kamailio/kamailio/commit/9de780b8a7a1ac4c3a936b86d324c9a…

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