sr-dev October 2023

sr-dev@lists.kamailio.org

15 participants
286 discussions

git:master:d9111c69: pv: removed unnecessary break

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d9111c6978cdbb2742eb1ea7fd16dcb083a2c6f4 URL: https://github.com/kamailio/kamailio/commit/d9111c6978cdbb2742eb1ea7fd16dcb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-04T10:21:44+02:00 pv: removed unnecessary break --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/d9111c6978cdbb2742eb1ea7fd16dcb… Patch: https://github.com/kamailio/kamailio/commit/d9111c6978cdbb2742eb1ea7fd16dcb… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index cb70b70ae41..7fe2901613b 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -4623,7 +4623,6 @@ int pv_get_via_attr( return pv_get_null(msg, param, res); } return pv_get_sintval(msg, param, res, ocv.oc); - break; case 10: /* oc-algo */ if(parse_via_oc(msg, vb, &ocv) < 0) { return pv_get_null(msg, param, res);

1 year, 2 months

git:master:b5cf0da2: pv: return via variable oc value as it is

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b5cf0da2fbae5ed0b887b0323b8bf8a44e29d80d URL: https://github.com/kamailio/kamailio/commit/b5cf0da2fbae5ed0b887b0323b8bf8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-04T09:46:37+02:00 pv: return via variable oc value as it is --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/b5cf0da2fbae5ed0b887b0323b8bf8a… Patch: https://github.com/kamailio/kamailio/commit/b5cf0da2fbae5ed0b887b0323b8bf8a… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 50e1abbd485..cb70b70ae41 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -4622,11 +4622,7 @@ int pv_get_via_attr( if(parse_via_oc(msg, vb, &ocv) < 0) { return pv_get_null(msg, param, res); } - if(ocv.oc == 1) { - return pv_get_sintval(msg, param, res, 1); - } else { - return pv_get_sintval(msg, param, res, 2); - } + return pv_get_sintval(msg, param, res, ocv.oc); break; case 10: /* oc-algo */ if(parse_via_oc(msg, vb, &ocv) < 0) {

1 year, 2 months

git:master:d2d17049: github: move login to ghcr.io on top [skip ci]

by Victor Seva

Module: kamailio Branch: master Commit: d2d17049b5e82b497c44b6b4a2a461917eaed4bb URL: https://github.com/kamailio/kamailio/commit/d2d17049b5e82b497c44b6b4a2a4619… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-03T08:45:56+02:00 github: move login to ghcr.io on top [skip ci] --- Modified: .github/workflows/alpine.yml --- Diff: https://github.com/kamailio/kamailio/commit/d2d17049b5e82b497c44b6b4a2a4619… Patch: https://github.com/kamailio/kamailio/commit/d2d17049b5e82b497c44b6b4a2a4619… --- diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml index afddd299f74..33f4dc08884 100644 --- a/.github/workflows/alpine.yml +++ b/.github/workflows/alpine.yml @@ -31,6 +31,14 @@ jobs: if: ${{ github.event_name == 'schedule' }} run: test -z "$(git rev-list --after='24 hours' ${{ github.sha }})" && echo "should_run=false" >> $GITHUB_OUTPUT || echo "should_run=true" >> $GITHUB_OUTPUT + - name: Login to GitHub Container Registry + if: ${{ steps.should_run.outputs.should_run != 'false' }} + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Compile Kamailio source if: ${{ steps.should_run.outputs.should_run != 'false' }} run: | @@ -93,14 +101,6 @@ jobs: suffix=-debug latest=false - - name: Login to GitHub Container Registry - if: ${{ steps.should_run.outputs.should_run != 'false' }} - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: temporal workarround for "-alpine" and "-debug" builds if: ${{ steps.should_run.outputs.should_run != 'false' }} run: |

1 year, 2 months

git:master:2bf06119: github: define alpine permissions [skip ci]

by Victor Seva

Module: kamailio Branch: master Commit: 2bf06119773761ceb1446d3742c158d7f29fbda1 URL: https://github.com/kamailio/kamailio/commit/2bf06119773761ceb1446d3742c158d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-03T08:40:26+02:00 github: define alpine permissions [skip ci] > unauthorized: access token has insufficient scopes --- Modified: .github/workflows/alpine.yml --- Diff: https://github.com/kamailio/kamailio/commit/2bf06119773761ceb1446d3742c158d… Patch: https://github.com/kamailio/kamailio/commit/2bf06119773761ceb1446d3742c158d… --- diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml index f6ced16554b..afddd299f74 100644 --- a/.github/workflows/alpine.yml +++ b/.github/workflows/alpine.yml @@ -10,7 +10,9 @@ on: env: IMAGE_NAME: kamailio-ci SOURCE_BRANCH: ${{ github.ref_name }} - +permissions: + contents: read + packages: write jobs: x86_64: runs-on: ubuntu-latest

1 year, 2 months

git:master:6b6c0663: corex: reformat exports structures

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6b6c0663d3ae894e8e686eb32288f71387739cc7 URL: https://github.com/kamailio/kamailio/commit/6b6c0663d3ae894e8e686eb32288f71… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-02T11:48:41+02:00 corex: reformat exports structures --- Modified: src/modules/corex/corex_mod.c Modified: src/modules/corex/corex_rpc.c Modified: src/modules/corex/corex_rpc_shm.c --- Diff: https://github.com/kamailio/kamailio/commit/6b6c0663d3ae894e8e686eb32288f71… Patch: https://github.com/kamailio/kamailio/commit/6b6c0663d3ae894e8e686eb32288f71…

1 year, 2 months

git:master:0f4058a7: core: check if status with filter is implemented by memory manager

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0f4058a7ff0abb59785d2d1dd3e65517ab4ceaa4 URL: https://github.com/kamailio/kamailio/commit/0f4058a7ff0abb59785d2d1dd3e6551… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-02T11:01:44+02:00 core: check if status with filter is implemented by memory manager --- Modified: src/core/mem/pkg.h Modified: src/core/mem/shm.h --- Diff: https://github.com/kamailio/kamailio/commit/0f4058a7ff0abb59785d2d1dd3e6551… Patch: https://github.com/kamailio/kamailio/commit/0f4058a7ff0abb59785d2d1dd3e6551… --- diff --git a/src/core/mem/pkg.h b/src/core/mem/pkg.h index 9a6b9dac2b1..540ac22ceb0 100644 --- a/src/core/mem/pkg.h +++ b/src/core/mem/pkg.h @@ -65,8 +65,14 @@ void pkg_print_manager(void); #endif #define pkg_status() _pkg_root.xstatus(_pkg_root.mem_block) -#define pkg_status_filter(fmatch, fp) \ - _pkg_root.xstatus_filter(_pkg_root.mem_block, fmatch, fp) +#define pkg_status_filter(fmatch, fp) \ + do { \ + if(_pkg_root.xstatus_filter) { \ + _pkg_root.xstatus_filter(_pkg_root.mem_block, fmatch, fp); \ + } else { \ + LM_ERR("pkg status with filter not implemented\n"); \ + } \ + while(0) #define pkg_info(mi) _pkg_root.xinfo(_pkg_root.mem_block, mi) #define pkg_report(mr) _pkg_root.xreport(_pkg_root.mem_block, mr) #define pkg_available() _pkg_root.xavailable(_pkg_root.mem_block) diff --git a/src/core/mem/shm.h b/src/core/mem/shm.h index 9cdadc10618..6d3a855fa7c 100644 --- a/src/core/mem/shm.h +++ b/src/core/mem/shm.h @@ -87,8 +87,14 @@ extern sr_shm_api_t _shm_root; #endif #define shm_status() _shm_root.xstatus(_shm_root.mem_block) -#define shm_status_filter(fmatch, fp) \ - _shm_root.xstatus_filter(_shm_root.mem_block, fmatch, fp) +#define shm_status_filter(fmatch, fp) \ + do { \ + if(_shm_root.xstatus_filter) { \ + _shm_root.xstatus_filter(_shm_root.mem_block, fmatch, fp); \ + } else { \ + LM_ERR("shm status with filter not implemented\n"); \ + } \ + 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, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2023