sr-dev November 2023

sr-dev@lists.kamailio.org

15 participants
389 discussions

git:master:9b01012b: core: use string building functions with explicit lenght

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9b01012b5fab43ca3b1ddc7d7493b0edc69cdceb URL: https://github.com/kamailio/kamailio/commit/9b01012b5fab43ca3b1ddc7d7493b0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-09T10:44:00+01:00 core: use string building functions with explicit lenght --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/9b01012b5fab43ca3b1ddc7d7493b0e… Patch: https://github.com/kamailio/kamailio/commit/9b01012b5fab43ca3b1ddc7d7493b0e… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 1b7ea7332d2..9660afce320 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -326,8 +326,7 @@ static int register_module(module_exports_t *e, char *path, void *handle) LM_ERR("too long module name: %s\n", mod->exports.name); goto error; } - strcpy(defmod, "MOD_"); - strcat(defmod, mod->exports.name); + snprintf(defmod, 64, "MOD_%s", mod->exports.name); pp_define_set_type(KSR_PPDEF_DEFINE); if(pp_define(strlen(defmod), defmod) < 0) { LM_ERR("unable to set cfg define for module: %s\n", mod->exports.name); @@ -402,6 +401,7 @@ int ksr_locate_module(char *mod_path, char **new_path) { struct stat stat_buf; str modname; + str modfile; char *mdir; char *nxt_mdir; char *path; @@ -412,11 +412,14 @@ int ksr_locate_module(char *mod_path, char **new_path) *new_path = NULL; path = mod_path; path_type = 0; - modname.s = path; - modname.len = strlen(mod_path); - if(modname.len > 3 && strcmp(modname.s + modname.len - 3, ".so") == 0) { + modfile.s = path; + modfile.len = strlen(mod_path); + modname.s = modfile.s; + if(modfile.len > 3 && strcmp(modfile.s + modfile.len - 3, ".so") == 0) { path_type = 1; - modname.len -= 3; + modname.len = modfile.len - 3; + } else { + modname.len = modfile.len; } if(!strchr(path, '/')) path_type |= 2; @@ -445,9 +448,12 @@ int ksr_locate_module(char *mod_path, char **new_path) len++; } path[len] = 0; - strcat(path, modname.s); - if(!(path_type & 1)) + if(path_type & 1) { + strncat(path, modfile.s, modfile.len); + } else { + strncat(path, modname.s, modname.len); strcat(path, ".so"); + } if(stat(path, &stat_buf) == -1) { LM_DBG("module file not found <%s>\n", path); @@ -470,9 +476,12 @@ int ksr_locate_module(char *mod_path, char **new_path) path[len] = 0; strncat(path, modname.s, modname.len); strcat(path, "/"); - strcat(path, modname.s); - if(!(path_type & 1)) + if(path_type & 1) { + strncat(path, modfile.s, modfile.len); + } else { + strncat(path, modname.s, modname.len); strcat(path, ".so"); + } if(stat(path, &stat_buf) == -1) { LM_DBG("module file not found <%s>\n", path);

1 year

git:master:af86d0e2: modules: readme files regenerated - ims_charging ... [skip ci]

by The Root

Module: kamailio Branch: master Commit: af86d0e27b9a66cff392fd5e462901864bc3dc18 URL: https://github.com/kamailio/kamailio/commit/af86d0e27b9a66cff392fd5e4629018… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2023-11-09T09:31:21+01:00 modules: readme files regenerated - ims_charging ... [skip ci] --- Modified: src/modules/ims_charging/README --- Diff: https://github.com/kamailio/kamailio/commit/af86d0e27b9a66cff392fd5e4629018… Patch: https://github.com/kamailio/kamailio/commit/af86d0e27b9a66cff392fd5e4629018…

1 year

git:master:8269b719: modules: readme files regenerated - rtpengine ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 8269b719775ce704eade4a832ae8abb56af08841 URL: https://github.com/kamailio/kamailio/commit/8269b719775ce704eade4a832ae8abb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-11-09T09:32:21+01:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/8269b719775ce704eade4a832ae8abb… Patch: https://github.com/kamailio/kamailio/commit/8269b719775ce704eade4a832ae8abb… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index b4e71c7eafa..96693dcd018 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -463,8 +463,8 @@ Chapter 1. Admin Guide would specify the weight 2 for this server, for example. The selection of the set is done from script prior using - rtpengine_delete(), rtpengine_offer() or rtpengine_answer() functions - - see the set_rtpengine_set() function. + rtpengine_delete(), rtpengine_offer(), rtpengine_answer() or + rtpengine_manage() functions - see the set_rtpengine_set() function. Another way to select the set is to define setid_avp module parameter and assign setid to the defined avp before calling rtpengine_offer() or @@ -2150,7 +2150,6 @@ modparam("rtpengine", "dtmf_events_sock", "127.0.0.1:2223") sends it back to the module to be placed back into the SIP message. This is useful if you have a set of RTP proxies that the caller must use, and another distinct set of RTP proxies that the callee must use. - This is supported by all rtpengine commands except rtpengine_manage(). This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE.

1 year

git:master:aab0e4a3: rtpengine: remove mistaken statement for set_rtpengine_set() about rtpengine_manage()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: aab0e4a3b86f309f8a0333d20f632fec1158af9f URL: https://github.com/kamailio/kamailio/commit/aab0e4a3b86f309f8a0333d20f632fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-09T09:27:07+01:00 rtpengine: remove mistaken statement for set_rtpengine_set() about rtpengine_manage() --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/aab0e4a3b86f309f8a0333d20f632fe… Patch: https://github.com/kamailio/kamailio/commit/aab0e4a3b86f309f8a0333d20f632fe… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index cc1dc3025bf..1e394453493 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -52,8 +52,8 @@ </para> <para> The selection of the set is done from script prior using - rtpengine_delete(), rtpengine_offer() or rtpengine_answer() - functions - see the set_rtpengine_set() function. + rtpengine_delete(), rtpengine_offer(), rtpengine_answer() or + rtpengine_manage() functions - see the set_rtpengine_set() function. </para> <para> Another way to select the set is to define setid_avp @@ -2328,10 +2328,10 @@ modparam("rtpengine", "wsapi", "lwsc") <section id="rtpengine.p.dtmf_events_sock" xreflabel="dtmf_events_sock"> <title><varname>dtmf_events_sock</varname> (string)</title> <para> - Definition of IPv4/IPv6 UDP socket used to receive dtmf events from RTPEngine. + Definition of IPv4/IPv6 UDP socket used to receive dtmf events from RTPEngine. </para> <para> - DTMF events coming from RTPEngine will trigger rtpengine:dtmf-event route. + DTMF events coming from RTPEngine will trigger rtpengine:dtmf-event route. </para> <para> <emphasis> @@ -2374,8 +2374,7 @@ modparam("rtpengine", "dtmf_events_sock", "127.0.0.1:2223") another time and sends it back to the module to be placed back into the &sip; message. This is useful if you have a set of &rtp; proxies that the caller must use, and another distinct set of &rtp; proxies that the - callee must use. This is supported by all rtpengine commands except - rtpengine_manage(). + callee must use. </para> <para> This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, @@ -2519,7 +2518,7 @@ rtpengine_offer(); of ignoring endpoint addresses in the &sdp; body. </para></listitem> <listitem><para> - <emphasis>received-from=IP</emphasis> - Configure the SIP-source-address IP + <emphasis>received-from=IP</emphasis> - Configure the SIP-source-address IP explicitly, which will be useful when two kamailio is cascaded where first kamailio is handling NAT and second kamailio RTPEngine. </para></listitem>

1 year

git:master:12dcdd36: devcontainer: use prebuild image [skip ci]

by Victor Seva

Module: kamailio Branch: master Commit: 12dcdd3664bbb990cd749872bea3744bb7eff315 URL: https://github.com/kamailio/kamailio/commit/12dcdd3664bbb990cd749872bea3744… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-11-08T23:33:38+01:00 devcontainer: use prebuild image [skip ci] --- Modified: .devcontainer/devcontainer.json --- Diff: https://github.com/kamailio/kamailio/commit/12dcdd3664bbb990cd749872bea3744… Patch: https://github.com/kamailio/kamailio/commit/12dcdd3664bbb990cd749872bea3744… --- diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 7ab1083ed00..2a0413eae4d 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -4,6 +4,7 @@ */ "name": "Debian", "build": { + "cacheFrom": "ghcr.io/kamailio/kamailio-master-devcontainer", "context": "../pkg/kamailio/deb", "dockerfile": "Dockerfile" },

1 year

git:master:721bfc88: devcontainer: add github-cli

by Victor Seva

Module: kamailio Branch: master Commit: 721bfc880a7c01b1792e5770a26fc7d5fe4faa42 URL: https://github.com/kamailio/kamailio/commit/721bfc880a7c01b1792e5770a26fc7d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-11-08T22:46:07+01:00 devcontainer: add github-cli --- Modified: .devcontainer/devcontainer.json --- Diff: https://github.com/kamailio/kamailio/commit/721bfc880a7c01b1792e5770a26fc7d… Patch: https://github.com/kamailio/kamailio/commit/721bfc880a7c01b1792e5770a26fc7d… --- diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index bc6019c6877..7ab1083ed00 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -10,7 +10,8 @@ // Features to add to the dev container. More info: https://containers.dev/features. "features": { - "ghcr.io/wxw-matt/devcontainer-features/command_runner:0": {} + "ghcr.io/wxw-matt/devcontainer-features/command_runner:0": {}, + "ghcr.io/devcontainers/features/github-cli:1": {} }, // Use 'forwardPorts' to make a list of ports inside the container available locally.

1 year

git:master:38585ea2: github: prebuild devcontainer image

by Victor Seva

Module: kamailio Branch: master Commit: 38585ea29773543d9c2fe3559005487511ac90ce URL: https://github.com/kamailio/kamailio/commit/38585ea29773543d9c2fe3559005487… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-11-08T22:45:54+01:00 github: prebuild devcontainer image --- Added: .github/workflows/devcontainer.yaml --- Diff: https://github.com/kamailio/kamailio/commit/38585ea29773543d9c2fe3559005487… Patch: https://github.com/kamailio/kamailio/commit/38585ea29773543d9c2fe3559005487… --- diff --git a/.github/workflows/devcontainer.yaml b/.github/workflows/devcontainer.yaml new file mode 100644 index 00000000000..3321b4feec4 --- /dev/null +++ b/.github/workflows/devcontainer.yaml @@ -0,0 +1,56 @@ + +--- +name: build devcontainer image +'on': + push: + branches: + - master + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +env: + DIST: bookworm + +jobs: + build: + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 2 + + - name: print latest_commit + run: echo ${{ github.sha }} + + - name: Get changed files + id: changed-files + uses: tj-actions/changed-files@v40 + with: + since_last_remote_commit: true + + - name: changes in relevant files + id: changed-files-builder + uses: tj-actions/changed-files@v40 + with: + files: | + .devcontainer/** + pkg/kamailio/deb/${{ env.DIST }}/** + + - name: Login to GitHub Container Registry + if: steps.changed-files-builder.outputs.any_changed == 'true' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Pre-build dev container image + if: steps.changed-files-builder.outputs.any_changed == 'true' + uses: devcontainers/ci(a)v0.3 + with: + imageName: ghcr.io/${{ github.repository_owner }}/kamailio-${{ github.ref_name }}-devcontainer + cacheFrom: ghcr.io/${{ github.repository_owner }}/kamailio-${{ github.ref_name }}-devcontainer + push: always

1 year

git:master:9b4fe94d: devcontainer: add gitlens extension [skip ci]

by Victor Seva

Module: kamailio Branch: master Commit: 9b4fe94d71c25e9ac3a43a5010a5dece7adaf14c URL: https://github.com/kamailio/kamailio/commit/9b4fe94d71c25e9ac3a43a5010a5dec… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-11-08T20:57:11+01:00 devcontainer: add gitlens extension [skip ci] --- Modified: .devcontainer/devcontainer.json --- Diff: https://github.com/kamailio/kamailio/commit/9b4fe94d71c25e9ac3a43a5010a5dec… Patch: https://github.com/kamailio/kamailio/commit/9b4fe94d71c25e9ac3a43a5010a5dec… --- diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index a0f156e25bb..bc6019c6877 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -25,6 +25,7 @@ "extensions": [ "ms-vscode.cpptools-extension-pack", "GitHub.vscode-github-actions", + "eamodio.gitlens", "xaver.clang-format" ] }

1 year

git:master:6aa940f7: dialplan: reformat exported structures more human friendly

by Victor Seva

Module: kamailio Branch: master Commit: 6aa940f7acbc565545ae9199b288d16a50bafcab URL: https://github.com/kamailio/kamailio/commit/6aa940f7acbc565545ae9199b288d16… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-11-08T20:53:53+01:00 dialplan: reformat exported structures more human friendly revert to the format it had before 01d0d1de2c8 --- Modified: src/modules/dialplan/dialplan.c --- Diff: https://github.com/kamailio/kamailio/commit/6aa940f7acbc565545ae9199b288d16… Patch: https://github.com/kamailio/kamailio/commit/6aa940f7acbc565545ae9199b288d16… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index 235158513f9..43aa6cd5a1b 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -96,47 +96,53 @@ int dp_append_branch = 1; int dp_reload_delta = 5; static time_t *dp_rpc_reload_time = NULL; +/* clang-format off */ +static param_export_t mod_params[]={ + { "db_url", PARAM_STR, &dp_db_url }, + { "table_name", PARAM_STR, &dp_table_name }, + { "dpid_col", PARAM_STR, &dpid_column }, + { "pr_col", PARAM_STR, &pr_column }, + { "match_op_col", PARAM_STR, &match_op_column }, + { "match_exp_col", PARAM_STR, &match_exp_column }, + { "match_len_col", PARAM_STR, &match_len_column }, + { "subst_exp_col", PARAM_STR, &subst_exp_column }, + { "repl_exp_col", PARAM_STR, &repl_exp_column }, + { "attrs_col", PARAM_STR, &attrs_column }, + { "attrs_pvar", PARAM_STR, &dp_attr_pvar_s }, + { "fetch_rows", PARAM_INT, &dp_fetch_rows }, + { "match_dynamic", PARAM_INT, &dp_match_dynamic }, + { "append_branch", PARAM_INT, &dp_append_branch }, + { "reload_delta", PARAM_INT, &dp_reload_delta }, + {0,0,0} +}; -static param_export_t mod_params[] = {{"db_url", PARAM_STR, &dp_db_url}, - {"table_name", PARAM_STR, &dp_table_name}, - {"dpid_col", PARAM_STR, &dpid_column}, - {"pr_col", PARAM_STR, &pr_column}, - {"match_op_col", PARAM_STR, &match_op_column}, - {"match_exp_col", PARAM_STR, &match_exp_column}, - {"match_len_col", PARAM_STR, &match_len_column}, - {"subst_exp_col", PARAM_STR, &subst_exp_column}, - {"repl_exp_col", PARAM_STR, &repl_exp_column}, - {"attrs_col", PARAM_STR, &attrs_column}, - {"attrs_pvar", PARAM_STR, &dp_attr_pvar_s}, - {"fetch_rows", PARAM_INT, &dp_fetch_rows}, - {"match_dynamic", PARAM_INT, &dp_match_dynamic}, - {"append_branch", PARAM_INT, &dp_append_branch}, - {"reload_delta", PARAM_INT, &dp_reload_delta}, {0, 0, 0}}; - -static cmd_export_t cmds[] = {{"dp_translate", (cmd_function)dp_translate_f, 2, - dp_trans_fixup, 0, ANY_ROUTE}, - {"dp_translate", (cmd_function)dp_translate_f, 1, dp_trans_fixup, 0, - ANY_ROUTE}, - {"dp_reload", (cmd_function)dp_reload_f, 0, 0, 0, ANY_ROUTE}, - {"dp_match", (cmd_function)w_dp_match, 2, fixup_igp_spve, - fixup_free_igp_spve, ANY_ROUTE}, - {"dp_replace", (cmd_function)w_dp_replace, 3, dp_replace_fixup, - dp_replace_fixup_free, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - -struct module_exports exports = { - "dialplan", /* module's name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - mod_params, /* param exports */ - 0, /* exported RPC functions */ - 0, /* exported pseudo-variables */ - 0, /* reply processing function */ - mod_init, /* module initialization function */ - child_init, /* per-child init function */ - mod_destroy /* module destroy function */ +static cmd_export_t cmds[]={ + {"dp_translate",(cmd_function)dp_translate_f, 2, dp_trans_fixup, 0, + ANY_ROUTE}, + {"dp_translate",(cmd_function)dp_translate_f, 1, dp_trans_fixup, 0, + ANY_ROUTE}, + {"dp_reload",(cmd_function)dp_reload_f, 0, 0, 0, + ANY_ROUTE}, + {"dp_match",(cmd_function)w_dp_match, 2, fixup_igp_spve, + fixup_free_igp_spve, ANY_ROUTE}, + {"dp_replace",(cmd_function)w_dp_replace, 3, dp_replace_fixup, + dp_replace_fixup_free, ANY_ROUTE}, + {0,0,0,0,0,0} }; +struct module_exports exports= { + "dialplan", /* module's name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + mod_params, /* param exports */ + 0, /* exported RPC functions */ + 0, /* exported pseudo-variables */ + 0, /* reply processing function */ + mod_init, /* module initialization function */ + child_init, /* per-child init function */ + mod_destroy /* module destroy function */ +}; +/* clang-format on */ static int mod_init(void) {

1 year

git:master:4642a12c: debugger: reformat exported structures more human friendly

by Victor Seva

Module: kamailio Branch: master Commit: 4642a12c109939f71f91ba7807ded1491e241e26 URL: https://github.com/kamailio/kamailio/commit/4642a12c109939f71f91ba7807ded14… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-11-08T20:03:49+01:00 debugger: reformat exported structures more human friendly revert to the format it had before 656e147c470 --- Modified: src/modules/debugger/debugger_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4642a12c109939f71f91ba7807ded14… Patch: https://github.com/kamailio/kamailio/commit/4642a12c109939f71f91ba7807ded14…

1 year

← Newer
1
...
31
32
33
34
35
36
37
38
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2023