sr-dev

sr-dev@lists.kamailio.org

15 participants
45351 discussions

git:master:03c93484: app_jsdt: initialize allocated buffer
by Daniel-Constantin Mierla 08 May '25

08 May '25

Module: kamailio Branch: master Commit: 03c93484901928700d282a1684e4b6e4eaeed6c4 URL: https://github.com/kamailio/kamailio/commit/03c93484901928700d282a1684e4b6e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-05-08T09:59:25+02:00 app_jsdt: initialize allocated buffer --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/03c93484901928700d282a1684e4b6e… Patch: https://github.com/kamailio/kamailio/commit/03c93484901928700d282a1684e4b6e… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index b11d66aa519..93383860379 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -496,6 +496,7 @@ static int jsdt_load_dir(duk_context *ctx, const char *path) full_buffer = (char *)malloc(size_to_allocate); if(full_buffer) { + memset(full_buffer, 0, size_to_allocate); buf = full_buffer; allocated_len = size_to_allocate; }

1 0

[kamailio/kamailio] rtpengine: improve compatibility of rtpengine per call leg stats parsing (PR #4233)
by tsearle 08 May '25

08 May '25

#### Pre-Submission Checklist    - [*] Commit message has the format required by CONTRIBUTING guide - [*] Commits are split per component (core, individual modules, libs, utils, ...) - [*] Each component has a single commit (if not, squash them into one commit) - [*] 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) - [ ] 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 - [*] Tested changes locally - [*] Related to issue #4232 #### Description not all versions of rtpengine sends a key SSRC per stream. For those that do not the same information can be found in ingress SSRCs. Add logic to check for the SSRC value there if the SSRC key is not present. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4233 -- Commit Summary -- * rtpengine: improve compatibility of rtpengine per call leg stats parsing -- File Changes -- M src/modules/rtpengine/rtpengine.c (19) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4233.patch https://github.com/kamailio/kamailio/pull/4233.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4233 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4233(a)github.com>

3 8

git:5.8:9fb936b7: rtpengine: improve compatibility of rtpengine per call leg stats parsing
by Torrey Searle 07 May '25

07 May '25

Module: kamailio Branch: 5.8 Commit: 9fb936b75dd7a06ac8b9a012b03b7c85ca7884ab URL: https://github.com/kamailio/kamailio/commit/9fb936b75dd7a06ac8b9a012b03b7c8… Author: Torrey Searle <torrey.searle(a)wavecrest.com> Committer: Torrey Searle <torrey.searle(a)wavecrest.com> Date: 2025-05-07T16:41:50+02:00 rtpengine: improve compatibility of rtpengine per call leg stats parsing not all versions of rtpengine sends a key SSRC per stream. For those that do not the same information can be found in ingress SSRCs. Add logic to check for the SSRC value there if the SSRC key is not present. (cherry picked from commit 992ee3df02148a940c255b8be7eb9d8e63465834) (cherry picked from commit e3b1220b375b48f16ae361cfe592e8c1bd8e7649) --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/9fb936b75dd7a06ac8b9a012b03b7c8… Patch: https://github.com/kamailio/kamailio/commit/9fb936b75dd7a06ac8b9a012b03b7c8… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 561384df566..81456c4faea 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -4052,7 +4052,8 @@ static void parse_call_stats_1(struct minmax_mos_label_stats *mmls, long long ssrc; char *endp; bencode_item_t *ssrc_list, *ssrc_key, *ssrc_dict, *tags, *tag_key, - *tag_dict, *medias, *media, *streams, *stream; + *tag_dict, *medias, *media, *streams, *stream, *ingress_ssrcs, + *ingress_ssrc; struct minmax_stats_vals min_vals = {.mos = 100}, max_vals = {.mos = -1}, average_vals = {.avg_samples = 0}, vals_decoded; @@ -4107,9 +4108,21 @@ static void parse_call_stats_1(struct minmax_mos_label_stats *mmls, (char *)stream->child->iov[1].iov_base); LM_DBG("rtpengine: XXX stream child val type %i\n", stream->child->sibling->type); - if((ssrc = bencode_dictionary_get_integer(stream, "SSRC", -1)) - == -1) - continue; + ssrc = bencode_dictionary_get_integer(stream, "SSRC", -1); + if(ssrc == -1) { + ingress_ssrcs = bencode_dictionary_get_expect( + stream, "ingress SSRCs", BENCODE_LIST); + if(!ingress_ssrcs || !ingress_ssrcs->child) + continue; + LM_DBG("rtpengine: XXX got ingress SSRCs\n"); + ingress_ssrc = ingress_ssrcs->child; + if((ssrc = bencode_dictionary_get_integer( + ingress_ssrc, "SSRC", -1)) + == -1) { + continue; + } + } + /* got a valid SSRC to watch for */ ssrcs[num_ssrcs] = ssrc; LM_DBG("rtpengine: found SSRC '%lli' for label '%.*s'\n", ssrc,

1 0

git:6.0:e3b1220b: rtpengine: improve compatibility of rtpengine per call leg stats parsing
by Torrey Searle 07 May '25

07 May '25

Module: kamailio Branch: 6.0 Commit: e3b1220b375b48f16ae361cfe592e8c1bd8e7649 URL: https://github.com/kamailio/kamailio/commit/e3b1220b375b48f16ae361cfe592e8c… Author: Torrey Searle <torrey.searle(a)wavecrest.com> Committer: Torrey Searle <torrey.searle(a)wavecrest.com> Date: 2025-05-07T16:40:06+02:00 rtpengine: improve compatibility of rtpengine per call leg stats parsing not all versions of rtpengine sends a key SSRC per stream. For those that do not the same information can be found in ingress SSRCs. Add logic to check for the SSRC value there if the SSRC key is not present. (cherry picked from commit 992ee3df02148a940c255b8be7eb9d8e63465834) --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/e3b1220b375b48f16ae361cfe592e8c… Patch: https://github.com/kamailio/kamailio/commit/e3b1220b375b48f16ae361cfe592e8c… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 49c942627cd..2401ad09cbd 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -4490,7 +4490,8 @@ static void parse_call_stats_1(struct minmax_mos_label_stats *mmls, long long ssrc; char *endp; bencode_item_t *ssrc_list, *ssrc_key, *ssrc_dict, *tags, *tag_key, - *tag_dict, *medias, *media, *streams, *stream; + *tag_dict, *medias, *media, *streams, *stream, *ingress_ssrcs, + *ingress_ssrc; struct minmax_stats_vals min_vals = {.mos = 100}, max_vals = {.mos = -1}, average_vals = {.avg_samples = 0}, vals_decoded; @@ -4545,9 +4546,21 @@ static void parse_call_stats_1(struct minmax_mos_label_stats *mmls, (char *)stream->child->iov[1].iov_base); LM_DBG("rtpengine: XXX stream child val type %i\n", stream->child->sibling->type); - if((ssrc = bencode_dictionary_get_integer(stream, "SSRC", -1)) - == -1) - continue; + ssrc = bencode_dictionary_get_integer(stream, "SSRC", -1); + if(ssrc == -1) { + ingress_ssrcs = bencode_dictionary_get_expect( + stream, "ingress SSRCs", BENCODE_LIST); + if(!ingress_ssrcs || !ingress_ssrcs->child) + continue; + LM_DBG("rtpengine: XXX got ingress SSRCs\n"); + ingress_ssrc = ingress_ssrcs->child; + if((ssrc = bencode_dictionary_get_integer( + ingress_ssrc, "SSRC", -1)) + == -1) { + continue; + } + } + /* got a valid SSRC to watch for */ ssrcs[num_ssrcs] = ssrc; LM_DBG("rtpengine: found SSRC '%lli' for label '%.*s'\n", ssrc,

1 0

[kamailio/kamailio] rtpengine: improve compatibility of per-leg statistics parsing (Issue #4232)
by tsearle 07 May '25

07 May '25

tsearle created an issue (kamailio/kamailio#4232) ### Description For getting A and B leg QoS stats, Kamailio expects there to be a SSRC key inside the Stream object. However some versions of rtpengine (tested with mr13.3.1.1) do not send this key. Looking at the master version of rtpengine, I see this key has been added to correspond to ingress SSRCs[0]. This patch adds a checking ingress SSRCs[0] as a fallback if SSRC ### Troubleshooting #### Reproduction use kamailio 6.0.1 and rtpengine mr13.3.1.1 using baresip as the calling and called party the following in the kamailio.cfg ``` modparam("rtpengine", "mos_A_label_pv", "$avp(mos_A_label)") #The name of a pseudovariable to hold the minimum encountered MOS value for the call. The value typically has a range of 1.0 through 5.0. modparam("rtpengine", "mos_min_A_pv", "$avp(mos_min_mos_A)") #The name of a pseudovariable to hold the amount of packetloss in percent at the time the minimum MOS value was encountered; modparam("rtpengine", "mos_min_packetloss_A_pv", "$avp(mos_min_packetloss_A)") #The name of a pseudovariable to hold the amount of jitter in milliseconds at the time the minimum MOS value was encountered; modparam("rtpengine", "mos_min_jitter_A_pv", "$avp(mos_min_jitter_A)") #The name of a pseudovariable to hold the packet round-trip time in microseconds at the time the minimum MOS value was encountered; modparam("rtpengine", "mos_min_roundtrip_A_pv", "$avp(mos_min_roundtrip_A)") #The name of a pseudovariable to hold the maximum encountered MOS value for the call. The value typically has a range of 1.0 through 5.0. modparam("rtpengine", "mos_max_A_pv", "$avp(mos_max_mos_A)") #The name of a pseudovariable to hold the amount of packetloss in percent at the time the maximum MOS value was encountered; modparam("rtpengine", "mos_max_packetloss_A_pv", "$avp(mos_max_packetloss_A)") #The name of a pseudovariable to hold the amount of jitter in milliseconds at the time the maximum MOS value was encountered; modparam("rtpengine", "mos_max_jitter_A_pv", "$avp(mos_max_jitter_A)") #The name of a pseudovariable to hold the packet round-trip time in microseconds at the time the maximum MOS value was encountered; modparam("rtpengine", "mos_max_roundtrip_A_pv", "$avp(mos_max_roundtrip_A)") #The name of a pseudovariable to hold the average (median) MOS value for the call. The value typically has a range of 1.0 through 5.0. modparam("rtpengine", "mos_average_A_pv", "$avp(mos_average_mos_A)") #The name of a pseudovariable to hold the average (median) amount of packetloss in percent present throughout the call. modparam("rtpengine", "mos_average_packetloss_A_pv", "$avp(mos_average_packetloss_A)") #The name of a pseudovariable to hold the average (median) amount of jitter in milliseconds present throughout the call. modparam("rtpengine", "mos_average_jitter_A_pv", "$avp(mos_average_jitter_A)") #The name of a pseudovariable to hold the average (median) packet round-trip time in microseconds present throughout the call. modparam("rtpengine", "mos_average_roundtrip_A_pv", "$avp(mos_average_roundtrip_A)") modparam("rtpengine", "mos_B_label_pv", "$avp(mos_B_label)") #The name of a pseudovariable to hold the minimum encountered MOS value for the call. The value typically has a range of 1.0 through 5.0. modparam("rtpengine", "mos_min_B_pv", "$avp(mos_min_mos_B)") #The name of a pseudovariable to hold the amount of packetloss in percent at the time the minimum MOS value was encountered; modparam("rtpengine", "mos_min_packetloss_B_pv", "$avp(mos_min_packetloss_B)") #The name of a pseudovariable to hold the amount of jitter in milliseconds at the time the minimum MOS value was encountered; modparam("rtpengine", "mos_min_jitter_B_pv", "$avp(mos_min_jitter_B)") #The name of a pseudovariable to hold the packet round-trip time in microseconds at the time the minimum MOS value was encountered; modparam("rtpengine", "mos_min_roundtrip_B_pv", "$avp(mos_min_roundtrip_B)") #The name of a pseudovariable to hold the maximum encountered MOS value for the call. The value typically has a range of 1.0 through 5.0. modparam("rtpengine", "mos_max_B_pv", "$avp(mos_max_mos_B)") #The name of a pseudovariable to hold the amount of packetloss in percent at the time the maximum MOS value was encountered; modparam("rtpengine", "mos_max_packetloss_B_pv", "$avp(mos_max_packetloss_B)") #The name of a pseudovariable to hold the amount of jitter in milliseconds at the time the maximum MOS value was encountered; modparam("rtpengine", "mos_max_jitter_B_pv", "$avp(mos_max_jitter_B)") #The name of a pseudovariable to hold the packet round-trip time in microseconds at the time the maximum MOS value was encountered; modparam("rtpengine", "mos_max_roundtrip_B_pv", "$avp(mos_max_roundtrip_B)") #The name of a pseudovariable to hold the average (median) MOS value for the call. The value typically has a range of 1.0 through 5.0. modparam("rtpengine", "mos_average_B_pv", "$avp(mos_average_mos_B)") #The name of a pseudovariable to hold the average (median) amount of packetloss in percent present throughout the call. modparam("rtpengine", "mos_average_packetloss_B_pv", "$avp(mos_average_packetloss_B)") #The name of a pseudovariable to hold the average (median) amount of jitter in milliseconds present throughout the call. modparam("rtpengine", "mos_average_jitter_B_pv", "$avp(mos_average_jitter_B)") #The name of a pseudovariable to hold the average (median) packet round-trip time in microseconds present throughout the call. modparam("rtpengine", "mos_average_roundtrip_B_pv", "$avp(mos_average_roundtrip_B)") ``` #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages ``` May 07 06:12:56 tst-ec1-blue-app-116 /usr/sbin/kamailio[3299]: { "level": "DEBUG", "module": "rtpengine", "file": "rtpengine.c", "line": 3684, "function": "rtpp_function_call", "callid": "3df537fef966eb1a", "logprefix": "{BYE <null> 10.152.8.37 3df537fef966eb1a } ", "message": "rtpengine hash table remove entry for callen=16 callid=3df537fef966eb1a viabranch=" } May 07 06:12:56 tst-ec1-blue-app-116 /usr/sbin/kamailio[3299]: { "level": "DEBUG", "module": "rtpengine", "file": "rtpengine.c", "line": 4508, "function": "parse_call_stats_1", "callid": "3df537fef966eb1a", "logprefix": "{BYE <null> 10.152.8.37 3df537fef966eb1a } ", "message": "rtpengine: looking for label 'Aleg_label'" } May 07 06:12:56 tst-ec1-blue-app-116 /usr/sbin/kamailio[3299]: { "level": "DEBUG", "module": "rtpengine", "file": "rtpengine.c", "line": 4514, "function": "parse_call_stats_1", "callid": "3df537fef966eb1a", "logprefix": "{BYE <null> 10.152.8.37 3df537fef966eb1a } ", "message": "rtpengine: XXX got tags" } May 07 06:12:56 tst-ec1-blue-app-116 /usr/sbin/kamailio[3299]: { "level": "DEBUG", "module": "rtpengine", "file": "rtpengine.c", "line": 4517, "function": "parse_call_stats_1", "callid": "3df537fef966eb1a", "logprefix": "{BYE <null> 10.152.8.37 3df537fef966eb1a } ", "message": "rtpengine: XXX got tag" } May 07 06:12:56 tst-ec1-blue-app-116 /usr/sbin/kamailio[3299]: { "level": "DEBUG", "module": "rtpengine", "file": "rtpengine.c", "line": 4522, "function": "parse_call_stats_1", "callid": "3df537fef966eb1a", "logprefix": "{BYE <null> 10.152.8.37 3df537fef966eb1a } ", "message": "rtpengine: XXX got label Aleg_label" } May 07 06:12:56 tst-ec1-blue-app-116 /usr/sbin/kamailio[3299]: { "level": "DEBUG", "module": "rtpengine", "file": "rtpengine.c", "line": 4525, "function": "parse_call_stats_1", "callid": "3df537fef966eb1a", "logprefix": "{BYE <null> 10.152.8.37 3df537fef966eb1a } ", "message": "rtpengine: XXX label match" } May 07 06:12:56 tst-ec1-blue-app-116 /usr/sbin/kamailio[3299]: { "level": "DEBUG", "module": "rtpengine", "file": "rtpengine.c", "line": 4530, "function": "parse_call_stats_1", "callid": "3df537fef966eb1a", "logprefix": "{BYE <null> 10.152.8.37 3df537fef966eb1a } ", "message": "rtpengine: XXX got medias" } May 07 06:12:56 tst-ec1-blue-app-116 /usr/sbin/kamailio[3299]: { "level": "DEBUG", "module": "rtpengine", "file": "rtpengine.c", "line": 4532, "function": "parse_call_stats_1", "callid": "3df537fef966eb1a", "logprefix": "{BYE <null> 10.152.8.37 3df537fef966eb1a } ", "message": "rtpengine: XXX got media" } May 07 06:12:56 tst-ec1-blue-app-116 /usr/sbin/kamailio[3299]: { "level": "DEBUG", "module": "rtpengine", "file": "rtpengine.c", "line": 4537, "function": "parse_call_stats_1", "callid": "3df537fef966eb1a", "logprefix": "{BYE <null> 10.152.8.37 3df537fef966eb1a } ", "message": "rtpengine: XXX got streams" } May 07 06:12:56 tst-ec1-blue-app-116 /usr/sbin/kamailio[3299]: { "level": "DEBUG", "module": "rtpengine", "file": "rtpengine.c", "line": 4542, "function": "parse_call_stats_1", "callid": "3df537fef966eb1a", "logprefix": "{BYE <null> 10.152.8.37 3df537fef966eb1a } ", "message": "rtpengine: XXX got stream type 4" } May 07 06:12:56 tst-ec1-blue-app-116 /usr/sbin/kamailio[3299]: { "level": "DEBUG", "module": "rtpengine", "file": "rtpengine.c", "line": 4543, "function": "parse_call_stats_1", "callid": "3df537fef966eb1a", "logprefix": "{BYE <null> 10.152.8.37 3df537fef966eb1a } ", "message": "rtpengine: XXX stream child 'local port'" } May 07 06:12:56 tst-ec1-blue-app-116 /usr/sbin/kamailio[3299]: { "level": "DEBUG", "module": "rtpengine", "file": "rtpengine.c", "line": 4546, "function": "parse_call_stats_1", "callid": "3df537fef966eb1a", "logprefix": "{BYE <null> 10.152.8.37 3df537fef966eb1a } ", "message": "rtpengine: XXX stream child val type 2" } May 07 06:12:56 tst-ec1-blue-app-116 /usr/sbin/kamailio[3299]: { "level": "DEBUG", "module": "rtpengine", "file": "rtpengine.c", "line": 4517, "function": "parse_call_stats_1", "callid": "3df537fef966eb1a", "logprefix": "{BYE <null> 10.152.8.37 3df537fef966eb1a } ", "message": "rtpengine: XXX got tag" } May 07 06:12:56 tst-ec1-blue-app-116 /usr/sbin/kamailio[3299]: { "level": "DEBUG", "module": "rtpengine", "file": "rtpengine.c", "line": 4522, "function": "parse_call_stats_1", "callid": "3df537fef966eb1a", "logprefix": "{BYE <null> 10.152.8.37 3df537fef966eb1a } ", "message": "rtpengine: XXX got label Bleg_label" } May 07 06:12:56 tst-ec1-blue-app-116 /usr/sbin/kamailio[3299]: { "level": "DEBUG", "module": "rtpengine", "file": "rtpengine.c", "line": 4508, "function": "parse_call_stats_1", "callid": "3df537fef966eb1a", "logprefix": "{BYE <null> 10.152.8.37 3df537fef966eb1a } ", "message": "rtpengine: looking for label 'Bleg_label'" } May 07 06:12:56 tst-ec1-blue-app-116 /usr/sbin/kamailio[3299]: { "level": "DEBUG", "module": "rtpengine", "file": "rtpengine.c", "line": 4514, "function": "parse_call_stats_1", "callid": "3df537fef966eb1a", "logprefix": "{BYE <null> 10.152.8.37 3df537fef966eb1a } ", "message": "rtpengine: XXX got tags" } May 07 06:12:56 tst-ec1-blue-app-116 /usr/sbin/kamailio[3299]: { "level": "DEBUG", "module": "rtpengine", "file": "rtpengine.c", "line": 4517, "function": "parse_call_stats_1", "callid": "3df537fef966eb1a", "logprefix": "{BYE <null> 10.152.8.37 3df537fef966eb1a } ", "message": "rtpengine: XXX got tag" } May 07 06:12:56 tst-ec1-blue-app-116 /usr/sbin/kamailio[3299]: { "level": "DEBUG", "module": "rtpengine", "file": "rtpengine.c", "line": 4522, "function": "parse_call_stats_1", "callid": "3df537fef966eb1a", "logprefix": "{BYE <null> 10.152.8.37 3df537fef966eb1a } ", "message": "rtpengine: XXX got label Aleg_label" } May 07 06:12:56 tst-ec1-blue-app-116 /usr/sbin/kamailio[3299]: { "level": "DEBUG", "module": "rtpengine", "file": "rtpengine.c", "line": 4517, "function": "parse_call_stats_1", "callid": "3df537fef966eb1a", "logprefix": "{BYE <null> 10.152.8.37 3df537fef966eb1a } ", "message": "rtpengine: XXX got tag" } May 07 06:12:56 tst-ec1-blue-app-116 /usr/sbin/kamailio[3299]: { "level": "DEBUG", "module": "rtpengine", "file": "rtpengine.c", "line": 4522, "function": "parse_call_stats_1", "callid": "3df537fef966eb1a", "logprefix": "{BYE <null> 10.152.8.37 3df537fef966eb1a } ", "message": "rtpengine: XXX got label Bleg_label" } May 07 06:12:56 tst-ec1-blue-app-116 /usr/sbin/kamailio[3299]: { "level": "DEBUG", "module": "rtpengine", "file": "rtpengine.c", "line": 4525, "function": "parse_call_stats_1", "callid": "3df537fef966eb1a", "logprefix": "{BYE <null> 10.152.8.37 3df537fef966eb1a } ", "message": "rtpengine: XXX label match" } May 07 06:12:56 tst-ec1-blue-app-116 /usr/sbin/kamailio[3299]: { "level": "DEBUG", "module": "rtpengine", "file": "rtpengine.c", "line": 4530, "function": "parse_call_stats_1", "callid": "3df537fef966eb1a", "logprefix": "{BYE <null> 10.152.8.37 3df537fef966eb1a } ", "message": "rtpengine: XXX got medias" } May 07 06:12:56 tst-ec1-blue-app-116 /usr/sbin/kamailio[3299]: { "level": "DEBUG", "module": "rtpengine", "file": "rtpengine.c", "line": 4532, "function": "parse_call_stats_1", "callid": "3df537fef966eb1a", "logprefix": "{BYE <null> 10.152.8.37 3df537fef966eb1a } ", "message": "rtpengine: XXX got media" } May 07 06:12:56 tst-ec1-blue-app-116 /usr/sbin/kamailio[3299]: { "level": "DEBUG", "module": "rtpengine", "file": "rtpengine.c", "line": 4537, "function": "parse_call_stats_1", "callid": "3df537fef966eb1a", "logprefix": "{BYE <null> 10.152.8.37 3df537fef966eb1a } ", "message": "rtpengine: XXX got streams" } May 07 06:12:56 tst-ec1-blue-app-116 /usr/sbin/kamailio[3299]: { "level": "DEBUG", "module": "rtpengine", "file": "rtpengine.c", "line": 4542, "function": "parse_call_stats_1", "callid": "3df537fef966eb1a", "logprefix": "{BYE <null> 10.152.8.37 3df537fef966eb1a } ", "message": "rtpengine: XXX got stream type 4" } May 07 06:12:56 tst-ec1-blue-app-116 /usr/sbin/kamailio[3299]: { "level": "DEBUG", "module": "rtpengine", "file": "rtpengine.c", "line": 4543, "function": "parse_call_stats_1", "callid": "3df537fef966eb1a", "logprefix": "{BYE <null> 10.152.8.37 3df537fef966eb1a } ", "message": "rtpengine: XXX stream child 'local port'" } May 07 06:12:56 tst-ec1-blue-app-116 /usr/sbin/kamailio[3299]: { "level": "DEBUG", "module": "rtpengine", "file": "rtpengine.c", "line": 4546, "function": "parse_call_stats_1", "callid": "3df537fef966eb1a", "logprefix": "{BYE <null> 10.152.8.37 3df537fef966eb1a } ", "message": "rtpengine: XXX stream child val type 2" } ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4232 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4232(a)github.com>

2 2

git:master:992ee3df: rtpengine: improve compatibility of rtpengine per call leg stats parsing
by Richard Fuchs 07 May '25

07 May '25

Module: kamailio Branch: master Commit: 992ee3df02148a940c255b8be7eb9d8e63465834 URL: https://github.com/kamailio/kamailio/commit/992ee3df02148a940c255b8be7eb9d8… Author: Torrey Searle <torrey.searle(a)wavecrest.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2025-05-07T09:06:19-04:00 rtpengine: improve compatibility of rtpengine per call leg stats parsing not all versions of rtpengine sends a key SSRC per stream. For those that do not the same information can be found in ingress SSRCs. Add logic to check for the SSRC value there if the SSRC key is not present. --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/992ee3df02148a940c255b8be7eb9d8… Patch: https://github.com/kamailio/kamailio/commit/992ee3df02148a940c255b8be7eb9d8… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 49c942627cd..2401ad09cbd 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -4490,7 +4490,8 @@ static void parse_call_stats_1(struct minmax_mos_label_stats *mmls, long long ssrc; char *endp; bencode_item_t *ssrc_list, *ssrc_key, *ssrc_dict, *tags, *tag_key, - *tag_dict, *medias, *media, *streams, *stream; + *tag_dict, *medias, *media, *streams, *stream, *ingress_ssrcs, + *ingress_ssrc; struct minmax_stats_vals min_vals = {.mos = 100}, max_vals = {.mos = -1}, average_vals = {.avg_samples = 0}, vals_decoded; @@ -4545,9 +4546,21 @@ static void parse_call_stats_1(struct minmax_mos_label_stats *mmls, (char *)stream->child->iov[1].iov_base); LM_DBG("rtpengine: XXX stream child val type %i\n", stream->child->sibling->type); - if((ssrc = bencode_dictionary_get_integer(stream, "SSRC", -1)) - == -1) - continue; + ssrc = bencode_dictionary_get_integer(stream, "SSRC", -1); + if(ssrc == -1) { + ingress_ssrcs = bencode_dictionary_get_expect( + stream, "ingress SSRCs", BENCODE_LIST); + if(!ingress_ssrcs || !ingress_ssrcs->child) + continue; + LM_DBG("rtpengine: XXX got ingress SSRCs\n"); + ingress_ssrc = ingress_ssrcs->child; + if((ssrc = bencode_dictionary_get_integer( + ingress_ssrc, "SSRC", -1)) + == -1) { + continue; + } + } + /* got a valid SSRC to watch for */ ssrcs[num_ssrcs] = ssrc; LM_DBG("rtpengine: found SSRC '%lli' for label '%.*s'\n", ssrc,

1 0

git:master:f2a60cfa: pkg/kamailio/deb: version set 6.1.0~dev1 [skip ci]
by Victor Seva 06 May '25

06 May '25

Module: kamailio Branch: master Commit: f2a60cfac4cf3a5a6d84e24f7845ab4faeacf45e URL: https://github.com/kamailio/kamailio/commit/f2a60cfac4cf3a5a6d84e24f7845ab4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-05-06T15:39:08+02:00 pkg/kamailio/deb: version set 6.1.0~dev1 [skip ci] --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jammy/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/noble/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/f2a60cfac4cf3a5a6d84e24f7845ab4… Patch: https://github.com/kamailio/kamailio/commit/f2a60cfac4cf3a5a6d84e24f7845ab4…

1 0

git:master:4405af93: modules: readme files regenerated - app_jsdt ... [skip ci]
by Kamailio Dev 06 May '25

06 May '25

Module: kamailio Branch: master Commit: 4405af938ec72c0482e85abb3abea7853c5a22bb URL: https://github.com/kamailio/kamailio/commit/4405af938ec72c0482e85abb3abea78… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-05-06T14:46:10+02:00 modules: readme files regenerated - app_jsdt ... [skip ci] --- Modified: src/modules/app_jsdt/README --- Diff: https://github.com/kamailio/kamailio/commit/4405af938ec72c0482e85abb3abea78… Patch: https://github.com/kamailio/kamailio/commit/4405af938ec72c0482e85abb3abea78…

1 0

git:master:2e20c74f: app_jsdt: doc - fix section tags for loaddir
by Daniel-Constantin Mierla 06 May '25

06 May '25

Module: kamailio Branch: master Commit: 2e20c74fb03f2442cde5f3f69989a0ed914f542c URL: https://github.com/kamailio/kamailio/commit/2e20c74fb03f2442cde5f3f69989a0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-05-06T14:38:02+02:00 app_jsdt: doc - fix section tags for loaddir --- Modified: src/modules/app_jsdt/doc/app_jsdt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2e20c74fb03f2442cde5f3f69989a0e… Patch: https://github.com/kamailio/kamailio/commit/2e20c74fb03f2442cde5f3f69989a0e… --- diff --git a/src/modules/app_jsdt/doc/app_jsdt_admin.xml b/src/modules/app_jsdt/doc/app_jsdt_admin.xml index 6d139c29428..bbf2148b9b4 100644 --- a/src/modules/app_jsdt/doc/app_jsdt_admin.xml +++ b/src/modules/app_jsdt/doc/app_jsdt_admin.xml @@ -107,35 +107,31 @@ modparam("app_jsdt", "load", "/usr/local/etc/kamailio/js/myscript.js") </programlisting> </example> </section> - <section> - <title>Parameters</title> - <section id="app_jsdt.p.loaddir"> - <title> - <varname>loaddir</varname> (str) - </title> - <para> - Set the path to the folder containing JavaScript files to be loaded at startup. All - .js files in the folder will be loaded and combined into a single javascript script. - Then you can use jsdt_run(function, params) to execute a function from the - script at runtime. If you use it for KEMI configuration, - then it has to include the required functions. - </para> - <para> - <emphasis> - Default value is <quote>null</quote>. - </emphasis> - </para> - <example> - <title> - Set <varname>loaddir</varname> parameter - </title> - <programlisting format="linespecific"> - ... - modparam("app_jsdt", "loaddir", "/usr/local/etc/kamailio/js") - ... - </programlisting> - </example> - </section> + <section id="app_jsdt.p.loaddir"> + <title><varname>loaddir</varname> (str)</title> + <para> + Set the path to the folder containing JavaScript files to be loaded at startup. All + .js files in the folder will be loaded and combined into a single javascript script. + Then you can use jsdt_run(function, params) to execute a function from the + script at runtime. If you use it for KEMI configuration, + then it has to include the required functions. + </para> + <para> + <emphasis> + Default value is <quote>null</quote>. + </emphasis> + </para> + <example> + <title> + Set <varname>loaddir</varname> parameter + </title> + <programlisting format="linespecific"> +... +modparam("app_jsdt", "loaddir", "/usr/local/etc/kamailio/js") +... +</programlisting> + </example> + </section> <section id="app_jsdt.p.mode"> <title><varname>mode</varname> (int)</title> <para> @@ -328,4 +324,3 @@ request_route { </programlisting> </section> </chapter> -

1 0

git:master:7fa8b166: Makefile.defs/CMakeLists.txt: version set to 6.1.0-dev1
by Daniel-Constantin Mierla 06 May '25

06 May '25

Module: kamailio Branch: master Commit: 7fa8b166bfc813270d19a30351326a94a9187852 URL: https://github.com/kamailio/kamailio/commit/7fa8b166bfc813270d19a30351326a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-05-06T14:34:06+02:00 Makefile.defs/CMakeLists.txt: version set to 6.1.0-dev1 --- Modified: CMakeLists.txt Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/7fa8b166bfc813270d19a30351326a9… Patch: https://github.com/kamailio/kamailio/commit/7fa8b166bfc813270d19a30351326a9… --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 36451562d6f..6d68b5da980 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ project( ) # Set the version number -set(EXTRAVERSION "-dev0") +set(EXTRAVERSION "-dev1") set(RELEASE "${PROJECT_VERSION}${EXTRAVERSION}") message(STATUS "PROJECT_VERSION: ${PROJECT_VERSION}") diff --git a/src/Makefile.defs b/src/Makefile.defs index 7656029123e..6ff7eeddb51 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 6 PATCHLEVEL = 1 SUBLEVEL = 0 -EXTRAVERSION = -dev0 +EXTRAVERSION = -dev1 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev