sr-dev July 2023

sr-dev@lists.kamailio.org

15 participants
238 discussions

[kamailio/kamailio] rtpproxy: make sure we null terminate the copy of the string. (PR #3524)

by Maksym Sobolyev

#### 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:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  The module has been broken in d00ceda2c04. The code to replace strcpy() did not terminate the target sting with \0. Discovered by our voiptests rig: https://github.com/sippy/voiptests/actions/workflows/kamailio.yml Results in a broken SDP (note garbage around o= attribute: ``` 1681 00:00:08.271/GLOBAL/alice_ua: RECEIVED message from [::1]:5060: 1682 SIP/2.0 183 Session Progress 1683 Via: SIP/2.0/UDP [::1]:5061;received=::1;rport=5061;branch=z9hG4bK20a1169c6781e4bfe26554e84d3b4925 1684 Record-Route: <sip:[::1];ftag=l5v4RNY4iYqP.*!0LQUA.MLVq8RX'm!q;lr> 1685 From: "Alice Smith" <sip:alice_2_ipv6@[::1]>;tag=l5v4RNY4iYqP.*!0LQUA.MLVq8RX'm!q 1686 To: <sip:bob_2@[::1]>;tag=c77c4b2c8430cf6c18566bc3d9212ed3 1687 Call-ID: O%CciL!Yf0-SQn]G46v4J(SPddRr<MtH(a))<0.ev}(]q.\%X[> 1688 CSeq: 200 INVITE 1689 Content-Type: application/sdp 1690 Content-Length: 296 1691 1692 v=0 1693 o=- 577651195072 577651195072 IN IP6 ::1\x86zU 1694 s=BOBSDP Session 1695 c=IN IP6 ::1\x86zU 1696 t=0 0 1697 m=image 13424 udptl t38 1698 a=T38FaxVersion:0 1699 a=T38MaxBitRate:14400 1700 a=T38FaxRateManagement:transferredTCF 1701 a=T38FaxMaxBuffer:262 1702 a=T38FaxMaxDatagram:176 1703 a=T38FaxUdpEC:t38UDPRedundancy 1704 a=nortpproxy:yes 1740 00:00:08.322/GLOBAL/alice_ua: RECEIVED message from 127.0.0.1:5060: 1741 SIP/2.0 183 Session Progress 1742 v: SIP/2.0/UDP 127.0.0.1:5061;received=127.0.0.1;rport=5061;branch=z9hG4bK8e357573055f35a768af0c9be78c836d 1743 Record-Route: <sip:127.0.0.1;ftag=q3~s'YH'`.Krs%LQKdFWrWnWgwPHJHnf;lr> 1744 f: "Alice Smith" <sip:alice_7_ipv4@127.0.0.1>;tag=q3~s'YH'`.Krs%LQKdFWrWnWgwPHJHnf 1745 t: <sip:bob_7@127.0.0.1>;tag=8ee80e5205ef358c3cb868fb5e5614f8 1746 i: m6!(QAFQlv}vTlycDH[rpMjW}mVV1phG@z/c{KI:L*n'[`%15 1747 CSeq: 200 INVITE 1748 c: application/sdp 1749 l: 328 1750 1751 v=0 1752 o=- 577651195078 577651195078 IN IP4 127.0.0.1z\xcfpzG\xd1\xcb`\xef=\x86zU 1753 s=BOBSDP Session 1754 c=IN IP4 127.0.0.1z\xcfpzG\xd1\xcb`\xef=\x86zU 1755 t=0 0 1756 m=image 13696 udptl t38 1757 a=T38FaxVersion:0 1758 a=T38MaxBitRate:14400 1759 a=T38FaxRateManagement:transferredTCF 1760 a=T38FaxMaxBuffer:262 1761 a=T38FaxMaxDatagram:176 1762 a=T38FaxUdpEC:t38UDPRedundancy 1763 a=nortpproxy:yes ``` Looks like there were multiple changes of the same nature. All of them probably needs to be re-evaluated to make sure this pattern is not propagated. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3524 -- Commit Summary -- * rtpproxy: make sure we null terminate the copy of the string. -- File Changes -- M src/modules/rtpproxy/rtpproxy.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3524.patch https://github.com/kamailio/kamailio/pull/3524.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3524 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3524(a)github.com>

1 year

git:master:bad420e9: .devcontainer: Initial support for devcontainers [skip ci]

by Victor Seva

Module: kamailio Branch: master Commit: bad420e9f72c237bbd608a9ff06ae3b63bce9625 URL: https://github.com/kamailio/kamailio/commit/bad420e9f72c237bbd608a9ff06ae3b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-26T15:10:03+02:00 .devcontainer: Initial support for devcontainers [skip ci] Allows to develop inside a container using vscode > https://code.visualstudio.com/docs/devcontainers/containers --- Added: .devcontainer/Dockerfile Added: .devcontainer/devcontainer.json --- Diff: https://github.com/kamailio/kamailio/commit/bad420e9f72c237bbd608a9ff06ae3b… Patch: https://github.com/kamailio/kamailio/commit/bad420e9f72c237bbd608a9ff06ae3b… --- diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 00000000000..50a901b764a --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,17 @@ +FROM mcr.microsoft.com/devcontainers/base:bookworm +# utils packages +RUN apt-get update && \ + export DEBIAN_FRONTEND=noninteractive && \ + apt-get -y install --no-install-recommends \ + apt-utils dialog clang-format clang pbuilder + +# bookworm packaging +RUN mkdir -p /usr/local/src/pkg +COPY bookworm /usr/local/src/pkg/debian + +# get build dependences +RUN cd /usr/local/src/pkg/ && \ + /usr/lib/pbuilder/pbuilder-satisfydepends-experimental + +# clean +RUN apt-get clean && rm -rf /var/lib/apt/lists/* diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 00000000000..98d103801ea --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,34 @@ +{ + /* For format details, see https://aka.ms/devcontainer.json. For config options, see the + * README at: https://github.com/devcontainers/templates/tree/main/src/debian + */ + "name": "Debian", + "build": { + "context": "../pkg/kamailio/deb", + "dockerfile": "Dockerfile" + }, + + // Features to add to the dev container. More info: https://containers.dev/features. + "features": { + "ghcr.io/wxw-matt/devcontainer-features/command_runner:0": {} + }, + + // Use 'forwardPorts' to make a list of ports inside the container available locally. + "forwardPorts": [ + 5060 + ], + + // Configure tool-specific properties. + "customizations": { + "vscode": { + "settings": {}, + "extensions": [ + "ms-vscode.cpptools-extension-pack", + "xaver.clang-format" + ] + } + }, + + // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. + "remoteUser": "root" +}

1 year

git:master:c2f12479: .clang-format: add json settings [skip ci]

by Victor Seva

Module: kamailio Branch: master Commit: c2f12479debe7bd5f5819f3c3b332929dd5fe703 URL: https://github.com/kamailio/kamailio/commit/c2f12479debe7bd5f5819f3c3b33292… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-26T15:10:03+02:00 .clang-format: add json settings [skip ci] --- Modified: .clang-format --- Diff: https://github.com/kamailio/kamailio/commit/c2f12479debe7bd5f5819f3c3b33292… Patch: https://github.com/kamailio/kamailio/commit/c2f12479debe7bd5f5819f3c3b33292… --- diff --git a/.clang-format b/.clang-format index d805149083d..6f7a705477f 100644 --- a/.clang-format +++ b/.clang-format @@ -1,4 +1,7 @@ --- +Language: Json +BasedOnStyle: llvm +--- Language: Cpp # BasedOnStyle: LLVM AccessModifierOffset: -4 @@ -87,4 +90,3 @@ Standard: Cpp11 TabWidth: 4 UseTab: Always ... -

1 year

[kamailio/kamailio] Initial support for devcontainers (PR #3516)

by Victor Seva

#### Description Initial support of [devcontainers](https://containers.dev/) Allows to develop inside a container using [vscode](https://code.visualstudio.com/docs/devcontainers/containers) Next steps: * configure github actions to build and publish the image in our github repository https://github.com/devcontainers/ci/blob/main/docs/github-action.md * include configurations for vscode to build and run kamailio * investigate how to debug inside vscode You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3516 -- Commit Summary -- * .clang-format: add json settings * .devcontainer: Initial support for devcontainers -- File Changes -- M .clang-format (4) A .devcontainer/Dockerfile (17) A .devcontainer/devcontainer.json (34) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3516.patch https://github.com/kamailio/kamailio/pull/3516.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3516 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3516(a)github.com>

1 year

git:master:192b681c: sipcapture: make sure we null terminate the copy of the string

by Victor Seva

Module: kamailio Branch: master Commit: 192b681ce7fcd868a4a47a7c26863c733321b8d4 URL: https://github.com/kamailio/kamailio/commit/192b681ce7fcd868a4a47a7c26863c7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-26T15:00:38+02:00 sipcapture: make sure we null terminate the copy of the string bug introduced at cbd7810fff3d5145c1ce34c0e362b5590bb92a12 --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/192b681ce7fcd868a4a47a7c26863c7… Patch: https://github.com/kamailio/kamailio/commit/192b681ce7fcd868a4a47a7c26863c7… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index de0a15174cc..5efb1898036 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -2252,7 +2252,8 @@ static int sip_capture( ip.s = ip_addr2a(&msg->rcv.src_ip); ip.len = strlen(ip.s); - memcpy(buf_ip, ip.s, ip.len); + /* Copy, including teminating \0 */ + memcpy(buf_ip, ip.s, ip.len + 1); sco.source_ip.s = buf_ip; sco.source_ip.len = ip.len; sco.source_port = msg->rcv.src_port; @@ -2839,7 +2840,8 @@ static int report_capture(sip_msg_t *msg, str *_table, str *_corr, str *_data) /* IP source and destination */ ip.s = ip_addr2a(&msg->rcv.src_ip); ip.len = strlen(ip.s); - memcpy(buf_ip, ip.s, ip.len); + /* Copy, including teminating \0 */ + memcpy(buf_ip, ip.s, ip.len + 1); sco.source_ip.s = buf_ip; sco.source_ip.len = ip.len; sco.source_port = msg->rcv.src_port;

1 year

git:master:3c1700fb: rtpproxy: make sure we null terminate the copy of the string.

by Victor Seva

Module: kamailio Branch: master Commit: 3c1700fb7693c05025be1058e856fe610f4be031 URL: https://github.com/kamailio/kamailio/commit/3c1700fb7693c05025be1058e856fe6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-26T14:55:17+02:00 rtpproxy: make sure we null terminate the copy of the string. bug introduced at d00ceda2c04 --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/3c1700fb7693c05025be1058e856fe6… Patch: https://github.com/kamailio/kamailio/commit/3c1700fb7693c05025be1058e856fe6… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 9d7190cabc3..bc252982e1c 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -1834,7 +1834,8 @@ static int rtpproxy_answer1_helper_f(struct sip_msg *msg, char *flags) cp.s = ip_addr2a(&msg->rcv.dst_ip); cp.len = strlen(cp.s); - memcpy(newip, cp.s, cp.len); + /* Copy, including teminating \0 */ + memcpy(newip, cp.s, cp.len + 1); return force_rtp_proxy(msg, flags, newip, 0, 0); }

1 year

git:master:2750e48b: rtpproxy: make sure we null terminate the copy of the string.

by Victor Seva

Module: kamailio Branch: master Commit: 2750e48b5445e9334cb7a062d7d53a1fb9a0a411 URL: https://github.com/kamailio/kamailio/commit/2750e48b5445e9334cb7a062d7d53a1… Author: Maksym Sobolyev <sobomax(a)sippysoft.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-26T14:46:45+02:00 rtpproxy: make sure we null terminate the copy of the string. Broken in d00ceda2c04. --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/2750e48b5445e9334cb7a062d7d53a1… Patch: https://github.com/kamailio/kamailio/commit/2750e48b5445e9334cb7a062d7d53a1… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 8103fef4edd..9d7190cabc3 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -1698,7 +1698,8 @@ static int rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) if(ip == NULL) { cp.s = ip_addr2a(&msg->rcv.dst_ip); cp.len = strlen(cp.s); - memcpy(newip, cp.s, cp.len); + /* Copy, including teminating \0 */ + memcpy(newip, cp.s, cp.len + 1); } if(msg->msg_flags & FL_SDP_BODY)

1 year

git:master:8b113985: rtpengine: increase buf size to print mos llint range

by Stefan Mititelu

Module: kamailio Branch: master Commit: 8b1139851d9f88add1fd7da0dbc0b2b56933cdd3 URL: https://github.com/kamailio/kamailio/commit/8b1139851d9f88add1fd7da0dbc0b2b… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)govoip.ro> Date: 2023-07-20T15:25:37+03:00 rtpengine: increase buf size to print mos llint range --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/8b1139851d9f88add1fd7da0dbc0b2b… Patch: https://github.com/kamailio/kamailio/commit/8b1139851d9f88add1fd7da0dbc0b2b… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 59bcfb47795..68003908268 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -180,14 +180,15 @@ struct minmax_mos_label_stats }; struct minmax_stats_vals { - long long mos; - long long at; - long long packetloss; - long long jitter; - long long roundtrip; - long long roundtrip_leg; - long long samples; - long long avg_samples; /* our own running count to average the averages */ + long long int mos; + long long int at; + long long int packetloss; + long long int jitter; + long long int roundtrip; + long long int roundtrip_leg; + long long int samples; + long long int + avg_samples; /* our own running count to average the averages */ }; #define RTPE_LIST_VERSION_DELAY 10 @@ -3879,12 +3880,13 @@ static void avp_print_decimal(pv_elem_t *pv, int num, struct sip_msg *msg) len = snprintf(buf, sizeof(buf), "%i.%i", num / 10, abs(num % 10)); avp_print_s(pv, buf, len, msg); } -static void avp_print_int(pv_elem_t *pv, int num, struct sip_msg *msg) +static void avp_print_llint( + pv_elem_t *pv, long long int num, struct sip_msg *msg) { int len; - char buf[8]; + char buf[20]; - len = snprintf(buf, sizeof(buf), "%i", num); + len = snprintf(buf, sizeof(buf), "%lld", num); avp_print_s(pv, buf, len, msg); } static void avp_print_time(pv_elem_t *pv, int num, struct sip_msg *msg) @@ -3904,12 +3906,13 @@ static void avp_print_mos(struct minmax_mos_stats *s, avp_print_decimal(s->mos_pv, vals->mos / vals->avg_samples, msg); avp_print_time(s->at_pv, vals->at - created, msg); - avp_print_int(s->packetloss_pv, vals->packetloss / vals->avg_samples, msg); - avp_print_int(s->jitter_pv, vals->jitter / vals->avg_samples, msg); - avp_print_int(s->roundtrip_pv, vals->roundtrip / vals->avg_samples, msg); - avp_print_int( + avp_print_llint( + s->packetloss_pv, vals->packetloss / vals->avg_samples, msg); + avp_print_llint(s->jitter_pv, vals->jitter / vals->avg_samples, msg); + avp_print_llint(s->roundtrip_pv, vals->roundtrip / vals->avg_samples, msg); + avp_print_llint( s->roundtrip_leg_pv, vals->roundtrip_leg / vals->avg_samples, msg); - avp_print_int(s->samples_pv, vals->samples / vals->avg_samples, msg); + avp_print_llint(s->samples_pv, vals->samples / vals->avg_samples, msg); } static int decode_mos_vals_dict(

1 year

[kamailio/kamailio] rtpengine: increase buf size to print mos llint range (PR #3517)

by Stefan Mititelu

1 year

git:5.6:d4d28c09: dialog: set cbs list to NULL after destroying

by Victor Seva

Module: kamailio Branch: 5.6 Commit: d4d28c098ddc07ab1b956a13878cd8e6f180fe3d URL: https://github.com/kamailio/kamailio/commit/d4d28c098ddc07ab1b956a13878cd8e… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-20T09:38:17+02:00 dialog: set cbs list to NULL after destroying (cherry picked from commit 6881faadec45dd16dd896b13db44862e7df70422) (cherry picked from commit 20be29ab3638d803341ec376b02edd7c14a9174a) --- Modified: src/modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/d4d28c098ddc07ab1b956a13878cd8e… Patch: https://github.com/kamailio/kamailio/commit/d4d28c098ddc07ab1b956a13878cd8e… --- diff --git a/src/modules/dialog/dlg_hash.c b/src/modules/dialog/dlg_hash.c index 54b8916d4e0..d61bfb62b49 100644 --- a/src/modules/dialog/dlg_hash.c +++ b/src/modules/dialog/dlg_hash.c @@ -370,8 +370,11 @@ void destroy_dlg(struct dlg_cell *dlg) if (dlg_db_mode) remove_dialog_from_db(dlg); - if (dlg->cbs.first) + if(dlg->cbs.first) { destroy_dlg_callbacks_list(dlg->cbs.first); + dlg->cbs.first = NULL; + dlg->cbs.types = 0; + } if (dlg->profile_links) destroy_linkers(dlg->profile_links);

1 year

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2023