sr-dev February 2022

sr-dev@lists.kamailio.org

17 participants
241 discussions

git:master:f85cd7eb: blst: converted log macros and removed function names

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f85cd7eb9d3249ee93f0de7f978d0a9e7044df77 URL: https://github.com/kamailio/kamailio/commit/f85cd7eb9d3249ee93f0de7f978d0a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-24T14:12:44+01:00 blst: converted log macros and removed function names --- Modified: src/modules/blst/blst.c --- Diff: https://github.com/kamailio/kamailio/commit/f85cd7eb9d3249ee93f0de7f978d0a9… Patch: https://github.com/kamailio/kamailio/commit/f85cd7eb9d3249ee93f0de7f978d0a9… --- diff --git a/src/modules/blst/blst.c b/src/modules/blst/blst.c index 5d33368bd8..1c2773c53c 100644 --- a/src/modules/blst/blst.c +++ b/src/modules/blst/blst.c @@ -119,11 +119,10 @@ static int ki_blst_add(sip_msg_t* msg, int t) S_TO_TICKS(t)); return 1; }else{ - LOG(L_WARN, "WARNING: blst: blst_add: blocklist support disabled\n"); + LM_WARN("blocklist support disabled\n"); } #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_add: blocklist support not compiled-in" - " - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -193,12 +192,10 @@ static int ki_blst_add_retry_after(sip_msg_t* msg, int t_min, int t_max) S_TO_TICKS(t)); return 1; }else{ - LOG(L_WARN, "WARNING: blst: blst_add_retry_after:" - " blocklist support disabled\n"); + LM_WARN("blocklist support disabled\n"); } #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_add_retry_after:" - " blocklist support not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -241,11 +238,10 @@ static int ki_blst_del(sip_msg_t* msg) if (dst_blocklist_del(&src, msg)) return 1; }else{ - LOG(L_WARN, "WARNING: blst: blst_del: blocklist support disabled\n"); + LM_WARN("blocklist support disabled\n"); } #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_del: blocklist support not compiled-in" - " - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return -1; } @@ -281,8 +277,7 @@ static int ki_blst_is_blocklisted(sip_msg_t* msg) " blocklist support disabled\n"); } #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_is_blocklisted:" - " blocklist support not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return -1; } @@ -309,8 +304,7 @@ static int ki_blst_set_ignore(sip_msg_t* msg, int mask) msg->fwd_send_flags.blst_imask|=blst_imask; return 1; #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_ignore_req: blocklist support" - " not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -349,8 +343,7 @@ static int ki_blst_clear_ignore(sip_msg_t* msg, int mask) msg->fwd_send_flags.blst_imask&=~blst_imask; return 1; #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_ignore_req: blocklist support" - " not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -390,8 +383,7 @@ static int ki_blst_rpl_set_ignore(sip_msg_t* msg, int mask) msg->rpl_send_flags.blst_imask|=blst_imask; return 1; #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_ignore_req: blocklist support" - " not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -432,8 +424,7 @@ static int ki_blst_rpl_clear_ignore(sip_msg_t* msg, int mask) msg->rpl_send_flags.blst_imask&=~blst_imask; return 1; #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_ignore_req: blocklist support" - " not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; }

2 years, 2 months

git:master:a63fde36: pkg/kamailio/deb: add kamailio-nats-modules to bookworm

by Victor Seva

Module: kamailio Branch: master Commit: a63fde36f440b6d79cea6cdb0dfeee6258d96698 URL: https://github.com/kamailio/kamailio/commit/a63fde36f440b6d79cea6cdb0dfeee6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-02-23T14:25:46+01:00 pkg/kamailio/deb: add kamailio-nats-modules to bookworm https://tracker.debian.org/news/1305763/natsc-320-1-migrated-to-testing/ --- Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/debian/backports/bookworm --- Diff: https://github.com/kamailio/kamailio/commit/a63fde36f440b6d79cea6cdb0dfeee6… Patch: https://github.com/kamailio/kamailio/commit/a63fde36f440b6d79cea6cdb0dfeee6… --- diff --git a/pkg/kamailio/deb/bookworm/control b/pkg/kamailio/deb/bookworm/control index 8f425be82c..4e670a602c 100644 --- a/pkg/kamailio/deb/bookworm/control +++ b/pkg/kamailio/deb/bookworm/control @@ -29,6 +29,7 @@ Build-Depends: libmongoc-dev, libmono-2.0-dev [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x], libmosquitto-dev, + libnats-dev, libncurses5-dev, libpcre3-dev, libperl-dev, @@ -840,6 +841,24 @@ Description: Libwebsockets module for the Kamailio SIP server This package contains the lwcs module, which provides a client-side WebSockets API through libwebsockets. +Package: kamailio-nats-modules +Architecture: any +Multi-Arch: same +Pre-Depends: + ${misc:Pre-Depends}, +Depends: + kamailio (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Description: Nats module for the Kamailio SIP server + Kamailio is a very fast and flexible SIP (RFC3261) + server. Written entirely in C, Kamailio can handle thousands calls + per second even on low-budget hardware. + . + This package contains the nats module, which provides a NATS consumer for Kamailio. + NATS is a real time distributed messaging platform, more details about it can be + found at nats.io. + Package: kamailio-extra-modules Architecture: any Multi-Arch: same diff --git a/pkg/kamailio/deb/bookworm/rules b/pkg/kamailio/deb/bookworm/rules index ddf8846c9d..2161ac0bb4 100755 --- a/pkg/kamailio/deb/bookworm/rules +++ b/pkg/kamailio/deb/bookworm/rules @@ -21,7 +21,7 @@ include /usr/share/dpkg/buildflags.mk export RADCLI=1 # modules not in the "main" kamailio package -EXCLUDED_MODULES= java python nats +EXCLUDED_MODULES= java python # extra modules to skip, because they are not compilable now # - regardless if they go to the main kamailio package or to some module package, @@ -37,7 +37,7 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ snmpstats carrierroute xmpp cpl redisgeoip geoip2 \ sqlite json mono ruby ims sctp \ tls outbound websocket autheph kazoo cnxcc \ - erlangsystemd phonenum mongodb rabbitmq python3 mqtt secsipid lwsc + erlang nats systemd phonenum mongodb rabbitmq python3 mqtt secsipid lwsc # module groups to be packaged onto kamailio-extra-modules EXTRA_GROUPS=gzcompress uuid ev jansson http_async diff --git a/pkg/kamailio/deb/debian/backports/bookworm b/pkg/kamailio/deb/debian/backports/bookworm index 21dafb2d11..1d39bd6509 100755 --- a/pkg/kamailio/deb/debian/backports/bookworm +++ b/pkg/kamailio/deb/debian/backports/bookworm @@ -35,13 +35,6 @@ sed -i -e '/^ python,/d' -e '/python-dev/d' \ sed -i -e 's/ python [ ,$]*//' ${DIST}/rules sed -i -e '/^EXCLUDED_MODULES=/s/$/ python/' ${DIST}/rules -# no libnats-dev -sed -i -e '/^ libnats-dev,/d' \ - -e '/^Package: kamailio-nats-modules/,/^$/d' \ - ${DIST}/control -sed -i -e 's/ nats [ ,$]*//' ${DIST}/rules -sed -i -e '/^EXCLUDED_MODULES=/s/$/ nats/' ${DIST}/rules - wrap-and-sort -sat -d ${DIST} # clean backports scripts

2 years, 2 months

[kamailio/kamailio] db_redis: cluster support (Issue #2977)

by Riccardo-78

### Description At the moment db_redis driver does not support interfacing with a redis cluster. This is a proposal to add support to it. The db_redis module will get a new module parameter to enable cluster support (with default 0 - disabled): ``` modparam("db_redis", "cluster", 1) ``` The redis url used by other modules needs to specify all nodes in the cluster, and must NOT include redis database number (since it's not supported in cluster mode): ``` #!define DBURL_USRLOC "redis://10.0.1.1:6379,10.0.1.2:6379,10.0.1.3:6379" ``` The implementation is going to use the [hiredis-cluster](https://github.com/Nordix/hiredis-cluster) library (BSD license). If cluster mode is not enabled the module will behave like before, i.e. all calls to redis will use hiredis library directly. If you find this proposal sensible, I'll start coding it. Feedback is welcome, of course! -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2977 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/2977(a)github.com>

2 years, 2 months

[kamailio/kamailio] nathelper: uninitialized data (PR #3035)

by Matthias Urlichs

#### 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 - [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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  The IP checksum is part of the header and must be zeroed before checksumming. This patch also silences another (benign) warning. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3035 -- Commit Summary -- * nathelper: Fix uninitialized data -- File Changes -- M src/modules/nathelper/nathelper.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3035.patch https://github.com/kamailio/kamailio/pull/3035.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3035 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3035(a)github.com>

2 years, 2 months

git:master:7cbbd8fb: nathelper: Fix uninitialized data

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7cbbd8fb22ac0d57a5dd3883dee185b3bc0601e2 URL: https://github.com/kamailio/kamailio/commit/7cbbd8fb22ac0d57a5dd3883dee185b… Author: Matthias Urlichs <matthias(a)urlichs.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-23T08:56:24+01:00 nathelper: Fix uninitialized data - the IP checksum is part of the header and must be zeroed before checksumming - also silence another (benign) warning --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/7cbbd8fb22ac0d57a5dd3883dee185b… Patch: https://github.com/kamailio/kamailio/commit/7cbbd8fb22ac0d57a5dd3883dee185b… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 22e128ac9c..cd657a7071 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1786,7 +1786,7 @@ static inline int replace_sdp_ip( { str body1, oldip, newip; str body = *org_body; - int pf, pf1 = 0; + int pf = 0, pf1 = 0; str body2; char *bodylimit = body.s + body.len; int ret; @@ -2145,6 +2145,7 @@ static int send_raw(const char *buf, int buf_len, union sockaddr_union *to, ip->ip_off = 0; ip->ip_ttl = 69; ip->ip_p = 17; + ip->ip_sum = 0; ip->ip_src.s_addr = s_ip; ip->ip_dst.s_addr = to->sin.sin_addr.s_addr;

2 years, 2 months

[kamailio/kamailio] ims_ipsec_pcscf: fix issues with UEs not sending certain replies thro… (PR #3029)

by kristiyan-peychev-flolive

…ugh the ipsec tunnel   #### 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:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  I've fixed an issue that would ignore legitimate replies that are sent by real-world UEs, causing calls to completely break due to timeouts. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3029 -- Commit Summary -- * ims_ipsec_pcscf: fix issues with UEs not sending certain replies through the ipsec tunnel -- File Changes -- M src/modules/ims_ipsec_pcscf/cmd.c (108) M src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c (13) M src/modules/ims_ipsec_pcscf/ipsec.c (39) D src/modules/ims_ipsec_pcscf/port_gen.c (227) D src/modules/ims_ipsec_pcscf/port_gen.h (41) M src/modules/ims_ipsec_pcscf/sec_agree.c (26) M src/modules/ims_ipsec_pcscf/spi_gen.c (119) M src/modules/ims_ipsec_pcscf/spi_gen.h (6) M src/modules/ims_ipsec_pcscf/spi_list.c (72) M src/modules/ims_ipsec_pcscf/spi_list.h (13) M src/modules/ims_ipsec_pcscf/spi_list_tests.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3029.patch https://github.com/kamailio/kamailio/pull/3029.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3029 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3029(a)github.com>

2 years, 2 months

[kamailio/kamailio] ims: fix a crash with contact parsing (PR #3032)

by kristiyan-peychev-flolive

When running as a P-CSCF a crash would occur with certain in-dialog replies. The `msg->contact->parsed` pointer is unreliably reused and would point to garbage.   #### 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  When running as a P-CSCF a crash would occur with certain in-dialog replies. The `msg->contact->parsed` pointer is unreliably reused and would point to garbage. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3032 -- Commit Summary -- * ims: fix a crash with contact parsing -- File Changes -- M src/lib/ims/ims_getters.c (21) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3032.patch https://github.com/kamailio/kamailio/pull/3032.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3032 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3032(a)github.com>

2 years, 2 months

git:master:84898be4: modules: readme files regenerated - async ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 84898be41740624ceb03a2f135683c880f5f95e0 URL: https://github.com/kamailio/kamailio/commit/84898be41740624ceb03a2f135683c8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-02-21T12:46:21+01:00 modules: readme files regenerated - async ... [skip ci] --- Modified: src/modules/async/README --- Diff: https://github.com/kamailio/kamailio/commit/84898be41740624ceb03a2f135683c8… Patch: https://github.com/kamailio/kamailio/commit/84898be41740624ceb03a2f135683c8…

2 years, 2 months

git:master:d5b09279: async: docs - fixed mismatching tags

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d5b0927983b308d36e512f0134b0aef015f22f89 URL: https://github.com/kamailio/kamailio/commit/d5b0927983b308d36e512f0134b0aef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-21T12:34:20+01:00 async: docs - fixed mismatching tags --- Modified: src/modules/async/doc/async_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d5b0927983b308d36e512f0134b0aef… Patch: https://github.com/kamailio/kamailio/commit/d5b0927983b308d36e512f0134b0aef… --- diff --git a/src/modules/async/doc/async_admin.xml b/src/modules/async/doc/async_admin.xml index 7185cbff52..126da999ec 100644 --- a/src/modules/async/doc/async_admin.xml +++ b/src/modules/async/doc/async_admin.xml @@ -111,8 +111,6 @@ modparam("async", "ms_timer", 10) </programlisting> </example> </section> - <section> - <title>Parameters</title> <section id="async.p.return"> <title><varname>return</varname> (int)</title> <para>

2 years, 2 months

[kamailio/kamailio] Erlang: Fixes to get the module functional again (PR #3024)

by James Van Vleet

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] 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 - [x] Related to issue #2069 #### Description The Erlang module is not working at all with newer Kamailio versions. One of the issues was already found in #2069 but no code was submitted. The second one I believe is related to https://github.com/kamailio/kamailio/commit/7bb2669528a819ec29a8193eebc9c64… in that the erlang module assumes that pvi.type is zero and uses that field to type the custom fields it manages and this commit starts populating pvi.type with a 4. I don't have a solid grasp on pvapi.c so if the experts have a better way to fix this up I am all ears. These two commits do get the module working properly and I am able to use both the custom erlang PV terms and the RPC feature from my proxy now. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3024 -- Commit Summary -- * Erlang: Erlang module assumes pvi.type is zero * Erlang: Revert breaking change -- File Changes -- M src/modules/erlang/pv_atom.c (3) M src/modules/erlang/pv_pid.c (3) M src/modules/erlang/pv_ref.c (3) M src/modules/erlang/pv_xbuff.c (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3024.patch https://github.com/kamailio/kamailio/pull/3024.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3024 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3024(a)github.com>

2 years, 2 months

← Newer
1
...
9
10
11
12
13
14
15
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2022