sr-dev December 2023

sr-dev@lists.kamailio.org

14 participants
237 discussions

git:master:14e763fd: github: [skip ci]: bump actions/stale from 8 to 9
by Victor Seva 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: 14e763fd15a846d4377214521cac06113ba6888d URL: https://github.com/kamailio/kamailio/commit/14e763fd15a846d4377214521cac061… Author: dependabot[bot] <49699333+dependabot[bot](a)users.noreply.github.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-12T00:24:42+01:00 github: [skip ci]: bump actions/stale from 8 to 9 Bumps [actions/stale](https://github.com/actions/stale) from 8 to 9. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/v8...v9) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support(a)github.com> --- Modified: .github/workflows/issue_management.yml --- Diff: https://github.com/kamailio/kamailio/commit/14e763fd15a846d4377214521cac061… Patch: https://github.com/kamailio/kamailio/commit/14e763fd15a846d4377214521cac061… --- diff --git a/.github/workflows/issue_management.yml b/.github/workflows/issue_management.yml index 0d0b2ef9aa5..ce4d061d033 100644 --- a/.github/workflows/issue_management.yml +++ b/.github/workflows/issue_management.yml @@ -11,7 +11,7 @@ jobs: stale: runs-on: ubuntu-latest steps: - - uses: actions/stale@v8 + - uses: actions/stale@v9 with: stale-issue-message: 'This issue is stale because it has been open 6 weeks with no activity. Remove stale label or comment or this will be closed in 2 weeks.' stale-pr-message: 'This PR is stale because it has been open 6 weeks with no activity. Remove stale label or comment or this will be closed in 2 weeks.'

1 0

git:master:ee2ad77a: modules: readme files regenerated - jsonrpcs ... [skip ci]
by Kamailio Dev 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: ee2ad77aa71326d355e299625ebbd31f67f8ed20 URL: https://github.com/kamailio/kamailio/commit/ee2ad77aa71326d355e299625ebbd31… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-12-11T17:17:05+01:00 modules: readme files regenerated - jsonrpcs ... [skip ci] --- Modified: src/modules/jsonrpcs/README --- Diff: https://github.com/kamailio/kamailio/commit/ee2ad77aa71326d355e299625ebbd31… Patch: https://github.com/kamailio/kamailio/commit/ee2ad77aa71326d355e299625ebbd31… --- diff --git a/src/modules/jsonrpcs/README b/src/modules/jsonrpcs/README index b1be2506b26..d4aa520a5ea 100644 --- a/src/modules/jsonrpcs/README +++ b/src/modules/jsonrpcs/README @@ -354,7 +354,7 @@ modparam("jsonrpcs", "dgram_timeout", 2000) Example 1.14. Set tcp_socket parameter ... -modparam("jsonrpcs", "tcp_socket", "udp:1.2.3.4:5042") +modparam("jsonrpcs", "tcp_socket", "tcp:1.2.3.4:5042") ... 5. Functions

1 0

git:master:af49deac: jsonrpcs: doc - fix example for tcp_socket parameter
by Daniel-Constantin Mierla 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: af49deacad22b9f2d6502649002d51ad2423f005 URL: https://github.com/kamailio/kamailio/commit/af49deacad22b9f2d6502649002d51a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-11T17:08:08+01:00 jsonrpcs: doc - fix example for tcp_socket parameter --- Modified: src/modules/jsonrpcs/doc/jsonrpcs_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/af49deacad22b9f2d6502649002d51a… Patch: https://github.com/kamailio/kamailio/commit/af49deacad22b9f2d6502649002d51a… --- diff --git a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml index 0e39676edd7..ab8aee4fcd0 100644 --- a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml +++ b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml @@ -413,7 +413,7 @@ modparam("jsonrpcs", "dgram_timeout", 2000) <title>Set <varname>tcp_socket</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("jsonrpcs", "tcp_socket", "udp:1.2.3.4:5042") +modparam("jsonrpcs", "tcp_socket", "tcp:1.2.3.4:5042") ... </programlisting> </example> @@ -638,4 +638,3 @@ rm /tmp/kamailio_jsonrpc_reply_fifo </section> </chapter> -

1 0

git:master:7eb96925: siptrace: check sscan() return value
by Daniel-Constantin Mierla 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: 7eb96925c4bb4664cce589050dff3e1c8b98b6f0 URL: https://github.com/kamailio/kamailio/commit/7eb96925c4bb4664cce589050dff3e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-11T15:51:01+01:00 siptrace: check sscan() return value --- Modified: src/modules/siptrace/siptrace_send.c --- Diff: https://github.com/kamailio/kamailio/commit/7eb96925c4bb4664cce589050dff3e1… Patch: https://github.com/kamailio/kamailio/commit/7eb96925c4bb4664cce589050dff3e1… --- diff --git a/src/modules/siptrace/siptrace_send.c b/src/modules/siptrace/siptrace_send.c index bac4ad04779..d8a5f974bb3 100644 --- a/src/modules/siptrace/siptrace_send.c +++ b/src/modules/siptrace/siptrace_send.c @@ -158,7 +158,8 @@ int sip_trace_xheaders_read(struct _siptrace_data *sto) char *searchend = NULL; char *eoh = NULL; char *xheaders = NULL; - long long unsigned int tv_sec, tv_usec; + long long unsigned int tv_sec = 0, tv_usec = 0; + int rv = 0; if(trace_xheaders_read == 0) { return 0; @@ -202,16 +203,17 @@ int sip_trace_xheaders_read(struct _siptrace_data *sto) } // Parse the x-headers: scanf() - if(sscanf(xheaders, - "\r\n" - "X-Siptrace-Fromip: %50s\r\n" - "X-Siptrace-Toip: %50s\r\n" - "X-Siptrace-Time: %llu %llu\r\n" - "X-Siptrace-Method: %50s\r\n" - "X-Siptrace-Dir: %3s", - sto->fromip.s, sto->toip.s, &tv_sec, &tv_usec, sto->method.s, - sto->dir) - == EOF) { + rv = sscanf(xheaders, + "\r\n" + "X-Siptrace-Fromip: %50s\r\n" + "X-Siptrace-Toip: %50s\r\n" + "X-Siptrace-Time: %llu %llu\r\n" + "X-Siptrace-Method: %50s\r\n" + "X-Siptrace-Dir: %3s", + sto->fromip.s, sto->toip.s, &tv_sec, &tv_usec, sto->method.s, + sto->dir); + + if(rv == EOF || rv < 6) { LM_ERR("malformed x-headers\n"); goto erroraftermalloc; }

1 0

git:master:1b7ea63d: core: main - check limit for values of -m and -M
by Daniel-Constantin Mierla 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: 1b7ea63df655246b5b6ca123d9ed25d1764d9402 URL: https://github.com/kamailio/kamailio/commit/1b7ea63df655246b5b6ca123d9ed25d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-11T15:37:26+01:00 core: main - check limit for values of -m and -M --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/1b7ea63df655246b5b6ca123d9ed25d… Patch: https://github.com/kamailio/kamailio/commit/1b7ea63df655246b5b6ca123d9ed25d… --- diff --git a/src/main.c b/src/main.c index db694381421..3aa79b73d91 100644 --- a/src/main.c +++ b/src/main.c @@ -2094,6 +2094,7 @@ int main(int argc, char **argv) struct name_lst *n_lst; char *p; struct stat st = {0}; + long l1 = 0; #define KSR_TBUF_SIZE 512 char tbuf[KSR_TBUF_SIZE]; @@ -2181,12 +2182,20 @@ int main(int argc, char **argv) fprintf(stderr, "bad private mem size\n"); goto error; } - pkg_mem_size = strtol(optarg, &tmp, 10) * 1024 * 1024; + l1 = strtol(optarg, &tmp, 10); if(tmp && (*tmp)) { fprintf(stderr, "bad private mem size number: -M %s\n", optarg); goto error; - }; + } + /* safety check for upper limit of 1TB */ + if(l1 <= 0 || l1 > 1024L * 1024) { + fprintf(stderr, + "our of limits private mem size number: -M %s\n", + optarg); + goto error; + } + pkg_mem_size = 1024UL * 1024 * l1; break; case 'x': sr_memmng_shm = optarg; @@ -2315,11 +2324,18 @@ int main(int argc, char **argv) fprintf(stderr, "bad shared mem size\n"); goto error; } - shm_mem_size = strtol(optarg, &tmp, 10) * 1024 * 1024; + l1 = strtol(optarg, &tmp, 10); if(tmp && (*tmp)) { fprintf(stderr, "bad shmem size number: -m %s\n", optarg); goto error; - }; + } + /* safety check for upper limit of 16TB */ + if(l1 <= 0 || l1 > 16L * 1024 * 1024) { + fprintf(stderr, "our of limits shmem size number: -m %s\n", + optarg); + goto error; + } + shm_mem_size = 1024UL * 1024 * l1; LM_INFO("shared memory: %ld bytes\n", shm_mem_size); break; case 'd':

1 0

git:master:75a7d0d8: core: route struct - use helper macro to get action address
by Daniel-Constantin Mierla 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: 75a7d0d8b1340d292aba9b589263619f5a6e11c1 URL: https://github.com/kamailio/kamailio/commit/75a7d0d8b1340d292aba9b589263619… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-11T14:19:04+01:00 core: route struct - use helper macro to get action address --- Modified: src/core/route_struct.c --- Diff: https://github.com/kamailio/kamailio/commit/75a7d0d8b1340d292aba9b589263619… Patch: https://github.com/kamailio/kamailio/commit/75a7d0d8b1340d292aba9b589263619… --- diff --git a/src/core/route_struct.c b/src/core/route_struct.c index 654e588beb3..fa43b498e75 100644 --- a/src/core/route_struct.c +++ b/src/core/route_struct.c @@ -561,11 +561,12 @@ void print_actions(struct action *a) */ struct action *get_action_from_param(void **param, int param_no) { - struct action *ac, ac2; - action_u_t *au, au2; + cfg_action_t *ac; + action_u_t *au; /* param points to au->u.string, get pointer to au */ - au = (void *)((char *)param - ((char *)&au2.u.string - (char *)&au2)); + au = ksr_container_of(param, action_u_t, u.string); au = au - 1 - param_no; - ac = (void *)((char *)au - ((char *)&ac2.val - (char *)&ac2)); + /* au points to ac->val, get pointer to ac */ + ac = ksr_container_of(au, cfg_action_t, val); return ac; }

1 0

git:master:9c336764: core: cast to variable type action_u_t*
by Daniel-Constantin Mierla 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: 9c336764f567c873e25792efd813be1806d215d3 URL: https://github.com/kamailio/kamailio/commit/9c336764f567c873e25792efd813be1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-11T13:01:18+01:00 core: cast to variable type action_u_t* --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/9c336764f567c873e25792efd813be1… Patch: https://github.com/kamailio/kamailio/commit/9c336764f567c873e25792efd813be1… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 9660afce320..d67e7e44af3 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -1092,7 +1092,7 @@ action_u_t *fixup_get_param( { action_u_t *a; /* cur_param points to a->u.string, get pointer to a */ - a = (void *)((char *)cur_param - offsetof(action_u_t, u.string)); + a = (action_u_t *)((char *)cur_param - offsetof(action_u_t, u.string)); return a + required_param_no - cur_param_no; } @@ -1114,7 +1114,7 @@ int fixup_get_param_count(void **cur_param, int cur_param_no) action_param_type *fixup_get_param_ptype(void **param) { action_u_t *a; - a = (void *)((char *)param - offsetof(action_u_t, u.string)); + a = (action_u_t *)((char *)param - offsetof(action_u_t, u.string)); return &a->type; }

1 0

git:master:6aa967eb: debugger: updated dbg_fixup_get_action() to use helper macro for structure address
by Daniel-Constantin Mierla 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: 6aa967eb82fa9092f0a32101e44798e4d66fc708 URL: https://github.com/kamailio/kamailio/commit/6aa967eb82fa9092f0a32101e44798e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-11T12:54:25+01:00 debugger: updated dbg_fixup_get_action() to use helper macro for structure address --- Modified: src/modules/debugger/debugger_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6aa967eb82fa9092f0a32101e44798e… Patch: https://github.com/kamailio/kamailio/commit/6aa967eb82fa9092f0a32101e44798e… --- diff --git a/src/modules/debugger/debugger_mod.c b/src/modules/debugger/debugger_mod.c index 3b3b7922dd2..b6248644d65 100644 --- a/src/modules/debugger/debugger_mod.c +++ b/src/modules/debugger/debugger_mod.c @@ -320,12 +320,13 @@ static int w_dbg_dump(struct sip_msg *msg, char *mask, char *level) */ static struct action *dbg_fixup_get_action(void **param, int param_no) { - struct action *ac, ac2; - action_u_t *au, au2; + cfg_action_t *ac; + action_u_t *au; /* param points to au->u.string, get pointer to au */ - au = (void *)((char *)param - ((char *)&au2.u.string - (char *)&au2)); + au = ksr_container_of(param, action_u_t, u.string); au = au - 1 - param_no; - ac = (void *)((char *)au - ((char *)&ac2.val - (char *)&ac2)); + /* au points to ac->val, get pointer to ac */ + ac = ksr_container_of(au, cfg_action_t, val); return ac; }

1 0

git:master:1b81cbc9: tm: use helper macro to get structure address from member
by Daniel-Constantin Mierla 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: 1b81cbc9f79354aae604e33ac978dece95c0326c URL: https://github.com/kamailio/kamailio/commit/1b81cbc9f79354aae604e33ac978dec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-11T12:25:56+01:00 tm: use helper macro to get structure address from member --- Modified: src/modules/tm/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/1b81cbc9f79354aae604e33ac978dec… Patch: https://github.com/kamailio/kamailio/commit/1b81cbc9f79354aae604e33ac978dec… --- diff --git a/src/modules/tm/timer.c b/src/modules/tm/timer.c index a2ebb434ccb..c0cbade59d6 100644 --- a/src/modules/tm/timer.c +++ b/src/modules/tm/timer.c @@ -486,8 +486,8 @@ ticks_t retr_buf_handler(ticks_t ticks, struct timer_ln *tl, void *p) unsigned long crt_retr_interval_ms; struct cell *t; - rbuf = (struct retr_buf *)((void *)tl - - (void *)(&((struct retr_buf *)0)->timer)); + rbuf = ksr_container_of(tl, struct retr_buf, timer); + membar_depends(); /* to be on the safe side */ t = rbuf->my_T;

1 0

git:master:ad2e976d: core: helper macro to get enclosing struture from a member address
by Daniel-Constantin Mierla 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: ad2e976d9200bd68c88e4a78edc0d250ba4045ba URL: https://github.com/kamailio/kamailio/commit/ad2e976d9200bd68c88e4a78edc0d25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-11T11:31:56+01:00 core: helper macro to get enclosing struture from a member address --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/ad2e976d9200bd68c88e4a78edc0d25… Patch: https://github.com/kamailio/kamailio/commit/ad2e976d9200bd68c88e4a78edc0d25… --- diff --git a/src/core/ut.h b/src/core/ut.h index 8e2e4f0d8f0..ff8d964e559 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -33,6 +33,7 @@ #include <limits.h> #include <time.h> #include <unistd.h> +#include <stddef.h> #include <ctype.h> #include <string.h> #include <strings.h> @@ -143,6 +144,8 @@ #define is_in_str(p, in) (p < in->s + in->len && *p) +#define ksr_container_of(ptr, type, member) \ + ((type *)((char *)(ptr)-offsetof(type, member))) /* links a value to a msgid */ struct msgid_var

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2023