sr-dev December 2023

sr-dev@lists.kamailio.org

14 participants
234 discussions

git:master:7eb96925: siptrace: check sscan() return value

by Daniel-Constantin Mierla

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 year

git:master:1b7ea63d: core: main - check limit for values of -m and -M

by Daniel-Constantin Mierla

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 year

git:master:75a7d0d8: core: route struct - use helper macro to get action address

by Daniel-Constantin Mierla

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 year

git:master:9c336764: core: cast to variable type action_u_t*

by Daniel-Constantin Mierla

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 year

git:master:6aa967eb: debugger: updated dbg_fixup_get_action() to use helper macro for structure address

by Daniel-Constantin Mierla

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 year

git:master:1b81cbc9: tm: use helper macro to get structure address from member

by Daniel-Constantin Mierla

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 year

git:master:ad2e976d: core: helper macro to get enclosing struture from a member address

by Daniel-Constantin Mierla

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 year

git:master:9db18bc4: dialog: check first the size

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9db18bc48bff0d230e66973a45c8e72e1b7744e8 URL: https://github.com/kamailio/kamailio/commit/9db18bc48bff0d230e66973a45c8e72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-11T10:07:39+01:00 dialog: check first the size --- Modified: src/modules/dialog/dlg_var.c --- Diff: https://github.com/kamailio/kamailio/commit/9db18bc48bff0d230e66973a45c8e72… Patch: https://github.com/kamailio/kamailio/commit/9db18bc48bff0d230e66973a45c8e72… --- diff --git a/src/modules/dialog/dlg_var.c b/src/modules/dialog/dlg_var.c index 10df9e90c3e..db5f61c4e05 100644 --- a/src/modules/dialog/dlg_var.c +++ b/src/modules/dialog/dlg_var.c @@ -667,8 +667,8 @@ int pv_set_dlg_ctx( break; case 4: if(val && val->flags & PV_VAL_STR) { - if(val->rs.s[val->rs.len] == '\0' - && val->rs.len < DLG_TOROUTE_SIZE) { + if(val->rs.len < DLG_TOROUTE_SIZE + && val->rs.s[val->rs.len] == '\0') { _dlg_ctx.to_route = route_lookup(&main_rt, val->rs.s); strcpy(_dlg_ctx.to_route_name, val->rs.s); } else {

1 year

git:master:e614575d: sca: check return for snprintf()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e614575d53f5e3b7d3a4796a445728f862e60916 URL: https://github.com/kamailio/kamailio/commit/e614575d53f5e3b7d3a4796a445728f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-11T09:53:48+01:00 sca: check return for snprintf() --- Modified: src/modules/sca/sca_call_info.c --- Diff: https://github.com/kamailio/kamailio/commit/e614575d53f5e3b7d3a4796a445728f… Patch: https://github.com/kamailio/kamailio/commit/e614575d53f5e3b7d3a4796a445728f… --- diff --git a/src/modules/sca/sca_call_info.c b/src/modules/sca/sca_call_info.c index a1af143c017..2694239cb9f 100644 --- a/src/modules/sca/sca_call_info.c +++ b/src/modules/sca/sca_call_info.c @@ -112,6 +112,7 @@ static int sca_call_info_header_append_appearances( str state_str; int slot_idx; int len = -1; + int l1 = -1; int usedlen = -1; slot_idx = @@ -153,9 +154,14 @@ static int sca_call_info_header_append_appearances( sca_appearance_state_to_str(app->state, &state_str); // state_str.s is a nul-terminated string literal - len += snprintf(hdrbuf + len, maxlen - len, + l1 = snprintf(hdrbuf + len, maxlen - len, ">;appearance-index=%d;appearance-state=%s", app->index, state_str.s); + if(l1 < 0 || l1 >= maxlen - len) { + LM_ERR("failed to print the header\n"); + return -1; + } + len += l1; if(!SCA_STR_EMPTY(&app->uri)) { hdrbuf[len] = ';';

1 year

[kamailio/kamailio] Add support for Linux kernel anyIP feature (Issue #3394)

by mohsen

Hi I have a kimailio box that receives messages from one interface and send it from another interface and I use dispatcher module successfully. Now I assigned an I range to Linux loopback interface through Linux kernel anyip feature. And I can ping the range. ip -4 route add local 192.168.0.0/24 dev lo I want to send messages from source of the ip in this range but kamailio cant do this in the right way. I added this two directives to kamailio.cfg: mhomed=yes ip_free_bind = 1 and when I want to use an ip from the list I use $fs=”udp:192.168.0.120:5060”; With no luck If I use force_send_socket(udp:192.168.0.120:5060); kamailio returns an error bad force_send_socket argument: 192.168.0.120:5060 (kamailio doesn't listen on it) and if I add listen directive for one ip like: listen=udp:192.168.0.120:5060 everything works fine but I want to be able to use any ip from list not just one ip. Thanks. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3394 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3394(a)github.com>

1 year

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2023