sr-dev January 2022

sr-dev@lists.kamailio.org

13 participants
261 discussions

by Daniel-Constantin Mierla

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

2 years, 11 months

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

by Eulnono76

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

2 years, 11 months

app_lua warning

by Juha Heinanen

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

2 years, 11 months

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

by Daniel-Constantin Mierla

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

2 years, 11 months

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

by Daniel-Constantin Mierla

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

2 years, 11 months

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

by Daniel-Constantin Mierla

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

2 years, 11 months

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

by Daniel-Constantin Mierla

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

2 years, 11 months

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

by Daniel-Constantin Mierla

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

2 years, 11 months

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

by Victor Seva

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

2 years, 11 months

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

by Kamailio Dev

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

2 years, 11 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2022