sr-dev January 2022

sr-dev@lists.kamailio.org

13 participants
261 discussions

git:master:36320b7a: nathelper: docs for alias_name parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 36320b7a22982cc6d2aff610b325bf9620d99239 URL: https://github.com/kamailio/kamailio/commit/36320b7a22982cc6d2aff610b325bf9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-31T19:32:35+01:00 nathelper: docs for alias_name parameter --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/36320b7a22982cc6d2aff610b325bf9… Patch: https://github.com/kamailio/kamailio/commit/36320b7a22982cc6d2aff610b325bf9… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index 832e324819..d0e8a18ea4 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -508,6 +508,27 @@ modparam("nathelper", "filter_server_id", 1) ... modparam("nathelper", "nat_addr_mode", 0) ... +</programlisting> + </example> + </section> + <section id="nathelper.p.alias_name"> + <title><varname>alias_name</varname> (string)</title> + <para> + The parameter sets the name of the Contact URI parameter set by + set_contact_alias() or add_contact_alias() and processed by + handle_ruri_alias() in R-URI. + </para> + <para> + <emphasis> + Default value is <quote>alias</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>alias_name</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("nathelper", "alias_name", "saddr") +... </programlisting> </example> </section>

2 years, 9 months

git:master:e3cfb250: nathelper: added alias_name parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e3cfb250912911e31bbc69e9927d48ef9384e949 URL: https://github.com/kamailio/kamailio/commit/e3cfb250912911e31bbc69e9927d48e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-31T19:28:09+01:00 nathelper: added alias_name parameter - allows to set the name of the parmeter used for alias --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/e3cfb250912911e31bbc69e9927d48e… Patch: https://github.com/kamailio/kamailio/commit/e3cfb250912911e31bbc69e9927d48e… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 3fdbc0332a..2d9e4ee6b7 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -201,6 +201,7 @@ static int nh_filter_srvid = 0; /*0-> disabled, 1 ->enabled*/ unsigned int *natping_state = NULL; +static str nh_alias_name = str_init(""); /* clang-format off */ static cmd_export_t cmds[] = { @@ -275,6 +276,7 @@ static param_export_t params[] = { {"append_sdp_oldmediaip", INT_PARAM, &sdp_oldmediaip }, {"filter_server_id", INT_PARAM, &nh_filter_srvid }, {"nat_addr_mode", INT_PARAM, &nh_nat_addr_mode }, + {"alias_name", PARAM_STR, &nh_alias_name }, {0, 0, 0} }; @@ -449,6 +451,12 @@ static int mod_init(void) LM_ERR("failed to register RPC commands\n"); return -1; } + if(nh_alias_name.s != NULL && nh_alias_name.len > 0) { + if(ksr_contact_alias_set_name(&nh_alias_name) < 0) { + LM_ERR("failed to set contact alias parameter name\n"); + return -1; + } + } if(rcv_avp_param && *rcv_avp_param) { s.s = rcv_avp_param;

2 years, 9 months

git:master:ff1a1d0a: core: dset - added function to set contact alias parameter name

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ff1a1d0adef9dbfeb9a523297027a162c2f644ea URL: https://github.com/kamailio/kamailio/commit/ff1a1d0adef9dbfeb9a523297027a16… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-31T17:30:07+01:00 core: dset - added function to set contact alias parameter name --- Modified: src/core/dset.c Modified: src/core/dset.h --- Diff: https://github.com/kamailio/kamailio/commit/ff1a1d0adef9dbfeb9a523297027a16… Patch: https://github.com/kamailio/kamailio/commit/ff1a1d0adef9dbfeb9a523297027a16… --- diff --git a/src/core/dset.c b/src/core/dset.c index f682cede71..26530c2769 100644 --- a/src/core/dset.c +++ b/src/core/dset.c @@ -873,6 +873,30 @@ int msg_get_src_addr(sip_msg_t *msg, str *uri, int mode) return 0; } + +/** + * set name of alias parameter used for contact/r-uri src/rcv address encoding + */ +int ksr_contact_alias_set_name(str *aname) +{ + _ksr_contact_salias.s = (char*)pkg_malloc(aname->len + 3); + if(_ksr_contact_salias.s==NULL) { + PKG_MEM_ERROR; + return -1; + } + _ksr_contact_salias.s[0] = ';'; + memcpy(_ksr_contact_salias.s + 1, aname->s, aname->len); + _ksr_contact_salias.s[aname->len+1] = '='; + _ksr_contact_salias.s[aname->len+2] = '\0'; + _ksr_contact_salias.len = aname->len + 2; + _ksr_contact_alias.s = _ksr_contact_salias.s + 1; + _ksr_contact_alias.len = _ksr_contact_salias.len - 1; + LM_DBG("new contact alias parameter expression [%.*s]\n", + _ksr_contact_salias.len, _ksr_contact_salias.s); + + return 0; +} + /** * add alias parameter with encoding of source address * - nuri->s must point to a buffer of nuri->len size diff --git a/src/core/dset.h b/src/core/dset.h index 56ffe953eb..b661fc7c84 100644 --- a/src/core/dset.h +++ b/src/core/dset.h @@ -285,6 +285,7 @@ int getbflagsval(unsigned int branch, flag_t* res); */ int setbflagsval(unsigned int branch, flag_t val); +int ksr_contact_alias_set_name(str *aname); int uri_add_rcv_alias(sip_msg_t *msg, str *uri, str *nuri); int uri_restore_rcv_alias(str *uri, str *nuri, str *suri); int uri_trim_rcv_alias(str *uri, str *nuri);

2 years, 9 months

[kamailio/kamailio] register using uac module is getting send even if send_socket is not in this listening list of kamailio (#2624)

by Surendra Tiwari

### Description I am uac module with database. uacreg table have the send_socket column. i do have 2 kamailio server running. i want only kamailio-1 should send register to uacreg entries. for this i have used send_socket column with socket of kamailio-1. After this we can see both kamailio server sending registration and that's the problem.  ### Troubleshooting #### Reproduction loadmodule "uac.so" modparam("uac","auth_username_avp","$avp(auser)") modparam("uac","auth_password_avp","$avp(apass)") modparam("uac","auth_realm_avp","$avp(arealm)") modparam("uac", "reg_contact_addr", "EXTERNAL_IP:5060") modparam("uac", "reg_db_url", DBURL) and use send_socket into uacreg with kamailio-1 socket.  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.8 (x86_64/linux) 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: unknown compiled with gcc 8.3.0 ``` * **Operating System**:  ``` root@ip-10-0-12-135:/etc/kamailio# uname -a Linux ip-10-0-12-135 5.3.0-1019-aws #21~18.04.1-Ubuntu SMP Mon May 11 12:33:03 UTC 2020 x86_64 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/2624

2 years, 9 months

git:master:4793b392: nathelper: use contact uri alias parameter name via core globals

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4793b392489e64a6f106f04f5faaca6d40eeccf8 URL: https://github.com/kamailio/kamailio/commit/4793b392489e64a6f106f04f5faaca6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-31T14:29:48+01:00 nathelper: use contact uri alias parameter name via core globals --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/4793b392489e64a6f106f04f5faaca6… Patch: https://github.com/kamailio/kamailio/commit/4793b392489e64a6f106f04f5faaca6…

2 years, 9 months

git:master:2ed2161a: core: dset - global variables for contact uri alias parameter name

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2ed2161a2d7e7c027c5fe7bad3ebdee606ad8e1f URL: https://github.com/kamailio/kamailio/commit/2ed2161a2d7e7c027c5fe7bad3ebdee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-31T14:01:08+01:00 core: dset - global variables for contact uri alias parameter name --- Modified: src/core/dset.c Modified: src/core/dset.h --- Diff: https://github.com/kamailio/kamailio/commit/2ed2161a2d7e7c027c5fe7bad3ebdee… Patch: https://github.com/kamailio/kamailio/commit/2ed2161a2d7e7c027c5fe7bad3ebdee…

2 years, 9 months

[kamailio/kamailio] app_lua: build warning (#2728)

by sergey-safarov

``` which: no lua-config in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin) which: no lua-config in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin) CC (gcc) [M app_lua.so] app_lua_api.o app_lua_api.c: In function 'lua_sr_kemi_register_libs': app_lua_api.c:1942:2: warning: implicit declaration of function 'luaL_openlib'; did you mean 'luaL_openlibs'? [-Wimplicit-f unction-declaration] 1942 | luaL_openlib(L, "KSR", _sr_crt_KSRMethods, 0); | ^~~~~~~~~~~~ | luaL_openlibs CC (gcc) [M app_lua.so] app_lua_kemi_export.o CC (gcc) [M app_lua.so] app_lua_mod.o LD (gcc) [M app_lua.so] app_lua.so which: no lua-config in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin) which: no lua-config in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin) CC (gcc) [M app_lua_sr.so] app_lua_sr_api.o app_lua_sr_api.c: In function 'lua_sr_core_openlibs': app_lua_sr_api.c:1614:2: warning: implicit declaration of function 'luaL_openlib'; did you mean 'luaL_openlibs'? [-Wimplici t-function-declaration] 1614 | luaL_openlib(L, "sr", _sr_core_Map, 0); | ^~~~~~~~~~~~ | luaL_openlibs CC (gcc) [M app_lua_sr.so] app_lua_sr_exp.o app_lua_sr_exp.c: In function 'lua_sr_exp_openlibs': app_lua_sr_exp.c:3686:3: warning: implicit declaration of function 'luaL_openlib'; did you mean 'luaL_openlibs'? [-Wimplici t-function-declaration] 3686 | luaL_openlib(L, "sr.sl", _sr_sl_Map, 0); | ^~~~~~~~~~~~ | luaL_openlibs CC (gcc) [M app_lua_sr.so] app_lua_sr_mod.o LD (gcc) [M app_lua_sr.so] app_lua_sr.so ``` -- 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/2728

2 years, 9 months

[kamailio/kamailio] REGISTER with http_async_client (Issue #3009)

by cyril-rm

Hi there, I have a weird issue with kamailio (latest docker image kamailio-ci:5.5.2-alpine) and http_async_client. Before posting a lot of logs, let me describe what I want to achieve. I have a Kamailio and a SIP Phone. The SIP phone sends a REGISTER to kamailio, then in my routing block, I check if I have an Authorization header. Since I don't have an Authorization (first message), I use "www_challenge()". This replies to the SIP phone, and then the SIP phone sends a new REGISTER with the correct Authorization header. So far so good. Now, when I get the REGISTER with Authorization header, I want to ask an HTTP endpoint if this user is allowed to connect and check the password using http_async_query(). The problem is that when the transaction resumes, the tmx module is unhappy and throws this error : `30(36) CRITICAL: tmx [t_var.c:546]: pv_get_tm_reply_code(): no picked branch (-1) for a final response in MODE_ONFAILURE ` And a 500 error is sent back to the sip phone. The AUTH_REPLY route is still called and I can use the $http* values. it seems that my AUTH_REPLY route is called but considered as a "failure_route" `19(27) exec: *** cfgtrace:dbg_cfg_trace(): failure_route=[AUTH_REPLY] c=[/etc/kamailio/kamailio.cfg] l=665 a=16 n=if ` Do you see something that I am doing wrong or missing in my logic? Is pausing/resuming to use the async http client is allowed if I'm handling a REGISTER transaction? Here's a simplified version of my routing block (not far from reality): ``` request_route{ route(AUTH); route[AUTH]{ if (is_method("REGISTER"){ if(no_auth_header){ www_challenge("$td","1"); exit; } else{ t_newtran(); http_async_query("http://xxx.xxx.xxx.xxx:9000/auth?foo=bar", "AUTH_REPLY"); } } } route[AUTH_REPLY]{ xlog("L_INFO", "route[HTTP_REPLY]: status $http_rs\n"); } } ``` Best regards! -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3009 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3009(a)github.com>

2 years, 10 months

git:master:3b75ccbf: app_lua_sr: support for lua 5.4.x

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3b75ccbfda758e0d72e34ad5e9d3deb75d10ecf9 URL: https://github.com/kamailio/kamailio/commit/3b75ccbfda758e0d72e34ad5e9d3deb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T16:25:56+01:00 app_lua_sr: support for lua 5.4.x --- Modified: src/modules/app_lua_sr/app_lua_sr_api.c --- Diff: https://github.com/kamailio/kamailio/commit/3b75ccbfda758e0d72e34ad5e9d3deb… Patch: https://github.com/kamailio/kamailio/commit/3b75ccbfda758e0d72e34ad5e9d3deb… --- 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 90267467d6..884330c604 100644 --- a/src/modules/app_lua_sr/app_lua_sr_api.c +++ b/src/modules/app_lua_sr/app_lua_sr_api.c @@ -45,8 +45,70 @@ #include "app_lua_sr_api.h" #include "app_lua_sr_exp.h" +#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 504 +#define luaL_openlib ksr_luaL_openlib +#endif + + extern app_lua_api_t _app_lua_api; + +#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 504 +/** + * + */ +void ksr_luaL_openlib_mode(lua_State *L, const char *libname, + const luaL_Reg *lfuncs, int nup, int mode) +{ + char modname[256]; + char *submod = NULL; + int tidx = 0; + if(mode) { + /* support for registering 'module.submodule' functions + * - 'module' functions must be registered first */ + if(strlen(libname)>254) { + LM_ERR("module name is too long [%s]\n", libname); + return; + } + strcpy(modname, libname); + submod = strchr(modname, '.'); + if(submod != NULL) { + *submod = '\0'; + submod++; + } + lua_getglobal(L, modname); + if (lua_isnil(L, -1)) { + if(submod != NULL) { + LM_ERR("main module not registered yet [%s]\n", libname); + return; + } + lua_pop(L, 1); + lua_newtable(L); + luaL_setfuncs(L, lfuncs, 0); + lua_setglobal(L, modname); + return; + } + tidx = lua_gettop(L); + lua_newtable(L); + luaL_setfuncs(L, lfuncs, 0); + lua_setfield(L, tidx, submod); + return; + } + lua_newtable(L); + luaL_setfuncs(L, lfuncs, 0); + lua_setglobal(L, libname); +} + +/** + * + */ +void ksr_luaL_openlib(lua_State *L, const char *libname, + const luaL_Reg *lfuncs, int nup) +{ + ksr_luaL_openlib_mode(L, libname, lfuncs, nup, 1); +} +#endif + /** * */

2 years, 10 months

git:5.5:d0b14f3e: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.5 Commit: d0b14f3e64355aca6c1f0218c804b34b0810c703 URL: https://github.com/kamailio/kamailio/commit/d0b14f3e64355aca6c1f0218c804b34… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-01-26T14:01:43+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/siputils/README Modified: src/modules/statsc/README --- Diff: https://github.com/kamailio/kamailio/commit/d0b14f3e64355aca6c1f0218c804b34… Patch: https://github.com/kamailio/kamailio/commit/d0b14f3e64355aca6c1f0218c804b34… --- diff --git a/src/modules/siputils/README b/src/modules/siputils/README index 87d3ecf9e4..fb4508ebaa 100644 --- a/src/modules/siputils/README +++ b/src/modules/siputils/README @@ -452,6 +452,11 @@ modparam("auth", "rpid_avp", "$avp(myrpid)") timeout value will be converted to a 180 message. Please note that you need to set a positive timeout value in order to use this function. + Note: the change of sip reply can be done only in cases when it is not + parsed too much before config execution, otherwise it fails. For + example, setting global parameter "log_prefix" can cause this function + to fail changing the replies. + The function returns TRUE on success, and FALSE during processing failures. diff --git a/src/modules/statsc/README b/src/modules/statsc/README index 2ef41cc72d..d06f3925b2 100644 --- a/src/modules/statsc/README +++ b/src/modules/statsc/README @@ -103,6 +103,8 @@ modparam("statsc", "interval", 300) How many items to store for each statistic. + Note: it must be set before any 'track' parameter. + Default value is 100. Example 1.2. Set items parameter

2 years, 10 months

← Newer
1
...
8
9
10
11
12
13
14
...
27
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