- sr-dev - kamailio.org

git:master:ff1a1d0a: core: dset - added function to set contact alias parameter name
by Daniel-Constantin Mierla 31 Jan '22

31 Jan '22

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);

1 0

[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 31 Jan '22

31 Jan '22

### 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

5 10

git:master:4793b392: nathelper: use contact uri alias parameter name via core globals
by Daniel-Constantin Mierla 31 Jan '22

31 Jan '22

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…

1 0

git:master:2ed2161a: core: dset - global variables for contact uri alias parameter name
by Daniel-Constantin Mierla 31 Jan '22

31 Jan '22

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…

1 0

[kamailio/kamailio] app_lua: build warning (#2728)
by sergey-safarov 29 Jan '22

29 Jan '22

``` 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 10

[kamailio/kamailio] REGISTER with http_async_client (Issue #3009)
by cyril-rm 27 Jan '22

27 Jan '22

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 3

git:master:3b75ccbf: app_lua_sr: support for lua 5.4.x
by Daniel-Constantin Mierla 26 Jan '22

26 Jan '22

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 + /** * */

1 0

git:5.5:d0b14f3e: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 26 Jan '22

26 Jan '22

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

1 0

git: new commits in branch 5.5
by Daniel-Constantin Mierla 26 Jan '22

26 Jan '22

- URL: https://github.com/kamailio/kamailio/commit/5d08f4028ad6f805940d1824e17fb14… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:33:14+01:00 core: parser - clang format parser_f.c (cherry picked from commit 03acf834a19689d6c3efcea93e48985d3e7ffc37) - URL: https://github.com/kamailio/kamailio/commit/fb06dbf3e0452f1b4e8772da3fa94d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:33:33+01:00 core: parser sdp - check if delimiter exceeds body limit (cherry picked from commit bd5280726a9842b257afabae548853d000ecd249) - URL: https://github.com/kamailio/kamailio/commit/5715fc40664438e092d444ea31b99c9… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2022-01-26T13:33:51+01:00 dlgs: optimize dlgs_init, if/else path are identical (cherry picked from commit 8e7f2e6a158bb2c59600b03be3c7e6eefc416180) - URL: https://github.com/kamailio/kamailio/commit/97bc9751485dfd9aa314e15aaef73b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:34:18+01:00 misc/examples: kemi - update lua sample config (cherry picked from commit 99a9f27c8d24a06f201b4713f7a2bfeb37092482) - URL: https://github.com/kamailio/kamailio/commit/0ba7876e5cc1120d7e64e779ba9327e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:34:29+01:00 misc/examples: kemi - sanity checks for response in python script (cherry picked from commit bd42130e3cfb87856b4b0431de50eccdd4324f9f) - URL: https://github.com/kamailio/kamailio/commit/42e3c28f2744ee4c799c972bed56e41… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:34:46+01:00 auth_identity: close file in case of errors - GH #2983 (cherry picked from commit 84cdc33429c61fe7cac91cbedf96bef560267313) - URL: https://github.com/kamailio/kamailio/commit/65e50fbd24f9239a4dab25c6b832867… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Date: 2022-01-26T13:35:23+01:00 ldap: rename private function ldap_connect When compiling against openldap 2.6.0 kamailio's private ldap_connect() clashes with openldap's own. curl dealt with a similar issue earlier (see [1]). Simply rename the function to avoid the issue. In file included from ldap_api_fn.c:37: ldap_connect.h:34:12: error: conflicting types for 'ldap_connect'; have 'int(char *)' 34 | extern int ldap_connect(char *_ld_name); | ^~~~~~~~~~~~ In file included from ldap_api_fn.c:33: /home/sk/tmp/sdk/openwrt-sdk-ath79-generic_gcc-11.2.0_musl.Linux-x86_64/staging_dir/target-mips_24kc_musl/usr/include/ldap.h:1555:1: note: previous declaration of 'ldap_connect' with type 'int(LDAP *)' {aka 'int(struct ldap *)'} 1555 | ldap_connect( LDAP *ld ); | ^~~~~~~~~~~~ make[5]: *** [../../Makefile.rules:100: ldap_api_fn.o] Error 1 make[4]: *** [Makefile:511: modules] Error 1 [1] https://github.com/curl/curl/commit/8bdde6b14ce3b5fd71c772a578fcbd4b6fa6df19 Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> (cherry picked from commit 362c6de08058948d0a70a1eeb14ec718f922b4e5) - URL: https://github.com/kamailio/kamailio/commit/e0084adcda85b10b3b0c0765a292cfd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:35:58+01:00 siputils: docs - note about restrictions of ring_insert_callid() - GH #2989 (cherry picked from commit 090f1f74603de6113f3dd41095ae41b4f03f8171) - URL: https://github.com/kamailio/kamailio/commit/0aa4340764f78c74a62054050d88056… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:36:17+01:00 core: parser sdp - print hdr name by length on error in get_sdp_hdr_field() (cherry picked from commit c4e462fa6bda38ac6fd814ce8d98ea030d4049b9) - URL: https://github.com/kamailio/kamailio/commit/0ea3ec6b76ecd519d3a9446c79d5361… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:38:15+01:00 core: renamed global is_main to _ksr_is_main - safer to avoid conflicts with other libs (cherry picked from commit f3454dd9f2d065e7757e9d9680b815481d08269c) - URL: https://github.com/kamailio/kamailio/commit/a1939714a74bac7b3118373e6fedf2b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:38:28+01:00 ctl: rename is_main to _ksr_is_main (cherry picked from commit e7c14adc0b171fae9ad7c0fed4fb3c785dd282ca) - URL: https://github.com/kamailio/kamailio/commit/5e3b2f9dd2465508b10531bf345e892… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:38:36+01:00 db_text: rename is_main to _ksr_is_main (cherry picked from commit 52cad0a39b224add8ff7eb6dd253f00122e93704) - URL: https://github.com/kamailio/kamailio/commit/32973b52303a5576a821af50d0ba2db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:38:46+01:00 http_async_module: check return for event_base_dispatch() - exit if it fails - part of GH #2999 (cherry picked from commit 461ec0a79ae365729c11efcbd96fc158c50a2891) - URL: https://github.com/kamailio/kamailio/commit/5e105ffbc6ad699ab06fbbf7e50c2b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:38:55+01:00 usrloc: removed unrelated comment with is_main - was not even used (cherry picked from commit 3a00526bbe535d46d234108cb71fd80376f0718d) - URL: https://github.com/kamailio/kamailio/commit/7ebe3f4cb5fbe68159ee94bc962585d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:39:03+01:00 ims_usrloc_pcscf: removed unrelated comment with is_main - was not even used (cherry picked from commit 5978ec116c3efacacf260e9f579d93c9e9bfb780) - URL: https://github.com/kamailio/kamailio/commit/d3dffa9b3afb57b041a046d5c6a8d90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:39:12+01:00 p_usrloc: removed unrelated comment with is_main - was not even used (cherry picked from commit 9d280b589a035fa04cd4c7235671d1fdb6ae44e9) - URL: https://github.com/kamailio/kamailio/commit/183afaf6ecdd3ddde4ea5b9ad61202e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:39:31+01:00 ims_usrloc_scscf: removed unrelated comment with is_main - was not even used (cherry picked from commit 819ca1d7afe558d944fa88b2d453bf7ae7fcc819) - URL: https://github.com/kamailio/kamailio/commit/e3ed8c0d80dea4da4c522864f1480d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:39:46+01:00 presence: utils - use memcpy instead of strncpy for coherence (cherry picked from commit 33c40170e73adc71e2ad66d8dbb6c776b771ce5d) - URL: https://github.com/kamailio/kamailio/commit/7381ccd61a325e5b6502d05588ac8ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:39:57+01:00 lcr: init buffers to try to get rid of new warnings (cherry picked from commit 0247c336e208912324c71aea9843e688d7c5a463) - URL: https://github.com/kamailio/kamailio/commit/e855d251d27e5a399cfa3d8a70b4387… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:40:06+01:00 dispatcher: safety checks for str fields (cherry picked from commit 5443db4d632c8502dc622cc28fe2847fb0c147c1) - URL: https://github.com/kamailio/kamailio/commit/93cd99f08c61b7355e948dfbf855eb3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:40:22+01:00 rls: free xml doc in case of error (cherry picked from commit 55f23d09faee06a892dde13e371d144b98bae68f) - URL: https://github.com/kamailio/kamailio/commit/4f002432bf2699d99f7b83a3652fc9e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:40:39+01:00 avpops: init variable to fix warning (cherry picked from commit b7815d04ced35d5b5ccbcdaa39d41ef4a2cb2ad0) - URL: https://github.com/kamailio/kamailio/commit/c8582892d0cacbd2ed857f87d2fa59a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:40:47+01:00 db_text: init variable to fix warning (cherry picked from commit 102b7c62ae9877151ce542b8b5747051fb954acb) - URL: https://github.com/kamailio/kamailio/commit/49d5f6eb5f9f0a800dbaaf02c3ef8ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:40:55+01:00 dialog: init variable to fix warning (cherry picked from commit 682f9984fc4942d5f786f0ca9d798630d618f8da) - URL: https://github.com/kamailio/kamailio/commit/8c0fcc2a437b194c9a4f5426d1e611c… Author: Morten Tryfoss <morten(a)tryfoss.no> Date: 2022-01-26T13:41:16+01:00 dispatcher: Fix handling of inactive destination for alg 13 Alg 13 did try to distribute calls to inactive destinations. If the highest priority destination is inactive, hash is not updated and the xavp is not set. This is resulting in failover mechanism not working at all for the given call. When the hash variable is not updated, it makes alg 13 behave like round robin if the scenario above occurs. If you got two destinations and the highest priority is out of service, 50% of the calls will fail. Now I tried a more simple approach updating hash with the first entry of the sorted list. (cherry picked from commit adba3caa2d12d1f8b89d720fbb9a6a9cdc8b2573) - URL: https://github.com/kamailio/kamailio/commit/ef9b353910d10d91fde88193b7a3dd9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:41:30+01:00 core: parser - print ascii code and position of invalid char for identity info (cherry picked from commit 40e59d9c3b8ec531cb9e26093c43647a43108dfd) - URL: https://github.com/kamailio/kamailio/commit/c8d579452906aee0c2716ef9ac25fe0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:42:03+01:00 dispatcher: removed module name from log message - updates to debug messages (cherry picked from commit 29ebde9cfe746c1dd9083a5fc4b26a32c39ca0a4) - URL: https://github.com/kamailio/kamailio/commit/633148323c83b9f35d221ff59fbf7b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:42:17+01:00 tm: update uri when refreshing local uac shortcuts (cherry picked from commit 0ed1282238da6cdd8a4dbef1b61493b70a850a6b) - URL: https://github.com/kamailio/kamailio/commit/3d4ceff9aa77b841fa2df938cfbab9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:42:40+01:00 db_unixodbc: catch queries without result to skip printing error logs - GH #2810 (cherry picked from commit 795a09077ccc5dd06f9074978dc77dd81389512b) - URL: https://github.com/kamailio/kamailio/commit/331e60374e6a0c283b835ab62da8482… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:42:55+01:00 stats: detect of mod param items is set after track - it can lead to crash if items is set to greater value than the default one (GH #2101) - round up for better memory alignment in the allocated structures (cherry picked from commit b29c79c8d83fd23064e50dcee02e5f85ec51328d) - URL: https://github.com/kamailio/kamailio/commit/38bdf24485f3e4d2d9489ba695f7b23… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:43:05+01:00 statsc: note that items param must be set before track (cherry picked from commit f517f8c655e676f5872eda5f81f5244eac4eed25) - URL: https://github.com/kamailio/kamailio/commit/b149906e3c0558fd9cb866d39b36f18… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:43:51+01:00 core: set exit flag for return 0 (cherry picked from commit 23c39ecbdd29f2fff0af4a693b08032e8afff48b) - URL: https://github.com/kamailio/kamailio/commit/3ee8896e87a8a2b0f6e704d806983b5… Author: drTr0jan <drtr0jan(a)yandex.ru> Date: 2022-01-26T13:44:49+01:00 phonenum: Makefile - support for FreeBSD build - updated LIBS and DEFS variables, making them consistent with the rest of modules; - removed predefined CXX and LD variables. (cherry picked from commit c4b280bd5b5b0cfb8d34ecef296972f2a043791e) - URL: https://github.com/kamailio/kamailio/commit/0ee717c91ca0dc590d6764803c15198… Author: drTr0jan <drtr0jan(a)yandex.ru> Date: 2022-01-26T13:44:59+01:00 websocket: Makefile - support for FreeBSD build - updated LIBS and DEFS variables, making them consistent with the rest of modules. (cherry picked from commit 0a3476384b325514b1da784b74cc821360193409) - URL: https://github.com/kamailio/kamailio/commit/d40337449e274f6c6d9ea1754977287… Author: drTr0jan <drtr0jan(a)yandex.ru> Date: 2022-01-26T13:45:06+01:00 rtp_media_server: Makefile - support for FreeBSD build - updated LIBS and DEFS variables, making them consistent with the rest of modules. (cherry picked from commit cda05478b25ad93b1fb7475cf6b2767d7164bbbb) - URL: https://github.com/kamailio/kamailio/commit/254d19b4dd703c24a7a15e5539e585e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:45:17+01:00 websocket: makefile - set library path for localbase (cherry picked from commit 2e4258f440a07a2cfd20082af22bba4f9a2448ab) - URL: https://github.com/kamailio/kamailio/commit/a18374d1f0c5ec58e92981e4ac14320… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:45:28+01:00 Makefile.defs: set localbase for macports on macos (cherry picked from commit 584eabf7de6af9f835678f9c6d6851cce49a3878) - URL: https://github.com/kamailio/kamailio/commit/4e6cd4cd5f2eab7d4f6300a9ac1c488… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:45:55+01:00 dispatcher: check reload delta in functions building new routing structure (cherry picked from commit 76c273ecaa76f031ce9892acd895b4eacf4de17e)

1 0

[kamailio/kamailio] Append HF don't work in event_route (Issue #3006)
by Eulnono76 24 Jan '22

24 Jan '22

### 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 6

app_lua warning
by Juha Heinanen 24 Jan '22

24 Jan '22

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 5

git:master:5d5934ab: app_lua_sr: Makefile - reworked detection of lua version with support for 5.3 and 5.4
by Daniel-Constantin Mierla 24 Jan '22

24 Jan '22

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…

1 0

git:master:74bcf6e3: app_lua_sr: fixed confition on number of parameters for xavp get
by Daniel-Constantin Mierla 24 Jan '22

24 Jan '22

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 +}

1 0

git:master:8caf07a4: app_lua: Makefile - check cross compile for luajit
by Daniel-Constantin Mierla 24 Jan '22

24 Jan '22

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

1 0

git:master:76c273ec: dispatcher: check reload delta in functions building new routing structure
by Daniel-Constantin Mierla 24 Jan '22

24 Jan '22

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;

1 0

git:master:673dab16: app_lua: Makefile - reworked detection of lua version with support for 5.3 and 5.4
by Daniel-Constantin Mierla 24 Jan '22

24 Jan '22

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…

1 0

git:master:f2cf4581: github: use bullseye docker image
by Victor Seva 24 Jan '22

24 Jan '22

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

1 0

git:master:e139f0c6: modules: readme files regenerated - kex ... [skip ci]
by Kamailio Dev 24 Jan '22

24 Jan '22

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…

1 0

git:master:9b9a4b28: core: added rpc command core.runinfo
by Daniel-Constantin Mierla 24 Jan '22

24 Jan '22

Module: kamailio Branch: master Commit: 9b9a4b283539f4575240737f2557ad84a4df9615 URL: https://github.com/kamailio/kamailio/commit/9b9a4b283539f4575240737f2557ad8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-24T09:49:02+01:00 core: added rpc command core.runinfo - return runtime info: running version, uptime, ... --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/9b9a4b283539f4575240737f2557ad8… Patch: https://github.com/kamailio/kamailio/commit/9b9a4b283539f4575240737f2557ad8… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index 8231e3b1b9..e4695bb251 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -370,6 +370,45 @@ static void core_info(rpc_t* rpc, void* c) +static const char* core_runinfo_doc[] = { + "Runtime info - binary name, version, uptime, ...", /* Documentation string */ + 0 /* Method signature(s) */ +}; + +static void core_runinfo(rpc_t* rpc, void* c) +{ + void* s; + time_t now; + char buf[MAX_CTIME_LEN]; + str snow; + snow.s = buf; + int uptime; + + time(&now); + + if (rpc->add(c, "{", &s) < 0) { + rpc->fault(c, 500, "Server failure"); + return; + } + rpc->struct_add(s, "s", "name", ver_name); + rpc->struct_add(s, "s", "version", ver_version); + rpc->struct_add(s, "s", "sourceid", ver_id); + rpc->struct_add(s, "s", "compiler", ver_compiler); + rpc->struct_add(s, "s", "compiled", ver_compiled_time); + if(ctime_r(&now, snow.s)) { + snow.len = strlen(snow.s); + if(snow.len>2 && snow.s[snow.len-1]=='\n') snow.len--; + rpc->struct_add(s, "S", "time_now", &snow); + } + rpc->struct_add(s, "s", "time_started", up_since_ctime); + uptime = (int)(now-up_since); + rpc->struct_add(s, "d", "uptime_secs", uptime); + rpc->struct_printf(s, "utime_days", "%dd %dh %dm %ds", + uptime/86400, (uptime%86400)/3600, ((uptime%86400)%3600)/60, + ((uptime%86400)%3600)%60); + +} + static const char* core_uptime_doc[] = { "Returns uptime of SIP server.", /* Documentation string */ 0 /* Method signature(s) */ @@ -1079,6 +1118,8 @@ static rpc_export_t core_rpc_methods[] = { 0 }, {"core.info", core_info, core_info_doc, 0 }, + {"core.runinfo", core_runinfo, core_runinfo_doc, + 0 }, {"core.uptime", core_uptime, core_uptime_doc, 0 }, {"core.ps", core_ps, core_ps_doc, RET_ARRAY}, {"core.psx", core_psx, core_psx_doc, RET_ARRAY},

1 0

git:master:999857f0: kex: docs for rpc core.runinfo
by Daniel-Constantin Mierla 24 Jan '22

24 Jan '22

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>

1 0

git:master:399c9517: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 23 Jan '22

23 Jan '22

Module: kamailio Branch: master Commit: 399c95171db003dc56b0f870c8dacd3922ac45c3 URL: https://github.com/kamailio/kamailio/commit/399c95171db003dc56b0f870c8dacd3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-01-23T20:01:22+01:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/399c95171db003dc56b0f870c8dacd3… Patch: https://github.com/kamailio/kamailio/commit/399c95171db003dc56b0f870c8dacd3…

1 0

git:master:90b7f615: htable: docs - removed extra ending section tag
by Daniel-Constantin Mierla 23 Jan '22

23 Jan '22

Module: kamailio Branch: master Commit: 90b7f6157abbbdf0de61ac3f7764ad41f29f37d9 URL: https://github.com/kamailio/kamailio/commit/90b7f6157abbbdf0de61ac3f7764ad4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-23T19:50:44+01:00 htable: docs - removed extra ending section tag - fault of previous commit --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/90b7f6157abbbdf0de61ac3f7764ad4… Patch: https://github.com/kamailio/kamailio/commit/90b7f6157abbbdf0de61ac3f7764ad4… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 196f9707fa..e39482acd3 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -1477,7 +1477,6 @@ kamcmd htable.seti test x[0] 123 ... </programlisting> </section> - </section> <section id="htable.rpc.setex"> <title> <function moreinfo="none">htable.setex htable key expire</function>

1 0

git:master:8ea9d5a8: app_lua: enclose ksr_luaL_openlib() between defines
by Daniel-Constantin Mierla 23 Jan '22

23 Jan '22

Module: kamailio Branch: master Commit: 8ea9d5a8b989332e16ecc56373d7d417123dc20c URL: https://github.com/kamailio/kamailio/commit/8ea9d5a8b989332e16ecc56373d7d41… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-23T19:48:59+01:00 app_lua: enclose ksr_luaL_openlib() between defines - uses functions not available in lua 5.1 --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/8ea9d5a8b989332e16ecc56373d7d41… Patch: https://github.com/kamailio/kamailio/commit/8ea9d5a8b989332e16ecc56373d7d41… --- diff --git a/src/modules/app_lua/app_lua_api.c b/src/modules/app_lua/app_lua_api.c index 2bf255414a..0a1d13532c 100644 --- a/src/modules/app_lua/app_lua_api.c +++ b/src/modules/app_lua/app_lua_api.c @@ -188,6 +188,7 @@ int sr_lua_reload_module(unsigned int reload) return 0; } +#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 504 /** * */ @@ -241,6 +242,7 @@ void ksr_luaL_openlib(lua_State *L, const char *libname, { ksr_luaL_openlib_mode(L, libname, lfuncs, nup, 1); } +#endif /** *

1 0

[kamailio/kamailio] Kamailio 5.3 bc5970811d coredump (Issue #2998)
by Stefan Mititelu 21 Jan '22

21 Jan '22

### Description Hello, I'm being stuck at debugging a coredump for kamailio 5.3. built at bc5970811d commit, that happened when receiving/forwarding 100 Trying. It is not easily reproducible. I'm stuck at question 1 and 2, below. Please let me know if you have any other ideas of what is happening. Thank you.  #### Debugging Data ``` (gdb) bt #0 0x00005593f836b822 in match_by_name (avp=0xc, id=105, name=0x7ffc060813a8) at core/usr_avp.c:378 #1 0x00005593f836c670 in search_next_avp (s=0x7ffc060813a0, val=0x7ffc06081380) at core/usr_avp.c:499 #2 0x00005593f836c02c in search_avp (ident=..., val=0x7ffc06081380, state=0x7ffc060813a0) at core/usr_avp.c:465 #3 0x00005593f836b9a6 in search_first_avp (flags=1, name=..., val=0x7ffc06081380, s=0x7ffc060813a0) at core/usr_avp.c:414 #4 0x00007f82877df246 in pv_get_avp (msg=0x7f82890e0708, param=0x7f8288ce18d0, res=0x7ffc060814e0) at pv_core.c:1793 #5 0x00005593f839b872 in pv_get_spec_value (msg=0x7f82890e0708, sp=0x7f8288ce18b8, value=0x7ffc060814e0) at core/pvapi.c:1404 #6 0x00005593f81b88f2 in rv_defined (h=0x7ffc06082f80, msg=0x7f82890e0708, res=0x7ffc060816d0, rv=0x7f8288ce18b0, cache=0x0) at core/rvalue.c:1854 #7 0x00005593f81b89ad in int_rve_defined (h=0x7ffc06082f80, msg=0x7f82890e0708, res=0x7ffc060816d0, rve=0x7f8288ce18a8) at core/rvalue.c:1890 #8 0x00005593f81b9fc4 in rval_expr_eval_int (h=0x7ffc06082f80, msg=0x7f82890e0708, res=0x7ffc060816d0, rve=0x7f8288ce2708) at core/rvalue.c:2113 #9 0x00005593f81ec024 in do_action (h=0x7ffc06082f80, a=0x7f8288ce5390, msg=0x7f82890e0708) at core/action.c:1047 #10 0x00005593f81fa61a in run_actions (h=0x7ffc06082f80, a=0x7f8288ce5390, msg=0x7f82890e0708) at core/action.c:1576 #11 0x00005593f81ec523 in do_action (h=0x7ffc06082f80, a=0x7f8288ce54e0, msg=0x7f82890e0708) at core/action.c:1062 #12 0x00005593f81fa61a in run_actions (h=0x7ffc06082f80, a=0x7f8288ce54e0, msg=0x7f82890e0708) at core/action.c:1576 #13 0x00005593f81e8aac in do_action (h=0x7ffc06082f80, a=0x7f8288ffa900, msg=0x7f82890e0708) at core/action.c:695 #14 0x00005593f81fa61a in run_actions (h=0x7ffc06082f80, a=0x7f8288ffa6c8, msg=0x7f82890e0708) at core/action.c:1576 #15 0x00005593f81fae2c in run_top_route (a=0x7f8288ffa6c8, msg=0x7f82890e0708, c=0x7ffc06082f80) at core/action.c:1661 #16 0x00007f828793a44d in reply_received (p_msg=0x7f82890e0708) at t_reply.c:2429 #17 0x00005593f82eb5f5 in do_forward_reply (msg=0x7f82890e0708, mode=0) at core/forward.c:763 #18 0x00005593f82ed46a in forward_reply (msg=0x7f82890e0708) at core/forward.c:864 #19 0x00005593f835b481 in receive_msg ( buf=0x5593f8637640 <buf> "SIP/2.0 100 trying -- your call is important to us\r\nVia: SIP/2.0/UDP "..., len=529, rcv_info=0x7ffc06083520) at core/receive.c:509 #20 0x00005593f8232670 in udp_rcv_loop () at core/udp_server.c:554 #21 0x00005593f819a052 in main_loop () at main.c:1673 #22 0x00005593f81a343b in main (argc=9, argv=0x7ffc06083e68) at main.c:2802 ``` ``` (gdb) frame 0 #0 0x00005593f836b822 in match_by_name (avp=0xc, id=105, name=0x7ffc060813a8) at core/usr_avp.c:378 378 in core/usr_avp.c (gdb) print avp $3 = (avp_t *) 0xc (gdb) print *avp Cannot access memory at address 0xc ``` ``` (gdb) frame 2 #2 0x00005593f836c02c in search_avp (ident=..., val=0x7ffc06081380, state=0x7ffc060813a0) at core/usr_avp.c:465 465 in core/usr_avp.c (gdb) print list $4 = (avp_list_t *) 0x7f8207bb25e0 (gdb) print *list $5 = (avp_list_t) 0x7f821fff4c88 (gdb) print state->avp $6 = (avp_t *) 0xc (gdb) print state->name $7 = {n = -2003544275, s = {s = 0x7f828894572d "lastdst)", len = 7}, re = 0x7f828894572d} (gdb) print state->flags $8 = 497 (gdb) info locals ret = 0x18861c010 st = {flags = 273, id = 10, name = {n = -2000249939, s = {s = 0x7f8288c69bad "mapped_identity_user)", len = 20}, re = 0x7f8288c69bad}, avp = 0x7f823768ba60} list = 0x7f8207bb25e0 __func__ = "search_avp" ``` ``` (gdb) frame 4 #4 0x00007f82877df246 in pv_get_avp (msg=0x7f82890e0708, param=0x7f8288ce18d0, res=0x7ffc060814e0) at pv_core.c:1793 1793 pv_core.c: No such file or directory. (gdb) info locals name_type = 1 avp_name = {n = -2003544275, s = {s = 0x7f828894572d "lastdst)", len = 7}, re = 0x7f828894572d} avp_value = {n = -128721111, s = {s = 0x5593f853df29 "", len = 0}, re = 0x5593f853df29} avp = 0x7f8288dcec50 avp_value0 = {n = 0, s = {s = 0x0, len = -130631258}, re = 0x0} avp0 = 0x7ffc06082f80 idx = 0 idxf = 0 p = 0x200000000 <error: Cannot access memory at address 0x200000000> p_ini = 0x7f82890e0708 "/\031\232" p_size = 21907 n = 0 state = {flags = 497, id = 105, name = {n = -2003544275, s = {s = 0x7f828894572d "lastdst)", len = 7}, re = 0x7f828894572d}, avp = 0xc} __func__ = "pv_get_avp" ``` Question1: In frame 4, shouldn't "state" local variable be all 0's? Question2: In frame 2, shouldn't "state->avp" have the value of "*list"? ### Possible Solutions I've seen there is a static declaration of "state" or "st" inside functions: ``` ./src/modules/avp/avp.c:915: static struct search_state state; ./src/core/usr_avp.c:421: static struct search_state st; ``` ### 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: compiled with gcc 8.3.0 ``` * **Operating System**: ``` Debian 10 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2998 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/2998(a)github.com>

2 3

git:master:b0e705fb: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 21 Jan '22

21 Jan '22

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

1 0

git:master:083de68b: htable: added rpc command to set expire for an intem
by Daniel-Constantin Mierla 21 Jan '22

21 Jan '22

Module: kamailio Branch: master Commit: 083de68b8e930b3be151a56f7452e14ea5bcc752 URL: https://github.com/kamailio/kamailio/commit/083de68b8e930b3be151a56f7452e14… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-21T08:46:03+01:00 htable: added rpc command to set expire for an intem --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/083de68b8e930b3be151a56f7452e14… Patch: https://github.com/kamailio/kamailio/commit/083de68b8e930b3be151a56f7452e14… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index ed28190880..5599ffe0e6 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1413,6 +1413,10 @@ static const char* htable_seti_doc[2] = { "Set one key in a hash table to an integer value.", 0 }; +static const char* htable_setex_doc[2] = { + "Set expire in a hash table for the item referenced by key.", + 0 +}; static const char* htable_list_doc[2] = { "List all htables.", 0 @@ -1611,6 +1615,35 @@ static void htable_rpc_seti(rpc_t* rpc, void* c) { return; } +/*! \brief RPC htable.setex command to set expire for one item */ +static void htable_rpc_setex(rpc_t* rpc, void* c) { + str htname, itname; + int exval; + ht_t *ht; + + if (rpc->scan(c, "SS.d", &htname, &itname, &exval) < 3) { + rpc->fault(c, 500, + "Not enough parameters (htable name, item name and expire)"); + return; + } + + /* check if htable exists */ + ht = ht_get_table(&htname); + if (!ht) { + rpc->fault(c, 500, "No such htable"); + return; + } + + + if(ki_ht_setex(NULL, &htname, &itname, exval)<0) { + rpc->fault(c, 500, "Failed to set the item"); + return; + } + + rpc->rpl_printf(c, "Ok"); + return; +} + /*! \brief RPC htable.dump command to print content of a hash table */ static void htable_rpc_dump(rpc_t* rpc, void* c) { @@ -1973,6 +2006,7 @@ rpc_export_t htable_rpc[] = { {"htable.get", htable_rpc_get, htable_get_doc, 0}, {"htable.sets", htable_rpc_sets, htable_sets_doc, 0}, {"htable.seti", htable_rpc_seti, htable_seti_doc, 0}, + {"htable.setex", htable_rpc_setex, htable_setex_doc, 0}, {"htable.listTables", htable_rpc_list, htable_list_doc, RET_ARRAY}, {"htable.reload", htable_rpc_reload, htable_reload_doc, 0}, {"htable.store", htable_rpc_store, htable_store_doc, 0},

1 0

git:master:2b9c0a5f: htable: docs for rpc command htable.setex
by Daniel-Constantin Mierla 21 Jan '22

21 Jan '22

Module: kamailio Branch: master Commit: 2b9c0a5fbc2c9ce7354655fa22038e22302553af URL: https://github.com/kamailio/kamailio/commit/2b9c0a5fbc2c9ce7354655fa22038e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-21T08:49:51+01:00 htable: docs for rpc command htable.setex --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2b9c0a5fbc2c9ce7354655fa22038e2… Patch: https://github.com/kamailio/kamailio/commit/2b9c0a5fbc2c9ce7354655fa22038e2… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 360abbd896..196f9707fa 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -1475,6 +1475,36 @@ kamcmd htable.seti test x 123 # Set first entry in array key x $sht(test=>x[0]) as integer kamcmd htable.seti test x[0] 123 ... +</programlisting> + </section> + </section> + <section id="htable.rpc.setex"> + <title> + <function moreinfo="none">htable.setex htable key expire</function> + </title> + <para> + Set the expire for an item in hash table. + </para> + <para> + Name: <emphasis>htable.setex</emphasis> + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para>htable : name of the hash table</para> + </listitem> + <listitem><para>key : key name in the hash table</para> + </listitem> + <listitem><para>expire : integer value for the expire (seconds)</para> + </listitem> + </itemizedlist> + <para> + Example: + </para> +<programlisting format="linespecific"> +... +# set expire for $sht(test=>x) to 120 secs +kamctl rpc htable.seti test x 120 +... </programlisting> </section> <section id="htable.rpc.dump">

1 0

git:master:c23104bd: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 20 Jan '22

20 Jan '22

Module: kamailio Branch: master Commit: c23104bd16c8b1df983e434dc6017a69bf586604 URL: https://github.com/kamailio/kamailio/commit/c23104bd16c8b1df983e434dc6017a6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-01-20T16:31:20+01:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/c23104bd16c8b1df983e434dc6017a6… Patch: https://github.com/kamailio/kamailio/commit/c23104bd16c8b1df983e434dc6017a6… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index ba2f50461e..5fe4071d56 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -1295,7 +1295,7 @@ event_route[uac:reply] { * contact_addr - contact address to be used for this record instead of reg_contact_addr module parameter, e.g.:, 192.168.0.125:5060. It - can be set to '.' (dot) to skip setting it and then + can be set to '' (empty string) to skip setting it and then reg_contact_addr modparam is used. * socket - Used socket for sending out registration requests, e.g.:,

1 0

git:master:8014638f: uac: fix wrong documentation regarding contact_addr database, empty string means skip, not dot
by Henning Westerholt 20 Jan '22

20 Jan '22

Module: kamailio Branch: master Commit: 8014638fb8a3653868684d00df7dfb8e3f13eb33 URL: https://github.com/kamailio/kamailio/commit/8014638fb8a3653868684d00df7dfb8… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-01-20T15:16:39Z uac: fix wrong documentation regarding contact_addr database, empty string means skip, not dot --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8014638fb8a3653868684d00df7dfb8… Patch: https://github.com/kamailio/kamailio/commit/8014638fb8a3653868684d00df7dfb8… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index b6184a6daa..188d1b913e 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -1619,7 +1619,7 @@ event_route[uac:reply] { <listitem><para> <emphasis>contact_addr</emphasis> - contact address to be used for this record instead of reg_contact_addr module parameter, e.g.:, 192.168.0.125:5060. It can - be set to '.' (dot) to skip setting it and then reg_contact_addr modparam is used. + be set to '' (empty string) to skip setting it and then reg_contact_addr modparam is used. </para></listitem> </itemizedlist> <itemizedlist>

1 0

git:master:2e4258f4: websocket: makefile - set library path for localbase
by Daniel-Constantin Mierla 20 Jan '22

20 Jan '22

Module: kamailio Branch: master Commit: 2e4258f440a07a2cfd20082af22bba4f9a2448ab URL: https://github.com/kamailio/kamailio/commit/2e4258f440a07a2cfd20082af22bba4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-20T13:02:44+01:00 websocket: makefile - set library path for localbase --- Modified: src/modules/websocket/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/2e4258f440a07a2cfd20082af22bba4… Patch: https://github.com/kamailio/kamailio/commit/2e4258f440a07a2cfd20082af22bba4… --- diff --git a/src/modules/websocket/Makefile b/src/modules/websocket/Makefile index 764453b080..99b1fe1f8c 100644 --- a/src/modules/websocket/Makefile +++ b/src/modules/websocket/Makefile @@ -40,7 +40,7 @@ LIBS+= $(TLS_EXTRA_LIBS) ifeq ($(EMBEDDED_UTF8_DECODE),0) DEFS += -I$(LOCALBASE)/include - LIBS += -lunistring + LIBS += -L$(LOCALBASE)/lib -lunistring else DEFS += -DEMBEDDED_UTF8_DECODE endif

1 0

git:master:584eabf7: Makefile.defs: set localbase for macports on macos
by Daniel-Constantin Mierla 20 Jan '22

20 Jan '22

Module: kamailio Branch: master Commit: 584eabf7de6af9f835678f9c6d6851cce49a3878 URL: https://github.com/kamailio/kamailio/commit/584eabf7de6af9f835678f9c6d6851c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-20T13:02:44+01:00 Makefile.defs: set localbase for macports on macos --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/584eabf7de6af9f835678f9c6d6851c… Patch: https://github.com/kamailio/kamailio/commit/584eabf7de6af9f835678f9c6d6851c… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 84f9438bc4..d2d7c60814 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -524,7 +524,12 @@ ifeq ($(OS), darwin) doc_dir = share/doc/$(MAIN_NAME)/ man_dir = man/ data_dir = share/$(MAIN_NAME)/ + MACPORTS = $(shell which port 2>/dev/null) +ifeq ($(MACPORTS),) LOCALBASE ?= /usr/local +else + LOCALBASE ?= /opt/local +endif endif LOCALBASE ?= /usr/local

1 0

git:master:ca3b5f3c: modules: readme files regenerated - db_redis ... [skip ci]
by Kamailio Dev 20 Jan '22

20 Jan '22

Module: kamailio Branch: master Commit: ca3b5f3ca581c4327d6b02342773fed47ea82ee2 URL: https://github.com/kamailio/kamailio/commit/ca3b5f3ca581c4327d6b02342773fed… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-01-20T12:31:24+01:00 modules: readme files regenerated - db_redis ... [skip ci] --- Modified: src/modules/db_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/ca3b5f3ca581c4327d6b02342773fed… Patch: https://github.com/kamailio/kamailio/commit/ca3b5f3ca581c4327d6b02342773fed… --- diff --git a/src/modules/db_redis/README b/src/modules/db_redis/README index ef76592a83..ab56c61379 100644 --- a/src/modules/db_redis/README +++ b/src/modules/db_redis/README @@ -178,6 +178,11 @@ allid,time_hires&cid:callid running Kamailio with this module loaded: * hiredis - available at https://github.com/redis/hiredis + The following library is an optional dependency to support redis + cluster protocol: + * hiredis-cluster - available at + https://github.com/Nordix/hiredis-cluster + 4. Parameters 4.1. schema_path (string) @@ -227,6 +232,10 @@ modparam("db_redis", "verbosity", 0) 'redis://[username]@host:port/database'. Username is optional. The database portion must be a valid Redis database number. + For cluster support you need to set the "db_url" modparam with a comma + separated list of cluster hosts: 'redis://host1:port1,host2:port2/'. + The database portion is not supported in cluster mode. + Example 1.4. Usage ... loadmodule "db_redis.so"

1 0

[kamailio/kamailio] Db redis cluster support (PR #2995)
by Riccardo-78 20 Jan '22

20 Jan '22

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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) - [x] 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 - [x] Tested changes locally - [x] Related to issue #2977 #### Description Add support for redis cluster protocol via hiredis-cluster library to db_redis module You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2995 -- Commit Summary -- * db_redis: added hiredis-cluster detection * db_redis: use cluster api * db_redis: update documentation -- File Changes -- M src/modules/db_redis/Makefile (14) M src/modules/db_redis/doc/db_redis_admin.xml (15) M src/modules/db_redis/redis_connection.c (115) M src/modules/db_redis/redis_connection.h (34) M src/modules/db_redis/redis_dbase.c (135) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2995.patch https://github.com/kamailio/kamailio/pull/2995.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2995 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/2995(a)github.com>

3 5

git:master:8eec0115: db_redis: use cluster api
by Daniel-Constantin Mierla 20 Jan '22

20 Jan '22

Module: kamailio Branch: master Commit: 8eec0115a2689ce1d4bff2b5bab909f2401965f4 URL: https://github.com/kamailio/kamailio/commit/8eec0115a2689ce1d4bff2b5bab909f… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-20T12:30:22+01:00 db_redis: use cluster api --- Modified: src/modules/db_redis/redis_connection.c Modified: src/modules/db_redis/redis_connection.h Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/8eec0115a2689ce1d4bff2b5bab909f… Patch: https://github.com/kamailio/kamailio/commit/8eec0115a2689ce1d4bff2b5bab909f…

1 0

git:master:610603da: db_redis: update documentation
by Daniel-Constantin Mierla 20 Jan '22

20 Jan '22

Module: kamailio Branch: master Commit: 610603da5fb45eeffba2f7d623f50b358e65d6ed URL: https://github.com/kamailio/kamailio/commit/610603da5fb45eeffba2f7d623f50b3… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-20T12:30:22+01:00 db_redis: update documentation --- Modified: src/modules/db_redis/doc/db_redis_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/610603da5fb45eeffba2f7d623f50b3… Patch: https://github.com/kamailio/kamailio/commit/610603da5fb45eeffba2f7d623f50b3… --- diff --git a/src/modules/db_redis/doc/db_redis_admin.xml b/src/modules/db_redis/doc/db_redis_admin.xml index 6439c79b6f..b3b54c08a2 100644 --- a/src/modules/db_redis/doc/db_redis_admin.xml +++ b/src/modules/db_redis/doc/db_redis_admin.xml @@ -146,6 +146,17 @@ location=entry:ruid&usrdom:username,domain&timer:partition,keepalive;acc </listitem> </itemizedlist> </para> + <para> + The following library is an optional dependency to support redis cluster protocol: + <itemizedlist> + <listitem> + <para> + <emphasis>hiredis-cluster</emphasis> - available at + <ulink url="https://github.com/Nordix/hiredis-cluster">https://github.com/Nordix/hiredis-cluster</ulink> + </para> + </listitem> + </itemizedlist> + </para> </section> </section> @@ -216,6 +227,10 @@ modparam("db_redis", "verbosity", 0) 'redis://[username]@host:port/database'. Username is optional. The database portion must be a valid Redis database number. </para> + <para> + For cluster support you need to set the "db_url" modparam with a comma separated list of cluster hosts: + 'redis://host1:port1,host2:port2/'. The database portion is not supported in cluster mode. + </para> <example> <title>Usage</title> <programlisting format="linespecific">

1 0

git:master:f15c768c: db_redis: added hiredis-cluster detection
by Daniel-Constantin Mierla 20 Jan '22

20 Jan '22

Module: kamailio Branch: master Commit: f15c768ce89ef78eb87e476d4c6dff0b29585df2 URL: https://github.com/kamailio/kamailio/commit/f15c768ce89ef78eb87e476d4c6dff0… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-20T12:30:22+01:00 db_redis: added hiredis-cluster detection --- Modified: src/modules/db_redis/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/f15c768ce89ef78eb87e476d4c6dff0… Patch: https://github.com/kamailio/kamailio/commit/f15c768ce89ef78eb87e476d4c6dff0… --- diff --git a/src/modules/db_redis/Makefile b/src/modules/db_redis/Makefile index ca8020d543..179bc6f406 100644 --- a/src/modules/db_redis/Makefile +++ b/src/modules/db_redis/Makefile @@ -10,6 +10,12 @@ HIREDIS_BUILDER = $(shell \ if pkg-config --exists hiredis; then \ echo 'pkg-config hiredis'; \ fi) + +HIREDIS_CLUSTER_BUILDER = $(shell \ + if pkg-config --exists hiredis_cluster; then \ + echo 'pkg-config hiredis_cluster'; \ + fi) + endif ifeq ($(HIREDIS_BUILDER),) @@ -33,6 +39,14 @@ endif DEFS+=$(HIREDISDEFS) LIBS=$(HIREDISLIBS) +ifneq ($(HIREDIS_CLUSTER_BUILDER),) + HIREDISCLUSTERDEFS = $(shell $(HIREDIS_CLUSTER_BUILDER) --cflags) + HIREDISCLUSTERLIBS = $(shell $(HIREDIS_CLUSTER_BUILDER) --libs) + DEFS+=-DWITH_HIREDIS_CLUSTER + DEFS+=$(HIREDISCLUSTERDEFS) + LIBS+=$(HIREDISCLUSTERLIBS) +endif + SERLIBPATH=../../lib SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 $(SERLIBPATH)/srdb1/srdb1

1 0

[kamailio/kamailio] Fix websocket and phonenum for build on FreeBSD (PR #3000)
by Boris Korzun 20 Jan '22

20 Jan '22

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] 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 - [x] 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description `websocket` and `phonenum` are not build on FreeBSD environment. The proposed patch fixes it and makes modules are consistent with the rest of modules. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3000 -- Commit Summary -- * phonenum: Makefile - support for FreeBSD build * websocket: Makefile - support for FreeBSD build -- File Changes -- M src/modules/phonenum/Makefile (9) M src/modules/websocket/Makefile (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3000.patch https://github.com/kamailio/kamailio/pull/3000.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3000 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3000(a)github.com>

2 7

git:master:cda05478: rtp_media_server: Makefile - support for FreeBSD build
by Daniel-Constantin Mierla 20 Jan '22

20 Jan '22

Module: kamailio Branch: master Commit: cda05478b25ad93b1fb7475cf6b2767d7164bbbb URL: https://github.com/kamailio/kamailio/commit/cda05478b25ad93b1fb7475cf6b2767… Author: drTr0jan <drtr0jan(a)yandex.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-20T12:27:09+01:00 rtp_media_server: Makefile - support for FreeBSD build - updated LIBS and DEFS variables, making them consistent with the rest of modules. --- Modified: src/modules/rtp_media_server/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/cda05478b25ad93b1fb7475cf6b2767… Patch: https://github.com/kamailio/kamailio/commit/cda05478b25ad93b1fb7475cf6b2767… --- diff --git a/src/modules/rtp_media_server/Makefile b/src/modules/rtp_media_server/Makefile index 5386a3065a..18645c209a 100644 --- a/src/modules/rtp_media_server/Makefile +++ b/src/modules/rtp_media_server/Makefile @@ -2,11 +2,11 @@ include ../../Makefile.defs auto_gen= NAME=rtp_media_server.so -DEFS+=-I$(LOCALBASE)/lib +DEFS+=-I$(LOCALBASE)/include ORTPLIBS=-lortp BCUNITLIBS=-lbcunit MS2LIBS=-lmediastreamer -LIBS=$(ORTPLIBS) $(BCUNITLIBS) $(MS2LIBS) +LIBS+=-L$(LOCALBASE)/lib $(ORTPLIBS) $(BCUNITLIBS) $(MS2LIBS) include ../../Makefile.modules

1 0

git:master:c4b280bd: phonenum: Makefile - support for FreeBSD build
by Daniel-Constantin Mierla 20 Jan '22

20 Jan '22

Module: kamailio Branch: master Commit: c4b280bd5b5b0cfb8d34ecef296972f2a043791e URL: https://github.com/kamailio/kamailio/commit/c4b280bd5b5b0cfb8d34ecef296972f… Author: drTr0jan <drtr0jan(a)yandex.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-20T12:27:09+01:00 phonenum: Makefile - support for FreeBSD build - updated LIBS and DEFS variables, making them consistent with the rest of modules; - removed predefined CXX and LD variables. --- Modified: src/modules/phonenum/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/c4b280bd5b5b0cfb8d34ecef296972f… Patch: https://github.com/kamailio/kamailio/commit/c4b280bd5b5b0cfb8d34ecef296972f… --- diff --git a/src/modules/phonenum/Makefile b/src/modules/phonenum/Makefile index 4f187fccf6..f465226a97 100644 --- a/src/modules/phonenum/Makefile +++ b/src/modules/phonenum/Makefile @@ -5,13 +5,11 @@ include ../../Makefile.defs auto_gen= NAME=phonenum.so -CXX=g++ -LD=g++ -LIB_DIR = /opt/local/lib +CXX?=g++ +LD?=g++ -LIBS= -L${LIB_DIR} cphonenumber.o -lphonenumber -lgeocoding - -DEFS+= -I/opt/local/include +LIBS+=-L$(LOCALBASE)/lib cphonenumber.o -lphonenumber -lgeocoding +DEFS+=-I$(LOCALBASE)/include CXXFLAGS=$(CFLAGS:-Wno-deprecated option=) CXXFLAGS+=-Wno-write-strings -Wno-deprecated -Wno-unused-function -Wno-sign-compare -Wno-strict-aliasing

1 0

git:master:0a347638: websocket: Makefile - support for FreeBSD build
by Daniel-Constantin Mierla 20 Jan '22

20 Jan '22

Module: kamailio Branch: master Commit: 0a3476384b325514b1da784b74cc821360193409 URL: https://github.com/kamailio/kamailio/commit/0a3476384b325514b1da784b74cc821… Author: drTr0jan <drtr0jan(a)yandex.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-20T12:27:09+01:00 websocket: Makefile - support for FreeBSD build - updated LIBS and DEFS variables, making them consistent with the rest of modules. --- Modified: src/modules/websocket/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/0a3476384b325514b1da784b74cc821… Patch: https://github.com/kamailio/kamailio/commit/0a3476384b325514b1da784b74cc821… --- diff --git a/src/modules/websocket/Makefile b/src/modules/websocket/Makefile index f74003225b..764453b080 100644 --- a/src/modules/websocket/Makefile +++ b/src/modules/websocket/Makefile @@ -39,7 +39,8 @@ endif LIBS+= $(TLS_EXTRA_LIBS) ifeq ($(EMBEDDED_UTF8_DECODE),0) - LIBS+= -lunistring + DEFS += -I$(LOCALBASE)/include + LIBS += -lunistring else DEFS += -DEMBEDDED_UTF8_DECODE endif

1 0

git:master:23c39ecb: core: set exit flag for return 0
by Daniel-Constantin Mierla 20 Jan '22

20 Jan '22

Module: kamailio Branch: master Commit: 23c39ecbdd29f2fff0af4a693b08032e8afff48b URL: https://github.com/kamailio/kamailio/commit/23c39ecbdd29f2fff0af4a693b08032… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-20T09:57:45+01:00 core: set exit flag for return 0 --- Modified: src/core/action.c --- Diff: https://github.com/kamailio/kamailio/commit/23c39ecbdd29f2fff0af4a693b08032… Patch: https://github.com/kamailio/kamailio/commit/23c39ecbdd29f2fff0af4a693b08032… --- diff --git a/src/core/action.c b/src/core/action.c index b8525f6c6a..48b150dd70 100644 --- a/src/core/action.c +++ b/src/core/action.c @@ -366,6 +366,9 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) goto error; } h->run_flags|=(unsigned int)a->val[1].u.number; + if(unlikely((ret==0) && (h->run_flags&RETURN_R_F))) { + h->run_flags |= EXIT_R_F; + } break; case FORWARD_T: #ifdef USE_TCP

1 0

git:master:af080336: modules: readme files regenerated - presence_conference ... [skip ci]
by Kamailio Dev 18 Jan '22

18 Jan '22

Module: kamailio Branch: master Commit: af080336e1d63cf51d0f29ed946ebfb73c2c77f0 URL: https://github.com/kamailio/kamailio/commit/af080336e1d63cf51d0f29ed946ebfb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-01-18T20:31:18+01:00 modules: readme files regenerated - presence_conference ... [skip ci] --- Modified: src/modules/presence_conference/README Modified: src/modules/presence_dialoginfo/README Modified: src/modules/presence_mwi/README Modified: src/modules/presence_profile/README Modified: src/modules/presence_reginfo/README Modified: src/modules/presence_xml/README --- Diff: https://github.com/kamailio/kamailio/commit/af080336e1d63cf51d0f29ed946ebfb… Patch: https://github.com/kamailio/kamailio/commit/af080336e1d63cf51d0f29ed946ebfb…

1 0

[kamailio/kamailio] presence : add default_expires and use in the presence* modules (PR #3003)
by adita76 18 Jan '22

18 Jan '22

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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) - [x] 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 - [x] Tested changes locally - [x] Related to issue #2996 #### Description closes #2996 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3003 -- Commit Summary -- * presence: added default_expires parameter * presence_conference: use parameter presence/default_expires instead of 3600 constant * presence_dialoginfo: use parameter presence/default_expires instead of 3600 constant * presence_mwi: use parameter presence/default_expires instead of 3600 constant * presence_profile: use parameter presence/default_expires instead of 3600 constant * presence_reginfo: use parameter presence/default_expires instead of 3600 constant * presence_xml: use parameter presence/default_expires instead of 3600 constant -- File Changes -- M src/modules/presence/doc/presence_admin.xml (22) M src/modules/presence/presence.c (6) M src/modules/presence/presence.h (1) M src/modules/presence_conference/add_events.c (14) M src/modules/presence_dialoginfo/add_events.c (12) M src/modules/presence_mwi/add_events.c (12) M src/modules/presence_profile/add_events.c (13) M src/modules/presence_reginfo/add_events.c (12) M src/modules/presence_xml/add_events.c (19) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3003.patch https://github.com/kamailio/kamailio/pull/3003.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3003 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3003(a)github.com>

3 18

git:master:e8ece95f: presence_reginfo: use parameter default_expires instead of 3600 constant
by Daniel-Constantin Mierla 18 Jan '22

18 Jan '22

Module: kamailio Branch: master Commit: e8ece95f0c56d81d644fe469e3cbbf56c11c0891 URL: https://github.com/kamailio/kamailio/commit/e8ece95f0c56d81d644fe469e3cbbf5… Author: Adrian Tabacioiu <adi.tabacioiu(a)c-s.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-18T20:19:16+01:00 presence_reginfo: use parameter default_expires instead of 3600 constant - GH #2996 --- Modified: src/modules/presence_reginfo/add_events.c Modified: src/modules/presence_reginfo/doc/presence_reginfo_admin.xml Modified: src/modules/presence_reginfo/presence_reginfo.c Modified: src/modules/presence_reginfo/presence_reginfo.h --- Diff: https://github.com/kamailio/kamailio/commit/e8ece95f0c56d81d644fe469e3cbbf5… Patch: https://github.com/kamailio/kamailio/commit/e8ece95f0c56d81d644fe469e3cbbf5… --- diff --git a/src/modules/presence_reginfo/add_events.c b/src/modules/presence_reginfo/add_events.c index 3cb9f7a145..468a14dd3a 100644 --- a/src/modules/presence_reginfo/add_events.c +++ b/src/modules/presence_reginfo/add_events.c @@ -39,7 +39,7 @@ int reginfo_add_events(void) event.content_type.s = "application/reginfo+xml"; event.content_type.len = 23; - event.default_expires= 3600; + event.default_expires= pres_reginfo_default_expires; event.type = PUBL_TYPE; event.req_auth = 0; event.evs_publ_handl = 0; diff --git a/src/modules/presence_reginfo/doc/presence_reginfo_admin.xml b/src/modules/presence_reginfo/doc/presence_reginfo_admin.xml index b99c35e088..9c7450a2e2 100644 --- a/src/modules/presence_reginfo/doc/presence_reginfo_admin.xml +++ b/src/modules/presence_reginfo/doc/presence_reginfo_admin.xml @@ -64,6 +64,31 @@ </section> </section> + <section> + <title>Parameters</title> + <section id="presence_reginfo.p.default_expires"> + <title><varname>default_expires</varname> (int)</title> + <para> + The default expires value used when missing from SUBSCRIBE + message (in seconds). + </para> + <para> + <emphasis>Default value is <quote>3600</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>default_expires</varname> parameter</title> + <programlisting format="linespecific"> + ... + modparam("presence_reginfo", "default_expires", 3600) + ... + </programlisting> + </example> + </section> + + </section> + + <section> <title>Functions</title> <para> diff --git a/src/modules/presence_reginfo/presence_reginfo.c b/src/modules/presence_reginfo/presence_reginfo.c index eadbfdad24..abb8755ca0 100644 --- a/src/modules/presence_reginfo/presence_reginfo.c +++ b/src/modules/presence_reginfo/presence_reginfo.c @@ -46,14 +46,23 @@ static int mod_init(void); /* module variables */ add_event_t pres_add_event; +/* module parameters */ +unsigned int pres_reginfo_default_expires = 3600; + +/* module exported paramaters */ +static param_export_t params[] = { + { "default_expires", INT_PARAM, &pres_reginfo_default_expires }, + {0, 0, 0} +}; + /* module exports */ /* clang-format off */ struct module_exports exports= { "presence_reginfo", /* module name */ DEFAULT_DLFLAGS, /* dlopen flags */ 0, /* exported functions */ - 0, /* exported parameters */ - 0, /* RPC method exports */ + params, /* exported parameters */ + 0, /* RPC method exports */ 0, /* exported pseudo-variables */ 0, /* response handling function */ mod_init, /* module initialization function */ diff --git a/src/modules/presence_reginfo/presence_reginfo.h b/src/modules/presence_reginfo/presence_reginfo.h index 6d5371535b..6fa47c008f 100644 --- a/src/modules/presence_reginfo/presence_reginfo.h +++ b/src/modules/presence_reginfo/presence_reginfo.h @@ -25,5 +25,5 @@ #define _PRES_REGINFO_H_ extern add_event_t pres_add_event; - +extern unsigned int pres_reginfo_default_expires; #endif

1 0

git:master:ad8e1c4d: presence_xml: use parameter default_expires instead of 3600 constant
by Daniel-Constantin Mierla 18 Jan '22

18 Jan '22

Module: kamailio Branch: master Commit: ad8e1c4d0cfb0a8c6af17b08900ef45064e54303 URL: https://github.com/kamailio/kamailio/commit/ad8e1c4d0cfb0a8c6af17b08900ef45… Author: Adrian Tabacioiu <adi.tabacioiu(a)c-s.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-18T20:19:16+01:00 presence_xml: use parameter default_expires instead of 3600 constant - GH #2996 --- Modified: src/modules/presence_xml/add_events.c Modified: src/modules/presence_xml/doc/presence_xml_admin.xml Modified: src/modules/presence_xml/presence_xml.c Modified: src/modules/presence_xml/presence_xml.h --- Diff: https://github.com/kamailio/kamailio/commit/ad8e1c4d0cfb0a8c6af17b08900ef45… Patch: https://github.com/kamailio/kamailio/commit/ad8e1c4d0cfb0a8c6af17b08900ef45… --- diff --git a/src/modules/presence_xml/add_events.c b/src/modules/presence_xml/add_events.c index a7e82aa71f..54a3c52bf4 100644 --- a/src/modules/presence_xml/add_events.c +++ b/src/modules/presence_xml/add_events.c @@ -33,6 +33,7 @@ #include "../../core/parser/parse_content.h" #include "../../core/data_lump_rpl.h" #include "../../core/ut.h" +#include "../presence/presence.h" #include "xcap_auth.h" #include "notify_body.h" #include "add_events.h" @@ -65,7 +66,7 @@ int xml_add_events(void) event.agg_nbody = pres_agg_nbody; event.evs_publ_handl = xml_publ_handl; event.free_body = free_xml_body; - event.default_expires = 3600; + event.default_expires = pxml_default_expires; event.get_rules_doc = pres_get_rules_doc; event.get_pidf_doc = pres_get_pidf_doc; if(psapi.add_event(&event) < 0) { @@ -85,7 +86,7 @@ int xml_add_events(void) event.content_type.len = 27; event.type = WINFO_TYPE; event.free_body = free_xml_body; - event.default_expires = 3600; + event.default_expires = pxml_default_expires; if(psapi.add_event(&event) < 0) { LM_ERR("while adding event presence.winfo\n"); @@ -106,7 +107,7 @@ int xml_add_events(void) event.content_type.len = 27; event.type = PUBL_TYPE; event.free_body = free_xml_body; - event.default_expires = 3600; + event.default_expires = pxml_default_expires; if(psapi.add_event(&event) < 0) { LM_ERR("while adding event dialog;sla\n"); return -1; @@ -124,7 +125,7 @@ int xml_add_events(void) event.content_type.len = 25; event.type = PUBL_TYPE; - event.default_expires = 3600; + event.default_expires = pxml_default_expires; if(psapi.add_event(&event) < 0) { LM_ERR("while adding event xcap-diff\n"); return -1; diff --git a/src/modules/presence_xml/doc/presence_xml_admin.xml b/src/modules/presence_xml/doc/presence_xml_admin.xml index 4eaf7d82ac..387fd2f759 100644 --- a/src/modules/presence_xml/doc/presence_xml_admin.xml +++ b/src/modules/presence_xml/doc/presence_xml_admin.xml @@ -413,6 +413,27 @@ modparam("presence_xml", "presence_single_body_lookup_element", "status") </programlisting> </example> </section> + +<section id="presence_xml.p.default_expires"> + <title><varname>default_expires</varname> (int)</title> + <para> + The default expires value used when missing from SUBSCRIBE + message (in seconds). + </para> + <para> + <emphasis>Default value is <quote>3600</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>default_expires</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("presence_xml", "default_expires", 3600) +... +</programlisting> + </example> +</section> + </section> diff --git a/src/modules/presence_xml/presence_xml.c b/src/modules/presence_xml/presence_xml.c index cc9b814eed..85ebca3d49 100644 --- a/src/modules/presence_xml/presence_xml.c +++ b/src/modules/presence_xml/presence_xml.c @@ -98,6 +98,8 @@ int pxml_force_single_body = 0; str pxml_single_body_priorities = str_init("Available|Ringing|On the Phone"); str pxml_single_body_lookup_element = str_init("note"); +unsigned int pxml_default_expires = 3600; + /** SL API structure */ sl_api_t slb; @@ -138,6 +140,7 @@ static param_export_t params[]={ { "force_presence_single_body", INT_PARAM, &pxml_force_single_body }, { "presence_single_body_priorities", PARAM_STR, &pxml_single_body_priorities }, { "presence_single_body_lookup_element", PARAM_STR, &pxml_single_body_lookup_element }, + { "default_expires", INT_PARAM, &pxml_default_expires }, { 0, 0, 0} }; /* clang-format on */ diff --git a/src/modules/presence_xml/presence_xml.h b/src/modules/presence_xml/presence_xml.h index e77891e642..7c20b9c7eb 100644 --- a/src/modules/presence_xml/presence_xml.h +++ b/src/modules/presence_xml/presence_xml.h @@ -53,4 +53,6 @@ extern int pxml_integrated_xcap_server; extern xcap_serv_t *xs_list; extern xcapGetNewDoc_t xcap_GetNewDoc; +extern unsigned int pxml_default_expires; + #endif

1 0

git:master:1e3606eb: presence_mwi: use parameter default_expires instead of 3600 constant
by Daniel-Constantin Mierla 18 Jan '22

18 Jan '22

Module: kamailio Branch: master Commit: 1e3606ebca0d927595f6a0aa98cc0972174b9a62 URL: https://github.com/kamailio/kamailio/commit/1e3606ebca0d927595f6a0aa98cc097… Author: Adrian Tabacioiu <adi.tabacioiu(a)c-s.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-18T20:19:16+01:00 presence_mwi: use parameter default_expires instead of 3600 constant - GH #2996 --- Modified: src/modules/presence_mwi/add_events.c Modified: src/modules/presence_mwi/doc/presence_mwi_admin.xml Modified: src/modules/presence_mwi/presence_mwi.c Modified: src/modules/presence_mwi/presence_mwi.h --- Diff: https://github.com/kamailio/kamailio/commit/1e3606ebca0d927595f6a0aa98cc097… Patch: https://github.com/kamailio/kamailio/commit/1e3606ebca0d927595f6a0aa98cc097… --- diff --git a/src/modules/presence_mwi/add_events.c b/src/modules/presence_mwi/add_events.c index 001034ade4..089940e081 100644 --- a/src/modules/presence_mwi/add_events.c +++ b/src/modules/presence_mwi/add_events.c @@ -124,7 +124,7 @@ int mwi_add_events(void) event.content_type.s = "application/simple-message-summary"; event.content_type.len = 34; - event.default_expires= 3600; + event.default_expires= pres_mwi_default_expires; event.type = PUBL_TYPE; event.req_auth = 0; event.evs_publ_handl = mwi_publ_handl; diff --git a/src/modules/presence_mwi/doc/presence_mwi_admin.xml b/src/modules/presence_mwi/doc/presence_mwi_admin.xml index e73c3f72a8..654dd080cd 100644 --- a/src/modules/presence_mwi/doc/presence_mwi_admin.xml +++ b/src/modules/presence_mwi/doc/presence_mwi_admin.xml @@ -68,9 +68,26 @@ <section> <title>Parameters</title> - <para> - None. - </para> + <section id="presence_mwi.p.default_expires"> + <title><varname>default_expires</varname> (int)</title> + <para> + The default expires value used when missing from SUBSCRIBE + message (in seconds). + </para> + <para> + <emphasis>Default value is <quote>3600</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>default_expires</varname> parameter</title> + <programlisting format="linespecific"> + ... + modparam("presence_mwi", "default_expires", 3600) + ... + </programlisting> + </example> + </section> + </section> <section> diff --git a/src/modules/presence_mwi/presence_mwi.c b/src/modules/presence_mwi/presence_mwi.c index afd605f7c7..9fdeeeb84c 100644 --- a/src/modules/presence_mwi/presence_mwi.c +++ b/src/modules/presence_mwi/presence_mwi.c @@ -59,6 +59,9 @@ static int mod_init(void); /* module variables */ add_event_t pres_add_event; +/* module parameters */ +unsigned int pres_mwi_default_expires = 3600; + /* module exported commands */ static cmd_export_t cmds[] = { @@ -67,6 +70,7 @@ static cmd_export_t cmds[] = /* module exported paramaters */ static param_export_t params[] = { + { "default_expires", INT_PARAM, &pres_mwi_default_expires }, {0, 0, 0} }; diff --git a/src/modules/presence_mwi/presence_mwi.h b/src/modules/presence_mwi/presence_mwi.h index 9e7d5c4d52..5eed0d742c 100644 --- a/src/modules/presence_mwi/presence_mwi.h +++ b/src/modules/presence_mwi/presence_mwi.h @@ -34,5 +34,6 @@ #define _PRES_MWI_H_ extern add_event_t pres_add_event; +extern unsigned int pres_mwi_default_expires; #endif

1 0

git:master:86cb58b0: presence_profile: use parameter default_expires instead of 3600 constant
by Daniel-Constantin Mierla 18 Jan '22

18 Jan '22

Module: kamailio Branch: master Commit: 86cb58b045854c6fe95afbd81c2c13c81e1052d5 URL: https://github.com/kamailio/kamailio/commit/86cb58b045854c6fe95afbd81c2c13c… Author: Adrian Tabacioiu <adi.tabacioiu(a)c-s.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-18T20:19:16+01:00 presence_profile: use parameter default_expires instead of 3600 constant - GH #2996 --- Modified: src/modules/presence_profile/add_events.c Modified: src/modules/presence_profile/doc/presence_profile_admin.xml Modified: src/modules/presence_profile/presence_profile.c Modified: src/modules/presence_profile/presence_profile.h --- Diff: https://github.com/kamailio/kamailio/commit/86cb58b045854c6fe95afbd81c2c13c… Patch: https://github.com/kamailio/kamailio/commit/86cb58b045854c6fe95afbd81c2c13c… --- diff --git a/src/modules/presence_profile/add_events.c b/src/modules/presence_profile/add_events.c index 72a5f58567..ec03193d41 100644 --- a/src/modules/presence_profile/add_events.c +++ b/src/modules/presence_profile/add_events.c @@ -45,11 +45,10 @@ int profile_add_events(void) event.name.s = "ua-profile"; event.name.len = 10; - event.content_type.s = "text/xml"; event.content_type.len = 8; - event.default_expires= 3600; + event.default_expires= pres_profile_default_expires; event.type = PUBL_TYPE; event.req_auth = 0; event.evs_publ_handl = 0; diff --git a/src/modules/presence_profile/doc/presence_profile_admin.xml b/src/modules/presence_profile/doc/presence_profile_admin.xml index c54be3446b..ddc811f88e 100644 --- a/src/modules/presence_profile/doc/presence_profile_admin.xml +++ b/src/modules/presence_profile/doc/presence_profile_admin.xml @@ -64,9 +64,25 @@ <section> <title>Exported Parameters</title> - <para> - None. - </para> + <section id="presence_profile.p.default_expires"> + <title><varname>default_expires</varname> (int)</title> + <para> + The default expires value used when missing from SUBSCRIBE + message (in seconds). + </para> + <para> + <emphasis>Default value is <quote>3600</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>default_expires</varname> parameter</title> + <programlisting format="linespecific"> + ... + modparam("presence_profile", "default_expires", 3600) + ... + </programlisting> + </example> + </section> </section> <section> diff --git a/src/modules/presence_profile/presence_profile.c b/src/modules/presence_profile/presence_profile.c index 0a4ab47434..ba3a2746f1 100644 --- a/src/modules/presence_profile/presence_profile.c +++ b/src/modules/presence_profile/presence_profile.c @@ -56,13 +56,22 @@ static int mod_init(void); /* module variables */ add_event_t pres_add_event; +/* module parameters */ +unsigned int pres_profile_default_expires = 3600; + +/* module exported paramaters */ +static param_export_t params[] = { + { "default_expires", INT_PARAM, &pres_profile_default_expires }, + {0, 0, 0} +}; + /* module exports */ /* clang-format off */ struct module_exports exports= { "presence_profile", /* module name */ DEFAULT_DLFLAGS, /* dlopen flags */ 0, /* exported functions */ - 0, /* exported parameters */ + params, /* exported parameters */ 0, /* RPC method exports */ 0, /* exported pseudo-variables */ 0, /* response handling function */ diff --git a/src/modules/presence_profile/presence_profile.h b/src/modules/presence_profile/presence_profile.h index 7906f323b4..ff70a74941 100644 --- a/src/modules/presence_profile/presence_profile.h +++ b/src/modules/presence_profile/presence_profile.h @@ -31,5 +31,6 @@ #define _PRES_PROFILE_H_ extern add_event_t pres_add_event; +extern unsigned int pres_profile_default_expires; #endif

1 0

git:master:21588198: presence_conference: use parameter default_expires instead of 3600 constant
by Daniel-Constantin Mierla 18 Jan '22

18 Jan '22

Module: kamailio Branch: master Commit: 2158819818afabd501af1a41803989d4bd00656e URL: https://github.com/kamailio/kamailio/commit/2158819818afabd501af1a41803989d… Author: Adrian Tabacioiu <adi.tabacioiu(a)c-s.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-18T20:19:16+01:00 presence_conference: use parameter default_expires instead of 3600 constant - GH #2996 --- Modified: src/modules/presence_conference/add_events.c Modified: src/modules/presence_conference/doc/presence_conference_admin.xml Modified: src/modules/presence_conference/presence_conference.c Modified: src/modules/presence_conference/presence_conference.h --- Diff: https://github.com/kamailio/kamailio/commit/2158819818afabd501af1a41803989d… Patch: https://github.com/kamailio/kamailio/commit/2158819818afabd501af1a41803989d… --- diff --git a/src/modules/presence_conference/add_events.c b/src/modules/presence_conference/add_events.c index 576746efed..7683f5a8bc 100644 --- a/src/modules/presence_conference/add_events.c +++ b/src/modules/presence_conference/add_events.c @@ -43,7 +43,7 @@ int conference_add_events(void) event.content_type.s = "application/conference-info+xml"; event.content_type.len = 31; - event.default_expires= 3600; + event.default_expires = pres_conf_default_expires; event.type = PUBL_TYPE; event.req_auth = 0; event.evs_publ_handl = 0; diff --git a/src/modules/presence_conference/doc/presence_conference_admin.xml b/src/modules/presence_conference/doc/presence_conference_admin.xml index 6b1f46012e..158d241c24 100644 --- a/src/modules/presence_conference/doc/presence_conference_admin.xml +++ b/src/modules/presence_conference/doc/presence_conference_admin.xml @@ -76,6 +76,26 @@ modparam("presence_conference", "use_partial_states", 0) </example> </section> +<section id="presence_conference.p.default_expires"> + <title><varname>default_expires</varname> (int)</title> + <para> + The default expires value used when missing from SUBSCRIBE + message (in seconds). + </para> + <para> + <emphasis>Default value is <quote>3600</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>default_expires</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("presence_conference", "default_expires", 3600) +... +</programlisting> + </example> +</section> + </section> <section> diff --git a/src/modules/presence_conference/presence_conference.c b/src/modules/presence_conference/presence_conference.c index cb117c3c6a..890533e11f 100644 --- a/src/modules/presence_conference/presence_conference.c +++ b/src/modules/presence_conference/presence_conference.c @@ -49,6 +49,7 @@ add_event_t pres_add_event; /* module parameters */ int use_partial_states = 0; +unsigned int pres_conf_default_expires = 3600; /* module exported commands */ static cmd_export_t cmds[] = @@ -59,6 +60,7 @@ static cmd_export_t cmds[] = /* module exported paramaters */ static param_export_t params[] = { { "use_partial_states", INT_PARAM, &use_partial_states }, + { "default_expires", INT_PARAM, &pres_conf_default_expires }, {0, 0, 0} }; diff --git a/src/modules/presence_conference/presence_conference.h b/src/modules/presence_conference/presence_conference.h index f8e0efe9de..8bf05885af 100644 --- a/src/modules/presence_conference/presence_conference.h +++ b/src/modules/presence_conference/presence_conference.h @@ -26,5 +26,6 @@ #define _PRES_CONFERENCE_H_ extern add_event_t pres_add_event; +extern unsigned int pres_conf_default_expires; #endif

1 0

git:master:31598421: presence_dialoginfo: use parameter default_expires instead of 3600 constant
by Daniel-Constantin Mierla 18 Jan '22

18 Jan '22

Module: kamailio Branch: master Commit: 31598421de858786f9ed416db8f33c12c0efd383 URL: https://github.com/kamailio/kamailio/commit/31598421de858786f9ed416db8f33c1… Author: Adrian Tabacioiu <adi.tabacioiu(a)c-s.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-18T20:19:16+01:00 presence_dialoginfo: use parameter default_expires instead of 3600 constant - GH #2996 --- Modified: src/modules/presence_dialoginfo/add_events.c Modified: src/modules/presence_dialoginfo/doc/presence_dialoginfo_admin.xml Modified: src/modules/presence_dialoginfo/presence_dialoginfo.c Modified: src/modules/presence_dialoginfo/presence_dialoginfo.h --- Diff: https://github.com/kamailio/kamailio/commit/31598421de858786f9ed416db8f33c1… Patch: https://github.com/kamailio/kamailio/commit/31598421de858786f9ed416db8f33c1… --- diff --git a/src/modules/presence_dialoginfo/add_events.c b/src/modules/presence_dialoginfo/add_events.c index 03cd981837..bed11b2d48 100644 --- a/src/modules/presence_dialoginfo/add_events.c +++ b/src/modules/presence_dialoginfo/add_events.c @@ -43,7 +43,7 @@ int dlginfo_add_events(void) event.content_type.s = "application/dialog-info+xml"; event.content_type.len = 27; - event.default_expires= 3600; + event.default_expires= pres_dlginfo_default_expires; event.type = PUBL_TYPE; event.req_auth = 0; event.evs_publ_handl = 0; diff --git a/src/modules/presence_dialoginfo/doc/presence_dialoginfo_admin.xml b/src/modules/presence_dialoginfo/doc/presence_dialoginfo_admin.xml index cdb1729584..caca121f18 100644 --- a/src/modules/presence_dialoginfo/doc/presence_dialoginfo_admin.xml +++ b/src/modules/presence_dialoginfo/doc/presence_dialoginfo_admin.xml @@ -248,6 +248,26 @@ modparam("presence_dialoginfo", "force_dummy_dialog", 1) </example> </section> +<section id="presence_dialoginfo.p.default_expires"> + <title><varname>default_expires</varname> (int)</title> + <para> + The default expires value used when missing from SUBSCRIBE + message (in seconds). + </para> + <para> + <emphasis>Default value is <quote>3600</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>default_expires</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("presence_dialoginfo", "default_expires", 3600) +... +</programlisting> + </example> +</section> + </section> <section> diff --git a/src/modules/presence_dialoginfo/presence_dialoginfo.c b/src/modules/presence_dialoginfo/presence_dialoginfo.c index 9bf8199dda..edc96fb11e 100644 --- a/src/modules/presence_dialoginfo/presence_dialoginfo.c +++ b/src/modules/presence_dialoginfo/presence_dialoginfo.c @@ -49,6 +49,7 @@ add_event_t pres_add_event; /* module parameters */ int force_single_dialog = 0; int force_dummy_dialog = 0; +unsigned int pres_dlginfo_default_expires = 3600; /* module exported commands */ static cmd_export_t cmds[] = @@ -60,6 +61,7 @@ static cmd_export_t cmds[] = static param_export_t params[] = { { "force_single_dialog", INT_PARAM, &force_single_dialog }, { "force_dummy_dialog", INT_PARAM, &force_dummy_dialog }, + { "default_expires", INT_PARAM, &pres_dlginfo_default_expires }, {0, 0, 0} }; diff --git a/src/modules/presence_dialoginfo/presence_dialoginfo.h b/src/modules/presence_dialoginfo/presence_dialoginfo.h index 750a8c3347..2e9c40553d 100644 --- a/src/modules/presence_dialoginfo/presence_dialoginfo.h +++ b/src/modules/presence_dialoginfo/presence_dialoginfo.h @@ -26,5 +26,6 @@ #define _PRES_DLGINFO_H_ extern add_event_t pres_add_event; +extern unsigned int pres_dlginfo_default_expires; #endif

1 0

[kamailio/kamailio] replacing wrong function return with correct one (PR #3004)
by Saurabh 18 Jan '22

18 Jan '22

Replacing wrong return function with correct one in `w_ht_iterator_setex` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3004 -- Commit Summary -- * replacing wrong function return with correct one -- File Changes -- M src/modules/htable/htable.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3004.patch https://github.com/kamailio/kamailio/pull/3004.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3004 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3004(a)github.com>

2 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev