sr-dev May 2023

sr-dev@lists.kamailio.org

16 participants
322 discussions

git:master:c88e506f: lcr: fix crash be calling load_gw* via KEMI

by Victor Seva

Module: kamailio Branch: master Commit: c88e506fe6a1ba0f588c5866a63ffb18fa25478a URL: https://github.com/kamailio/kamailio/commit/c88e506fe6a1ba0f588c5866a63ffb1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-05-04T20:53:09+02:00 lcr: fix crash be calling load_gw* via KEMI move the check of lcr_id to the helper fixes #3435 --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c88e506fe6a1ba0f588c5866a63ffb1… Patch: https://github.com/kamailio/kamailio/commit/c88e506fe6a1ba0f588c5866a63ffb1… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index 1f713a9e404..be945fb8af8 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -2298,6 +2298,11 @@ static int ki_load_gws_furi( } } + if((lcr_id < 1) || (lcr_id > lcr_count_param)) { + LM_ERR("invalid lcr_id parameter value %d\n", lcr_id); + return -1; + } + /* Use rules and gws with index lcr_id */ rules = rule_pt[lcr_id]; gws = gw_pt[lcr_id]; @@ -2492,10 +2497,7 @@ static int load_gws(struct sip_msg *_m, int argc, action_u_t argv[]) LM_ERR("invalid lcr_id parameter %s\n", argv[0].u.string); return -1; } - if((lcr_id < 1) || (lcr_id > lcr_count_param)) { - LM_ERR("invalid lcr_id parameter value %d\n", lcr_id); - return -1; - } + if(argc > 1) { ruri_user = argv[1].u.str; } else {

1 year, 6 months

[kamailio/kamailio] lcr: fix crash be calling load_gw* via KEMI (PR #3436)

by Victor Seva

#### 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:  - [x] PR should be backported to stable branches - [ ] Tested changes locally - [ x] Related to issue #3435 #### Description move the check of lcr_id to the helper so every ``ki_load_gw*()`` will be protected You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3436 -- Commit Summary -- * lcr: fix crash be calling load_gw* via KEMI -- File Changes -- M src/modules/lcr/lcr_mod.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3436.patch https://github.com/kamailio/kamailio/pull/3436.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3436 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3436(a)github.com>

1 year, 6 months

git:master:1c924f9b: Makefile.defs: version set to 5.8.0-dev0

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1c924f9bc9d880f9c32fe5cb4d23722f27107be6 URL: https://github.com/kamailio/kamailio/commit/1c924f9bc9d880f9c32fe5cb4d23722… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-04T20:45:00+02:00 Makefile.defs: version set to 5.8.0-dev0 - master branch is open for new features to be part of future release series 5.8.x --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/1c924f9bc9d880f9c32fe5cb4d23722… Patch: https://github.com/kamailio/kamailio/commit/1c924f9bc9d880f9c32fe5cb4d23722… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 07625c9f97a..a40cfa55cd3 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -105,9 +105,9 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 -PATCHLEVEL = 7 +PATCHLEVEL = 8 SUBLEVEL = 0 -EXTRAVERSION = -pre1 +EXTRAVERSION = -dev0 # memory manager switcher # 0 - f_malloc (fast malloc)

1 year, 6 months

git:5.7:239b374c: Makefile.defs: version set to 5.7.0-rc0

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.7 Commit: 239b374c7d30c1865b749f247ecdc7bb80898063 URL: https://github.com/kamailio/kamailio/commit/239b374c7d30c1865b749f247ecdc7b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-04T20:37:14+02:00 Makefile.defs: version set to 5.7.0-rc0 - branch 5.7 for 5.7.x release series --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/239b374c7d30c1865b749f247ecdc7b… Patch: https://github.com/kamailio/kamailio/commit/239b374c7d30c1865b749f247ecdc7b… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 07625c9f97..bd15e29269 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 7 SUBLEVEL = 0 -EXTRAVERSION = -pre1 +EXTRAVERSION = -rc0 # memory manager switcher # 0 - f_malloc (fast malloc)

1 year, 6 months

git:master:e80e877e: Makefile.defs: version set to 5.7.0-pre1

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e80e877e4c0bab977c80c147b826d3b67b4c02d9 URL: https://github.com/kamailio/kamailio/commit/e80e877e4c0bab977c80c147b826d3b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-04T18:24:45+02:00 Makefile.defs: version set to 5.7.0-pre1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/e80e877e4c0bab977c80c147b826d3b… Patch: https://github.com/kamailio/kamailio/commit/e80e877e4c0bab977c80c147b826d3b… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 12cbd3d94b..07625c9f97 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 7 SUBLEVEL = 0 -EXTRAVERSION = -pre0 +EXTRAVERSION = -pre1 # memory manager switcher # 0 - f_malloc (fast malloc)

1 year, 6 months

[kamailio/kamailio] Getting error when configuring kamaailio. (Issue #3432)

by rutujasm

### Description  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3432 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3432(a)github.com>

1 year, 6 months

git:master:20561b66: db_flatstore: use unsigned long long for printing time_t value

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 20561b66364f2321c604d0655c3029decdd2dff6 URL: https://github.com/kamailio/kamailio/commit/20561b66364f2321c604d0655c3029d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-04T14:22:06+02:00 db_flatstore: use unsigned long long for printing time_t value --- Modified: src/modules/db_flatstore/flat_cmd.c Modified: src/modules/db_flatstore/km_flatstore.c --- Diff: https://github.com/kamailio/kamailio/commit/20561b66364f2321c604d0655c3029d… Patch: https://github.com/kamailio/kamailio/commit/20561b66364f2321c604d0655c3029d… --- diff --git a/src/modules/db_flatstore/flat_cmd.c b/src/modules/db_flatstore/flat_cmd.c index fbbb57a0c4..3b0ecb0191 100644 --- a/src/modules/db_flatstore/flat_cmd.c +++ b/src/modules/db_flatstore/flat_cmd.c @@ -142,7 +142,7 @@ int flat_put(db_res_t* res, db_cmd_t* cmd) break; case DB_DATETIME: - if (fprintf(f, "%u", (unsigned int)cmd->vals[i].v.time) < 0) + if (fprintf(f, "%llu", (unsigned long long)cmd->vals[i].v.time) < 0) goto error; break; diff --git a/src/modules/db_flatstore/km_flatstore.c b/src/modules/db_flatstore/km_flatstore.c index 007d1b8338..b933479ad0 100644 --- a/src/modules/db_flatstore/km_flatstore.c +++ b/src/modules/db_flatstore/km_flatstore.c @@ -207,7 +207,7 @@ int flat_db_insert(const db1_con_t* h, const db_key_t* k, const db_val_t* v, break; case DB1_DATETIME: - fprintf(f, "%u", (unsigned int)VAL_TIME(v + i)); + fprintf(f, "%llu", (unsigned long long)VAL_TIME(v + i)); break; case DB1_BLOB:

1 year, 6 months

git:master:254c1451: stats: use J for printing timestamp to rpc result

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 254c14517ba698e0e8ed8bb85b0bc24948f48f50 URL: https://github.com/kamailio/kamailio/commit/254c14517ba698e0e8ed8bb85b0bc24… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-04T14:17:20+02:00 stats: use J for printing timestamp to rpc result --- Modified: src/modules/statsc/statsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/254c14517ba698e0e8ed8bb85b0bc24… Patch: https://github.com/kamailio/kamailio/commit/254c14517ba698e0e8ed8bb85b0bc24… --- diff --git a/src/modules/statsc/statsc_mod.c b/src/modules/statsc/statsc_mod.c index 92447339151..cbba9eb29d7 100644 --- a/src/modules/statsc/statsc_mod.c +++ b/src/modules/statsc/statsc_mod.c @@ -410,8 +410,8 @@ static void statsc_rpc_report(rpc_t* rpc, void* ctx) rpc->fault(ctx, 500, "Error creating rpc (1)"); return; } - if(rpc->struct_add(th, "u[", - "timestamp", (uint64_t)tn, + if(rpc->struct_add(th, "J[", + "timestamp", (unsigned long long)tn, "stats", &ts)<0) { rpc->fault(ctx, 500, "Error creating rpc (2)"); return;

1 year, 6 months

git:master:c5d846d4: dlgs: use PRIu64 to print uint64_t

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c5d846d499cdc4fa6829c3bf4d7a120d9dbe16da URL: https://github.com/kamailio/kamailio/commit/c5d846d499cdc4fa6829c3bf4d7a120… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-04T14:11:06+02:00 dlgs: use PRIu64 to print uint64_t --- Modified: src/modules/dlgs/dlgs_records.c --- Diff: https://github.com/kamailio/kamailio/commit/c5d846d499cdc4fa6829c3bf4d7a120… Patch: https://github.com/kamailio/kamailio/commit/c5d846d499cdc4fa6829c3bf4d7a120… --- diff --git a/src/modules/dlgs/dlgs_records.c b/src/modules/dlgs/dlgs_records.c index 2f0bb65b6ce..25026136b21 100644 --- a/src/modules/dlgs/dlgs_records.c +++ b/src/modules/dlgs/dlgs_records.c @@ -27,6 +27,7 @@ #include <stdint.h> #include <regex.h> #include <fnmatch.h> +#include <inttypes.h> #include "../../core/dprint.h" #include "../../core/ut.h" @@ -658,7 +659,7 @@ int dlgs_ht_dbg(void) LM_ERR("\tdst: %.*s\n", it->dst.len, it->dst.s); LM_ERR("\tdata: %.*s\n", it->data.len, it->data.s); LM_ERR("\truid: %.*s\n", it->ruid.len, it->ruid.s); - LM_ERR("\thashid: %u ts_init: %llu ts_answer: %llu\n", it->hashid, + LM_ERR("\thashid: %u ts_init: %" PRIu64 " ts_answer: %" PRIu64 "\n", it->hashid, (uint64_t)it->ts_init, (uint64_t)it->ts_answer); it = it->next; }

1 year, 6 months

Branching 5.7 on git repo for 5.7.x releases

by Daniel-Constantin Mierla

Hello, I am planning to split 5.7.x series on its own git branch 5.7 on Thursday, May 4, 2023. After that, master branch will be open for new features (to become part of 5.8 or what ever version will be decided to be next). Usually testing should continue for branch 5.7 for another 1-2 weeks, then, if no relevant road blockers pop up, we should release 5.7.0 as first stable version in the 5.7.x series. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - June 5-7, 2023 - www.kamailioworld.com

1 year, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2023