sr-dev March 2019

sr-dev@lists.kamailio.org

28 participants
322 discussions

kamailio based IMSinBOX
by vgribanovsky＠yandex.ru 18 Mar '19

18 Mar '19

Dear development team, last week I completed the development of the prototype IMS - IMSinBOX. Development was done at the request of employer in order to create stand for testing and demonstration of its main products: OCS / PCRF. Since all basic IMSinBOX's nodes made using the code of the "Kamailio" I think it is necessary to provide the community of "Kamailio" developers all the fixes and additions, which made me in project, including: modules problems fix methods 1 ims_registrar_pcscf identification of the identification of the ims_usrloc_pcscf client based onto "Via" client based onto "host:port:proto" ims_qos "host:port:proto" mislead received usrloc & qos 2 siputils/ bug in the functions fix chargingvector settind, getting lib/ims/ ICID/IOI ims_getters 3 ims_charging bugs; fix; lack of IMS message implement ECUR using OMA charging CPM Charging Specification Best regards, Vadim Gribanovsky

2 1

Memory leaks in websocket module
by Andrey Deykunov 16 Mar '19

16 Mar '19

Hi guys, We had Kamailio 5.1.4 with websocket module. Unfortunately, our clients don't support websocket keepalive mechanism at all, so I used TCP keepalive instead with the following parameters: tcp_keepalive=yes tcp_keepcnt=6 tcp_keepidle=60 tcp_keepintvl=10 and set up KEEPALIVE_MECHANISM_NONE: modparam("websocket", "keepalive_mechanism", 0) During load testing and debugging, when 8k clients sent registrations, it was found out that shared memory was not freed after closing connections. So I've decided to add new keepalive mechanism that periodically checks TCP connection related to websocket: enum { KEEPALIVE_MECHANISM_NONE = 0, KEEPALIVE_MECHANISM_PING = 1, KEEPALIVE_MECHANISM_PONG = 2, KEEPALIVE_MECHANISM_TCP_CONN_CHECK = 3 }; and added the line to config: # Enable custom tcp-connection-health based keepalive mechanism (3) # KEEPALIVE_MECHANISM_NONE = 0, # KEEPALIVE_MECHANISM_PING = 1, # KEEPALIVE_MECHANISM_PONG = 2 # KEEPALIVE_MECHANISM_TCP_CONN_CHECK = 3 modparam("websocket", "keepalive_mechanism", 3) Also, I've implemented the mechanism in ws_keepalive function: void ws_keepalive(unsigned int ticks, void *param) { int check_time = (int)time(NULL) - cfg_get(websocket, ws_cfg, keepalive_timeout); ws_connection_t **list = NULL, **list_head = NULL; ws_connection_t *wsc = NULL; /* get an array of pointer to all ws connection */ list_head = wsconn_get_list(); if(!list_head) return; list = list_head; wsc = *list_head; while(wsc && wsc->last_used < check_time) { if (ws_keepalive_mechanism == KEEPALIVE_MECHANISM_TCP_CONN_CHECK) { struct tcp_connection *con = tcpconn_get(wsc->id, 0, 0, 0, 0); if(!con) { LM_INFO("tcp connection has been lost\n"); wsc->state = WS_S_CLOSING; } } if(wsc->state == WS_S_CLOSING || wsc->awaiting_pong) { LM_INFO("forcibly closing connection\n"); wsconn_close_now(wsc); } else { int opcode = (ws_keepalive_mechanism == KEEPALIVE_MECHANISM_PING) ? OPCODE_PING : OPCODE_PONG; ping_pong(wsc, opcode); } wsc = *(++list); } wsconn_put_list(list_head); } and changed memory allocation method in wsconn_get_list and wsconn_put_list methods from pkg to shm, because, as it turned out during load testing, pkg_malloc (the C malloc) may cousing fails under huge loads. These modifications solved the problem. But about a week ago we've started switching to ver. 5.2.1 and found a lot of changes in the websocket module. So, I've added my changes in this commit https://github.com/korizza/kamailio/commit/b3e03d03574ff4ff076005bb8a01d746… . Please take a look. BTW: adding ws_conn_put_id in this commit https://github.com/kamailio/kamailio/commit/a975bca1702ea2f3db47f834f7e4da2… did not solve problem with ref counter increasing. Thanks, Andrey Deykunov

2 1

git:master:b84859ac: Merge pull request #1891 from mslehto/old_modules_dir
by GitHub 16 Mar '19

16 Mar '19

Module: kamailio Branch: master Commit: b84859acc22be08cad2ef1500aba5ca4fb42e72e URL: https://github.com/kamailio/kamailio/commit/b84859acc22be08cad2ef1500aba5ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-03-16T07:36:25+01:00 Merge pull request #1891 from mslehto/old_modules_dir Makefile: give warning when old modules directory is found --- Modified: Makefile --- Diff: https://github.com/kamailio/kamailio/commit/b84859acc22be08cad2ef1500aba5ca… Patch: https://github.com/kamailio/kamailio/commit/b84859acc22be08cad2ef1500aba5ca… --- diff --git a/Makefile b/Makefile index f0df1b6396..6d4abe6e90 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,9 @@ KSR_DIR ?= src/ # default target for makefile .DEFAULT_GOAL := default +ifneq ($(wildcard modules),) +$(warning "old Kamailio modules directory found, you should clean that") +endif # strip the src/ from the path to modules SMODPARAM=

1 0

git:master:d72c3f2c: Makefile: give warning when old modules directory is found
by Mikko Lehto 16 Mar '19

16 Mar '19

Module: kamailio Branch: master Commit: d72c3f2c960b7db10aec3fa6cc6b2f39ab03ace4 URL: https://github.com/kamailio/kamailio/commit/d72c3f2c960b7db10aec3fa6cc6b2f3… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2019-03-13T22:16:26+02:00 Makefile: give warning when old modules directory is found --- Modified: Makefile --- Diff: https://github.com/kamailio/kamailio/commit/d72c3f2c960b7db10aec3fa6cc6b2f3… Patch: https://github.com/kamailio/kamailio/commit/d72c3f2c960b7db10aec3fa6cc6b2f3… --- diff --git a/Makefile b/Makefile index f0df1b6396..6d4abe6e90 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,9 @@ KSR_DIR ?= src/ # default target for makefile .DEFAULT_GOAL := default +ifneq ($(wildcard modules),) +$(warning "old Kamailio modules directory found, you should clean that") +endif # strip the src/ from the path to modules SMODPARAM=

1 0

[kamailio/kamailio] Makefile: give warning when old modules directory is found (#1891)
by Mikko Lehto 16 Mar '19

16 Mar '19

For some reason, I sometimes have obsolete `modules` -subdirectory in top level source directory. It seems to happen after going back and forth in Kamailio 4.x git branches and then back to 5.x. When that happens, Makefile target "modules" does not correctly start building: ``` $ gmake modules gmake: 'modules' is up to date. ``` Proposed patch tries to draw attention into such situation: ``` $ gmake modules Makefile:14: "old Kamailio modules directory found, you should clean that" gmake: 'modules' is up to date. ``` I think `git clean` could clean such leftovers but I am not brave enough to propose running that automatically. Tested on FreeBSD 11.2 (GNU Make 4.2.1) and Ubuntu 16.04 (GNU Make 4.1). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1891 -- Commit Summary -- * Makefile: give warning when old modules directory is found -- File Changes -- M Makefile (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1891.patch https://github.com/kamailio/kamailio/pull/1891.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/1891

2 2

[kamailio/kamailio] [5.1] pv: add $def pseudo variable (#1894)
by sergey-safarov 16 Mar '19

16 Mar '19

That is backport of #1814 Kazoo still use 5.0/5.1 branch You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1894 -- Commit Summary -- * core: allow pvar resolve in subsdef * core: allow pp_define_get to be used by modules * pv: add $def pseudo variable -- File Changes -- M src/core/cfg.lex (4) M src/core/ppcfg.c (4) M src/modules/pv/pv.c (2) M src/modules/pv/pv_core.c (25) M src/modules/pv/pv_core.h (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1894.patch https://github.com/kamailio/kamailio/pull/1894.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/1894

2 2

[kamailio/kamailio] Def psevdo 5.2 (#1893)
by sergey-safarov 16 Mar '19

16 Mar '19

That is back port of https://github.com/kamailio/kamailio/pull/1814 Kazoo still use 5.0/5.1 branch I expect if created backport into 5.1 branch, than backport to 5.2 also need. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1893 -- Commit Summary -- * core: allow pvar resolve in subsdef * core: allow pp_define_get to be used by modules * pv: add $def pseudo variable -- File Changes -- M src/core/cfg.lex (4) M src/core/ppcfg.c (4) M src/modules/pv/pv.c (2) M src/modules/pv/pv_core.c (25) M src/modules/pv/pv_core.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1893.patch https://github.com/kamailio/kamailio/pull/1893.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/1893

2 2

Errored: sergey-safarov/kamailio#131 (5.1 - d525a45)
by Travis CI 16 Mar '19

16 Mar '19

Build Update for sergey-safarov/kamailio ------------------------------------- Build: #131 Status: Errored Duration: 6 mins and 0 secs Commit: d525a45 (5.1) Author: lazedo Message: pv: add $def pseudo variable (cherry picked from commit 43aeb98fbe3902cb8a1c5d653ce0ff8f4551d99a) View the changeset: https://github.com/sergey-safarov/kamailio/compare/78e948d9e800...d525a45c1… View the full build log and details: https://travis-ci.org/sergey-safarov/kamailio/builds/507096561?utm_medium=n… -- You can unsubscribe from build emails from the sergey-safarov/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=15162101&u…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:951570df: uac: add debugging information also for display name removal case
by Henning Westerholt 15 Mar '19

15 Mar '19

Module: kamailio Branch: master Commit: 951570df487310537371468491c6eaa33d4fb0ee URL: https://github.com/kamailio/kamailio/commit/951570df487310537371468491c6eaa… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-03-16T00:25:11+01:00 uac: add debugging information also for display name removal case --- Modified: src/modules/uac/replace.c --- Diff: https://github.com/kamailio/kamailio/commit/951570df487310537371468491c6eaa… Patch: https://github.com/kamailio/kamailio/commit/951570df487310537371468491c6eaa… --- diff --git a/src/modules/uac/replace.c b/src/modules/uac/replace.c index 1b764f3796..ddc82360bb 100644 --- a/src/modules/uac/replace.c +++ b/src/modules/uac/replace.c @@ -326,6 +326,7 @@ int replace_uri( struct sip_msg *msg, str *display, str *uri, /* some new display to set? */ if (display->len) { + LM_DBG("adding new display [%.*s]\n", display->len, display->s); /* add the new display exactly over the deleted one */ buf.s = pkg_malloc( display->len + 2 ); if (buf.s==0)

1 0

git:master:3a337552: uac: small spelling fix in debug output
by Henning Westerholt 15 Mar '19

15 Mar '19

Module: kamailio Branch: master Commit: 3a3375523c385e76066403a3a97a841444e22d99 URL: https://github.com/kamailio/kamailio/commit/3a3375523c385e76066403a3a97a841… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-03-15T18:12:22+01:00 uac: small spelling fix in debug output --- Modified: src/modules/uac/replace.c --- Diff: https://github.com/kamailio/kamailio/commit/3a3375523c385e76066403a3a97a841… Patch: https://github.com/kamailio/kamailio/commit/3a3375523c385e76066403a3a97a841… --- diff --git a/src/modules/uac/replace.c b/src/modules/uac/replace.c index db5ea253fb..1b764f3796 100644 --- a/src/modules/uac/replace.c +++ b/src/modules/uac/replace.c @@ -882,7 +882,7 @@ static void replace_callback(struct dlg_cell *dlg, int type, return; } - LM_DBG("Replace [%.*s] eith [%.*s]\n", old_uri.len, old_uri.s, + LM_DBG("Replace [%.*s] with [%.*s]\n", old_uri.len, old_uri.s, new_uri->len, new_uri->s); /* duplicate the decoded value */

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2019