sr-dev March 2019

sr-dev@lists.kamailio.org

28 participants
322 discussions

git:5.2:7aaa77e6: rtpengine: normalise `compat.h` handling towards bencode upstream

by Richard Fuchs

Module: kamailio Branch: 5.2 Commit: 7aaa77e682aa7b5da011c222df393601adf278b0 URL: https://github.com/kamailio/kamailio/commit/7aaa77e682aa7b5da011c222df39360… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2019-03-11T07:57:16-04:00 rtpengine: normalise `compat.h` handling towards bencode upstream fixes #1885 --- Added: src/modules/rtpengine/compat.h Modified: src/modules/rtpengine/bencode.h --- Diff: https://github.com/kamailio/kamailio/commit/7aaa77e682aa7b5da011c222df39360… Patch: https://github.com/kamailio/kamailio/commit/7aaa77e682aa7b5da011c222df39360… --- diff --git a/src/modules/rtpengine/bencode.h b/src/modules/rtpengine/bencode.h index f5f775538f..f2efb742cc 100644 --- a/src/modules/rtpengine/bencode.h +++ b/src/modules/rtpengine/bencode.h @@ -4,24 +4,7 @@ #include <sys/uio.h> #include <string.h> -#if defined(SHM_MEM) || defined(PKG_MALLOC) || defined(pkg_malloc) -/* kamailio */ -# include "../../core/mem/mem.h" -# include "../../core/str.h" -# ifndef BENCODE_MALLOC -# define BENCODE_MALLOC pkg_malloc -# define BENCODE_FREE pkg_free -# endif -# define INLINE static inline -#else -/* rtpengine */ -# include "compat.h" -# include "str.h" -# ifndef BENCODE_MALLOC -# define BENCODE_MALLOC malloc -# define BENCODE_FREE free -# endif -#endif +#include "compat.h" struct bencode_buffer; enum bencode_type; diff --git a/src/modules/rtpengine/compat.h b/src/modules/rtpengine/compat.h new file mode 100644 index 0000000000..8cb87aa4bd --- /dev/null +++ b/src/modules/rtpengine/compat.h @@ -0,0 +1,12 @@ +#ifndef __COMPAT__H__ +#define __COMPAT__H__ + +#include "../../core/mem/mem.h" +#include "../../core/str.h" +#ifndef BENCODE_MALLOC +#define BENCODE_MALLOC pkg_malloc +#define BENCODE_FREE pkg_free +#endif +#define INLINE static inline + +#endif

5 years, 8 months

[kamailio/kamailio] RTPEngine does not compile with system malloc for pkg (#1885)

by Daniel-Constantin Mierla

### Description I compile Kamailio with system malloc from time to time to check with static analyzers for memory leaks. The git master branch fails with: ``` CC (gcc) [M rtpengine.so] rtpengine_hash.o In file included from rtpengine.h:26, from rtpengine_hash.c:1: bencode.h:18:11: fatal error: compat.h: No such file or directory # include "compat.h" ^~~~~~~~~~ compilation terminated. make[2]: *** [../../Makefile.rules:100: rtpengine_hash.o] Error 1 make[1]: *** [Makefile:511: modules] Error 1 make[1]: Leaving directory '/home/porto/work/sip/esr/kamailio-dev/src' make: *** [Makefile:27: all] Error 2 ``` It seems that some file is missing there. ### Troubleshooting #### Reproduction Run: ``` make MEMPKG=sys cfg ``` Then compile with `make all`. #### Debugging Data  ``` See above. ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` Kamailio master branch. ``` * **Operating System**:  ``` Linux Debian Testing. ``` -- 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/issues/1885

5 years, 8 months

git:master:99ca2a1b: rtpengine: normalise `compat.h` handling towards bencode upstream

by Richard Fuchs

Module: kamailio Branch: master Commit: 99ca2a1b9e84d81ec966446afe3c45db5f6b7943 URL: https://github.com/kamailio/kamailio/commit/99ca2a1b9e84d81ec966446afe3c45d… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2019-03-11T07:53:32-04:00 rtpengine: normalise `compat.h` handling towards bencode upstream fixes #1885 --- Added: src/modules/rtpengine/compat.h Modified: src/modules/rtpengine/bencode.h --- Diff: https://github.com/kamailio/kamailio/commit/99ca2a1b9e84d81ec966446afe3c45d… Patch: https://github.com/kamailio/kamailio/commit/99ca2a1b9e84d81ec966446afe3c45d… --- diff --git a/src/modules/rtpengine/bencode.h b/src/modules/rtpengine/bencode.h index 272e8125c7..f2efb742cc 100644 --- a/src/modules/rtpengine/bencode.h +++ b/src/modules/rtpengine/bencode.h @@ -4,24 +4,7 @@ #include <sys/uio.h> #include <string.h> -#if defined(PKG_MALLOC) || defined(pkg_malloc) -/* kamailio */ -# include "../../core/mem/mem.h" -# include "../../core/str.h" -# ifndef BENCODE_MALLOC -# define BENCODE_MALLOC pkg_malloc -# define BENCODE_FREE pkg_free -# endif -# define INLINE static inline -#else -/* rtpengine */ -# include "compat.h" -# include "str.h" -# ifndef BENCODE_MALLOC -# define BENCODE_MALLOC malloc -# define BENCODE_FREE free -# endif -#endif +#include "compat.h" struct bencode_buffer; enum bencode_type; diff --git a/src/modules/rtpengine/compat.h b/src/modules/rtpengine/compat.h new file mode 100644 index 0000000000..8cb87aa4bd --- /dev/null +++ b/src/modules/rtpengine/compat.h @@ -0,0 +1,12 @@ +#ifndef __COMPAT__H__ +#define __COMPAT__H__ + +#include "../../core/mem/mem.h" +#include "../../core/str.h" +#ifndef BENCODE_MALLOC +#define BENCODE_MALLOC pkg_malloc +#define BENCODE_FREE pkg_free +#endif +#define INLINE static inline + +#endif

5 years, 8 months

Kamailio v5.2.2 Released

by Daniel-Constantin Mierla

Hello, Kamailio SIP Server v5.2.2 stable release is out. This is a maintenance release of the latest stable branch, 5.2, that includes fixes since the release of v5.2.1. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.2.x. Deployments running previous v5.2.x versions are strongly recommended to be upgraded to v5.2.2. For more details about version 5.2.2 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2019/03/kamailio-v5-2-2-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Looking forward to meeting many of you in Berlin, at Kamailio World Conference 2019! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 6-8, 2019 -- www.kamailioworld.com Kamailio Advanced Training - Mar 25-27, 2019, in Washington, DC, USA -- www.asipto.com

5 years, 8 months

git:5.2:67f967cc: ChangeLog: content updated for v5.2.2

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 67f967cccb06ecdfef8ce6456bfb94cef6564063 URL: https://github.com/kamailio/kamailio/commit/67f967cccb06ecdfef8ce6456bfb94c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-11T12:25:33+01:00 ChangeLog: content updated for v5.2.2 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/67f967cccb06ecdfef8ce6456bfb94c… Patch: https://github.com/kamailio/kamailio/commit/67f967cccb06ecdfef8ce6456bfb94c…

5 years, 8 months

git:5.2:22e81f47: Makefile.defs: version set to 5.2.2

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 22e81f47c3d8cf3e30bebf81b3f5f64382696c50 URL: https://github.com/kamailio/kamailio/commit/22e81f47c3d8cf3e30bebf81b3f5f64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-11T12:19:43+01:00 Makefile.defs: version set to 5.2.2 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/22e81f47c3d8cf3e30bebf81b3f5f64… Patch: https://github.com/kamailio/kamailio/commit/22e81f47c3d8cf3e30bebf81b3f5f64… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 349e21cc2a..7a403c60a1 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 2 -SUBLEVEL = 1 +SUBLEVEL = 2 EXTRAVERSION = # memory manager switcher

5 years, 8 months

git:5.2:81102f74: pkg/kamailio/deb: version set to 5.2.2

by Victor Seva

Module: kamailio Branch: 5.2 Commit: 81102f7499a2a4822a764f2279bd3966054a21fa URL: https://github.com/kamailio/kamailio/commit/81102f7499a2a4822a764f2279bd396… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-03-11T11:25:42+01:00 pkg/kamailio/deb: version set to 5.2.2 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/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/81102f7499a2a4822a764f2279bd396… Patch: https://github.com/kamailio/kamailio/commit/81102f7499a2a4822a764f2279bd396…

5 years, 8 months

git:master:111a63cf: tcpops: log message when execution kemi callback fails

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 111a63cfdb6c392321fb7b8f5e6b760e1fc995b5 URL: https://github.com/kamailio/kamailio/commit/111a63cfdb6c392321fb7b8f5e6b760… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-11T10:32:27+01:00 tcpops: log message when execution kemi callback fails --- Modified: src/modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/111a63cfdb6c392321fb7b8f5e6b760… Patch: https://github.com/kamailio/kamailio/commit/111a63cfdb6c392321fb7b8f5e6b760… --- diff --git a/src/modules/tcpops/tcpops.c b/src/modules/tcpops/tcpops.c index cab215365c..9abf34af6e 100644 --- a/src/modules/tcpops/tcpops.c +++ b/src/modules/tcpops/tcpops.c @@ -260,7 +260,12 @@ static void tcpops_tcp_closed_run_route(tcp_closed_event_info_t *tev) } else { evname = &tcpops_evrt_closed; } - sr_kemi_route(keng, fmsg, EVENT_ROUTE, &tcpops_event_callback, evname); + if(sr_kemi_route(keng, fmsg, EVENT_ROUTE, &tcpops_event_callback, + evname)<0) { + LM_ERR("error running event route kemi callback [%.*s - %.*s]\n", + tcpops_event_callback.len, tcpops_event_callback.s, + evname->len, evname->s); + } } set_route_type(backup_rt); }

5 years, 8 months

git:5.2:6e2251df: pkg: version set to 5.2.2 for obs, rpms and apkbuild

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 6e2251df9dcc006a9ad3427c747364d47e1c7410 URL: https://github.com/kamailio/kamailio/commit/6e2251df9dcc006a9ad3427c747364d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-11T10:26:20+01:00 pkg: version set to 5.2.2 for obs, rpms and apkbuild --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/oracle/el6/kamailio.spec Modified: pkg/kamailio/oracle/el7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/6e2251df9dcc006a9ad3427c747364d… Patch: https://github.com/kamailio/kamailio/commit/6e2251df9dcc006a9ad3427c747364d… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 29b55a0dbc..4a08a3c065 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.2.1 +pkgver=5.2.2 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 31ea71c781..9b45c70b1d 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.2.1 +%define ver 5.2.2 %define rel dev1.0%{dist} %if 0%{?fedora} == 27 diff --git a/pkg/kamailio/oracle/el6/kamailio.spec b/pkg/kamailio/oracle/el6/kamailio.spec index 4493d7368f..5e59e41a92 100644 --- a/pkg/kamailio/oracle/el6/kamailio.spec +++ b/pkg/kamailio/oracle/el6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.2.1 +%define ver 5.2.2 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/oracle/el7/kamailio.spec b/pkg/kamailio/oracle/el7/kamailio.spec index aa6e6adc13..f4d635d3bd 100644 --- a/pkg/kamailio/oracle/el7/kamailio.spec +++ b/pkg/kamailio/oracle/el7/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.2.1 +%define ver 5.2.2 %define rel 0 %define _sharedir %{_prefix}/share

5 years, 8 months

git:5.2:77eebed8: topoh: check returned pointer when decoding call-id

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 77eebed8be1930fdb03f4fce0a1caac1bd45c583 URL: https://github.com/kamailio/kamailio/commit/77eebed8be1930fdb03f4fce0a1caac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-11T10:19:54+01:00 topoh: check returned pointer when decoding call-id (cherry picked from commit b5ce9d8f9a1b1fd705ad4b533e7cbc9166a3f577) --- Modified: src/modules/topoh/th_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/77eebed8be1930fdb03f4fce0a1caac… Patch: https://github.com/kamailio/kamailio/commit/77eebed8be1930fdb03f4fce0a1caac… --- diff --git a/src/modules/topoh/th_msg.c b/src/modules/topoh/th_msg.c index e03b3653fa..6849520540 100644 --- a/src/modules/topoh/th_msg.c +++ b/src/modules/topoh/th_msg.c @@ -559,6 +559,10 @@ int th_unmask_callid_str(str *icallid, str *ocallid) } out.s = th_mask_decode(icallid->s, icallid->len, &th_callid_prefix, 0, &out.len); + if(out.s == NULL) { + LM_ERR("failed to decode call-id\n"); + return -2; + } if(out.len>=TH_CALLID_SIZE) { pkg_free(out.s); LM_ERR("not enough callid buf size (needed %d)\n", out.len);

5 years, 8 months

← Newer
1
...
22
23
24
25
26
27
28
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2019