sr-dev July 2024

sr-dev@lists.kamailio.org

16 participants
212 discussions

git:master:214eaaa5: rtpengine: check fd before closing
by Daniel-Constantin Mierla 12 Jul '24

12 Jul '24

Module: kamailio Branch: master Commit: 214eaaa5b7a0308fd7384a41e97b1204d71c93de URL: https://github.com/kamailio/kamailio/commit/214eaaa5b7a0308fd7384a41e97b120… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-12T09:45:53+02:00 rtpengine: check fd before closing --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/214eaaa5b7a0308fd7384a41e97b120… Patch: https://github.com/kamailio/kamailio/commit/214eaaa5b7a0308fd7384a41e97b120… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 7b97a2ae1ee..8a2f6a08e8f 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3770,7 +3770,8 @@ static char *send_rtpp_command( return cp; badproxy: - close(fd); + if(fd >= 0) + close(fd); return NULL; }

1 0

git:master:87e1a4a7: stun: check message len for response
by Daniel-Constantin Mierla 12 Jul '24

12 Jul '24

Module: kamailio Branch: master Commit: 87e1a4a7f5d565a59a362f22e9372697f2f2f2af URL: https://github.com/kamailio/kamailio/commit/87e1a4a7f5d565a59a362f22e937269… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-12T08:06:36+02:00 stun: check message len for response --- Modified: src/modules/stun/kam_stun.c --- Diff: https://github.com/kamailio/kamailio/commit/87e1a4a7f5d565a59a362f22e937269… Patch: https://github.com/kamailio/kamailio/commit/87e1a4a7f5d565a59a362f22e937269… --- diff --git a/src/modules/stun/kam_stun.c b/src/modules/stun/kam_stun.c index b3c1e7877d3..3ad42ff1636 100644 --- a/src/modules/stun/kam_stun.c +++ b/src/modules/stun/kam_stun.c @@ -512,6 +512,10 @@ static int stun_create_response(struct stun_msg *req, struct stun_msg *res, } } + if(res->msg.buf.len < sizeof(struct stun_hdr)) { + LM_ERR("invalid message\n"); + return FATAL_ERROR; + } res->hdr.len = htons(res->msg.buf.len - sizeof(struct stun_hdr)); memcpy(&res->msg.buf.s[sizeof(USHORT_T)], (void *)&res->hdr.len, sizeof(USHORT_T));

1 0

git:master:1e1ad4e7: sdpops: proper detect CR or LF
by Daniel-Constantin Mierla 12 Jul '24

12 Jul '24

Module: kamailio Branch: master Commit: 1e1ad4e74822881bb4d9cc2e9bd0f53e845bb48b URL: https://github.com/kamailio/kamailio/commit/1e1ad4e74822881bb4d9cc2e9bd0f53… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-12T08:01:37+02:00 sdpops: proper detect CR or LF --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1e1ad4e74822881bb4d9cc2e9bd0f53… Patch: https://github.com/kamailio/kamailio/commit/1e1ad4e74822881bb4d9cc2e9bd0f53… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index f40062420a7..fb9abde6be5 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -2075,7 +2075,7 @@ int sdpops_attr_val(str *payload, str *attr, str *val) /* find EoL or EoData */ eline = sline; while(eline < payload->s + payload->len) { - if(*eline == '\r' || *eline == '\r') { + if(*eline == '\r' || *eline == '\n') { break; } eline++;

1 0

[kamailio/kamailio] ims_registrar_scscf: cannot build on Fedora 40 (Issue #3855)
by sergey-safarov 12 Jul '24

12 Jul '24

### Description "ims_registrar_scscf" cannot be compiled on Fedora 40 dist. ``` CC (gcc) [M ims_registrar_scscf.so] reply.o CC (gcc) [M ims_registrar_scscf.so] rerrno.o CC (gcc) [M ims_registrar_scscf.so] save.o CC (gcc) [M ims_registrar_scscf.so] server_assignment.o CC (gcc) [M ims_registrar_scscf.so] sip_msg.o CC (gcc) [M ims_registrar_scscf.so] stats.o CC (gcc) [M ims_registrar_scscf.so] userdata_parser.o userdata_parser.c: In function ‘ifc_tDefaultHandling2char’: userdata_parser.c:126:13: error: implicit declaration of function ‘strtol’; did you mean ‘strtok’? [-Wimplicit-function-declaration] 126 | r = strtol((char *)x, (char **)NULL, 10); | ^~~~~~ | strtok userdata_parser.c: In function ‘parse_spt_extension’: userdata_parser.c:411:32: error: implicit declaration of function ‘atoi’ [-Wimplicit-function-declaration] 411 | switch(atoi((char *)x)) { | ^~~~ make[2]: *** [../../Makefile.rules:100: userdata_parser.o] Error 1 make[1]: *** [Makefile:508: modules] Error 1 make[1]: Leaving directory '/root/rpmbuild/BUILD/kamailio-5.8.1/src' make: *** [Makefile:34: every-module] Error 2 error: Bad exit status from /var/tmp/rpm-tmp.tyeQgK (%build) RPM build errors: Bad exit status from /var/tmp/rpm-tmp.tyeQgK (%build) ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` used modified 5.8.1 version ``` * **Operating System**: ``` [root@sbc-stage-a0 SPECS]# cat /etc/os-release NAME="Fedora Linux" VERSION="40 (Container Image)" ID=fedora VERSION_ID=40 VERSION_CODENAME="" PLATFORM_ID="platform:f40" PRETTY_NAME="Fedora Linux 40 (Container Image)" ANSI_COLOR="0;38;2;60;110;180" LOGO=fedora-logo-icon CPE_NAME="cpe:/o:fedoraproject:fedora:40" DEFAULT_HOSTNAME="fedora" HOME_URL="https://fedoraproject.org/" DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora/f40/system-administrators-guide/" SUPPORT_URL="https://ask.fedoraproject.org/" BUG_REPORT_URL="https://bugzilla.redhat.com/" REDHAT_BUGZILLA_PRODUCT="Fedora" REDHAT_BUGZILLA_PRODUCT_VERSION=40 REDHAT_SUPPORT_PRODUCT="Fedora" REDHAT_SUPPORT_PRODUCT_VERSION=40 SUPPORT_END=2025-05-13 VARIANT="Container Image" VARIANT_ID=container ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3855 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3855(a)github.com>

2 3

[kamailio/kamailio] extented haproxy protocol support (PR #3731)
by sergey-safarov 12 Jul '24

12 Jul '24

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] 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 #3667 #### Description Allow creating Record-Route and Via header using destination address and port in the haproxy protocol header. PR created behalf @ivanuschak You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3731 -- Commit Summary -- * core: extented haproxy protocol parser * rr: extented haproxy protocol suppport * path: extented haproxy protocol suppport * websocket: extented haproxy protocol suppport * siptrace: extented haproxy protocol suppport -- File Changes -- M src/core/forward.h (4) M src/core/msg_translator.c (137) M src/core/parser/msg_parser.h (1) M src/core/receive.c (6) M src/core/receive.h (3) M src/core/tcp_conn.h (1) M src/core/tcp_main.c (22) M src/core/tcp_read.c (20) M src/modules/path/path.c (2) M src/modules/rr/loose.c (4) M src/modules/rr/record.c (6) M src/modules/siptrace/siptrace.c (89) M src/modules/websocket/ws_frame.c (9) M src/modules/websocket/ws_handshake.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3731.patch https://github.com/kamailio/kamailio/pull/3731.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3731 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3731(a)github.com>

6 22

git:master:1c2b3361: tmx: t_precheck_trans() - explicit catch of internal return 0
by Daniel-Constantin Mierla 11 Jul '24

11 Jul '24

Module: kamailio Branch: master Commit: 1c2b33615888dede0ea8abc098f6f910f810366b URL: https://github.com/kamailio/kamailio/commit/1c2b33615888dede0ea8abc098f6f91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-11T21:30:33+02:00 tmx: t_precheck_trans() - explicit catch of internal return 0 --- Modified: src/modules/tmx/tmx_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1c2b33615888dede0ea8abc098f6f91… Patch: https://github.com/kamailio/kamailio/commit/1c2b33615888dede0ea8abc098f6f91… --- diff --git a/src/modules/tmx/tmx_mod.c b/src/modules/tmx/tmx_mod.c index 68b1e418c66..2e46c82a99a 100644 --- a/src/modules/tmx/tmx_mod.c +++ b/src/modules/tmx/tmx_mod.c @@ -921,7 +921,7 @@ static int t_precheck_trans(sip_msg_t *msg) ret = tmx_check_pretran(msg); if(ret > 0) return 1; - return (ret - 1); + return (ret == 0) ? -1 : ret; } /**

1 0

git:master:e2193b9c: htable: do not print item name before is computed
by Daniel-Constantin Mierla 11 Jul '24

11 Jul '24

Module: kamailio Branch: master Commit: e2193b9cd7f59377c54e0424c0d4a1628a5a60de URL: https://github.com/kamailio/kamailio/commit/e2193b9cd7f59377c54e0424c0d4a16… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-11T19:38:24+02:00 htable: do not print item name before is computed --- Modified: src/modules/htable/ht_var.c --- Diff: https://github.com/kamailio/kamailio/commit/e2193b9cd7f59377c54e0424c0d4a16… Patch: https://github.com/kamailio/kamailio/commit/e2193b9cd7f59377c54e0424c0d4a16… --- diff --git a/src/modules/htable/ht_var.c b/src/modules/htable/ht_var.c index e79c7869ee5..4d7707f958b 100644 --- a/src/modules/htable/ht_var.c +++ b/src/modules/htable/ht_var.c @@ -38,8 +38,8 @@ int pv_get_ht_cell(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) if(hpv->ht == NULL) { hpv->ht = ht_get_table(&hpv->htname); if(hpv->ht == NULL) { - LM_ERR("htable not found for getting $sht(%.*s=>%.*s)\n", - hpv->htname.len, hpv->htname.s, htname.len, htname.s); + LM_ERR("htable not found for getting $sht(%.*s=>...)\n", + hpv->htname.len, hpv->htname.s); return pv_get_null(msg, param, res); } } @@ -77,8 +77,8 @@ int pv_set_ht_cell( if(hpv->ht == NULL) hpv->ht = ht_get_table(&hpv->htname); if(hpv->ht == NULL) { - LM_ERR("htable not found for setting $sht(%.*s=>%.*s)\n", - hpv->htname.len, hpv->htname.s, htname.len, htname.s); + LM_ERR("htable not found for setting $sht(%.*s=>...)\n", + hpv->htname.len, hpv->htname.s); return -1; }

1 0

git:master:0a9cb4bf: htable: updated duplicated rm op id
by Daniel-Constantin Mierla 11 Jul '24

11 Jul '24

Module: kamailio Branch: master Commit: 0a9cb4bf74bf11af88e93c1512053008d94aff13 URL: https://github.com/kamailio/kamailio/commit/0a9cb4bf74bf11af88e93c151205300… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-11T19:31:23+02:00 htable: updated duplicated rm op id --- Modified: src/modules/htable/ht_api.h --- Diff: https://github.com/kamailio/kamailio/commit/0a9cb4bf74bf11af88e93c151205300… Patch: https://github.com/kamailio/kamailio/commit/0a9cb4bf74bf11af88e93c151205300… --- diff --git a/src/modules/htable/ht_api.h b/src/modules/htable/ht_api.h index f7bd8ed42c0..5ac11b9bb00 100644 --- a/src/modules/htable/ht_api.h +++ b/src/modules/htable/ht_api.h @@ -124,9 +124,9 @@ int ht_reset_content(ht_t *ht); #define HT_RM_OP_EQ 1 #define HT_RM_OP_NE 2 #define HT_RM_OP_SW 3 -#define HT_RM_OP_EW 3 -#define HT_RM_OP_RE 4 -#define HT_RM_OP_IN 5 +#define HT_RM_OP_EW 4 +#define HT_RM_OP_RE 5 +#define HT_RM_OP_IN 6 int ht_rm_cell_op(str *sre, ht_t *ht, int mode, int op); int ht_match_cell_op_str(str *sre, ht_t *ht, int mode, int op);

1 0

git:master:fffe7aae: core: counters - declare global cnts_no as unsigned short
by Daniel-Constantin Mierla 11 Jul '24

11 Jul '24

Module: kamailio Branch: master Commit: fffe7aaecc41b8986eae342ce693bde87cdc20bc URL: https://github.com/kamailio/kamailio/commit/fffe7aaecc41b8986eae342ce693bde… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-11T15:50:48+02:00 core: counters - declare global cnts_no as unsigned short - it is used for counters h.id which is unsigned short --- Modified: src/core/counters.c --- Diff: https://github.com/kamailio/kamailio/commit/fffe7aaecc41b8986eae342ce693bde… Patch: https://github.com/kamailio/kamailio/commit/fffe7aaecc41b8986eae342ce693bde… --- diff --git a/src/core/counters.c b/src/core/counters.c index 5d9f26e5bce..dcf7ab7895e 100644 --- a/src/core/counters.c +++ b/src/core/counters.c @@ -83,9 +83,9 @@ static int grp_no = 0; /* number of groups */ /** counters array. a[proc_no][counter_id] => _cnst_vals[proc_no*cnts_no+counter_id] */ counter_array_t *_cnts_vals = 0; -int _cnts_row_len = 0; /* number of elements per row */ -static int cnts_no = 0; /* number of registered counters */ -static int cnts_max_rows = 0; /* set to 0 if not yet fully init */ +int _cnts_row_len = 0; /* number of elements per row */ +static unsigned short cnts_no = 0; /* number of registered counters */ +static int cnts_max_rows = 0; /* set to 0 if not yet fully init */ char *ksr_stats_namesep = KSR_STATS_NAMESEP;

1 0

git:master:d7466474: core: counters - init local global variables
by Daniel-Constantin Mierla 11 Jul '24

11 Jul '24

Module: kamailio Branch: master Commit: d7466474bdc86b2b0d0872c5fd41d743ec1c7d66 URL: https://github.com/kamailio/kamailio/commit/d7466474bdc86b2b0d0872c5fd41d74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-11T15:44:07+02:00 core: counters - init local global variables --- Modified: src/core/counters.c --- Diff: https://github.com/kamailio/kamailio/commit/d7466474bdc86b2b0d0872c5fd41d74… Patch: https://github.com/kamailio/kamailio/commit/d7466474bdc86b2b0d0872c5fd41d74… --- diff --git a/src/core/counters.c b/src/core/counters.c index 1a7d6637c17..5d9f26e5bce 100644 --- a/src/core/counters.c +++ b/src/core/counters.c @@ -70,22 +70,22 @@ struct grp_record /** hash table mapping a counter name to an id */ static struct str_hash_table cnts_hash_table; /** array mapping id 2 record */ -struct counter_record **cnt_id2record; -static int cnt_id2record_size; +struct counter_record **cnt_id2record = NULL; +static int cnt_id2record_size = 0; /** hash table for groups (maps a group name to a counter list) */ static struct str_hash_table grp_hash_table; /** array of groups, sorted */ -static struct grp_record **grp_sorted; -static int grp_sorted_max_size; -static int grp_sorted_crt_size; -static int grp_no; /* number of groups */ +static struct grp_record **grp_sorted = NULL; +static int grp_sorted_max_size = 0; +static int grp_sorted_crt_size = 0; +static int grp_no = 0; /* number of groups */ /** counters array. a[proc_no][counter_id] => _cnst_vals[proc_no*cnts_no+counter_id] */ counter_array_t *_cnts_vals = 0; -int _cnts_row_len; /* number of elements per row */ -static int cnts_no; /* number of registered counters */ -static int cnts_max_rows; /* set to 0 if not yet fully init */ +int _cnts_row_len = 0; /* number of elements per row */ +static int cnts_no = 0; /* number of registered counters */ +static int cnts_max_rows = 0; /* set to 0 if not yet fully init */ char *ksr_stats_namesep = KSR_STATS_NAMESEP;

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
22
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2024