sr-dev June 2019

sr-dev@lists.kamailio.org

19 participants
216 discussions

[kamailio/kamailio] gcj is no more let's use openjdk (#1971)

by xevilstar

I have compiled this app_java module on my debian buster, there's still a memory leak problem to solve : core> [core/route.c:872]: fix_actions(): fixing xlog() May 31 15:15:03 PROXY-TEST-01 /usr/sbin/kamailio[16509]: CRITICAL: <core> [core/mem/q_malloc.c:144]: qm_debug_check_frag(): BUG: qm: prev. fragm. tail overwritten(55c775816cd0, abcdefed)[0x7f64aa9c9d80:0x7f64aa9c9db8]! Memory allocator was called from xlog: xlog.c:498. Fragment marked by core: db_res.c:88. Exec from core/mem/q_malloc.c:384   #### 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/1971 -- Commit Summary -- * gcj is no more let's use openjdk -- File Changes -- M src/modules/app_java/Makefile (21) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1971.patch https://github.com/kamailio/kamailio/pull/1971.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/1971

4 years, 11 months

[kamailio/kamailio] Jansson Module (#1978)

by nicoonline

Hello, is there a way to add Jansson module for Centos 6 packages ? -- 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/1978

4 years, 11 months

git:5.1:c03ba1f1: pkg/kamailio/obs: Updated libevent2 deps for CentOS 6 dist [skip ci]

by Sergey Safarov

Module: kamailio Branch: 5.1 Commit: c03ba1f14f74b94d2ced1c79a8b44645ec636563 URL: https://github.com/kamailio/kamailio/commit/c03ba1f14f74b94d2ced1c79a8b4464… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-06-14T12:19:29+03:00 pkg/kamailio/obs: Updated libevent2 deps for CentOS 6 dist [skip ci] (cherry picked from commit a54b36e2533a71d8e38c03b497b470110a1e33fb) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/c03ba1f14f74b94d2ced1c79a8b4464… Patch: https://github.com/kamailio/kamailio/commit/c03ba1f14f74b94d2ced1c79a8b4464… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 8803cffd39..9a7c7ca00e 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -74,12 +74,12 @@ %bcond_with cnxcc %bcond_without dnssec %bcond_without geoip -%bcond_with http_async_client +%bcond_without http_async_client %bcond_without ims -%bcond_with jansson -%bcond_with json +%bcond_without jansson +%bcond_without json %bcond_without lua -%bcond_with kazoo +%bcond_without kazoo %bcond_without memcached %bcond_with mongodb %bcond_without perl @@ -418,8 +418,14 @@ Compressed body (SIP and HTTP) handling for kamailio. %package http_async_client Summary: Async HTTP client module for Kamailio Group: System Environment/Daemons -Requires: libevent, kamailio = %ver -BuildRequires: libevent-devel +Requires: kamailio = %ver +%if 0%{?rhel} == 6 +Requires: libevent2 +BuildRequires: libevent2-devel +%else +Requires: libevent +BuildRequires: libevent-devel +%endif %if 0%{?suse_version} Requires: libcurl4 BuildRequires: libcurl-devel @@ -464,7 +470,14 @@ IMS modules and extensions module for Kamailio. %package jansson Summary: JSON string handling and RPC modules for Kamailio using JANSSON library Group: System Environment/Daemons -Requires: libevent, kamailio = %ver +Requires: kamailio = %ver +%if 0%{?rhel} == 6 +Requires: libevent2 +BuildRequires: libevent2-devel +%else +Requires: libevent +BuildRequires: libevent-devel +%endif %if 0%{?suse_version} Requires: libjson-c2 BuildRequires: libjansson-devel @@ -482,8 +495,14 @@ JSON string handling and RPC modules for Kamailio using JANSSON library. %package json Summary: JSON string handling and RPC modules for Kamailio Group: System Environment/Daemons -Requires: libevent, kamailio = %ver +Requires: kamailio = %ver +%if 0%{?rhel} == 6 +Requires: libevent2 +BuildRequires: libevent2-devel +%else +Requires: libevent BuildRequires: libevent-devel +%endif %if 0%{?suse_version} Requires: libjson-c2 BuildRequires: libjson-c-devel @@ -501,8 +520,15 @@ JSON string handling and RPC modules for Kamailio. %package kazoo Summary: Kazoo middle layer connector support for Kamailio Group: System Environment/Daemons -Requires: libuuid, librabbitmq, json-c, libevent, kamailio = %ver -BuildRequires: libuuid-devel, librabbitmq-devel, json-c-devel, libevent-devel +Requires: libuuid, librabbitmq, json-c, kamailio = %ver +BuildRequires: libuuid-devel, librabbitmq-devel, json-c-devel +%if 0%{?rhel} == 6 +Requires: libevent2 +BuildRequires: libevent2-devel +%else +Requires: libevent +BuildRequires: libevent-devel +%endif %description kazoo Kazoo module for Kamailio.

4 years, 11 months

git:5.1:c5ee9015: pkg/kamailio/centos: Removed not updated packaging files

by Sergey Safarov

Module: kamailio Branch: 5.1 Commit: c5ee9015af545179ac43fe930991b96a5e495272 URL: https://github.com/kamailio/kamailio/commit/c5ee9015af545179ac43fe930991b96… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-06-14T02:34:10+03:00 pkg/kamailio/centos: Removed not updated packaging files (cherry picked from commit 8a274cb474799428b4ec838da53000fedd16abd8) --- Removed: pkg/kamailio/centos/6/README Removed: pkg/kamailio/centos/6/kamailio.init Removed: pkg/kamailio/centos/6/kamailio.spec Removed: pkg/kamailio/centos/6/kamailio.sysconfig Removed: pkg/kamailio/centos/7/README Removed: pkg/kamailio/centos/7/kamailio.init Removed: pkg/kamailio/centos/7/kamailio.service Removed: pkg/kamailio/centos/7/kamailio.spec Removed: pkg/kamailio/centos/7/kamailio.sysconfig Removed: pkg/kamailio/centos/7/kamailio.tmpfiles --- Diff: https://github.com/kamailio/kamailio/commit/c5ee9015af545179ac43fe930991b96… Patch: https://github.com/kamailio/kamailio/commit/c5ee9015af545179ac43fe930991b96…

4 years, 11 months

git:5.2:dcce685a: pkg/kamailio/obs: Updated libevent2 deps for CentOS 6 dist [skip ci]

by Sergey Safarov

Module: kamailio Branch: 5.2 Commit: dcce685ab41097dc77fad50c414a66e634db72b9 URL: https://github.com/kamailio/kamailio/commit/dcce685ab41097dc77fad50c414a66e… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-06-14T12:17:27+03:00 pkg/kamailio/obs: Updated libevent2 deps for CentOS 6 dist [skip ci] (cherry picked from commit a54b36e2533a71d8e38c03b497b470110a1e33fb) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/dcce685ab41097dc77fad50c414a66e… Patch: https://github.com/kamailio/kamailio/commit/dcce685ab41097dc77fad50c414a66e… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 1890646357..5a801d389c 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -108,12 +108,12 @@ %bcond_with cnxcc %bcond_without dnssec %bcond_without geoip -%bcond_with http_async_client +%bcond_without http_async_client %bcond_without ims -%bcond_with jansson -%bcond_with json +%bcond_without jansson +%bcond_without json %bcond_without lua -%bcond_with kazoo +%bcond_without kazoo %bcond_without memcached %bcond_with mongodb %bcond_without perl @@ -311,8 +311,14 @@ like Asterisk™, FreeSWITCH™ or SEMS. %package acc_json Summary: Account transaction information in a JSON dictionary Group: %{PKGGROUP} -Requires: libevent, kamailio = %ver +Requires: kamailio = %ver +%if 0%{?rhel} == 6 +Requires: libevent2 +BuildRequires: libevent2-devel +%else +Requires: libevent BuildRequires: libevent-devel +%endif %if 0%{?suse_version} Requires: libjansson BuildRequires: libjansson-devel @@ -488,8 +494,14 @@ Compressed body (SIP and HTTP) handling for kamailio. %package http_async_client Summary: Async HTTP client module for Kamailio Group: %{PKGGROUP} -Requires: libevent, kamailio = %ver -BuildRequires: libevent-devel +Requires: kamailio = %ver +%if 0%{?rhel} == 6 +Requires: libevent2 +BuildRequires: libevent2-devel +%else +Requires: libevent +BuildRequires: libevent-devel +%endif %if 0%{?suse_version} Requires: libcurl4 BuildRequires: libcurl-devel @@ -534,8 +546,14 @@ IMS modules and extensions module for Kamailio. %package jansson Summary: JSON string handling and RPC modules for Kamailio using JANSSON library Group: %{PKGGROUP} -Requires: libevent, kamailio = %ver +Requires: kamailio = %ver +%if 0%{?rhel} == 6 +Requires: libevent2 +BuildRequires: libevent2-devel +%else +Requires: libevent BuildRequires: libevent-devel +%endif %if 0%{?suse_version} Requires: libjson-c2 BuildRequires: libjansson-devel @@ -553,8 +571,14 @@ JSON string handling and RPC modules for Kamailio using JANSSON library. %package json Summary: JSON string handling and RPC modules for Kamailio Group: %{PKGGROUP} -Requires: libevent, kamailio = %ver +Requires: kamailio = %ver +%if 0%{?rhel} == 6 +Requires: libevent2 +BuildRequires: libevent2-devel +%else +Requires: libevent BuildRequires: libevent-devel +%endif %if 0%{?suse_version} Requires: libjson-c2 BuildRequires: libjson-c-devel @@ -572,8 +596,15 @@ JSON string handling and RPC modules for Kamailio. %package kazoo Summary: Kazoo middle layer connector support for Kamailio Group: %{PKGGROUP} -Requires: libuuid, librabbitmq, json-c, libevent, kamailio = %ver -BuildRequires: libuuid-devel, librabbitmq-devel, json-c-devel, libevent-devel +Requires: libuuid, librabbitmq, json-c, kamailio = %ver +BuildRequires: libuuid-devel, librabbitmq-devel, json-c-devel +%if 0%{?rhel} == 6 +Requires: libevent2 +BuildRequires: libevent2-devel +%else +Requires: libevent +BuildRequires: libevent-devel +%endif %description kazoo Kazoo module for Kamailio.

4 years, 11 months

git:master:a54b36e2: pkg/kamailio/obs: Updated libevent2 deps for CentOS 6 dist [skip ci]

by Sergey Safarov

Module: kamailio Branch: master Commit: a54b36e2533a71d8e38c03b497b470110a1e33fb URL: https://github.com/kamailio/kamailio/commit/a54b36e2533a71d8e38c03b497b4701… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-06-14T12:16:27+03:00 pkg/kamailio/obs: Updated libevent2 deps for CentOS 6 dist [skip ci] --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/a54b36e2533a71d8e38c03b497b4701… Patch: https://github.com/kamailio/kamailio/commit/a54b36e2533a71d8e38c03b497b4701… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 064e30aaba..8fd4254eb7 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -108,12 +108,12 @@ %bcond_with cnxcc %bcond_without dnssec %bcond_without geoip -%bcond_with http_async_client +%bcond_without http_async_client %bcond_without ims -%bcond_with jansson -%bcond_with json +%bcond_without jansson +%bcond_without json %bcond_without lua -%bcond_with kazoo +%bcond_without kazoo %bcond_without memcached %bcond_with mongodb %bcond_without perl @@ -311,8 +311,14 @@ like Asterisk™, FreeSWITCH™ or SEMS. %package acc_json Summary: Account transaction information in a JSON dictionary Group: %{PKGGROUP} -Requires: libevent, kamailio = %ver +Requires: kamailio = %ver +%if 0%{?rhel} == 6 +Requires: libevent2 +BuildRequires: libevent2-devel +%else +Requires: libevent BuildRequires: libevent-devel +%endif %if 0%{?suse_version} Requires: libjansson BuildRequires: libjansson-devel @@ -488,8 +494,14 @@ Compressed body (SIP and HTTP) handling for kamailio. %package http_async_client Summary: Async HTTP client module for Kamailio Group: %{PKGGROUP} -Requires: libevent, kamailio = %ver -BuildRequires: libevent-devel +Requires: kamailio = %ver +%if 0%{?rhel} == 6 +Requires: libevent2 +BuildRequires: libevent2-devel +%else +Requires: libevent +BuildRequires: libevent-devel +%endif %if 0%{?suse_version} Requires: libcurl4 BuildRequires: libcurl-devel @@ -534,8 +546,14 @@ IMS modules and extensions module for Kamailio. %package jansson Summary: JSON string handling and RPC modules for Kamailio using JANSSON library Group: %{PKGGROUP} -Requires: libevent, kamailio = %ver +Requires: kamailio = %ver +%if 0%{?rhel} == 6 +Requires: libevent2 +BuildRequires: libevent2-devel +%else +Requires: libevent BuildRequires: libevent-devel +%endif %if 0%{?suse_version} Requires: libjson-c2 BuildRequires: libjansson-devel @@ -553,8 +571,14 @@ JSON string handling and RPC modules for Kamailio using JANSSON library. %package json Summary: JSON string handling and RPC modules for Kamailio Group: %{PKGGROUP} -Requires: libevent, kamailio = %ver +Requires: kamailio = %ver +%if 0%{?rhel} == 6 +Requires: libevent2 +BuildRequires: libevent2-devel +%else +Requires: libevent BuildRequires: libevent-devel +%endif %if 0%{?suse_version} Requires: libjson-c2 BuildRequires: libjson-c-devel @@ -572,8 +596,15 @@ JSON string handling and RPC modules for Kamailio. %package kazoo Summary: Kazoo middle layer connector support for Kamailio Group: %{PKGGROUP} -Requires: libuuid, librabbitmq, json-c, libevent, kamailio = %ver -BuildRequires: libuuid-devel, librabbitmq-devel, json-c-devel, libevent-devel +Requires: libuuid, librabbitmq, json-c, kamailio = %ver +BuildRequires: libuuid-devel, librabbitmq-devel, json-c-devel +%if 0%{?rhel} == 6 +Requires: libevent2 +BuildRequires: libevent2-devel +%else +Requires: libevent +BuildRequires: libevent-devel +%endif %description kazoo Kazoo module for Kamailio.

4 years, 11 months

[kamailio/kamailio] [5.2.3][UAC] Via header does not respect "advertise" option of listen parameter (#1973)

by Michael Seifert

### Description Setting the `advertise` parameter of the `listen` option in `kamailio.cfg` has no effect on the `Via` address sent by the UAC module. I expected the `Via` header to contain the public IP. Instead, the REGISTER requests sent by the UAC module continue to use the private ip: ``` listen=<private ip>:5060 advertise <public ip>:5060 ``` ``` Via: SIP/2.0/UDP <private ip>:5060;branch=z9hG4bK6c7b.fc053184000000000000000000000000.0 ``` This is confusing since the core cookbook recommends against using `advertised_address`. ### Possible Solutions With the `advertised_address` option, the IP in the Via header is set to the public IP address as expected: ``` advertised_address=<public ip>:5060 listen=<private ip>:5060 ``` ``` Via: SIP/2.0/UDP <public ip>:5060;branch=z9hG4bK45ba.c2851fa6000000000000000000000000.0 ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.3 (x86_64/linux) c36229 flags: STATS: Off, USE_TCP, USE_TLS, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: c36229 compiled on 13:25:11 Jun 2 2019 with gcc 8.3.0 ``` * **Operating System**:  ``` Linux linux 5.1.5-gentoo #1 SMP PREEMPT Mon May 27 14:42:14 CEST 2019 x86_64 AMD A6-3670 APU with Radeon(tm) HD Graphics AuthenticAMD GNU/Linux ``` -- 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/1973

4 years, 11 months

git:master:1a3fc004: kemix: functions to get src/rcv ip and port

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1a3fc004e27555063a8bc942c946f6d54f84cf45 URL: https://github.com/kamailio/kamailio/commit/1a3fc004e27555063a8bc942c946f6d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-14T09:01:37+02:00 kemix: functions to get src/rcv ip and port --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1a3fc004e27555063a8bc942c946f6d… Patch: https://github.com/kamailio/kamailio/commit/1a3fc004e27555063a8bc942c946f6d… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index d3464b9a42..add50f09cb 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -317,6 +317,74 @@ static sr_kemi_xval_t* ki_kx_getw_ua(sip_msg_t *msg) return ki_kx_get_ua_mode(msg, SR_KEMI_XVAL_NULL_PRINT); } +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_srcip(sip_msg_t *msg) +{ + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + if(msg==NULL) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_NONE); + return &_sr_kemi_kx_xval; + } + + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + _sr_kemi_kx_xval.v.s.s = ip_addr2a(&msg->rcv.src_ip); + _sr_kemi_kx_xval.v.s.len = strlen(_sr_kemi_kx_xval.v.s.s); + return &_sr_kemi_kx_xval; +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_srcport(sip_msg_t *msg) +{ + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + if(msg==NULL) { + _sr_kemi_kx_xval.vtype = SR_KEMIP_INT; + _sr_kemi_kx_xval.v.n = 0; + return &_sr_kemi_kx_xval; + } + + _sr_kemi_kx_xval.vtype = SR_KEMIP_INT; + _sr_kemi_kx_xval.v.n = (int)msg->rcv.src_port; + return &_sr_kemi_kx_xval; +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_rcvip(sip_msg_t *msg) +{ + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + if(msg==NULL || msg->rcv.bind_address==NULL + || msg->rcv.bind_address->address_str.s==NULL) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_NONE); + return &_sr_kemi_kx_xval; + } + + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + _sr_kemi_kx_xval.v.s = msg->rcv.bind_address->address_str; + return &_sr_kemi_kx_xval; +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_rcvport(sip_msg_t *msg) +{ + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + if(msg==NULL || msg->rcv.bind_address==NULL) { + _sr_kemi_kx_xval.vtype = SR_KEMIP_INT; + _sr_kemi_kx_xval.v.n = 0; + return &_sr_kemi_kx_xval; + } + + _sr_kemi_kx_xval.vtype = SR_KEMIP_INT; + _sr_kemi_kx_xval.v.n = (int)msg->rcv.bind_address->port_no; + return &_sr_kemi_kx_xval; +} + /** * */ @@ -387,6 +455,26 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_srcip"), + SR_KEMIP_XVAL, ki_kx_get_srcip, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("get_srcport"), + SR_KEMIP_XVAL, ki_kx_get_srcport, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("get_rcvip"), + SR_KEMIP_XVAL, ki_kx_get_rcvip, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("get_rcvport"), + SR_KEMIP_XVAL, ki_kx_get_rcvport, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

4 years, 11 months

[kamailio/kamailio] Ipsec fix defects (#1982)

by alexyosifov

#### 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/1982 -- Commit Summary -- * ims_ipsec_pcscf: fixed possible use of uninitialized value in ipsec_forward() * ims_registrar_pcscf: fixed dereferencing null pointer "cb->contacts" in save() -- File Changes -- M src/modules/ims_ipsec_pcscf/cmd.c (4) M src/modules/ims_registrar_pcscf/save.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1982.patch https://github.com/kamailio/kamailio/pull/1982.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/1982

4 years, 11 months

git:master:15066536: Merge pull request #1982 from alexyosifov/ipsec_fix_defects

by GitHub

Module: kamailio Branch: master Commit: 15066536e65314f976328fc4387be2a5b53fe455 URL: https://github.com/kamailio/kamailio/commit/15066536e65314f976328fc4387be2a… Author: Tsvetomir Dimitrov <tsv.dimitrov(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-06-13T22:05:21+03:00 Merge pull request #1982 from alexyosifov/ipsec_fix_defects --- Modified: src/modules/ims_ipsec_pcscf/cmd.c Modified: src/modules/ims_registrar_pcscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/15066536e65314f976328fc4387be2a… Patch: https://github.com/kamailio/kamailio/commit/15066536e65314f976328fc4387be2a… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 576bf56ded..f696ac9e71 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -571,7 +571,7 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d) struct cell *t = tmb.t_gett(); if (!t) { LM_ERR("Error getting transaction\n"); - goto cleanup; + return ret; } req = t->uas.request; @@ -662,7 +662,7 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d) struct socket_info * client_sock = grep_sock_info(via_host.af == AF_INET ? &ipsec_listen_addr : &ipsec_listen_addr6, src_port, dst_proto); if(!client_sock) { LM_ERR("Error calling grep_sock_info() for ipsec client port\n"); - return -1; + goto cleanup; } m->force_send_socket = client_sock; diff --git a/src/modules/ims_registrar_pcscf/save.c b/src/modules/ims_registrar_pcscf/save.c index fb701e6af6..61a1d7a001 100644 --- a/src/modules/ims_registrar_pcscf/save.c +++ b/src/modules/ims_registrar_pcscf/save.c @@ -444,12 +444,6 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags) { cscf_get_p_associated_uri(_m, &public_ids, &num_public_ids, 1); service_routes = cscf_get_service_route(_m, &num_service_routes, 1); - { - struct via_body* vb = cscf_get_ue_via(_m); - LM_DBG("Save contact with AOR(uri) [%.*s], proto %d, port %d\n", - cb->contacts->uri.len, cb->contacts->uri.s, vb->proto, vb->port?vb->port:5060); - } - //update contacts if (!update_contacts(req, _m, _d, cb->star, expires_hdr, public_ids, num_public_ids, service_routes, num_service_routes, 0)) { LM_ERR("failed to update pcontact\n");

4 years, 11 months

← Newer
1
...
12
13
14
15
16
17
18
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2019