- sr-dev - kamailio.org

git:master:23a1d067: dialog: rename function parameter to avoid shadowing of global variable
by Daniel-Constantin Mierla 28 Dec '23

28 Dec '23

Module: kamailio Branch: master Commit: 23a1d06737fa6d2509b6f88574ad171aa32cf275 URL: https://github.com/kamailio/kamailio/commit/23a1d06737fa6d2509b6f88574ad171… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-28T10:21:01+01:00 dialog: rename function parameter to avoid shadowing of global variable --- Modified: src/modules/dialog/dlg_profile.c --- Diff: https://github.com/kamailio/kamailio/commit/23a1d06737fa6d2509b6f88574ad171… Patch: https://github.com/kamailio/kamailio/commit/23a1d06737fa6d2509b6f88574ad171… --- diff --git a/src/modules/dialog/dlg_profile.c b/src/modules/dialog/dlg_profile.c index 5dd3b372d49..43aee6278e0 100644 --- a/src/modules/dialog/dlg_profile.c +++ b/src/modules/dialog/dlg_profile.c @@ -70,21 +70,21 @@ static sruid_t _dlg_profile_sruid; /*! * \brief Add profile definitions to the global list * \see new_dlg_profile - * \param profiles profile name + * \param profiledef profile name * \param has_value set to 0 for a profile without value, otherwise it has a value * \return 0 on success, -1 on failure */ -int add_profile_definitions(char *profiles, unsigned int has_value) +int add_profile_definitions(char *profiledef, unsigned int has_value) { char *p; char *d; str name; unsigned int i; - if(profiles == NULL || strlen(profiles) == 0) + if(profiledef == NULL || strlen(profiledef) == 0) return 0; - p = profiles; + p = profiledef; do { /* locate name of profile */ name.s = p;

1 0

git:master:4b862326: timer: rename local variable to avoid shadowing global
by Daniel-Constantin Mierla 27 Dec '23

27 Dec '23

Module: kamailio Branch: master Commit: 4b862326cce4b16154353d393d60c8f12762da86 URL: https://github.com/kamailio/kamailio/commit/4b862326cce4b16154353d393d60c8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-27T12:09:26+01:00 timer: rename local variable to avoid shadowing global --- Modified: src/modules/timer/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/4b862326cce4b16154353d393d60c8f… Patch: https://github.com/kamailio/kamailio/commit/4b862326cce4b16154353d393d60c8f… --- diff --git a/src/modules/timer/timer.c b/src/modules/timer/timer.c index a7741496626..2f3f1b1bf34 100644 --- a/src/modules/timer/timer.c +++ b/src/modules/timer/timer.c @@ -88,12 +88,12 @@ static timer_action_t *timer_executed = 0; } static timer_action_t *find_action_by_name( - timer_action_t *timer_actions, char *name, int len) + timer_action_t *timer_actions_list, char *name, int len) { timer_action_t *a; if(len == -1) len = strlen(name); - for(a = timer_actions; a; a = a->next) { + for(a = timer_actions_list; a; a = a->next) { if(a->timer_name && strlen(a->timer_name) == len && strncmp(name, a->timer_name, len) == 0) return a;

1 0

[kamailio/kamailio] tm: Reset local_response_sent_lookup (PR #3687)
by Xenofon Karamanos 27 Dec '23

27 Dec '23

#### 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 - [x] Tested changes locally - [x] Related to issue #3064 (replace XXXX with an open issue number) #### Description  This PR fixes #3064. It resets the check variable back to 0 after sending a tm:local-response reply. As of currently, event_route[tm:local-response] will be called only max `children` times (one for each) and then won't process any more. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3687 -- Commit Summary -- * tm: Reset local_response_sent_lookup -- File Changes -- M src/modules/tm/t_reply.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3687.patch https://github.com/kamailio/kamailio/pull/3687.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3687 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3687(a)github.com>

2 3

git:master:9c72487c: sipcature: rename global variable to avoid shadowing by function parameter
by Daniel-Constantin Mierla 27 Dec '23

27 Dec '23

Module: kamailio Branch: master Commit: 9c72487cc5a54d7599e2904251133fc8cc29ed84 URL: https://github.com/kamailio/kamailio/commit/9c72487cc5a54d7599e2904251133fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-27T09:24:33+01:00 sipcature: rename global variable to avoid shadowing by function parameter --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/9c72487cc5a54d7599e2904251133fc… Patch: https://github.com/kamailio/kamailio/commit/9c72487cc5a54d7599e2904251133fc… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 320e351a371..7dc3ae81f80 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -176,7 +176,7 @@ static int hep_version(struct sip_msg *msg); static str db_url = str_init(DEFAULT_DB_URL); -static str table_name = str_init("sip_capture"); +static str _sipcap_table_name = str_init("sip_capture"); static str hash_source = str_init("call_id"); static str mt_mode = str_init("rand"); static str date_column = str_init("date"); @@ -338,7 +338,7 @@ int capture_mode_param(modparam_t type, void *val); * Exported parameters */ static param_export_t params[] = {{"db_url", PARAM_STR, &db_url}, - {"table_name", PARAM_STR, &table_name}, + {"table_name", PARAM_STR, &_sipcap_table_name}, {"hash_source", PARAM_STR, &hash_source}, {"mt_mode", PARAM_STR, &mt_mode}, {"date_column", PARAM_STR, &date_column}, @@ -818,9 +818,9 @@ static int mod_init(void) } } - /* Check the table name - if table_name is empty and no capture modes + /* Check the table name - if _sipcap_table_name is empty and no capture modes * are defined, then error*/ - if(!table_name.len && capture_modes_root == NULL) { + if(!_sipcap_table_name.len && capture_modes_root == NULL) { LM_ERR("ERROR: sipcapture: mod_init: table_name is not defined or " "empty\n"); return -1; @@ -831,14 +831,14 @@ static int mod_init(void) def_params = (char *)pkg_malloc( snprintf(NULL, 0, "db_url=%s;table_name=%s;mt_mode=%s;hash_source=%s", - db_url.s, table_name.s, mt_mode.s, hash_source.s) + db_url.s, _sipcap_table_name.s, mt_mode.s, hash_source.s) + 1); if(!def_params) { PKG_MEM_ERROR; return -1; } sprintf(def_params, "db_url=%s;table_name=%s;mt_mode=%s;hash_source=%s", - db_url.s, table_name.s, mt_mode.s, hash_source.s); + db_url.s, _sipcap_table_name.s, mt_mode.s, hash_source.s); str def_name, def_par; def_name.s = strdup("default"); @@ -1777,7 +1777,7 @@ static int sip_capture_store(struct _sipcapture_object *sco, str *dtable, } table = &c->table_names[ii]; } else { - table = &table_name; + table = &_sipcap_table_name; } tvsec_ = (time_t)(sco->tmstamp / 1000000);

1 0

git:master:0186246f: statsd: use bool type for local variable to match return of function
by Daniel-Constantin Mierla 27 Dec '23

27 Dec '23

Module: kamailio Branch: master Commit: 0186246fce8f0e4bb46b30c05174983cd957a3ba URL: https://github.com/kamailio/kamailio/commit/0186246fce8f0e4bb46b30c05174983… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-27T09:24:33+01:00 statsd: use bool type for local variable to match return of function --- Modified: src/modules/statsd/statsd.c --- Diff: https://github.com/kamailio/kamailio/commit/0186246fce8f0e4bb46b30c05174983… Patch: https://github.com/kamailio/kamailio/commit/0186246fce8f0e4bb46b30c05174983… --- diff --git a/src/modules/statsd/statsd.c b/src/modules/statsd/statsd.c index 9724c9244e2..e9d3682bbd4 100644 --- a/src/modules/statsd/statsd.c +++ b/src/modules/statsd/statsd.c @@ -99,7 +99,7 @@ struct module_exports exports = { static int mod_init(void) { - int rc = 0; + bool rc = false; if(!statsd_params.ip) { LM_INFO("Statsd init ip value is null. use default 127.0.0.1\n"); } else { @@ -113,7 +113,7 @@ static int mod_init(void) } rc = statsd_init(statsd_params.ip, statsd_params.port); - if(rc < 0) { + if(rc == false) { LM_ERR("Statsd connection failed (ERROR_CODE: %i)\n", rc); return -1; } else {

1 0

git:master:934a5dd1: xhttp_prom: renamed global ctx variable
by Daniel-Constantin Mierla 27 Dec '23

27 Dec '23

Module: kamailio Branch: master Commit: 934a5dd1347c7b54a2d5e4437e1d3ab581f90596 URL: https://github.com/kamailio/kamailio/commit/934a5dd1347c7b54a2d5e4437e1d3ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-27T09:24:33+01:00 xhttp_prom: renamed global ctx variable - avoid short name code scanner warning and shadowing with function parameter --- Modified: src/modules/xhttp_prom/xhttp_prom.c --- Diff: https://github.com/kamailio/kamailio/commit/934a5dd1347c7b54a2d5e4437e1d3ab… Patch: https://github.com/kamailio/kamailio/commit/934a5dd1347c7b54a2d5e4437e1d3ab… --- diff --git a/src/modules/xhttp_prom/xhttp_prom.c b/src/modules/xhttp_prom/xhttp_prom.c index 198fea7d09d..ee5a5520f3c 100644 --- a/src/modules/xhttp_prom/xhttp_prom.c +++ b/src/modules/xhttp_prom/xhttp_prom.c @@ -114,7 +114,7 @@ int prom_histogram_param(modparam_t type, void *val); * being currently processed. * @sa prom_ctx */ -static prom_ctx_t ctx; +static prom_ctx_t _prom_ctx; static xhttp_api_t xhttp_api; @@ -251,6 +251,8 @@ static int mod_init(void) if(buf_size == 0) buf_size = pkg_mem_size / 3; + memset(&_prom_ctx, 0, sizeof(prom_ctx_t)); + /* Initialize Prometheus metrics. */ if(prom_metric_init()) { LM_ERR("Cannot initialize Prometheus metrics\n"); @@ -441,22 +443,22 @@ static int ki_xhttp_prom_dispatch(sip_msg_t *msg) } /* Init xhttp_prom context */ - if(ctx.reply.buf.s) { - LM_ERR("Unexpected buf value [%p][%d]\n", ctx.reply.buf.s, - ctx.reply.buf.len); + if(_prom_ctx.reply.buf.s) { + LM_ERR("Unexpected buf value [%p][%d]\n", _prom_ctx.reply.buf.s, + _prom_ctx.reply.buf.len); /* Something happened and this memory was not freed. */ - xhttp_prom_reply_free(&ctx); + xhttp_prom_reply_free(&_prom_ctx); } - memset(&ctx, 0, sizeof(prom_ctx_t)); - ctx.msg = msg; - if(init_xhttp_prom_reply(&ctx) < 0) { + memset(&_prom_ctx, 0, sizeof(prom_ctx_t)); + _prom_ctx.msg = msg; + if(init_xhttp_prom_reply(&_prom_ctx) < 0) { goto send_reply; } send_reply: - if(!ctx.reply_sent) { - ret = prom_send(&ctx); + if(!_prom_ctx.reply_sent) { + ret = prom_send(&_prom_ctx); } if(ret < 0) { return -1; @@ -2317,18 +2319,18 @@ static void rpc_prom_histogram_observe(rpc_t *rpc, void *ct) static void rpc_prom_metric_list_print(rpc_t *rpc, void *ct) { /* We reuse ctx->reply for the occasion. */ - if(init_xhttp_prom_reply(&ctx) < 0) { + if(init_xhttp_prom_reply(&_prom_ctx) < 0) { goto clean; } - if(prom_metric_list_print(&ctx)) { + if(prom_metric_list_print(&_prom_ctx)) { LM_ERR("Cannot print a list of metrics\n"); goto clean; } /* Convert to zero terminated string. */ struct xhttp_prom_reply *reply; - reply = &(ctx.reply); + reply = &(_prom_ctx.reply); reply->body.s[reply->body.len] = '\0'; /* Print content of reply buffer. */ @@ -2339,7 +2341,7 @@ static void rpc_prom_metric_list_print(rpc_t *rpc, void *ct) clean: - xhttp_prom_reply_free(&ctx); + xhttp_prom_reply_free(&_prom_ctx); return; }

1 0

git:master:dde74dc1: tm: remove redundant check in if condition
by Daniel-Constantin Mierla 27 Dec '23

27 Dec '23

Module: kamailio Branch: master Commit: dde74dc1d3413bc677813502aa71d727cbe1e981 URL: https://github.com/kamailio/kamailio/commit/dde74dc1d3413bc677813502aa71d72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-27T09:24:33+01:00 tm: remove redundant check in if condition - else branch is already for >= 200 --- Modified: src/modules/tm/dlg.c --- Diff: https://github.com/kamailio/kamailio/commit/dde74dc1d3413bc677813502aa71d72… Patch: https://github.com/kamailio/kamailio/commit/dde74dc1d3413bc677813502aa71d72… --- diff --git a/src/modules/tm/dlg.c b/src/modules/tm/dlg.c index 29b8d50769f..96483259c8c 100644 --- a/src/modules/tm/dlg.c +++ b/src/modules/tm/dlg.c @@ -712,8 +712,9 @@ static inline int dlg_early_resp_uac(dlg_t *_d, struct sip_msg *_m) if(code < 200) { /* We are in early state already, do nothing */ - } else if((code >= 200) && (code <= 299)) { - /* Warning - we can handle here response for non-initial request (for + } else if(code <= 299) { + /* (200-299) + * Warning - we can handle here response for non-initial request (for * example UPDATE within early INVITE/BYE dialog) and move into * confirmed state may be error! But this depends on dialog type... */

1 0

git:master:09318b6d: seas: if expression on else not needed
by Daniel-Constantin Mierla 27 Dec '23

27 Dec '23

Module: kamailio Branch: master Commit: 09318b6d0f224cace31d7db925f792b66cefd469 URL: https://github.com/kamailio/kamailio/commit/09318b6d0f224cace31d7db925f792b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-27T09:24:33+01:00 seas: if expression on else not needed - evaluation of it is true on else branch --- Modified: src/modules/seas/event_dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/09318b6d0f224cace31d7db925f792b… Patch: https://github.com/kamailio/kamailio/commit/09318b6d0f224cace31d7db925f792b… --- diff --git a/src/modules/seas/event_dispatcher.c b/src/modules/seas/event_dispatcher.c index 57483212686..e827629e53f 100644 --- a/src/modules/seas/event_dispatcher.c +++ b/src/modules/seas/event_dispatcher.c @@ -312,9 +312,7 @@ int dispatcher_main_loop(void) poll_fds[3 + as_nr].revents = 0; as_nr++; /*not very sure if this is thread-safe*/ unc_as_nr--; - } else if( - fd - <= 0) { /* pull the upper set of incomplete AS down and take this one out*/ + } else { /* pull the upper set of incomplete AS down and take this one out*/ poll_tmp->revents = 0; for(k = i; k < (unc_as_nr - 1); k++) { j = 3 + as_nr + k;

1 0

git:master:440a9955: ss7ops: adapt if expression for uint
by Daniel-Constantin Mierla 27 Dec '23

27 Dec '23

Module: kamailio Branch: master Commit: 440a9955b4ce21b8c3dae9d6159d24a92ec28e7c URL: https://github.com/kamailio/kamailio/commit/440a9955b4ce21b8c3dae9d6159d24a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-27T09:24:33+01:00 ss7ops: adapt if expression for uint - equal 0 or less than 1 is same in this case --- Modified: src/modules/ss7ops/ss7ops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/440a9955b4ce21b8c3dae9d6159d24a… Patch: https://github.com/kamailio/kamailio/commit/440a9955b4ce21b8c3dae9d6159d24a… --- diff --git a/src/modules/ss7ops/ss7ops_mod.c b/src/modules/ss7ops/ss7ops_mod.c index b0f84694658..8772ff56b6b 100644 --- a/src/modules/ss7ops/ss7ops_mod.c +++ b/src/modules/ss7ops/ss7ops_mod.c @@ -221,9 +221,7 @@ static const uint8_t *extract_from_m2pa(const uint8_t *data, size_t *len) } data += 8; data_len -= 8; - if(data_len == 0) - return NULL; - else if(data_len < 1) { + if(data_len < 1) { LM_ERR("M2PA no space for prio %u\n", data_len); return NULL; }

1 0

git:master:439d451a: github: [skip ci]: bump tj-actions/changed-files from 40 to 41
by Victor Seva 26 Dec '23

26 Dec '23

Module: kamailio Branch: master Commit: 439d451ab3172c1a22f88fd4ba0756ede2318191 URL: https://github.com/kamailio/kamailio/commit/439d451ab3172c1a22f88fd4ba0756e… Author: dependabot[bot] <49699333+dependabot[bot](a)users.noreply.github.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-26T08:44:50+01:00 github: [skip ci]: bump tj-actions/changed-files from 40 to 41 Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 40 to 41. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/v40...v41) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support(a)github.com> --- Modified: .github/workflows/devcontainer.yaml --- Diff: https://github.com/kamailio/kamailio/commit/439d451ab3172c1a22f88fd4ba0756e… Patch: https://github.com/kamailio/kamailio/commit/439d451ab3172c1a22f88fd4ba0756e… --- diff --git a/.github/workflows/devcontainer.yaml b/.github/workflows/devcontainer.yaml index bfecd095f55..1c2a584ed84 100644 --- a/.github/workflows/devcontainer.yaml +++ b/.github/workflows/devcontainer.yaml @@ -33,14 +33,14 @@ jobs: - name: Get changed files if: ${{ ! inputs.force }} id: changed-files - uses: tj-actions/changed-files@v40 + uses: tj-actions/changed-files@v41 with: since_last_remote_commit: true - name: changes in relevant files if: ${{ ! inputs.force }} id: changed-files-builder - uses: tj-actions/changed-files@v40 + uses: tj-actions/changed-files@v41 with: files: | .devcontainer/**

1 0

[kamailio/kamailio] github: [skip ci]: bump tj-actions/changed-files from 40 to 41 (PR #3693)
by dependabot[bot] 26 Dec '23

26 Dec '23

Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 40 to 41. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/tj-actions/changed-files/releases">tj… releases</a>.</em></p> <blockquote> <h2>v41</h2> <h1>Changes in v41.0.1</h1> <h2>What's Changed</h2> <ul> <li>Upgraded to v41 by <a href="https://github.com/tj-actions-bot"><code>@tj-acti… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1811&q… <li>chore(deps): update dependency eslint-plugin-prettier to v5.1.2 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1813&q… <li>fix: update characters escaped by safe output by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1815&q… </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/tj-actions/changed-files/compare/v41...v41.0.… <hr /> <h1>Changes in v41.0.0</h1> <h2>🔥 🔥 BREAKING CHANGE 🔥 🔥</h2> <p>A new <code>safe_output</code> input is now available to prevent outputting unsafe filename characters (Enabled by default). This would escape characters in the filename that could be used for command injection.</p> <blockquote> <p>[!NOTE] This can be disabled by setting the <code>safe_output</code> to false this comes with a recommendation to store all outputs generated in an environment variable first before using them.</p> </blockquote> <h4>Example</h4> <pre lang="yaml"><code>... - name: Get changed files id: changed-files uses: tj-actions/changed-files@v40 with: safe_output: false # set to false because we are using an environment variable to store the output and avoid command injection. <pre><code>- name: List all added files env: ADDED_FILES: ${{ steps.changed-files.outputs.added_files }} run: | for file in &amp;quot;$ADDED_FILES&amp;quot;; do echo &amp;quot;$file was added&amp;quot; done </code></pre> <p>... </code></pre></p> <h2>What's Changed</h2> <ul> <li>chore(deps): update typescript-eslint monorepo to v6.15.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1801&q… <li>Upgraded to v40.2.3 by <a href="https://github.com/tj-actions-bot"><code>@tj-acti… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1800&q… <li>chore(deps): update dependency eslint-plugin-prettier to v5.1.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1802&q… <li>chore(deps): lock file maintenance by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1803&q… <li>chore(deps): update dependency eslint-plugin-prettier to v5.1.1 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1804&q… <li>fix: update safe output regex and the docs by <a href="https://github.com/tj-actions-bot"><code>@tj-acti… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1805&q… <li>Revert &quot;chore(deps): update actions/download-artifact action to v4&quot; by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1806&q… <li>Update README.md by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1808&q… </ul>  </blockquote> <p>... (truncated)</p> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/tj-actions/changed-files/blob/main/HISTORY.md… changelog</a>.</em></p> <blockquote> <h1>Changelog</h1> <h1><a href="https://github.com/tj-actions/changed-files/compare/v41.0.0...v4… - (2023-12-24)</h1> <h2>🐛 Bug Fixes</h2> <ul> <li>Update characters escaped by safe output (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1815…) (<a href="https://github.com/tj-actions/changed-files/commit/716b1e1304286…) - (Tonye Jack)</li> </ul> <h2>⚙️ Miscellaneous Tasks</h2> <ul> <li><strong>deps:</strong> Update dependency eslint-plugin-prettier to v5.1.2 (<a href="https://github.com/tj-actions/changed-files/commit/7aaf10d9eef19…) - (renovate[bot])</li> </ul> <h2>⬆️ Upgrades</h2> <ul> <li>Upgraded to v41 (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1811… </ul> <p>Co-authored-by: jackton1 <a href="mailto:jackton1@users.noreply.github.com">jackton1@users.noreply.github.com</a> (<a href="https://github.com/tj-actions/changed-files/commit/cc08e170f4447…) - (tj-actions[bot])</p> <h1><a href="https://github.com/tj-actions/changed-files/compare/v40.2.3...v4… - (2023-12-23)</h1> <h2>🐛 Bug Fixes</h2> <ul> <li>Update safe output regex and the docs (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1805…) (<a href="https://github.com/tj-actions/changed-files/commit/ff2f6e6b91913…) - (tj-actions[bot])</li> </ul> <h2>⏪ Reverts</h2> <ul> <li>Revert &quot;chore(deps): update actions/download-artifact action to v4&quot; (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1806… </ul> <p>(<a href="https://github.com/tj-actions/changed-files/commit/4f573fed06c9a…) - (Tonye Jack)</p> <h2>🔄 Update</h2> <ul> <li>Update README.md (<a href="https://github.com/tj-actions/changed-files/commit/6e79d6e3dbe48…) - (Tonye Jack)</li> <li>Update README.md (<a href="https://github.com/tj-actions/changed-files/commit/d13ac1942fb3c…) - (Tonye Jack)</li> <li>Update README.md (<a href="https://github.com/tj-actions/changed-files/commit/bb89f97963be9…) - (Tonye Jack)</li> <li>Updated README.md (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1810… </ul> <p>Co-authored-by: renovate[bot]  (<a href="https://github.com/tj-actions/changed-files/commit/1864078d0afad…) - (tj-actions[bot])</p> <ul> <li>Update README.md (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1808… </ul> <p>(<a href="https://github.com/tj-actions/changed-files/commit/47371c50e97c0…) - (Tonye Jack)</p> <h2>📝 Other</h2> <ul> <li>Merge pull request from GHSA-mcph-m25j-8j63</li> </ul> <ul> <li> <p>feat: add <code>safe_output</code> input enabled by default</p> </li> <li> <p>fix: migrate README to safe uses of interpolation</p> </li> </ul>  </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/tj-actions/changed-files/commit/716b1e1304286… fix: update characters escaped by safe output (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1815… <li><a href="https://github.com/tj-actions/changed-files/commit/7aaf10d9eef19… chore(deps): update dependency eslint-plugin-prettier to v5.1.2</li> <li><a href="https://github.com/tj-actions/changed-files/commit/cc08e170f4447… Upgraded to v41 (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1811… <li><a href="https://github.com/tj-actions/changed-files/commit/6e79d6e3dbe48… Update README.md</li> <li><a href="https://github.com/tj-actions/changed-files/commit/d13ac1942fb3c… Update README.md</li> <li><a href="https://github.com/tj-actions/changed-files/commit/bb89f97963be9… Update README.md</li> <li><a href="https://github.com/tj-actions/changed-files/commit/1864078d0afad… Updated README.md (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1810… <li><a href="https://github.com/tj-actions/changed-files/commit/f495a0321d3ff… chore(deps): lock file maintenance</li> <li><a href="https://github.com/tj-actions/changed-files/commit/47371c50e97c0… Update README.md (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1808… <li><a href="https://github.com/tj-actions/changed-files/commit/4f573fed06c9a… Revert &quot;chore(deps): update actions/download-artifact action to v4&quot; (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1806… <li>Additional commits viewable in <a href="https://github.com/tj-actions/changed-files/compare/v40...v41&qu… view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?d… Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3693 -- Commit Summary -- * github: [skip ci]: bump tj-actions/changed-files from 40 to 41 -- File Changes -- M .github/workflows/devcontainer.yaml (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3693.patch https://github.com/kamailio/kamailio/pull/3693.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3693 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3693(a)github.com>

2 1

Merry Christmas and Happy Holidays 2023-2024!
by Daniel-Constantin Mierla 25 Dec '23

25 Dec '23

Kamailio project continued to evolve steadily, a new major release was out during this year, next one planned in a few months, relying on an amazing community of developers and users. We hope it kept helping people and companies world wide to connect with the dear ones and build a better way of living. The season holidays are ahead, time to relax, spend time with family and friends! I take again this chance to express my thanks and greetings to all the friends, developers, supporting companies and community members that made 2023 another fantastic year for Kamailio project. Enjoy the holidays! Merry Christmas! Daniel * Santa is flying Kamailio! * -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services Kamailio World Conference - April 18-19, 2024, Berlin

2 1

git:master:973803b0: pkg/obs: removed auth_identity modules
by Daniel-Constantin Mierla 24 Dec '23

24 Dec '23

Module: kamailio Branch: master Commit: 973803b0a3944b9de7ebdc4366b23e933e66ffbe URL: https://github.com/kamailio/kamailio/commit/973803b0a3944b9de7ebdc4366b23e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-24T19:59:52+01:00 pkg/obs: removed auth_identity modules --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/973803b0a3944b9de7ebdc4366b23e9… Patch: https://github.com/kamailio/kamailio/commit/973803b0a3944b9de7ebdc4366b23e9… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 978c1073ac8..1dc6687e645 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -2336,9 +2336,7 @@ fi %files tls %defattr(-,root,root) -%doc %{_docdir}/kamailio/modules/README.auth_identity %doc %{_docdir}/kamailio/modules/README.tls -%{_libdir}/kamailio/modules/auth_identity.so %{_libdir}/kamailio/modules/tls.so

1 0

git:master:8a07c21b: pkg/alpine: removed auth_identity module
by Daniel-Constantin Mierla 24 Dec '23

24 Dec '23

Module: kamailio Branch: master Commit: 8a07c21b45d8afd0a0b84c09bbac6361a0f979d3 URL: https://github.com/kamailio/kamailio/commit/8a07c21b45d8afd0a0b84c09bbac636… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-24T17:23:55+01:00 pkg/alpine: removed auth_identity module --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/8a07c21b45d8afd0a0b84c09bbac636… Patch: https://github.com/kamailio/kamailio/commit/8a07c21b45d8afd0a0b84c09bbac636… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index b3d5c4d64bd..0696216564a 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -131,7 +131,7 @@ _mod_list_purple="purple" _mod_list_memcached="memcached" # - modules depending on openssl library -_mod_list_tls="auth_identity crypto tls" +_mod_list_tls="crypto tls" # - modules depending on openssl library _mod_list_outbound="outbound"

1 0

git:master:3bdc5665: Makefile.groups: removed auth_identity module
by Daniel-Constantin Mierla 24 Dec '23

24 Dec '23

Module: kamailio Branch: master Commit: 3bdc56654874b7e94e7052823714440b6457a100 URL: https://github.com/kamailio/kamailio/commit/3bdc56654874b7e94e7052823714440… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-24T17:21:57+01:00 Makefile.groups: removed auth_identity module - relocated to kamailio-archive repository --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/3bdc56654874b7e94e7052823714440… Patch: https://github.com/kamailio/kamailio/commit/3bdc56654874b7e94e7052823714440… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 8d15b198cc3..d730a7eb51b 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -91,9 +91,6 @@ mod_list_tlsdeps=crypto tls # - modules depending on static openssl library mod_list_tlsa=tlsa -# - modules depending on openssl (+curl) library -mod_list_tlsdeps_curl=auth_identity - # - modules depending on static wolfssl library mod_list_tls_wolfssl=tls_wolfssl @@ -255,7 +252,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_xmpp) \ $(mod_list_berkeley) $(mod_list_utils) \ $(mod_list_memcached) \ - $(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) \ + $(mod_list_tlsdeps) \ $(mod_list_websocket) \ $(mod_list_snmpstats) $(mod_list_presence) \ $(mod_list_lua) $(mod_list_python) \ @@ -314,7 +311,7 @@ module_group_standard=$(mod_list_basic) $(mod_list_extra) \ module_group_common=$(mod_list_db) $(mod_list_dbuid) \ $(mod_list_pcre) $(mod_list_radius) \ $(mod_list_xmldeps) $(mod_list_presence) \ - $(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) + $(mod_list_tlsdeps) # For db use (db modules, excluding drivers) module_group_db=$(mod_list_db) @@ -409,10 +406,10 @@ module_group_ktls_basic=$(mod_list_tlsdeps) ifeq ($(KTLS_INCLUDE_TLSA),yes) # pkg tls module with curl -module_group_ktls=$(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) $(mod_list_tlsa) +module_group_ktls=$(mod_list_tlsdeps) $(mod_list_tlsa) else # pkg tls module with curl -module_group_ktls=$(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) +module_group_ktls=$(mod_list_tlsdeps) # pkg tlsa module module_group_ktlsa=$(mod_list_tlsa)

1 0

git:master:5192e5d2: tmx: rework cleaning up on init failure
by Daniel-Constantin Mierla 24 Dec '23

24 Dec '23

Module: kamailio Branch: master Commit: 5192e5d275761ccd1af49d4bf9dd12e1438947b7 URL: https://github.com/kamailio/kamailio/commit/5192e5d275761ccd1af49d4bf9dd12e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-24T12:20:57+01:00 tmx: rework cleaning up on init failure --- Modified: src/modules/tmx/tmx_pretran.c --- Diff: https://github.com/kamailio/kamailio/commit/5192e5d275761ccd1af49d4bf9dd12e… Patch: https://github.com/kamailio/kamailio/commit/5192e5d275761ccd1af49d4bf9dd12e… --- diff --git a/src/modules/tmx/tmx_pretran.c b/src/modules/tmx/tmx_pretran.c index 7600a3c7b4b..a7c7d52df87 100644 --- a/src/modules/tmx/tmx_pretran.c +++ b/src/modules/tmx/tmx_pretran.c @@ -103,10 +103,11 @@ int tmx_init_pretran_table(void) for(n = 0; n < _tmx_ptran_size; n++) { if(lock_init(&_tmx_ptran_table[n].lock) == NULL) { LM_ERR("cannot init the lock %d\n", n); - n--; - while(n >= 0) { - lock_destroy(&_tmx_ptran_table[n].lock); - n--; + if(n > 0) { + do { + n--; + lock_destroy(&_tmx_ptran_table[n].lock); + } while(n > 0); } shm_free(_tmx_ptran_table); _tmx_ptran_table = 0;

1 0

[kamailio/kamailio] JSONRPC-S does not support batch requests (Issue #3677)
by Matthias van der Vlies 23 Dec '23

23 Dec '23

### Description It would be nice if the JSONRPC-S module would support batch requests. For example if you want to set multiple values in htable simultaneously. ### Expected behavior That the implementation is in line with JSON-RPC 2.0 specification and support batching. For example: `[ {"jsonrpc": "2.0", "method": "htable.stats", "id": 22}, {"jsonrpc": "2.0", "method": "htable.listTables", "id": 23} ]` #### Actual observed behavior Get an empty result with no error code (see Debugging data) Only the first message is parsed when discarding the brackets (which should give a json format error anyway, but doesn't) ` {"jsonrpc": "2.0", "method": "htable.stats", "id": 22}, {"jsonrpc": "2.0", "method": "htable.listTables", "id": 23} ` Then I get an answer to only the first request instead of expected JSON validation error. #### Debugging Data `curl -X POST -H "Content-Type: application/json" -d '[{"jsonrpc": "2.0", "method": "htable.stats", "id": 22},{"jsonrpc": "2.0", "method": "htable.listTables", "id": 23}]' http://10.0.0.1:5060/RPC { "jsonrpc": "2.0", "result": { } }` #### Log Messages `254(260) ERROR: jsonrpcs [jsonrpcs_mod.c:1263]: jsonrpc_dispatch(): missing or invalid jsonrpc field in request` #### SIP Traffic N/A ### Possible Solutions Needs a code fix ### Additional Information https://www.jsonrpc.org/specification -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3677 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3677(a)github.com>

2 2

[kamailio/kamailio] OpenSSL 3.0 deprecated warnings (Issue #3636)
by sergey-safarov 23 Dec '23

23 Dec '23

``` CC (gcc) [M auth_identity.so] auth_crypt.o auth_crypt.c: In function 'rsa_sha1_enc': auth_crypt.c:215:9: warning: 'RSA_sign' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 215 | if (RSA_sign(NID_sha1, | ^~ In file included from /usr/include/openssl/x509.h:36, from /usr/include/openssl/pem.h:23, from auth_crypt.c:33: /usr/include/openssl/rsa.h:353:27: note: declared here 353 | OSSL_DEPRECATEDIN_3_0 int RSA_sign(int type, const unsigned char *m, | ^~~~~~~~ auth_crypt.c: In function 'rsa_sha1_dec': auth_crypt.c:261:9: warning: 'EVP_PKEY_get1_RSA' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 261 | hpubkey = EVP_PKEY_get1_RSA(pkey); | ^~~~~~~ In file included from /usr/include/openssl/pem.h:22: /usr/include/openssl/evp.h:1348:16: note: declared here 1348 | struct rsa_st *EVP_PKEY_get1_RSA(EVP_PKEY *pkey); | ^~~~~~~~~~~~~~~~~ auth_crypt.c:269:9: warning: 'RSA_verify' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 269 | if (RSA_verify(NID_sha1, | ^~ /usr/include/openssl/rsa.h:356:27: note: declared here 356 | OSSL_DEPRECATEDIN_3_0 int RSA_verify(int type, const unsigned char *m, | ^~~~~~~~~~ auth_crypt.c:275:17: warning: 'RSA_free' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 275 | RSA_free(hpubkey); | ^~~~~~~~ /usr/include/openssl/rsa.h:298:28: note: declared here 298 | OSSL_DEPRECATEDIN_3_0 void RSA_free(RSA *r); | ^~~~~~~~ auth_crypt.c:298:9: warning: 'RSA_free' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 298 | RSA_free(hpubkey); | ^~~~~~~~ /usr/include/openssl/rsa.h:298:28: note: declared here 298 | OSSL_DEPRECATEDIN_3_0 void RSA_free(RSA *r); | ^~~~~~~~ CC (gcc) [M auth_identity.so] auth_dynstr.o CC (gcc) [M auth_identity.so] auth_hdrs.o CC (gcc) [M auth_identity.so] auth_http.o CC (gcc) [M auth_identity.so] auth_identity.o auth_identity.c: In function 'mod_init': auth_identity.c:396:9: warning: 'PEM_read_RSAPrivateKey' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 396 | glb_hmyprivkey=PEM_read_RSAPrivateKey(hpemfile, NULL, NULL, NULL); | ^~~~~~~~~~~~~~ In file included from auth_identity.c:43: /usr/include/openssl/pem.h:447:1: note: declared here 447 | DECLARE_PEM_rw_cb_attr(OSSL_DEPRECATEDIN_3_0, RSAPrivateKey, RSA) | ^~~~~~~~~~~~~~~~~~~~~~ auth_identity.c:408:9: warning: 'RSA_size' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 408 | if (initdynstr(&glb_encedmsg, RSA_size(glb_hmyprivkey))) | ^~ In file included from /usr/include/openssl/x509.h:36, from /usr/include/openssl/pem.h:23: /usr/include/openssl/rsa.h:209:27: note: declared here 209 | OSSL_DEPRECATEDIN_3_0 int RSA_size(const RSA *rsa); | ^~~~~~~~ auth_identity.c:412:9: warning: 'RSA_size' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 412 | if (initdynstr(&glb_b64encedmsg, (RSA_size(glb_hmyprivkey)/3+1)*4)) | ^~ /usr/include/openssl/rsa.h:209:27: note: declared here 209 | OSSL_DEPRECATEDIN_3_0 int RSA_size(const RSA *rsa); | ^~~~~~~~ CC (gcc) [M auth_identity.so] auth_tables.o LD (gcc) [M auth_identity.so] auth_identity.so ``` This warning on Fedora 38 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3636 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3636(a)github.com>

3 5

git:master:1b959ead: auth_identity: module relocated to kamailio-archive repository
by Daniel-Constantin Mierla 23 Dec '23

23 Dec '23

Module: kamailio Branch: master Commit: 1b959ead18fc8d7d55b1abe6f03fa3f849b57385 URL: https://github.com/kamailio/kamailio/commit/1b959ead18fc8d7d55b1abe6f03fa3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-23T17:20:40+01:00 auth_identity: module relocated to kamailio-archive repository - module is considered obsolete, not maintained - based on precursor specs of stir/shaken, not actually deployed in production by carriers - located now at: https://github.com/kamailio/kamailio-archive/tree/main/src/modules/auth_ide… --- Removed: src/modules/auth_identity/Makefile Removed: src/modules/auth_identity/README Removed: src/modules/auth_identity/auth_crypt.c Removed: src/modules/auth_identity/auth_dynstr.c Removed: src/modules/auth_identity/auth_hdrs.c Removed: src/modules/auth_identity/auth_http.c Removed: src/modules/auth_identity/auth_identity.c Removed: src/modules/auth_identity/auth_identity.h Removed: src/modules/auth_identity/auth_tables.c Removed: src/modules/auth_identity/doc/Makefile Removed: src/modules/auth_identity/doc/auth_identity.xml Removed: src/modules/auth_identity/doc/auth_identity_functions.xml Removed: src/modules/auth_identity/doc/auth_identity_params.xml --- Diff: https://github.com/kamailio/kamailio/commit/1b959ead18fc8d7d55b1abe6f03fa3f… Patch: https://github.com/kamailio/kamailio/commit/1b959ead18fc8d7d55b1abe6f03fa3f…

1 0

git:master:904a718d: sms: define size and check lenght for sender and ascii fields
by Daniel-Constantin Mierla 22 Dec '23

22 Dec '23

Module: kamailio Branch: master Commit: 904a718d15e4a83d752b6d2f0fa692fb10cda4b4 URL: https://github.com/kamailio/kamailio/commit/904a718d15e4a83d752b6d2f0fa692f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-22T15:10:51+01:00 sms: define size and check lenght for sender and ascii fields --- Modified: src/modules/sms/libsms_getsms.c Modified: src/modules/sms/sms_funcs.h --- Diff: https://github.com/kamailio/kamailio/commit/904a718d15e4a83d752b6d2f0fa692f… Patch: https://github.com/kamailio/kamailio/commit/904a718d15e4a83d752b6d2f0fa692f… --- diff --git a/src/modules/sms/libsms_getsms.c b/src/modules/sms/libsms_getsms.c index ea258ccf673..4181560490e 100644 --- a/src/modules/sms/libsms_getsms.c +++ b/src/modules/sms/libsms_getsms.c @@ -287,7 +287,13 @@ static int splitascii(struct modem *mdm, char *source, struct incame_sms *sms) if(!*start) return 1; start++; - strcpy(sms->ascii, start); + l1 = strlen(start); + if(l1 >= SMS_ASCII_LEN) { + /* truncate */ + l1 = SMS_ASCII_LEN - 1; + } + memcpy(sms->ascii, start, l1); + sms->ascii[l1] = '\0'; /* get the senders MSISDN */ start = strstr(source, "\",\""); if(start == 0) { @@ -301,7 +307,14 @@ static int splitascii(struct modem *mdm, char *source, struct incame_sms *sms) return 1; } *end = 0; - strcpy(sms->sender, start); + l1 = strlen(start); + if(l1 >= SMS_SENDER_LEN) { + /* truncate */ + l1 = SMS_SENDER_LEN - 1; + } + memcpy(sms->sender, start, l1); + sms->sender[l1] = '\0'; + /* Siemens M20 inserts the senders name between MSISDN and date */ start = end + 3; // Workaround for Thomas Stoeckel // diff --git a/src/modules/sms/sms_funcs.h b/src/modules/sms/sms_funcs.h index 4123b92c514..84c35c2f3a4 100644 --- a/src/modules/sms/sms_funcs.h +++ b/src/modules/sms/sms_funcs.h @@ -92,14 +92,18 @@ struct sms_msg }; #define SMS_NAME_LEN 64 +#define SMS_SENDER_LEN 32 +#define SMS_ASCII_LEN 500 +#define SMS_SMSC_LEN 32 + struct incame_sms { - char sender[31]; + char sender[SMS_SENDER_LEN]; char name[SMS_NAME_LEN]; char date[DATE_LEN]; char time[TIME_LEN]; - char ascii[500]; - char smsc[31]; + char ascii[SMS_ASCII_LEN]; + char smsc[SMS_SMSC_LEN]; int userdatalength; int is_statusreport; int sms_id;

1 0

git:master:1f5444fd: tm: make lookup event_route[tm:local-response] only once
by Daniel-Constantin Mierla 22 Dec '23

22 Dec '23

Module: kamailio Branch: master Commit: 1f5444fd2e25d227ffd70f1087d057a3b8002558 URL: https://github.com/kamailio/kamailio/commit/1f5444fd2e25d227ffd70f1087d057a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-22T14:50:59+01:00 tm: make lookup event_route[tm:local-response] only once - related to issue #3064 and PR #3687 --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/1f5444fd2e25d227ffd70f1087d057a… Patch: https://github.com/kamailio/kamailio/commit/1f5444fd2e25d227ffd70f1087d057a… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index c5a58bba8ab..f52ecc7d3ad 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -443,7 +443,7 @@ inline static void start_final_repl_retr(struct cell *t) } -static int _tm_local_response_sent_lookup = 0; +static int _tm_local_response_sent_evrt = -2; static int _reply_light(struct cell *trans, char *buf, unsigned int len, unsigned int code, char *to_tag, unsigned int to_tag_len, int lock, @@ -573,9 +573,15 @@ static int _reply_light(struct cell *trans, char *buf, unsigned int len, } rt = -1; if(likely(keng == NULL)) { - if(_tm_local_response_sent_lookup == 0) { + if(_tm_local_response_sent_evrt == -2) { rt = route_lookup(&event_rt, "tm:local-response"); - _tm_local_response_sent_lookup = 1; + if(rt < 0) { + _tm_local_response_sent_evrt = -1; + } else { + _tm_local_response_sent_evrt = rt; + } + } else { + rt = _tm_local_response_sent_evrt; } } if((rt >= 0 && event_rt.rlist[rt] != NULL) || (keng != NULL)

1 0

git:master:61efad28: seas: fix build warning
by Victor Seva 22 Dec '23

22 Dec '23

Module: kamailio Branch: master Commit: 61efad28eeb84d8b8f80fe7fd38d7bbb634717f4 URL: https://github.com/kamailio/kamailio/commit/61efad28eeb84d8b8f80fe7fd38d7bb… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-22T10:06:29+01:00 seas: fix build warning > CC (gcc) [M seas.so] encode_contact.o > encode_allow.c:40: warning: "_GNU_SOURCE" redefined > 40 | #define _GNU_SOURCE > | > <command-line>: note: this is the location of the previous definition --- Modified: src/modules/seas/encode_allow.c Modified: src/modules/seas/encode_contact.c Modified: src/modules/seas/encode_content_disposition.c Modified: src/modules/seas/encode_content_length.c Modified: src/modules/seas/encode_content_type.c Modified: src/modules/seas/encode_cseq.c Modified: src/modules/seas/encode_digest.c Modified: src/modules/seas/encode_expires.c Modified: src/modules/seas/encode_header.c Modified: src/modules/seas/encode_msg.c Modified: src/modules/seas/encode_parameters.c Modified: src/modules/seas/encode_route.c Modified: src/modules/seas/encode_to_body.c Modified: src/modules/seas/encode_uri.c Modified: src/modules/seas/encode_via.c Modified: src/modules/seas/utils.c --- Diff: https://github.com/kamailio/kamailio/commit/61efad28eeb84d8b8f80fe7fd38d7bb… Patch: https://github.com/kamailio/kamailio/commit/61efad28eeb84d8b8f80fe7fd38d7bb…

1 0

git:master:90df7449: pv: fix build warning
by Victor Seva 22 Dec '23

22 Dec '23

Module: kamailio Branch: master Commit: 90df744978ee2a83700d36ef88161f00b2220acb URL: https://github.com/kamailio/kamailio/commit/90df744978ee2a83700d36ef88161f0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-22T10:00:32+01:00 pv: fix build warning > CC (gcc) [M pv.so] pv_xavp.o > pv_core.c: In function 'pv_get_cnt': > pv_core.c:2841:61: warning: 'ravp' may be used uninitialized [-Wmaybe-uninitialized] > 2841 | if(ravp && ravp->val.type == SR_XTYPE_XAVP) { > | ~~~~~~~~~^~~~~ > pv_core.c:2776:36: note: 'ravp' was declared here > 2776 | sr_xavp_t *ravp, *sub_avp; > | ^~~~ --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/90df744978ee2a83700d36ef88161f0… Patch: https://github.com/kamailio/kamailio/commit/90df744978ee2a83700d36ef88161f0… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 03d025bba2f..d98abbf975d 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2773,7 +2773,7 @@ int pv_get_cnt(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) * But this would be less intuitive in our case for counting. */ pv_xavp_name_t *xname, *xname_sub; - sr_xavp_t *ravp, *sub_avp; + sr_xavp_t *ravp = NULL, *sub_avp = NULL; int root_idxf, root_idx_spec, root_idx; int sub_idxf, sub_idx_spec, sub_idx; int count;

1 0

git:master:86c57ef7: db_text: fix build warning
by Victor Seva 22 Dec '23

22 Dec '23

Module: kamailio Branch: master Commit: 86c57ef77848513e3224c73a6d2889e8a2bd6fc3 URL: https://github.com/kamailio/kamailio/commit/86c57ef77848513e3224c73a6d2889e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-22T09:58:39+01:00 db_text: fix build warning > CC (gcc) [M db_text.so] dbt_raw_query.o > dbt_raw_query.c:23: warning: "_GNU_SOURCE" redefined > 23 | #define _GNU_SOURCE > | > <command-line>: note: this is the location of the previous definition --- Modified: src/modules/db_text/dbt_raw_query.c --- Diff: https://github.com/kamailio/kamailio/commit/86c57ef77848513e3224c73a6d2889e… Patch: https://github.com/kamailio/kamailio/commit/86c57ef77848513e3224c73a6d2889e… --- diff --git a/src/modules/db_text/dbt_raw_query.c b/src/modules/db_text/dbt_raw_query.c index a6dc37a69b7..ede61fe3525 100644 --- a/src/modules/db_text/dbt_raw_query.c +++ b/src/modules/db_text/dbt_raw_query.c @@ -19,8 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - +#ifndef _GNU_SOURCE #define _GNU_SOURCE +#endif #include <string.h> #include "../../core/str.h"

1 0

git:master:8bfd6580: cfgt: fix build warning
by Victor Seva 22 Dec '23

22 Dec '23

Module: kamailio Branch: master Commit: 8bfd6580533b6d6005cd257632a5c0e575f75e39 URL: https://github.com/kamailio/kamailio/commit/8bfd6580533b6d6005cd257632a5c0e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-22T09:57:25+01:00 cfgt: fix build warning > CC (gcc) [M cfgt.so] cfgt_mod.o > cfgt_int.c:22: warning: "_GNU_SOURCE" redefined > 22 | #define _GNU_SOURCE > | > <command-line>: note: this is the location of the previous definition --- Modified: src/modules/cfgt/cfgt_int.c --- Diff: https://github.com/kamailio/kamailio/commit/8bfd6580533b6d6005cd257632a5c0e… Patch: https://github.com/kamailio/kamailio/commit/8bfd6580533b6d6005cd257632a5c0e… --- diff --git a/src/modules/cfgt/cfgt_int.c b/src/modules/cfgt/cfgt_int.c index f1357bb87aa..f74c044b83b 100644 --- a/src/modules/cfgt/cfgt_int.c +++ b/src/modules/cfgt/cfgt_int.c @@ -19,7 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ +#ifndef _GNU_SOURCE #define _GNU_SOURCE +#endif #include <stdio.h> #include <sys/stat.h> #include <sys/time.h>

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev