- sr-dev - kamailio.org

git:master:b75b6e4b: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 27 Feb '23

27 Feb '23

Module: kamailio Branch: master Commit: b75b6e4b5d7425ca995aa125171edebec52bf82b URL: https://github.com/kamailio/kamailio/commit/b75b6e4b5d7425ca995aa125171edeb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-27T20:16:29+01:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/b75b6e4b5d7425ca995aa125171edeb… Patch: https://github.com/kamailio/kamailio/commit/b75b6e4b5d7425ca995aa125171edeb…

1 0

git:master:e8c294f3: rtpengine: doc add codec-accept with an example
by Daniel-Constantin Mierla 27 Feb '23

27 Feb '23

Module: kamailio Branch: master Commit: e8c294f33f8b867b0f67d78c14b7327dc22dd726 URL: https://github.com/kamailio/kamailio/commit/e8c294f33f8b867b0f67d78c14b7327… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-27T20:07:00+01:00 rtpengine: doc add codec-accept with an example --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e8c294f33f8b867b0f67d78c14b7327… Patch: https://github.com/kamailio/kamailio/commit/e8c294f33f8b867b0f67d78c14b7327… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 85b1a0fbe8c..99f97305c2b 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2630,6 +2630,15 @@ rtpengine_offer(); and used for transcoding on the offering side. Useful only in combination with codec-transcode. <emphasis>all</emphasis> keyword can be used to mask all offered codecs </para></listitem> + + <listitem><para> + <emphasis>codec-accept=...</emphasis> - Similar to `mask` and `consume` but doesn't remove the codec from the list of + offered codecs. This means that a codec listed under `accept` will still be offered + to the remote peer, but if the remote peer rejects it, it will still be accepted + towards the original offerer and then used for transcoding. It is a more selective + version of what the `always transcode` flag does. + </para></listitem> + <listitem><para> <emphasis>T.38=decode</emphasis> - If the offered &sdp; contains a media section advertising T.38 over UDPTL, translate it to a regular audio media section @@ -2696,6 +2705,30 @@ if (has_body("application/sdp")) { t_on_reply("1"); } +... +</programlisting> + </example> + <example> + <title><function>rtpengine_offer</function> usage to force transcoding from opus to PCMU</title> + <programlisting format="linespecific"> +route { +... + if (is_method("INVITE")) { + if (has_body("application/sdp")) { + if (rtpengine_offer("codec-mask=opus codec-accept-opus codec-strip=PCMU codec-transcode=PCMU")) + t_on_reply("1"); + } + } +... +} + +onreply_route[1] +{ +... + if (has_body("application/sdp")) + rtpengine_answer("codec-strip=PCMU codec-strip=PCMA"); +... +} ... </programlisting> </example>

1 0

[kamailio/kamailio] rtpengine: doc add codec-accept with an example (PR #3381)
by Julien Chavanton 27 Feb '23

27 Feb '23

#### 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] Documentation. #### Description A) offers OPUS + PCMU B) answers PCMU I do not want PCMU to be selected, I would like to endup transcoding : ``` A <-opus-> rtpengine <-pcmu-> B ``` If I understand correctly, this is what I have to set on the rtpengine_offer ``` codec-mask=opus codec-strip=PCMU codec-transcode=PCMU ``` rtpengine is removing opus from the offer before sending it. The answer sent by rtpengine is as follows: ``` m=audio 10884 UDP/TLS/RTP/SAVPF 0 126 a=maxptime:150 a=mid:0 a=rtpmap:0 PCMU/8000 a=rtpmap:126 telephone-event/8000 ``` for this to work, I would expect rtpengine to insert opus and remove pcmu ? Answer : ``` That's what 'codec-accept` is for Try with `codec-accept-opus` and/or `opus-accept-opus/48000` in the offer. That should be all that's needed (assuming reasonably recent version). ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3381 -- Commit Summary -- * rtpengine: doc add codec-accept with an example -- File Changes -- M src/modules/rtpengine/doc/rtpengine_admin.xml (33) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3381.patch https://github.com/kamailio/kamailio/pull/3381.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3381 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3381(a)github.com>

3 2

Kamailio v5.6.4 Released
by Daniel-Constantin Mierla 27 Feb '23

27 Feb '23

Hello, Kamailio SIP Server v5.6.4 stable release is out. This is a maintenance release of the latest stable branch, 5.6, that includes fixes since the release of v5.6.3. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.6.x. Deployments running previous v5.6.x versions are strongly recommended to be upgraded to v5.6.4. For more details about version 5.6.4 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2023/02/kamailio-v5-6-4-released/ RPM, Debian/Ubuntu packages will be available soon as well. An additional note to say that call for speakers and registration for Kamailio World Conference 2023 are now open, more details at: * https://www.kamailioworld.com Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - June 5-7, 2023 - www.kamailioworld.com Kamailio Advanced Training - Online - March 27-30, 2023 - www.asipto.com

1 0

git:5.6:a004cfa0: ChangeLog: content updated for v5.6.4
by Daniel-Constantin Mierla 27 Feb '23

27 Feb '23

Module: kamailio Branch: 5.6 Commit: a004cfa0dbb59323af06de48752200eb189659cd URL: https://github.com/kamailio/kamailio/commit/a004cfa0dbb59323af06de48752200e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-27T10:24:26+01:00 ChangeLog: content updated for v5.6.4 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/a004cfa0dbb59323af06de48752200e… Patch: https://github.com/kamailio/kamailio/commit/a004cfa0dbb59323af06de48752200e…

1 0

git:5.6:383bc71c: Makefile.defs: version set to 5.6.4
by Daniel-Constantin Mierla 27 Feb '23

27 Feb '23

Module: kamailio Branch: 5.6 Commit: 383bc71cd4f3b2d5d0290f11a6c3975a58c7949e URL: https://github.com/kamailio/kamailio/commit/383bc71cd4f3b2d5d0290f11a6c3975… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-27T10:04:04+01:00 Makefile.defs: version set to 5.6.4 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/383bc71cd4f3b2d5d0290f11a6c3975… Patch: https://github.com/kamailio/kamailio/commit/383bc71cd4f3b2d5d0290f11a6c3975… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index f1ffe39e99..99eae5cdb1 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 6 -SUBLEVEL = 3 +SUBLEVEL = 4 EXTRAVERSION = # memory manager switcher

1 0

git:5.6:93aaf27b: pkg: version set to 5.6.4 for rpms and alpine specs
by Daniel-Constantin Mierla 27 Feb '23

27 Feb '23

Module: kamailio Branch: 5.6 Commit: 93aaf27bb49f65c42f78ecbd9942f272d79a4b10 URL: https://github.com/kamailio/kamailio/commit/93aaf27bb49f65c42f78ecbd9942f27… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-27T09:56:17+01:00 pkg: version set to 5.6.4 for rpms and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/93aaf27bb49f65c42f78ecbd9942f27… Patch: https://github.com/kamailio/kamailio/commit/93aaf27bb49f65c42f78ecbd9942f27… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 5afbd8bfabb..bd3a5e53d89 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.6.3 +pkgver=5.6.4 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 5a848948632..d24176a384e 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.6.3 +%define ver 5.6.4 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:5.6:c04c950d: pkg: deb specs updated for v5.6.4
by Daniel-Constantin Mierla 27 Feb '23

27 Feb '23

Module: kamailio Branch: 5.6 Commit: c04c950deee4a421d6a978adf977a8d856da9ebc URL: https://github.com/kamailio/kamailio/commit/c04c950deee4a421d6a978adf977a8d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-27T10:02:48+01:00 pkg: deb specs updated for v5.6.4 --- 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/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/c04c950deee4a421d6a978adf977a8d… Patch: https://github.com/kamailio/kamailio/commit/c04c950deee4a421d6a978adf977a8d…

1 0

Releasing v5.6.4
by Daniel-Constantin Mierla 27 Feb '23

27 Feb '23

Hello, I am considering to release Kamailio v5.6.4 (out of branch 5.6) next week (likely on Monday or Tuesday, Feb 27/28, 2023). If anyone is aware of issues not yet on the bug tracker, report them there asap in order to have a better chance to be fixed. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - June 5-7, 2023 - www.kamailioworld.com Kamailio Advanced Training - Online - March 27-30, 2023 - www.asipto.com

1 1

[kamailio/kamailio] hiops moduls (#2209)
by mojtabaesfandiari 26 Feb '23

26 Feb '23

#### 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 #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2209 -- Commit Summary -- * add received_in_via function(use it in hiops module) * hiops: new module in Kamailio -- File Changes -- M src/core/msg_translator.c (25) M src/core/msg_translator.h (3) A src/modules/hiops/Alarm-Indicator.c (153) A src/modules/hiops/Alarm-Indicator.h (57) A src/modules/hiops/BIT_STRING.c (189) A src/modules/hiops/BIT_STRING.h (33) A src/modules/hiops/CMakeLists.txt (92) A src/modules/hiops/Code.c (64) A src/modules/hiops/Code.h (49) A src/modules/hiops/CommunicationIdentifier.c (94) A src/modules/hiops/CommunicationIdentifier.h (43) A src/modules/hiops/GeneralizedTime.c (706) A src/modules/hiops/GeneralizedTime.h (69) A src/modules/hiops/HI1-Operation.c (94) A src/modules/hiops/HI1-Operation.h (61) A src/modules/hiops/IA5String.c (77) A src/modules/hiops/IA5String.h (27) A src/modules/hiops/INTEGER.c (1025) A src/modules/hiops/INTEGER.h (82) A src/modules/hiops/IP-value.c (130) A src/modules/hiops/IP-value.h (55) A src/modules/hiops/IPAddress.c (393) A src/modules/hiops/IPAddress.h (67) A src/modules/hiops/LawfulInterceptionIdentifier.c (126) A src/modules/hiops/LawfulInterceptionIdentifier.h (38) A src/modules/hiops/LocalTimeStamp.c (191) A src/modules/hiops/LocalTimeStamp.h (50) A src/modules/hiops/Makefile (15) A src/modules/hiops/National-HI1-ASN1parameters.c (139) A src/modules/hiops/National-HI1-ASN1parameters.h (43) A src/modules/hiops/NativeEnumerated.c (207) A src/modules/hiops/NativeEnumerated.h (32) A src/modules/hiops/NativeInteger.c (332) A src/modules/hiops/NativeInteger.h (37) A src/modules/hiops/Network-Element-Identifier.c (198) A src/modules/hiops/Network-Element-Identifier.h (60) A src/modules/hiops/Network-Identifier.c (94) A src/modules/hiops/Network-Identifier.h (48) A src/modules/hiops/Notification.c (153) A src/modules/hiops/Notification.h (57) A src/modules/hiops/OBJECT_IDENTIFIER.c (764) A src/modules/hiops/OBJECT_IDENTIFIER.h (139) A src/modules/hiops/OCTET_STRING.c (1807) A src/modules/hiops/OCTET_STRING.h (86) A src/modules/hiops/PrintableString.c (109) A src/modules/hiops/PrintableString.h (24) A src/modules/hiops/Priority.c (125) A src/modules/hiops/Priority.h (38) A src/modules/hiops/TimeStamp.c (64) A src/modules/hiops/TimeStamp.h (49) A src/modules/hiops/UTCTime.c (179) A src/modules/hiops/UTCTime.h (38) A src/modules/hiops/asn_application.h (47) A src/modules/hiops/asn_codecs.h (109) A src/modules/hiops/asn_codecs_prim.c (312) A src/modules/hiops/asn_codecs_prim.h (53) A src/modules/hiops/asn_internal.h (128) A src/modules/hiops/asn_system.h (137) A src/modules/hiops/ber_decoder.c (283) A src/modules/hiops/ber_decoder.h (64) A src/modules/hiops/ber_tlv_length.c (178) A src/modules/hiops/ber_tlv_length.h (50) A src/modules/hiops/ber_tlv_tag.c (144) A src/modules/hiops/ber_tlv_tag.h (60) A src/modules/hiops/constr_CHOICE.c (1114) A src/modules/hiops/constr_CHOICE.h (57) A src/modules/hiops/constr_SEQUENCE.c (1425) A src/modules/hiops/constr_SEQUENCE.h (60) A src/modules/hiops/constr_TYPE.c (77) A src/modules/hiops/constr_TYPE.h (180) A src/modules/hiops/constraints.c (93) A src/modules/hiops/constraints.h (63) A src/modules/hiops/der_encoder.c (201) A src/modules/hiops/der_encoder.h (68) A src/modules/hiops/hi1ops.c (682) A src/modules/hiops/hi1ops.h (102) A src/modules/hiops/hi2ops.c (1319) A src/modules/hiops/hi2ops.h (109) A src/modules/hiops/hiops.c (272) A src/modules/hiops/hiops.h (38) A src/modules/hiops/per_decoder.c (93) A src/modules/hiops/per_decoder.h (56) A src/modules/hiops/per_encoder.c (151) A src/modules/hiops/per_encoder.h (69) A src/modules/hiops/per_opentype.c (378) A src/modules/hiops/per_opentype.h (22) A src/modules/hiops/per_support.c (483) A src/modules/hiops/per_support.h (135) A src/modules/hiops/tcp_socket.c (136) A src/modules/hiops/tcp_socket.h (39) A src/modules/hiops/xer_decoder.c (368) A src/modules/hiops/xer_decoder.h (106) A src/modules/hiops/xer_encoder.c (67) A src/modules/hiops/xer_encoder.h (59) A src/modules/hiops/xer_support.c (227) A src/modules/hiops/xer_support.h (55) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2209.patch https://github.com/kamailio/kamailio/pull/2209.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2209

5 17

git:5.5:b825f14b: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 24 Feb '23

24 Feb '23

Module: kamailio Branch: 5.5 Commit: b825f14b7ef3fb92363bc56e753c65e6eda44c88 URL: https://github.com/kamailio/kamailio/commit/b825f14b7ef3fb92363bc56e753c65e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-24T17:47:03+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/ctl/README Modified: src/modules/exec/README Modified: src/modules/ims_dialog/README Modified: src/modules/rr/README --- Diff: https://github.com/kamailio/kamailio/commit/b825f14b7ef3fb92363bc56e753c65e… Patch: https://github.com/kamailio/kamailio/commit/b825f14b7ef3fb92363bc56e753c65e…

1 0

git: new commits in branch 5.5
by Daniel-Constantin Mierla 24 Feb '23

24 Feb '23

- URL: https://github.com/kamailio/kamailio/commit/f39f172ffb29035082eec3e580a0aa0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:29:00+01:00 corex: added fixup free functions in module exports (cherry picked from commit d5ae9019dcdfe5b51ce87f6957902abbaa7fa071) (cherry picked from commit 19aab1894ba88bc7152e00a84819d991937665a6) - URL: https://github.com/kamailio/kamailio/commit/8e64e5c29a0e03e29f33f2c562ee0ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:32:29+01:00 keepalive: removed redundant checks (cherry picked from commit cbe6cef58da8de7efa18c4e34458a81176d23e42) (cherry picked from commit 0ead35429a85800105178f7a8427d94ad390da33) - URL: https://github.com/kamailio/kamailio/commit/d721e45054f31899930d0833c06f563… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:33:00+01:00 kex: added fixup free functions to module exports (cherry picked from commit c8bd10f791ef7aa48a16104472b039a8ca1a53c5) (cherry picked from commit 46cd2b6732a1bcd49c31a4a4a1173d0b27ce39a1) - URL: https://github.com/kamailio/kamailio/commit/56941d00b9ed96da159eeba543cc1f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:34:26+01:00 secsipid: iterate through all Identity headers (cherry picked from commit cd3b776649e652b5d27b2718c22f08736b1e9e84) (cherry picked from commit a0e89d8fad7e764478b0ff69e1fe335fcd7104a9) - URL: https://github.com/kamailio/kamailio/commit/307a2bb2a6174ecc879978c74fbb68d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:34:34+01:00 secsipid: debug message if identity header is not found (cherry picked from commit 0920aa1a27565bc52fd1ff9f4b9fc31dbd0d2a75) (cherry picked from commit bea811e2a6e8b12f8491b7e46bcc58ad66c9e225) - URL: https://github.com/kamailio/kamailio/commit/887b53b23e2ba713eac46316bea343e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:34:46+01:00 secsipid: ensure headers are parsed (cherry picked from commit a0d9deb9f852f887bed7c0809f3056b5f75379c8) (cherry picked from commit a2c4e0efdb03ba31ddb295fbfd2d95a393480906) - URL: https://github.com/kamailio/kamailio/commit/dda9fa437786304ac0f2e726cf56400… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:34:57+01:00 websocket: more details on debig messages (cherry picked from commit e7bd1570e3788e9d04047b4d1d00cb8bd8b172d3) (cherry picked from commit af3a249364b20e46cc80a6ae6ea8c04c9d10513b) - URL: https://github.com/kamailio/kamailio/commit/047e71f4eae1ba76034adca72a5cd98… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:35:26+01:00 sipcapture: debug message with header offset and address family (cherry picked from commit 7f258d97431a9a4bccf8155def52c9e9070c9f1d) (cherry picked from commit caf8465d6f56c5891b8398814d3e66ad4996b386) - URL: https://github.com/kamailio/kamailio/commit/aba29b7bca17de61eaa6740a45365bf… Author: Rick Barenthin <rick(a)ng-voice.com> Date: 2023-02-24T17:36:12+01:00 tm: cleanup parsed body at the end t_continue_helper - if t_suspend and t_continue are used for replies and in the called route in t_continue the body of the sip message is parsed the pkg memory of the parsed body is leaked (cherry picked from commit f409a8c9f6fde33eaf8b428887e219b56740b0a5) (cherry picked from commit 7e12f4f5951ebcd40bc7779b6c7bf71081c38481) - URL: https://github.com/kamailio/kamailio/commit/8b9b056073d214755073f38b9eb44f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:36:25+01:00 core: tcp - debug message on no connect (cherry picked from commit 5fee7d818f18afcab4d2e17231d2e4eab79b7b48) (cherry picked from commit 0ba02031953029c3e4820264503400cbd9e14924) - URL: https://github.com/kamailio/kamailio/commit/0478e3d5022abcdc7f1dd15062d1633… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:38:48+01:00 websocket: ignore keepalive in state WS_S_REMOVING - GH #3331 (cherry picked from commit 34c3c42b7fe44dbe88110415ec78400a7defde61) (cherry picked from commit d59c64514f032a73a1f6aa65051f81b8784a5713) - URL: https://github.com/kamailio/kamailio/commit/8f8614fae4ae18cfe3d8011b5126d7e… Author: Sandro Gauci <sandro(a)enablesecurity.com> Date: 2023-02-24T17:38:58+01:00 exec: docs - added security warning - Added warning about potential for OS Command Injection - Updated invalid examples previous example gives the following error: pv_parse_spec2(): error searching pvar "rU.txt" (cherry picked from commit f81f0e77c5ab67431af1f62f0e027379a3445951) (cherry picked from commit ee7d314422003fc6edfbc364015499e38e18ae62) - URL: https://github.com/kamailio/kamailio/commit/844a6e131e6fd522da58ceb2b9f4ec1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:39:11+01:00 ims_dialog: fix module name in modparam examples (cherry picked from commit a4150741748779bba8e14bed286c6d64b1df7f17) (cherry picked from commit 6f3a48124cedc04332e45e9f38f54ed5acb1027d) - URL: https://github.com/kamailio/kamailio/commit/40b09a423a9d7b8fe1093831ad335b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:39:59+01:00 core: typos in comments and EoL after log when parse msg fails - GH #3348 (cherry picked from commit 51fa3da96c1eacd4d679598a3305180c9e818cfb) (cherry picked from commit b2e872799d8a694bd433193ec8157ab1d329edaa) - URL: https://github.com/kamailio/kamailio/commit/27ff2fba44bda772b66a8d6c8f4e8d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:40:52+01:00 rr: doc - fixed typos and use the proper param name add_username instead of enable_username (cherry picked from commit 022fa0cfc75d150fde219b8ae4f9a99b3fa2f132) (cherry picked from commit 1107423f6af0df4d788216324d6547247fa22224) - URL: https://github.com/kamailio/kamailio/commit/550f9d63b29110c8f5a2d736041c5ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:41:14+01:00 lib/ims: check return of strtok(...) (cherry picked from commit 63095ef1bef36a35952ed265f41d87ccbc1bba70) (cherry picked from commit 6796e7faeef7c0af9805b07e4f29c6924d8f3edc) - URL: https://github.com/kamailio/kamailio/commit/a735a7932711236115cdcf08c18b923… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:41:26+01:00 async: catch up on possible skipped slots due to slow tasks (cherry picked from commit 0a3c15239a620474bbbc7f4d2f57dda0e9aa0f58) (cherry picked from commit 89a65b849a392fea8a46b1e6ae8309c764cdf81e) - URL: https://github.com/kamailio/kamailio/commit/2ce7feed92c5751948c963ffb1bdd5d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:41:37+01:00 ctl: doc - binrpc_buffer_size can get only integer value (cherry picked from commit 44381746e0e826e8db04597942fa4cee6cbf9175) (cherry picked from commit a914333bbac7b52943dc8d9d58bf15614b6497d5) - URL: https://github.com/kamailio/kamailio/commit/1d14e1ba4c5fb5b0bc5121fdcd95c26… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:41:47+01:00 topos: use proper field for datetime value (cherry picked from commit 446892331900c2303e531da55bcb494ccb2d8bce) (cherry picked from commit 74416f1fe93dad9ce62c1f31daeb6385d92c3f74) - URL: https://github.com/kamailio/kamailio/commit/8e9144c5f73993a312d0a0bd526a7b0… Author: POIROTTE Francois <francois.poirotte(a)csgroup.eu> Date: 2023-02-24T17:42:01+01:00 kamctl: hide errors raised by "which" Hide error messages from "which" to avoid polluting kamctl's output (e.g. when a JSON document is returned) in environments where STDOUT and STDERR may be combined into a single stream (e.g. containers) (cherry picked from commit a229d230bca5e785670edc3901f849e93989f9fe) (cherry picked from commit 614071020f123263b6e0c0cace652f88ac40f470)

1 0

git:5.6:b27ddcd4: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 24 Feb '23

24 Feb '23

Module: kamailio Branch: 5.6 Commit: b27ddcd40250201ac9d9051308daa48797e8071c URL: https://github.com/kamailio/kamailio/commit/b27ddcd40250201ac9d9051308daa48… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-24T14:17:07+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/ctl/README Modified: src/modules/exec/README Modified: src/modules/ims_dialog/README Modified: src/modules/rr/README --- Diff: https://github.com/kamailio/kamailio/commit/b27ddcd40250201ac9d9051308daa48… Patch: https://github.com/kamailio/kamailio/commit/b27ddcd40250201ac9d9051308daa48…

1 0

git:5.6:74416f1f: topos: use proper field for datetime value
by Daniel-Constantin Mierla 24 Feb '23

24 Feb '23

Module: kamailio Branch: 5.6 Commit: 74416f1fe93dad9ce62c1f31daeb6385d92c3f74 URL: https://github.com/kamailio/kamailio/commit/74416f1fe93dad9ce62c1f31daeb638… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T13:55:17+01:00 topos: use proper field for datetime value (cherry picked from commit 446892331900c2303e531da55bcb494ccb2d8bce) --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/74416f1fe93dad9ce62c1f31daeb638… Patch: https://github.com/kamailio/kamailio/commit/74416f1fe93dad9ce62c1f31daeb638… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 56d56776a42..e0649b683d3 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -890,7 +890,7 @@ int tps_db_insert_branch(tps_data_t *td) db_keys[nr_keys] = &tt_col_rectime; db_vals[nr_keys].type = DB1_DATETIME; - db_vals[nr_keys].val.int_val = time(NULL); + db_vals[nr_keys].val.time_val = time(NULL); nr_keys++; db_keys[nr_keys] = &tt_col_a_callid;

1 0

git:5.6:61407102: kamctl: hide errors raised by "which"
by Daniel-Constantin Mierla 24 Feb '23

24 Feb '23

Module: kamailio Branch: 5.6 Commit: 614071020f123263b6e0c0cace652f88ac40f470 URL: https://github.com/kamailio/kamailio/commit/614071020f123263b6e0c0cace652f8… Author: POIROTTE Francois <francois.poirotte(a)csgroup.eu> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T13:56:26+01:00 kamctl: hide errors raised by "which" Hide error messages from "which" to avoid polluting kamctl's output (e.g. when a JSON document is returned) in environments where STDOUT and STDERR may be combined into a single stream (e.g. containers) (cherry picked from commit a229d230bca5e785670edc3901f849e93989f9fe) --- Modified: utils/kamctl/kamctl.base --- Diff: https://github.com/kamailio/kamailio/commit/614071020f123263b6e0c0cace652f8… Patch: https://github.com/kamailio/kamailio/commit/614071020f123263b6e0c0cace652f8… --- diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index f3b9e1f6670..164a867bd9b 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -10,7 +10,7 @@ locate_tool() { while [ -n "$1" ] do if [ -x /usr/bin/which ] ; then - TOOLPATH=`which $1` + TOOLPATH=`which $1 2> /dev/null` if [ -n "$TOOLPATH" ]; then return fi

1 0

git:5.6:a914333b: ctl: doc - binrpc_buffer_size can get only integer value
by Daniel-Constantin Mierla 24 Feb '23

24 Feb '23

Module: kamailio Branch: 5.6 Commit: a914333bbac7b52943dc8d9d58bf15614b6497d5 URL: https://github.com/kamailio/kamailio/commit/a914333bbac7b52943dc8d9d58bf156… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T13:54:17+01:00 ctl: doc - binrpc_buffer_size can get only integer value (cherry picked from commit 44381746e0e826e8db04597942fa4cee6cbf9175) --- Modified: src/modules/ctl/doc/ctl_params.xml --- Diff: https://github.com/kamailio/kamailio/commit/a914333bbac7b52943dc8d9d58bf156… Patch: https://github.com/kamailio/kamailio/commit/a914333bbac7b52943dc8d9d58bf156… --- diff --git a/src/modules/ctl/doc/ctl_params.xml b/src/modules/ctl/doc/ctl_params.xml index 558d706464c..5f944d79857 100644 --- a/src/modules/ctl/doc/ctl_params.xml +++ b/src/modules/ctl/doc/ctl_params.xml @@ -90,7 +90,7 @@ modparam("ctl", "binrpc", "udp:*:3012") # udp any , port 3012 </section> <section id="binrpc_buffer_size"> - <title><varname>binrpc_buffer_size</varname> (integer or string)</title> + <title><varname>binrpc_buffer_size</varname> (integer)</title> <para> The size of the internal buffer used for printing elements of the RPC response (e.g., internal RPC printf()). The value is given in bytes.

1 0

git:5.6:6796e7fa: lib/ims: check return of strtok(...)
by Daniel-Constantin Mierla 24 Feb '23

24 Feb '23

Module: kamailio Branch: 5.6 Commit: 6796e7faeef7c0af9805b07e4f29c6924d8f3edc URL: https://github.com/kamailio/kamailio/commit/6796e7faeef7c0af9805b07e4f29c69… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T13:53:21+01:00 lib/ims: check return of strtok(...) (cherry picked from commit 63095ef1bef36a35952ed265f41d87ccbc1bba70) --- Modified: src/lib/ims/ims_getters.c --- Diff: https://github.com/kamailio/kamailio/commit/6796e7faeef7c0af9805b07e4f29c69… Patch: https://github.com/kamailio/kamailio/commit/6796e7faeef7c0af9805b07e4f29c69… --- diff --git a/src/lib/ims/ims_getters.c b/src/lib/ims/ims_getters.c index 26fdbb8c418..56816be422f 100644 --- a/src/lib/ims/ims_getters.c +++ b/src/lib/ims/ims_getters.c @@ -1247,12 +1247,13 @@ int cscf_get_p_charging_vector(struct sip_msg *msg, str * icid, str * orig_ioi, LM_DBG("p_charging_vector body is %.*s\n", header_body.len, header_body.s); p = strtok(header_body.s, " ;:\r\t\n\"="); - loop: if (p > (header_body.s + header_body.len)) +loop: + if (p == NULL || p > (header_body.s + header_body.len)) return 1; if (strncmp(p, "icid-value", 10) == 0) { p = strtok(NULL, " ;:\r\t\n\"="); - if (p > (header_body.s + header_body.len)) { + if (p == NULL || p > (header_body.s + header_body.len)) { LM_ERR("cscf_get_p_charging_vector: no value for icid\n"); return 0; } @@ -1272,7 +1273,7 @@ int cscf_get_p_charging_vector(struct sip_msg *msg, str * icid, str * orig_ioi, } else if (strncmp(p, "orig-ioi", 8) == 0) { p = strtok(NULL, " ;:\r\t\n\"="); - if (p > (header_body.s + header_body.len)) { + if (p == NULL || p > (header_body.s + header_body.len)) { LM_ERR("cscf_get_p_charging_vector: no value for icid\n"); return 0; } @@ -1292,7 +1293,7 @@ int cscf_get_p_charging_vector(struct sip_msg *msg, str * icid, str * orig_ioi, } else if (strncmp(p, "term-ioi", 8) == 0) { p = strtok(NULL, " ;:\r\t\n\"="); - if (p > (header_body.s + header_body.len)) { + if (p == NULL || p > (header_body.s + header_body.len)) { LM_ERR("cscf_get_p_charging_vector: no value for icid\n"); return 0; } @@ -1314,7 +1315,7 @@ int cscf_get_p_charging_vector(struct sip_msg *msg, str * icid, str * orig_ioi, LM_DBG("end\n"); str_free(header_body, pkg); return 1; - out_of_memory: +out_of_memory: PKG_MEM_ERROR; return 0; }

1 0

git:5.6:89a65b84: async: catch up on possible skipped slots due to slow tasks
by Daniel-Constantin Mierla 24 Feb '23

24 Feb '23

Module: kamailio Branch: 5.6 Commit: 89a65b849a392fea8a46b1e6ae8309c764cdf81e URL: https://github.com/kamailio/kamailio/commit/89a65b849a392fea8a46b1e6ae8309c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T13:53:51+01:00 async: catch up on possible skipped slots due to slow tasks (cherry picked from commit 0a3c15239a620474bbbc7f4d2f57dda0e9aa0f58) --- Modified: src/modules/async/async_sleep.c --- Diff: https://github.com/kamailio/kamailio/commit/89a65b849a392fea8a46b1e6ae8309c… Patch: https://github.com/kamailio/kamailio/commit/89a65b849a392fea8a46b1e6ae8309c… --- diff --git a/src/modules/async/async_sleep.c b/src/modules/async/async_sleep.c index 02c3b8d488f..d6dd41d3f17 100644 --- a/src/modules/async/async_sleep.c +++ b/src/modules/async/async_sleep.c @@ -271,9 +271,12 @@ int async_sleep(sip_msg_t *msg, int seconds, cfg_action_t *act, str *cbname) return 0; } +static unsigned int _async_timer_exec_last_slot = -1; + void async_timer_exec(unsigned int ticks, void *param) { - int slot; + unsigned int idx; + unsigned int slot; async_item_t *ai; sr_kemi_eng_t *keng = NULL; str cbname = STR_NULL; @@ -282,33 +285,55 @@ void async_timer_exec(unsigned int ticks, void *param) if(_async_list_head == NULL) return; - slot = ticks % ASYNC_RING_SIZE; + idx = ticks % ASYNC_RING_SIZE; - while(1) { - lock_get(&_async_list_head->ring[slot].lock); - ai = _async_list_head->ring[slot].lstart; - if(ai != NULL) - _async_list_head->ring[slot].lstart = ai->next; - lock_release(&_async_list_head->ring[slot].lock); + if(idx == _async_timer_exec_last_slot) { + /* timer faster than 1sec */ + return; + } - if(ai == NULL) - break; - if(ai->ract != NULL) { - tmb.t_continue(ai->tindex, ai->tlabel, ai->ract); - ksr_msg_env_reset(); - } else { - keng = sr_kemi_eng_get(); - if(keng != NULL && ai->cbname_len>0) { - cbname.s = ai->cbname; - cbname.len = ai->cbname_len; - tmb.t_continue_cb(ai->tindex, ai->tlabel, &cbname, &evname); + if(_async_timer_exec_last_slot < 0) { + _async_timer_exec_last_slot = idx; + } + slot = (_async_timer_exec_last_slot + 1) % ASYNC_RING_SIZE; + if(slot != idx) { + LM_DBG("need to catch up from slot %u to %u (slots: %u)\n", slot, idx, + ASYNC_RING_SIZE); + } + + do { + while(1) { + lock_get(&_async_list_head->ring[slot].lock); + ai = _async_list_head->ring[slot].lstart; + if(ai != NULL) + _async_list_head->ring[slot].lstart = ai->next; + lock_release(&_async_list_head->ring[slot].lock); + + if(ai == NULL) + break; + if(ai->ract != NULL) { + tmb.t_continue(ai->tindex, ai->tlabel, ai->ract); ksr_msg_env_reset(); } else { - LM_WARN("no callback to be executed\n"); + keng = sr_kemi_eng_get(); + if(keng != NULL && ai->cbname_len>0) { + cbname.s = ai->cbname; + cbname.len = ai->cbname_len; + tmb.t_continue_cb(ai->tindex, ai->tlabel, &cbname, &evname); + ksr_msg_env_reset(); + } else { + LM_WARN("no callback to be executed\n"); + } } + shm_free(ai); } - shm_free(ai); - } + if(slot == idx) { + break; + } + slot = (slot + 1) % ASYNC_RING_SIZE; + } while(1); + + _async_timer_exec_last_slot = idx; } void async_mstimer_exec(unsigned int ticks, void *param)

1 0

git:5.6:6f3a4812: ims_dialog: fix module name in modparam examples
by Daniel-Constantin Mierla 24 Feb '23

24 Feb '23

Module: kamailio Branch: 5.6 Commit: 6f3a48124cedc04332e45e9f38f54ed5acb1027d URL: https://github.com/kamailio/kamailio/commit/6f3a48124cedc04332e45e9f38f54ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T13:51:45+01:00 ims_dialog: fix module name in modparam examples (cherry picked from commit a4150741748779bba8e14bed286c6d64b1df7f17) --- Modified: src/modules/ims_dialog/doc/ims_dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6f3a48124cedc04332e45e9f38f54ed… Patch: https://github.com/kamailio/kamailio/commit/6f3a48124cedc04332e45e9f38f54ed… --- diff --git a/src/modules/ims_dialog/doc/ims_dialog_admin.xml b/src/modules/ims_dialog/doc/ims_dialog_admin.xml index 5a2ddc95857..d5be1347b52 100644 --- a/src/modules/ims_dialog/doc/ims_dialog_admin.xml +++ b/src/modules/ims_dialog/doc/ims_dialog_admin.xml @@ -410,7 +410,7 @@ modparam("ims_dialog", "detect_spirals", 1) </title> <programlisting format="linespecific"> ... -modparam("dialog", "profiles_with_value", "caller ; my_profile") +modparam("ims_dialog", "profiles_with_value", "caller ; my_profile") ... </programlisting> </example> @@ -435,7 +435,7 @@ modparam("dialog", "profiles_with_value", "caller ; my_profile") </title> <programlisting format="linespecific"> ... -modparam("dialog", "profiles_no_value", "inbound ; outbound") +modparam("ims_dialog", "profiles_no_value", "inbound ; outbound") ... </programlisting> </example> @@ -460,7 +460,7 @@ modparam("dialog", "profiles_no_value", "inbound ; outbound") </title> <programlisting format="linespecific"> ... -modparam("dialog", "bridge_controller", "sip:ctd@kamailio.org") +modparam("ims_dialog", "bridge_controller", "sip:ctd@kamailio.org") ... </programlisting> </example>

1 0

git:5.6:b2e87279: core: typos in comments and EoL after log when parse msg fails
by Daniel-Constantin Mierla 24 Feb '23

24 Feb '23

Module: kamailio Branch: 5.6 Commit: b2e872799d8a694bd433193ec8157ab1d329edaa URL: https://github.com/kamailio/kamailio/commit/b2e872799d8a694bd433193ec8157ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T13:52:43+01:00 core: typos in comments and EoL after log when parse msg fails - GH #3348 (cherry picked from commit 51fa3da96c1eacd4d679598a3305180c9e818cfb) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/b2e872799d8a694bd433193ec8157ab… Patch: https://github.com/kamailio/kamailio/commit/b2e872799d8a694bd433193ec8157ab… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index bc1b9736df8..3ab6fae4725 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -53,7 +53,7 @@ * lookup is performed on the host part and the reply is sent to the * resulting ip. If a port is present or the host part is an ip address * the dns lookup will be a "normal" one (A or AAAA). - * - if rport is present, it's value will be used as the destination port + * - if rport is present, its value will be used as the destination port * (and this will also disable srv lookups) * - if no port is present the destination port will be taken from the srv * lookup. If the srv lookup fails or is not performed (e.g. ip address @@ -1459,7 +1459,7 @@ void process_lumps( struct sip_msg* msg, /* skip len bytes from orig msg */ s_offset+=t->len; } else if (t->op==LUMP_DEL && flag == FLAG_MSG_LUMPS_ONLY) { - /* copy lump value and indent as necessarely */ + /* copy lump value and indent as necessarily */ memcpy(new_buf+offset, orig + t->u.offset, t->len); offset+=t->len; if (new_buf[offset-1] != '\n') { @@ -1592,7 +1592,7 @@ static inline int adjust_clen(struct sip_msg* msg, int body_delta, int proto) /* The body has been changed, try to find * existing Content-Length */ - /* no need for Content-Length if it's and UDP packet and + /* no need for Content-Length if it's an UDP packet and * it hasn't Content-Length already */ if (msg->content_length==0){ /* content-length doesn't exist, append it */ @@ -1938,7 +1938,7 @@ int check_boundaries(struct sip_msg *msg, struct dest_info *send_info) /** builds a request in memory from another sip request. * * Side-effects: - it adds lumps to the msg which are _not_ cleaned. - * The added lumps are HDR_VIA_T (almost always added), HDR_CONTENLENGTH_T + * The added lumps are HDR_VIA_T (almost always added), HDR_CONTENTLENGTH_T * and HDR_ROUTE_T (when a Route: header is added as a result of a non-null * msg->path_vec). * - it might change send_info->proto and send_info->send_socket @@ -2109,7 +2109,7 @@ char * build_req_buf_from_sip_req(struct sip_msg* msg, } received_buf = NULL; } - /* if rport needs to be updated, delete it if present and add it's value */ + /* if rport needs to be updated, delete it if present and add its value */ if (rport_buf){ if (msg->via1->rport){ /* rport already present */ via_insert_param=del_lump(msg, @@ -3075,7 +3075,7 @@ char* create_via_hf(unsigned int *len, /* builds a char* buffer from message headers without body * first line is excluded in case of skip_first_line=1 - * error is set -1 if the memory allocation failes + * error is set -1 if the memory allocation fails */ char * build_only_headers( struct sip_msg* msg, int skip_first_line, unsigned int *returned_len, @@ -3127,7 +3127,7 @@ char * build_only_headers( struct sip_msg* msg, int skip_first_line, } /* builds a char* buffer from message body - * error is set -1 if the memory allocation failes + * error is set -1 if the memory allocation fails */ char * build_body( struct sip_msg* msg, unsigned int *returned_len, @@ -3253,7 +3253,7 @@ int build_sip_msg_from_buf(struct sip_msg *msg, char *buf, int len, msg->buf = buf; msg->len = len; if (parse_msg(buf, len, msg)!=0) { - LM_ERR("parsing failed"); + LM_ERR("parsing failed\n"); return -1; } msg->set_global_address=default_global_address;

1 0

git:5.6:1107423f: rr: doc - fixed typos and use the proper param name add_username instead of enable_username
by Daniel-Constantin Mierla 24 Feb '23

24 Feb '23

Module: kamailio Branch: 5.6 Commit: 1107423f6af0df4d788216324d6547247fa22224 URL: https://github.com/kamailio/kamailio/commit/1107423f6af0df4d788216324d65472… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T13:52:57+01:00 rr: doc - fixed typos and use the proper param name add_username instead of enable_username (cherry picked from commit 022fa0cfc75d150fde219b8ae4f9a99b3fa2f132) --- Modified: src/modules/rr/doc/rr_admin.xml Modified: src/modules/rr/doc/rr_devel.xml --- Diff: https://github.com/kamailio/kamailio/commit/1107423f6af0df4d788216324d65472… Patch: https://github.com/kamailio/kamailio/commit/1107423f6af0df4d788216324d65472… --- diff --git a/src/modules/rr/doc/rr_admin.xml b/src/modules/rr/doc/rr_admin.xml index 98bad1239f2..c1ad84277ed 100644 --- a/src/modules/rr/doc/rr_admin.xml +++ b/src/modules/rr/doc/rr_admin.xml @@ -12,7 +12,7 @@ <section> <title>Overview</title> - <para>The module contains record routing logic</para> + <para>The module contains record routing logic.</para> </section> <section id="RR-dialog-id"> @@ -20,7 +20,7 @@ <para>&kamailio; is basically <emphasis>only</emphasis> a transaction stateful proxy, without any dialog support build in. There are many - features/services which actually requires a dialog awareness, like storing + features/services which actually require a dialog awareness, like storing the information in the dialog creation stage, information which will be used during the whole dialog existence.</para> @@ -246,7 +246,7 @@ modparam("rr", "enable_socket_mismatch_warning", 0) <section id="rr.p.custom_user_avp"> <title><varname>custom_user_avp</varname> (avp string)</title> - <para>When enable_username is enabled, a call to record_route will add + <para>When add_username is enabled, a call to record_route will add the username of the RequestURI to the Record-Route URI. This parameter allows you to setup an AVP with which you can customise the username to be added in the Record-Route URI.</para> @@ -664,7 +664,7 @@ add_rr_param(";nat=yes"); <para>The function checks if the URI parameters of the local Route header (corresponding to the local server) matches the given regular - expression. It must be call after loose_route() (see <xref + expression. It must be called after loose_route() (see <xref linkend="rr.f.loose_route"/>).</para> <para>Meaning of the parameters is as follows:</para> diff --git a/src/modules/rr/doc/rr_devel.xml b/src/modules/rr/doc/rr_devel.xml index 9d16ea0791f..a451c4fb4dd 100644 --- a/src/modules/rr/doc/rr_devel.xml +++ b/src/modules/rr/doc/rr_devel.xml @@ -128,7 +128,7 @@ record_route_advertised_address("1.2.3.4:5090"); The function checks for the request <quote>msg</quote> if the URI parameters of the local Route header (corresponding to the local server) matches the given regular expression <quote>re</quote>. - It must be call after the loose_route was done. + It must be called after the loose_route was done. </para> <para> The function returns 0 on success. Otherwise, -1 is returned. @@ -157,7 +157,7 @@ record_route_advertised_address("1.2.3.4:5090"); <quote>msg</quote>. As for checking it's used the <quote>ftag</quote> Route header parameter, the append_fromtag (see <xref linkend="append-fromtag-id"/> module parameter - must be enables. Also this must be call only after the loose_route is + must be enables. Also this must be called only after the loose_route is done. </para> <para> @@ -185,9 +185,9 @@ record_route_advertised_address("1.2.3.4:5090"); <function moreinfo="none">get_route_param( msg, name, val)</function> </title> <para> - The function search in to the <quote>msg</quote>'s Route header + The function searches in the <quote>msg</quote>'s Route header parameters the parameter called <quote>name</quote> and returns its - value into <quote>val</quote>. It must be call only after the + value into <quote>val</quote>. It must be called only after the loose_route is done. </para> <para> @@ -220,7 +220,7 @@ record_route_advertised_address("1.2.3.4:5090"); <function moreinfo="none">register_rrcb( callback, param)</function> </title> <para> - The function register a new callback (along with its parameter). The + The function registers a new callback (along with its parameter). The callback will be called when a loose route will be performed for the local address. </para>

1 0

git:5.6:d59c6451: websocket: ignore keepalive in state WS_S_REMOVING
by Daniel-Constantin Mierla 24 Feb '23

24 Feb '23

Module: kamailio Branch: 5.6 Commit: d59c64514f032a73a1f6aa65051f81b8784a5713 URL: https://github.com/kamailio/kamailio/commit/d59c64514f032a73a1f6aa65051f81b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T13:49:54+01:00 websocket: ignore keepalive in state WS_S_REMOVING - GH #3331 (cherry picked from commit 34c3c42b7fe44dbe88110415ec78400a7defde61) --- Modified: src/modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/d59c64514f032a73a1f6aa65051f81b… Patch: https://github.com/kamailio/kamailio/commit/d59c64514f032a73a1f6aa65051f81b… --- diff --git a/src/modules/websocket/ws_frame.c b/src/modules/websocket/ws_frame.c index 583e9040522..c7927b16f43 100644 --- a/src/modules/websocket/ws_frame.c +++ b/src/modules/websocket/ws_frame.c @@ -809,13 +809,18 @@ void ws_keepalive(unsigned int ticks, void *param) LM_WARN("forcibly closing connection\n"); wsconn_close_now(wsc); } else if (ws_keepalive_mechanism == KEEPALIVE_MECHANISM_CONCHECK) { - tcp_connection_t *con = tcpconn_get(wsc->id, 0, 0, 0, 0); - if(con==NULL) { - LM_INFO("tcp connection has been lost (id: %d wsc: %p)\n", + if(wsc->state == WS_S_REMOVING) { + LM_DBG("ws (id: %d wsc: %p) in removing state ignoring keepalive\n", wsc->id, wsc); - wsc->state = WS_S_CLOSING; } else { - tcpconn_put(con); + tcp_connection_t *con = tcpconn_get(wsc->id, 0, 0, 0, 0); + if(con==NULL) { + LM_INFO("tcp connection has been lost (id: %d wsc: %p)\n", + wsc->id, wsc); + wsc->state = WS_S_CLOSING; + } else { + tcpconn_put(con); + } } } else { int opcode = (ws_keepalive_mechanism == KEEPALIVE_MECHANISM_PING)

1 0

git:5.6:ee7d3144: exec: docs - added security warning
by Daniel-Constantin Mierla 24 Feb '23

24 Feb '23

Module: kamailio Branch: 5.6 Commit: ee7d314422003fc6edfbc364015499e38e18ae62 URL: https://github.com/kamailio/kamailio/commit/ee7d314422003fc6edfbc364015499e… Author: Sandro Gauci <sandro(a)enablesecurity.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T13:50:24+01:00 exec: docs - added security warning - Added warning about potential for OS Command Injection - Updated invalid examples previous example gives the following error: pv_parse_spec2(): error searching pvar "rU.txt" (cherry picked from commit f81f0e77c5ab67431af1f62f0e027379a3445951) --- Modified: src/modules/exec/doc/exec_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ee7d314422003fc6edfbc364015499e… Patch: https://github.com/kamailio/kamailio/commit/ee7d314422003fc6edfbc364015499e… --- diff --git a/src/modules/exec/doc/exec_admin.xml b/src/modules/exec/doc/exec_admin.xml index 12249d5104a..9dee3522d66 100644 --- a/src/modules/exec/doc/exec_admin.xml +++ b/src/modules/exec/doc/exec_admin.xml @@ -77,6 +77,23 @@ Otherwise they will be evaluated as &kamailio; pseudo-variables, throwing errors. </para> + <para> + WARNING: if the exec functions are passed variables that might include + malicious input, then remote attackers may abuse the exec functions to + execute arbitrary code. Specifically, this may result in OS command injection. + In such cases, input validation is required to prevent the vulnerability. + The following is an example of how input validation and exec module + functions may be used together to prevent exploitation: + </para> + <programlisting format="linespecific"> +... +if !($rU =~ "^[0-9]{1,15}$") { + xlog("Malformed R-URI username: '$rU'\n"); + exit; +} +exec_msg("echo TEST >> /tmp/$(rU).txt"); +... + </programlisting> </section> <section> @@ -186,7 +203,7 @@ modparam("exec", "time_to_kill", 20) <programlisting format="linespecific"> ... exec_dset("echo TEST > /tmp/test.txt"); -exec_dset("echo TEST > /tmp/$rU.txt"); +exec_dset("echo TEST > /tmp/$(rU).txt"); ... </programlisting> </example> @@ -225,7 +242,7 @@ exec_dset("echo TEST > /tmp/$rU.txt"); <programlisting format="linespecific"> ... exec_msg("echo TEST > /tmp/test.txt"); -exec_msg("echo TEST > /tmp/$rU.txt"); +exec_msg("echo TEST > /tmp/$(rU).txt"); ... </programlisting> </example> @@ -300,7 +317,7 @@ exec_avp("echo TEST", "$avp(s:test)"); <programlisting format="linespecific"> ... exec_cmd("echo TEST > /tmp/test.txt"); -exec_cmd("echo TEST > /tmp/$rU.txt"); +exec_cmd("echo TEST > /tmp/$(rU).txt"); ... </programlisting> </example> @@ -315,4 +332,3 @@ exec_cmd("echo TEST > /tmp/$rU.txt"); </para> </section> </chapter> -

1 0

Info: Registration to Kamailio World 2023 is open!
by Daniel-Constantin Mierla 20 Feb '23

20 Feb '23

Hello, a quick note to the community forums to announce that the registration for the next Kamailio World Conference (June 5-7, 2022, in Berlin, Germany) is now open! The event returns to an in-person conference format, at the same wonderful location in the city center of Berlin! More details are available at: * https://www.kamailioworld.com/k2023/registration/ Call for presentations is also open, there is already a group of very interesting submissions, we aim to publish details about them in the near future. Looking forward to meeting many of you in Berlin! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - June 5-7, 2023 - www.kamailioworld.com Kamailio Advanced Training - Online - March 27-30, 2023 - www.asipto.com

1 0

git:master:a229d230: kamctl: hide errors raised by "which"
by Daniel-Constantin Mierla 17 Feb '23

17 Feb '23

Module: kamailio Branch: master Commit: a229d230bca5e785670edc3901f849e93989f9fe URL: https://github.com/kamailio/kamailio/commit/a229d230bca5e785670edc3901f849e… Author: POIROTTE Francois <francois.poirotte(a)csgroup.eu> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-17T16:41:08+01:00 kamctl: hide errors raised by "which" Hide error messages from "which" to avoid polluting kamctl's output (e.g. when a JSON document is returned) in environments where STDOUT and STDERR may be combined into a single stream (e.g. containers) --- Modified: utils/kamctl/kamctl.base --- Diff: https://github.com/kamailio/kamailio/commit/a229d230bca5e785670edc3901f849e… Patch: https://github.com/kamailio/kamailio/commit/a229d230bca5e785670edc3901f849e… --- diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index 40e4f09b905..08cd4412054 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -10,7 +10,7 @@ locate_tool() { while [ -n "$1" ] do if [ -x /usr/bin/which ] ; then - TOOLPATH=`which $1` + TOOLPATH=`which $1 2> /dev/null` if [ -n "$TOOLPATH" ]; then return fi

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev