sr-dev January 2022

sr-dev@lists.kamailio.org

13 participants
260 discussions

[kamailio/kamailio] Append HF don't work in event_route (Issue #3006)

by Eulnono76

### Description Hello, I'm trying to connect kamailio to Microsoft Teams. Dispatch is correctly configured and send SIP OPTION correctly. Following this tutorial : https://skalatan.de/en/blog/kamailio-sbc-teams, I added an Event_Route to add contact header to SIP OPTION from dispath to MS : event_route[tm:local-request] { xlog("*** tm:local-request *** "); if(is_method("OPTIONS") && $ru =~ "pstnhub.microsoft.com") { xlog("L_INFO", "Append new contact !\n"); append_hf("Contact: <sip:MY_SBC_NAME.COM:5061;transport=tls>\r\n"); } xlog("L_INFO", "Sent out tm request: $mb\n"); } When I check the log to see my sended frame, I don't see a contact header field : _INFO: <script>: Append new contact ! INFO: <script>: Sent out tm request : OPTIONS sip:sip.pstnhub.microsoft.com;transport=tls SIP/2.0 Via: SIP/2.0/TLS MY_SBC_NAME.COM:5061;branch=z9hG4bK4497.f3e5e754000000000000000000000000.0 To: <sip:sip.pstnhub.microsoft.com;transport=tls> From: <sip:MY_SBC_NAME.COM.fr>;tag=a76e006ace3802951ed860e08df964af-7971 CSeq: 10 OPTIONS Call-ID: 2e1278ea77796160-9837@MY_SBC_IP Max-Forwards: 70 Content-Length: 0 User-Agent: kamailio (5.2.1 (x86_64/linux))_ According the documentation about textop, append_hf(txt[, hdr]) : _This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE._ So my question is append HF can be used in Event_route ? Is there any other way to add contact header ? Regards, Arnaud ### Troubleshooting #### Reproduction Can be easily reproducted with the following code (don t forget to set SBC NAME) event_route[tm:local-request] { xlog("*** tm:local-request *** "); if(is_method("OPTIONS") && $ru =~ "pstnhub.microsoft.com") { xlog("L_INFO", "Append new contact !\n"); append_hf("Contact: <sip:MY_SBC_NAME.COM:5061;transport=tls>\r\n"); } xlog("L_INFO", "Sent out tm request: $mb\n"); } #### Log Messages INFO: <script>: Append new contact ! INFO: <script>: Sent out tm request : OPTIONS sip:sip.pstnhub.microsoft.com;transport=tls SIP/2.0 Via: SIP/2.0/TLS MY_SBC_NAME.COM:5061;branch=z9hG4bK4497.f3e5e754000000000000000000000000.0 To: <sip:sip.pstnhub.microsoft.com;transport=tls> From: <sip:MY_SBC_NAME.COM.fr>;tag=a76e006ace3802951ed860e08df964af-7971 CSeq: 10 OPTIONS Call-ID: 2e1278ea77796160-9837@MY_SBC_IP Max-Forwards: 70 Content-Length: 0 User-Agent: kamailio (5.2.1 (x86_64/linux)) ``` #### SIP Traffic Traffic is in TLS, can't be easily readed. ### Additional Information version: kamailio 5.3.9 (x86_64/linux) a5fd0a flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, 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, TLS_PTHREAD_MUTEX_SHARED 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: a5fd0a compiled on 15:59:30 Jan 10 2022 with gcc 8.3.0 * **Operating System**: No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 10 (buster) Release: 10 Codename: buster Linux debian 4.19.0-17-amd64 #1 SMP Debian 4.19.194-3 (2021-07-18) x86_64 GNU/Linux -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3006 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3006(a)github.com>

2 years, 3 months

app_lua warning

by Juha Heinanen

I noticed that master build on Debian 11 with ii liblua5.1-0-dev:amd64 5.1.5-8.1+b3 amd64 Development files for the Lua language version 5.1 gave compiler warning: CC (gcc) [M app_lua.so] app_lua_api.o app_lua_api.c: In function 'ksr_luaL_openlib_mode': app_lua_api.c:221:4: warning: implicit declaration of function 'luaL_setfuncs'; did you mean 'lua_setfenv'? [-Wimplicit-function-declaration] 221 | luaL_setfuncs(L, lfuncs, 0); | ^~~~~~~~~~~~~ | lua_setfenv I have not defined LUAJIT="yes" in the build. -- Juha

2 years, 3 months

git:master:74bcf6e3: app_lua_sr: fixed confition on number of parameters for xavp get

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 74bcf6e3f891def532fbcba7d709b3ee7ce9614d URL: https://github.com/kamailio/kamailio/commit/74bcf6e3f891def532fbcba7d709b3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-24T13:55:55+01:00 app_lua_sr: fixed confition on number of parameters for xavp get --- Modified: src/modules/app_lua_sr/app_lua_sr_api.c --- Diff: https://github.com/kamailio/kamailio/commit/74bcf6e3f891def532fbcba7d709b3e… Patch: https://github.com/kamailio/kamailio/commit/74bcf6e3f891def532fbcba7d709b3e… --- diff --git a/src/modules/app_lua_sr/app_lua_sr_api.c b/src/modules/app_lua_sr/app_lua_sr_api.c index 58b9d8c60a..90267467d6 100644 --- a/src/modules/app_lua_sr/app_lua_sr_api.c +++ b/src/modules/app_lua_sr/app_lua_sr_api.c @@ -1466,7 +1466,7 @@ static int lua_sr_xavp_get(lua_State *L) env_L = _app_lua_api.env_get_f(); num_param = lua_gettop(L); - if(num_param<2 && num_param>3) + if(num_param<2 || num_param>3) { LM_ERR("wrong number of parameters [%d]\n", num_param); return 0; @@ -1615,4 +1615,4 @@ void lua_sr_core_openlibs(lua_State *L) luaL_openlib(L, "sr.hdr", _sr_hdr_Map, 0); luaL_openlib(L, "sr.pv", _sr_pv_Map, 0); luaL_openlib(L, "sr.xavp", _sr_xavp_Map, 0); -} \ No newline at end of file +}

2 years, 3 months

git:master:5d5934ab: app_lua_sr: Makefile - reworked detection of lua version with support for 5.3 and 5.4

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5d5934ab14605f22231f1340f51b2b5c6ade46f5 URL: https://github.com/kamailio/kamailio/commit/5d5934ab14605f22231f1340f51b2b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-24T13:49:37+01:00 app_lua_sr: Makefile - reworked detection of lua version with support for 5.3 and 5.4 --- Modified: src/modules/app_lua_sr/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/5d5934ab14605f22231f1340f51b2b5… Patch: https://github.com/kamailio/kamailio/commit/5d5934ab14605f22231f1340f51b2b5…

2 years, 3 months

git:master:8caf07a4: app_lua: Makefile - check cross compile for luajit

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8caf07a43f86e6fc38bda96efb04c69679e26561 URL: https://github.com/kamailio/kamailio/commit/8caf07a43f86e6fc38bda96efb04c69… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-24T13:45:32+01:00 app_lua: Makefile - check cross compile for luajit - a few updates for compile flags ordering --- Modified: src/modules/app_lua/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/8caf07a43f86e6fc38bda96efb04c69… Patch: https://github.com/kamailio/kamailio/commit/8caf07a43f86e6fc38bda96efb04c69… --- diff --git a/src/modules/app_lua/Makefile b/src/modules/app_lua/Makefile index ca3012ee73..5c0ccd1477 100644 --- a/src/modules/app_lua/Makefile +++ b/src/modules/app_lua/Makefile @@ -17,6 +17,7 @@ ifeq ($(LUAJIT),) BUILDER = $(shell which pkg-config) endif ifeq ($(BUILDER),) + # no pkg-config - try finding by path ifneq ($(shell ls $(LOCALBASE)/lib/liblua* | grep liblua5.1),) LUALIB=lua5.1 else ifneq ($(shell ls $(LOCALBASE)/lib/liblua* | grep liblua5.2),) @@ -26,7 +27,7 @@ ifeq ($(LUAJIT),) else ifneq ($(shell ls $(LOCALBASE)/lib/liblua* | grep liblua5.4),) LUALIB=lua5.4 endif - DEFS+= -I$(LOCALBASE)/include -DLUA_COMPAT_MODULE -I$(LOCALBASE)/include/$(LUALIB) + DEFS+= -DLUA_COMPAT_MODULE -I$(LOCALBASE)/include -I$(LOCALBASE)/include/$(LUALIB) LIBS+= -L$(LOCALBASE)/lib -l$(LUALIB) -lm else ifneq ($(shell pkg-config --silence-errors --libs lua-5.1),) @@ -52,6 +53,7 @@ ifeq ($(LUAJIT),) DEFS+= $(shell pkg-config --cflags $(LUALIB)) LIBS = $(shell pkg-config --libs $(LUALIB)) else + # pkg-config with no lua library detected - try finding by path LUALIB=lua ifneq ($(shell ls $(LOCALBASE)/lib/liblua* | grep liblua5.1),) LUALIB=lua5.1 @@ -62,7 +64,7 @@ ifeq ($(LUAJIT),) else ifneq ($(shell ls $(LOCALBASE)/lib/liblua* | grep liblua5.4),) LUALIB=lua5.4 endif - DEFS+= -I$(LOCALBASE)/include -DLUA_COMPAT_MODULE -I$(LOCALBASE)/include/$(LUALIB) + DEFS+= -DLUA_COMPAT_MODULE -I$(LOCALBASE)/include -I$(LOCALBASE)/include/$(LUALIB) LIBS+= -L$(LOCALBASE)/lib -l$(LUALIB) -lm endif endif @@ -71,8 +73,10 @@ ifeq ($(LUAJIT),) LIBS = $(shell lua-config --libs) endif else - # Build using LuaJIT - BUILDER = $(shell which pkg-config) + # build using LuaJIT + ifeq ($(CROSS_COMPILE),) + BUILDER = $(shell which pkg-config) + endif ifeq ($(BUILDER),) DEFS+= -I/usr/include/luajit-2.1 LIBS = -lluajit-5.1

2 years, 3 months

git:master:673dab16: app_lua: Makefile - reworked detection of lua version with support for 5.3 and 5.4

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 673dab16593d9a70bf606adaf31b52d14ad75e99 URL: https://github.com/kamailio/kamailio/commit/673dab16593d9a70bf606adaf31b52d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-24T13:37:36+01:00 app_lua: Makefile - reworked detection of lua version with support for 5.3 and 5.4 --- Modified: src/modules/app_lua/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/673dab16593d9a70bf606adaf31b52d… Patch: https://github.com/kamailio/kamailio/commit/673dab16593d9a70bf606adaf31b52d…

2 years, 3 months

git:master:76c273ec: dispatcher: check reload delta in functions building new routing structure

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 76c273ecaa76f031ce9892acd895b4eacf4de17e URL: https://github.com/kamailio/kamailio/commit/76c273ecaa76f031ce9892acd895b4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-24T13:37:36+01:00 dispatcher: check reload delta in functions building new routing structure --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/76c273ecaa76f031ce9892acd895b4e… Patch: https://github.com/kamailio/kamailio/commit/76c273ecaa76f031ce9892acd895b4e… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 37000221e3..059df89123 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -952,6 +952,16 @@ static int ds_warn_fixup(void **param, int param_no) static int ds_reload(sip_msg_t *msg) { + if(ds_rpc_reload_time==NULL) { + LM_ERR("not ready for reload\n"); + return -1; + } + if(*ds_rpc_reload_time!=0 && *ds_rpc_reload_time > time(NULL) - ds_reload_delta) { + LM_ERR("ongoing reload\n"); + return -1; + } + *ds_rpc_reload_time = time(NULL); + if(!ds_db_url.s) { if(ds_load_list(dslistfile) != 0) LM_ERR("Error reloading from list\n"); @@ -1859,6 +1869,18 @@ static void dispatcher_rpc_add(rpc_t *rpc, void *ctx) str dest; str attrs = STR_NULL; + if(ds_rpc_reload_time==NULL) { + LM_ERR("Not ready for rebuilding destinations list\n"); + rpc->fault(ctx, 500, "Not ready for reload"); + return; + } + if(*ds_rpc_reload_time!=0 && *ds_rpc_reload_time > time(NULL) - ds_reload_delta) { + LM_ERR("ongoing reload\n"); + rpc->fault(ctx, 500, "Ongoing reload"); + return; + } + *ds_rpc_reload_time = time(NULL); + flags = 0; nparams = rpc->scan(ctx, "dS*dS", &group, &dest, &flags, &attrs); @@ -1890,6 +1912,18 @@ static void dispatcher_rpc_remove(rpc_t *rpc, void *ctx) int group; str dest; + if(ds_rpc_reload_time==NULL) { + LM_ERR("Not ready for rebuilding destinations list\n"); + rpc->fault(ctx, 500, "Not ready for reload"); + return; + } + if(*ds_rpc_reload_time!=0 && *ds_rpc_reload_time > time(NULL) - ds_reload_delta) { + LM_ERR("ongoing reload\n"); + rpc->fault(ctx, 500, "Ongoing reload"); + return; + } + *ds_rpc_reload_time = time(NULL); + if(rpc->scan(ctx, "dS", &group, &dest) < 2) { rpc->fault(ctx, 500, "Invalid Parameters"); return;

2 years, 3 months

git:master:f2cf4581: github: use bullseye docker image

by Victor Seva

Module: kamailio Branch: master Commit: f2cf4581389ddea28ab870842c3cbd864926ba43 URL: https://github.com/kamailio/kamailio/commit/f2cf4581389ddea28ab870842c3cbd8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-01-24T10:07:15+01:00 github: use bullseye docker image --- Modified: .github/workflows/main.yml Modified: test/travis/build_travis.sh --- Diff: https://github.com/kamailio/kamailio/commit/f2cf4581389ddea28ab870842c3cbd8… Patch: https://github.com/kamailio/kamailio/commit/f2cf4581389ddea28ab870842c3cbd8… --- diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3a745d88b0..4c94110f68 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,9 +22,9 @@ jobs: strategy: matrix: include: - - distribution: buster + - distribution: bullseye compilier: gcc - - distribution: buster + - distribution: bullseye compilier: clang - distribution: sid compilier: gcc diff --git a/test/travis/build_travis.sh b/test/travis/build_travis.sh index 368f013ebc..696e193dec 100755 --- a/test/travis/build_travis.sh +++ b/test/travis/build_travis.sh @@ -7,7 +7,7 @@ set -e -DIST=${DIST:-buster} +DIST=${DIST:-bullseye} CC=${CC:-gcc} if ! [ -d /code/pkg/kamailio/deb/"${DIST}" ] ; then

2 years, 3 months

git:master:e139f0c6: modules: readme files regenerated - kex ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: e139f0c6816728a7104be96b501559ae5a68a353 URL: https://github.com/kamailio/kamailio/commit/e139f0c6816728a7104be96b501559a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-01-24T10:01:28+01:00 modules: readme files regenerated - kex ... [skip ci] --- Modified: src/modules/kex/README --- Diff: https://github.com/kamailio/kamailio/commit/e139f0c6816728a7104be96b501559a… Patch: https://github.com/kamailio/kamailio/commit/e139f0c6816728a7104be96b501559a…

2 years, 3 months

git:master:999857f0: kex: docs for rpc core.runinfo

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 999857f092d59084430c3a4ce0ea71b7cd497de2 URL: https://github.com/kamailio/kamailio/commit/999857f092d59084430c3a4ce0ea71b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-24T09:51:08+01:00 kex: docs for rpc core.runinfo --- Modified: src/modules/kex/doc/kex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/999857f092d59084430c3a4ce0ea71b… Patch: https://github.com/kamailio/kamailio/commit/999857f092d59084430c3a4ce0ea71b… --- diff --git a/src/modules/kex/doc/kex_admin.xml b/src/modules/kex/doc/kex_admin.xml index 47eebc847f..34484bc4ec 100644 --- a/src/modules/kex/doc/kex_admin.xml +++ b/src/modules/kex/doc/kex_admin.xml @@ -489,6 +489,15 @@ resetdebug(); Verbose info, including version number, compile flags, compiler, repository, hash </para> </section> + <section id="kex.r.core.runinfo"> + <title> + <function moreinfo="none">core.runinfo</function> + </title> + <para> + Runtime details like running version, uptime, ... + </para> + </section> + <section id="kex.r.core.kill"> <title> <function moreinfo="none">core.kill</function>

2 years, 3 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2022