- sr-dev - kamailio.org

git:5.6:351c8c96: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 21 Nov '23

21 Nov '23

Module: kamailio Branch: 5.6 Commit: 351c8c962bc4573863b1b21da4d3728e8c7d0e33 URL: https://github.com/kamailio/kamailio/commit/351c8c962bc4573863b1b21da4d3728… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-11-21T11:16:58+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/app_lua/README Modified: src/modules/htable/README Modified: src/modules/http_async_client/README Modified: src/modules/kemix/README Modified: src/modules/mqueue/README Modified: src/modules/xhttp/README Modified: src/modules/xlog/README --- Diff: https://github.com/kamailio/kamailio/commit/351c8c962bc4573863b1b21da4d3728… Patch: https://github.com/kamailio/kamailio/commit/351c8c962bc4573863b1b21da4d3728…

1 0

git: new commits in branch 5.6
by Daniel-Constantin Mierla 21 Nov '23

21 Nov '23

- URL: https://github.com/kamailio/kamailio/commit/1121b39f80a371e670480997e91f956… Author: Ihor Olkhovskyi <ihor.olkhovskyi(a)cern.ch> Date: 2023-11-20T14:09:34+01:00 doc/htable: adding examples in a case of key value is an integer (cherry picked from commit 23c67322c244fc4bf6e990379d2fd876b55b2cbe) - URL: https://github.com/kamailio/kamailio/commit/cd156834b7217fbbbefff7367a83dc8… Author: Henning Westerholt <hw(a)gilawa.com> Date: 2023-11-20T14:09:55+01:00 htable: fix XML syntax errors introduced in 23c67322c244fc4bf (cherry picked from commit 70d8308bbf849b00be69d5c3091b57dfe214b81b) - URL: https://github.com/kamailio/kamailio/commit/b2083e806c0a8c5d2a202482e3670fa… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-11-20T14:14:47+01:00 lcr: fix building warnings initializating values > https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=… > [...] > lcr_mod.c:2630:9: warning: 'tmp_tag.len' may be used uninitialized [-Wmaybe-uninitialized] (cherry picked from commit 781ee072593f16a100ef00b5ef71fcfd6f8ded2b) - URL: https://github.com/kamailio/kamailio/commit/d6c60c09e30da3a1cd8ab1cf333650c… Author: Pantelis Kolatsis <pk(a)gilawa.com> Date: 2023-11-21T08:27:05+01:00 dispatcher: add missing memory allocation checks, convert to memory log macros (cherry picked from commit 6aee3bd7c86a1874cc140a7874b740981f14f5f5) - URL: https://github.com/kamailio/kamailio/commit/bf47b53fbd5f2dfa82060a3c4f2ec44… Author: Henning Westerholt <hw(a)gilawa.com> Date: 2023-11-21T08:27:23+01:00 dispatcher: small formatting adaption related to 6aee3bd7c (cherry picked from commit aa4d015a58bb24ba5bda6e6133b0e9f314e2318e) - URL: https://github.com/kamailio/kamailio/commit/8c11f2f93e30c41221a0c43836a1f07… Author: Pantelis Kolatsis <pk(a)gilawa.com> Date: 2023-11-21T08:27:35+01:00 dmq: add missing memory allocation checks, convert to memory log macros (cherry picked from commit 7e617ab89f5275f1b269382ae2c1fee508854cf1) - URL: https://github.com/kamailio/kamailio/commit/e547217dd93db36b107b92f224fea07… Author: Pantelis Kolatsis <pk(a)gilawa.com> Date: 2023-11-21T08:29:10+01:00 async: convert to memory error logging helper (cherry picked from commit b9d397c84cb3e0911e9823386b6eb4944b02c9ed) - URL: https://github.com/kamailio/kamailio/commit/8c7224f575018302e9efd6555e90cac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T10:36:47+01:00 siprepo: translate pointers to the new buffer - GH #3418 (cherry picked from commit 15c7f861d72c57ee57f41c108d948027e50a0a27) - URL: https://github.com/kamailio/kamailio/commit/69f483cc9195d912fbdb04bbd7588b3… Author: �� <git-dpa(a)aegee.org> Date: 2023-11-21T10:38:58+01:00 kemix: update Kamailio URLs to HTTP �� HTTPS (cherry picked from commit 79fc3f1fc9561f43146a107c824d1d97d3a8b021) - URL: https://github.com/kamailio/kamailio/commit/357230ff85dfeb46819e527be255faa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T10:45:23+01:00 siprepo: check if list is set on insert (cherry picked from commit 423a818cf6e8f6d672630a0365e13877a173508f) (cherry picked from commit e95a79eef0589be2f7d0470bfe6ba19b006730c6) - URL: https://github.com/kamailio/kamailio/commit/9705b10871c7056c192c54c3ba5c76f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T10:45:42+01:00 cfgt: reworked test on dest.s for freeing (cherry picked from commit b2f99145fa7f4088c80dd3e759372445f93f5492) (cherry picked from commit 3b6d0bd508d62b6f6cd0176551311d25225bf63e) - URL: https://github.com/kamailio/kamailio/commit/3c48704f19133f29f730ecaf8e53461… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T10:46:30+01:00 async: use _async_timer_exec_last_slot = UINT_MAX for initial value (cherry picked from commit bc544daea2ee4bb568cf0314f6d32b8aa0c81ecc) (cherry picked from commit b68cb1ace4d44ba0a471a9fd9a6138f3738efef4) - URL: https://github.com/kamailio/kamailio/commit/106a8da206220ba9148845b4c7027e8… Author: Akash Gupta <listen2akash(a)gmail.com> Date: 2023-11-21T10:47:28+01:00 tool: port the route_graph.py script to python version 3.x (cherry picked from commit fa2a69e2ae919b7ba221e87e2001bde83113ce2a) (cherry picked from commit 14638ef43f9b2ef710ae3a6464fb5db0b9de3377) - URL: https://github.com/kamailio/kamailio/commit/49b3285b8cd2be85e85862ca2896ab0… Author: Henning Westerholt <hw(a)gilawa.com> Date: 2023-11-21T10:47:46+01:00 tools: use python3 for route_graph.py tool, for old systems with both python2/python3, fix file closing (cherry picked from commit 7b1fe0483b684693c7baea9b62b471b64c6e22a9) (cherry picked from commit 4f3c32e48b79688ab905802c173b981f92c54e56) - URL: https://github.com/kamailio/kamailio/commit/82d774a3611a0c91cbd357efde8b894… Author: Ovidiu Sas <osas(a)voipembedded.com> Date: 2023-11-21T10:50:58+01:00 mqueue: fix documentation to match the code (cherry picked from commit 23d43645332451ec1ec6dab11da777f9c3bfe304) (cherry picked from commit 91cb5d0adf887db6a34e2a394ab34aae51f475bf) - URL: https://github.com/kamailio/kamailio/commit/a6830a127b0a135f7b5e8164c278d45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T10:51:54+01:00 http_client: fix depecration of CURLOPT_PROTOCOLS and CURLINFO_SIZE_DOWNLOAD - GH #3484 (cherry picked from commit b7b3c67fc1205d114fadf360a594930ef69835a3) (cherry picked from commit 23a121e5d8ffa172f71433c2ef74f323a54e8315) - URL: https://github.com/kamailio/kamailio/commit/6c833deb60daa4382974aa234b53b3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T10:52:07+01:00 http_client: fix depecration of CURLOPT_REDIR_PROTOCOLS - GH #3492 (cherry picked from commit 4d8263f9be97a541a24cbc6acc9855509640780b) (cherry picked from commit 2bd813b0c4c1b942ee634eca5e68a025be9fab8e) - URL: https://github.com/kamailio/kamailio/commit/99ec027801904aacbb4e2c34c030c3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T10:52:46+01:00 http_client: use LIBCURL_VERSION_NUM instead of CURL_AT_LEAST_VERSION - older distros have compilers that don't cope with the later (cherry picked from commit 7cd32bf9631a81c7c4382d45f498bdc9c7f9b34c) (cherry picked from commit 7630473f57c7c0ad600067cea7a89693d9926a81) - URL: https://github.com/kamailio/kamailio/commit/515420337ec110252012522f405cbc6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T10:54:53+01:00 jansson: print unknown type in log message (cherry picked from commit b8cae4fbcd026ffb81e8242500212582d9672ad5) (cherry picked from commit e681aa8236b502de31ad6600932517a259b6b62e) - URL: https://github.com/kamailio/kamailio/commit/16a1a3aff860efa54c3523792bf4b9a… Author: Norbert Kopp��ny Legyes <norbert.legyes(a)protonmail.com> Date: 2023-11-21T10:55:06+01:00 xlog: fix docs example for modparam methods_filter (cherry picked from commit b5a37683e364f596b6c5b4ebbba1fff951d7be84) (cherry picked from commit 80b26beb7d4f9cd4b3858e9e2dae4588feec8e28) - URL: https://github.com/kamailio/kamailio/commit/be104e03ede628ac130073a2a22f30c… Author: MVONDO Eric OBS/OINIS <bycl2332(a)orange.com> Date: 2023-11-21T10:56:24+01:00 siptrace: fix pseudo var direction attribute length (cherry picked from commit 508886c3054a8470fe4469e78e63aa37ae93922d) (cherry picked from commit 3e197c7c41c97badece29cbc6477119180b8dcad) - URL: https://github.com/kamailio/kamailio/commit/20b947cbd9c5379be34597d5dd8f866… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T10:56:43+01:00 http_async_client: docs - dependency on libevent - list style for dependencies and links to projects (cherry picked from commit f16d2658bbefb7a9f43076cbaa958fb3a27f6a0c) (cherry picked from commit 5b1592900920143c9ce5c188e2835c1afd27d489) - URL: https://github.com/kamailio/kamailio/commit/fc0faa5a7701720de17de734dab261a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T10:57:01+01:00 xhttp: note about available variables during http request processing (cherry picked from commit 170067e633ef32ea7b17adad46fdfe2c85fadda0) (cherry picked from commit 774b464af7c561e49253066e8ce3b4ee55463d9a) - URL: https://github.com/kamailio/kamailio/commit/f2ba8a78c9981740d7db22195bb8286… Author: Rick Barenthin <rick(a)ng-voice.com> Date: 2023-11-21T10:57:16+01:00 core: cfg.y typo in parsing XAVPVIAFIELDS In the XAVPVIAFIELDS block there is the string written to the wrong variable. The string is stored in _ksr_xavp_via_params.s but the lenght is stored in _ksr_xavp_via_fields.len. This breaks XAVPVIAPARAMS and XAVPVIAFIELDS. (cherry picked from commit 722a79a9ba8ca2608e699ec14684ce004ae10d60) (cherry picked from commit 34a2d87479d1bcc37d74f3d8fcb4186aea90fc84) - URL: https://github.com/kamailio/kamailio/commit/d77981dbb365d2fc345872fc8695a1f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T10:57:26+01:00 rabbitmq: proper check for allocated pointer (cherry picked from commit 4d58141ab84cf248e8c44a96181642ad0f187e80) (cherry picked from commit 3a217af6b9229989b3c7a788a01609e9513024c4) - URL: https://github.com/kamailio/kamailio/commit/d1334e78eca6601195caa786de5d99d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T10:58:16+01:00 core: parser - set via->params.len when body is finished (cherry picked from commit 82b0f273e1cf65051b6c50301c5073dce56c1149) (cherry picked from commit 59d0ebe41017c2270b62f6171285bae02673da3a) - URL: https://github.com/kamailio/kamailio/commit/f5c9c75eff82182174d1af52aa57d65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T10:58:27+01:00 msilo: cast to fix storage size warning (cherry picked from commit c11fcbbe9ed19bc54b800100d15d9ae269735f0c) (cherry picked from commit 35f0efadeceaecc8e3315f4682d9ac4eba36e363) - URL: https://github.com/kamailio/kamailio/commit/198af0d4777487650c2893ce3b2ebea… Author: �� <git-dpa(a)aegee.org> Date: 2023-11-21T10:58:41+01:00 [app_lua] clarify the file scripts can be in source or bytecode (cherry picked from commit a8747aa02ff3fbffd7a63bdc1e5c06188472edfa) (cherry picked from commit 9be895a16c91bcf4eb299ce0ffb14624755baa48) - URL: https://github.com/kamailio/kamailio/commit/8f56ad7736399588305188f068fd012… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T11:02:00+01:00 kamctl: check if kamctlrc is readable - related to GH #3594 (cherry picked from commit a3fd3b12ca9b1c3688255e9d645085947052bc6d) (cherry picked from commit 259812f03ec26d49776050ca5eb657f2771ce8d5) - URL: https://github.com/kamailio/kamailio/commit/49e01375e6d6c43a432ff11dc215564… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T11:02:08+01:00 kamdbctl: check if kamctlrc is readable (cherry picked from commit f16ec35fa448d03613e6bbbff4c354012f56073e) (cherry picked from commit b503b95a2a62a2e51a5cff20caaa30212d078e84) - URL: https://github.com/kamailio/kamailio/commit/76c538ec31184456ce57487ee6deec2… Author: VoIPNuggets.com <akash(a)voipnuggets.com> Date: 2023-11-21T11:03:26+01:00 tools: route_graph - added README file and updated reference URL [skip ci] (cherry picked from commit 976da8c72e9a056b724f584a803a4a8114f70d30) (cherry picked from commit acd47ad9a175684548dd3fb9c45d18ca81ba6fdb) - URL: https://github.com/kamailio/kamailio/commit/7f5fc6f5fbae4f0edd694a5f9400779… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T11:04:33+01:00 dmq_usrloc: avoid needless second local socket search - remove overwriting local socket string value with received item (cherry picked from commit f97149aec9da71085df9dcf4541abba7b756939c) (cherry picked from commit ba19a8f30d6c9f7757ef0c8d55e2139a8279d375) - URL: https://github.com/kamailio/kamailio/commit/17907f4137b28862a1bc86c5b61de96… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T11:05:42+01:00 db_redis: init allocated redis table structure (cherry picked from commit e24df12d10d8b88582907481d161c6a2db5cf8f1) (cherry picked from commit d015ee9c06a8cb6644101d08e4b54f80b96accf6) - URL: https://github.com/kamailio/kamailio/commit/25521d7a7d433eed271f5c44da88595… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T11:06:59+01:00 app_python3: enable error log mode for some of missing callback functions - tm-specific callbacks should trigger error log messages if not found (cherry picked from commit 695dc54dc1547fdee18b00cfa8e4d15f047834a5) (cherry picked from commit 40f5343d4ca2b4c1cf76eaf168a9b1ae4a722a6a)

1 0

[kamailio/kamailio] OpenSSL 3.0 deprecated-declarations on CentOS 9 (Issue #3647)
by sergey-safarov 21 Nov '23

21 Nov '23

``` make[3]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M db_sqlite.so] db_sqlite.so CC (gcc) [M log_systemd.so] journal_send.o CC (gcc) [M log_systemd.so] log_systemd_mod.o LD (gcc) [M log_systemd.so] log_systemd.so CC (gcc) [M systemdops.so] systemdops_mod.o LD (gcc) [M systemdops.so] systemdops.so CC (gcc) [M crypto.so] api.o CC (gcc) [M crypto.so] crypto_aes.o CC (gcc) [M crypto.so] crypto_evcb.o CC (gcc) [M crypto.so] crypto_mod.o CC (gcc) [M crypto.so] crypto_uuid.o LD (gcc) [M crypto.so] crypto.so CC (gcc) [M tls.so] tls_bio.o CC (gcc) [M tls.so] tls_cfg.o CC (gcc) [M tls.so] tls_config.o CC (gcc) [M tls.so] tls_ct_wrq.o CC (gcc) [M tls.so] tls_domain.o CC (gcc) [M tls.so] tls_dump_vf.o CC (gcc) [M tls.so] tls_init.o CC (gcc) [M tls.so] tls_locking.o CC (gcc) [M tls.so] tls_map.o CC (gcc) [M tls.so] tls_mod.o CC (gcc) [M tls.so] tls_rand.o CC (gcc) [M tls.so] tls_rpc.o CC (gcc) [M tls.so] tls_select.o CC (gcc) [M tls.so] tls_server.o CC (gcc) [M tls.so] tls_util.o CC (gcc) [M tls.so] tls_verify.o LD (gcc) [M tls.so] tls.so CC (gcc) [M auth_identity.so] auth_crypt.o auth_crypt.c: In function 'rsa_sha1_enc': auth_crypt.c:214:9: warning: 'RSA_sign' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 214 | if(RSA_sign(NID_sha1, sstrcrypted, sizeof sstrcrypted, | ^~ In file included from /usr/include/openssl/x509.h:36, from /usr/include/openssl/pem.h:23, from auth_crypt.c:33: /usr/include/openssl/rsa.h:356:27: note: declared here 356 | OSSL_DEPRECATEDIN_3_0 int RSA_sign(int type, const unsigned char *m, | ^~~~~~~~ auth_crypt.c: In function 'rsa_sha1_dec': auth_crypt.c:258:9: warning: 'EVP_PKEY_get1_RSA' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 258 | hpubkey = EVP_PKEY_get1_RSA(pkey); | ^~~~~~~ In file included from /usr/include/openssl/pem.h:22, from auth_crypt.c:33: /usr/include/openssl/evp.h:1359:16: note: declared here 1359 | struct rsa_st *EVP_PKEY_get1_RSA(EVP_PKEY *pkey); | ^~~~~~~~~~~~~~~~~ auth_crypt.c:266:9: warning: 'RSA_verify' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 266 | if(RSA_verify(NID_sha1, (unsigned char *)ssha, sshasize, | ^~ In file included from /usr/include/openssl/x509.h:36, from /usr/include/openssl/pem.h:23, from auth_crypt.c:33: /usr/include/openssl/rsa.h:359:27: note: declared here 359 | OSSL_DEPRECATEDIN_3_0 int RSA_verify(int type, const unsigned char *m, | ^~~~~~~~~~ auth_crypt.c:273:17: warning: 'RSA_free' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 273 | RSA_free(hpubkey); | ^~~~~~~~ In file included from /usr/include/openssl/x509.h:36, from /usr/include/openssl/pem.h:23, from auth_crypt.c:33: /usr/include/openssl/rsa.h:301:28: note: declared here 301 | OSSL_DEPRECATEDIN_3_0 void RSA_free(RSA *r); | ^~~~~~~~ auth_crypt.c:298:9: warning: 'RSA_free' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 298 | RSA_free(hpubkey); | ^~~~~~~~ In file included from /usr/include/openssl/x509.h:36, from /usr/include/openssl/pem.h:23, from auth_crypt.c:33: /usr/include/openssl/rsa.h:301:28: note: declared here 301 | OSSL_DEPRECATEDIN_3_0 void RSA_free(RSA *r); | ^~~~~~~~ CC (gcc) [M auth_identity.so] auth_dynstr.o CC (gcc) [M auth_identity.so] auth_hdrs.o CC (gcc) [M auth_identity.so] auth_http.o CC (gcc) [M auth_identity.so] auth_identity.o auth_identity.c: In function 'mod_init': auth_identity.c:414:9: warning: 'PEM_read_RSAPrivateKey' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 414 | glb_hmyprivkey = PEM_read_RSAPrivateKey(hpemfile, NULL, NULL, NULL); | ^~~~~~~~~~~~~~ In file included from auth_identity.c:43: /usr/include/openssl/pem.h:447:1: note: declared here 447 | DECLARE_PEM_rw_cb_attr(OSSL_DEPRECATEDIN_3_0, RSAPrivateKey, RSA) | ^~~~~~~~~~~~~~~~~~~~~~ auth_identity.c:425:9: warning: 'RSA_size' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 425 | if(initdynstr(&glb_encedmsg, RSA_size(glb_hmyprivkey))) | ^~ In file included from /usr/include/openssl/x509.h:36, from /usr/include/openssl/pem.h:23, from auth_identity.c:43: /usr/include/openssl/rsa.h:212:27: note: declared here 212 | OSSL_DEPRECATEDIN_3_0 int RSA_size(const RSA *rsa); | ^~~~~~~~ auth_identity.c:429:9: warning: 'RSA_size' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 429 | if(initdynstr(&glb_b64encedmsg, (RSA_size(glb_hmyprivkey) / 3 + 1) * 4)) | ^~ In file included from /usr/include/openssl/x509.h:36, from /usr/include/openssl/pem.h:23, from auth_identity.c:43: /usr/include/openssl/rsa.h:212:27: note: declared here 212 | OSSL_DEPRECATEDIN_3_0 int RSA_size(const RSA *rsa); | ^~~~~~~~ CC (gcc) [M auth_identity.so] auth_tables.o LD (gcc) [M auth_identity.so] auth_identity.so CC (gcc) [M db_unixodbc.so] connection.o CC (gcc) [M db_unixodbc.so] db_unixodbc.o CC (gcc) [M db_unixodbc.so] dbase.o CC (gcc) [M db_unixodbc.so] list.o CC (gcc) [M db_unixodbc.so] res.o CC (gcc) [M db_unixodbc.so] row.o CC (gcc) [M db_unixodbc.so] val.o ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3647 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3647(a)github.com>

2 2

git:master:775b819b: pkg/kamailio/deb: set WOLFSSL_INTERNAL=no
by Victor Seva 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: 775b819bc90a46d33d231572013bf82fb021f004 URL: https://github.com/kamailio/kamailio/commit/775b819bc90a46d33d231572013bf82… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-11-21T08:33:23+01:00 pkg/kamailio/deb: set WOLFSSL_INTERNAL=no --- Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jammy/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/775b819bc90a46d33d231572013bf82… Patch: https://github.com/kamailio/kamailio/commit/775b819bc90a46d33d231572013bf82…

2 1

[kamailio/kamailio] dmq: Add find dmq node by IP (PR #3642)
by Xenofon Karamanos 21 Nov '23

21 Nov '23

#### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR fixes a double insertion of DMQ nodes (one insertion for DNS name, one insertion for IP address), which can cause problems related to the handling of TCP sockets for DMQ usrloc. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3642 -- Commit Summary -- * dmq: Add find dmq node by IP -- File Changes -- M src/modules/dmq/dmqnode.c (27) M src/modules/dmq/dmqnode.h (2) M src/modules/dmq/notification_peer.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3642.patch https://github.com/kamailio/kamailio/pull/3642.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3642 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3642(a)github.com>

2 3

git:master:26ba1d9f: dmq: Add find dmq node by IP
by Henning Westerholt 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: 26ba1d9f42c77362de5ceb185d2fc1d1bb3f2d0c URL: https://github.com/kamailio/kamailio/commit/26ba1d9f42c77362de5ceb185d2fc1d… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-11-21T08:50:18+01:00 dmq: Add find dmq node by IP - Add find_dmq_node_ip - Add cmp_dmq_node_ip - Add check in notification peer --- Modified: src/modules/dmq/dmqnode.c Modified: src/modules/dmq/dmqnode.h Modified: src/modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/26ba1d9f42c77362de5ceb185d2fc1d… Patch: https://github.com/kamailio/kamailio/commit/26ba1d9f42c77362de5ceb185d2fc1d… --- diff --git a/src/modules/dmq/dmqnode.c b/src/modules/dmq/dmqnode.c index 75bfdb7dbef..28b2b3e5f7b 100644 --- a/src/modules/dmq/dmqnode.c +++ b/src/modules/dmq/dmqnode.c @@ -91,6 +91,18 @@ int cmp_dmq_node(dmq_node_t *node, dmq_node_t *cmpnode) && (node->uri.proto == cmpnode->uri.proto); } +/** + * @brief compare dmq node ip addresses + */ +int cmp_dmq_node_ip(dmq_node_t *node, dmq_node_t *cmpnode) +{ + if(!node || !cmpnode) { + LM_ERR("cmp_dmq_node_ip - null node received\n"); + return -1; + } + return ip_addr_cmp(&node->ip_address, &cmpnode->ip_address); +} + /** * @brief get the value of a parameter */ @@ -271,6 +283,21 @@ dmq_node_t *find_dmq_node(dmq_node_list_t *list, dmq_node_t *node) return NULL; } +/** + * @brief find dmq node ip + */ +dmq_node_t *find_dmq_node_ip(dmq_node_list_t *list, dmq_node_t *node) +{ + dmq_node_t *cur = list->nodes; + while(cur) { + if(cmp_dmq_node_ip(cur, node)) { + return cur; + } + cur = cur->next; + } + return NULL; +} + /** * @brief duplicate dmq node */ diff --git a/src/modules/dmq/dmqnode.h b/src/modules/dmq/dmqnode.h index cba9968e106..dad5dd23c52 100644 --- a/src/modules/dmq/dmqnode.h +++ b/src/modules/dmq/dmqnode.h @@ -68,9 +68,11 @@ dmq_node_t *add_dmq_node(dmq_node_list_t *list, str *uri); dmq_node_t *find_dmq_node(dmq_node_list_t *list, dmq_node_t *node); dmq_node_t *find_dmq_node_uri(dmq_node_list_t *list, str *uri); dmq_node_t *find_dmq_node_uri2(str *uri); +dmq_node_t *find_dmq_node_ip(dmq_node_list_t *list, dmq_node_t *node); int del_dmq_node(dmq_node_list_t *list, dmq_node_t *node); int dmq_node_del_by_uri(dmq_node_list_t *list, str *suri); int cmp_dmq_node(dmq_node_t *node, dmq_node_t *cmpnode); +int cmp_dmq_node_ip(dmq_node_t *node, dmq_node_t *cmpnode); int update_dmq_node_status(dmq_node_list_t *list, dmq_node_t *node, int status); dmq_node_t *shm_dup_node(dmq_node_t *node); void destroy_dmq_node(dmq_node_t *node, int shm); diff --git a/src/modules/dmq/notification_peer.c b/src/modules/dmq/notification_peer.c index b2470d5ff86..6189acf5359 100644 --- a/src/modules/dmq/notification_peer.c +++ b/src/modules/dmq/notification_peer.c @@ -408,6 +408,12 @@ int extract_node_list(dmq_node_list_t *update_list, struct sip_msg *msg) if(find == NULL) return -1; ret = find_dmq_node(update_list, find); + + if(!ret) { + LM_INFO("dmq node not found by name,try again with IP address\n"); + ret = find_dmq_node_ip(update_list, find); + } + if(!ret) { LM_DBG("found new node %.*s\n", STR_FMT(&tmp_uri)); cur = build_dmq_node(&tmp_uri, 1);

1 0

git:master:159f4762: pkg/kamailio/deb: introduce wolftls package
by Victor Seva 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: 159f476265ba9ee37650c3dc6aadd7b73f7612ec URL: https://github.com/kamailio/kamailio/commit/159f476265ba9ee37650c3dc6aadd7b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-11-21T08:16:03+01:00 pkg/kamailio/deb: introduce wolftls package --- Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/backports/bionic Modified: pkg/kamailio/deb/debian/backports/bullseye Modified: pkg/kamailio/deb/debian/backports/buster Modified: pkg/kamailio/deb/debian/backports/focal Modified: pkg/kamailio/deb/debian/backports/jessie Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/stretch Modified: pkg/kamailio/deb/debian/backports/trusty Modified: pkg/kamailio/deb/debian/backports/wheezy Modified: pkg/kamailio/deb/debian/backports/xenial Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jammy/control Modified: pkg/kamailio/deb/jammy/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/159f476265ba9ee37650c3dc6aadd7b… Patch: https://github.com/kamailio/kamailio/commit/159f476265ba9ee37650c3dc6aadd7b…

1 0

[kamailio/kamailio] core: add socket timestamp of received packets and keep track of receive delay (PR #3404)
by Nicolas C 20 Nov '23

20 Nov '23

#### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description This is a proposed evolution that adds socket timestamping of received UDP packets (using SO_TIMESTAMPNS). It computes the delay between this timestamp and the time at which the packet is read by Kamailio. This can then be accessed using pv "$TV(RD)" (RD for "receive relay"). Rationale : The Kamailio server is handling traffic that is irregular and can temporarily spike to a point where all children are still busy when new packets are incoming on the network interface. Consequently, these packets have to wait until a worker is available. The client will see a higher response time, that currently cannot be monitored by Kamailio itself. This evolution allows to make this wait time observable by Kamailio, allowing to log or write the information to CDR for example. If this is possible, I'd like to merge this feature in Kamailio. Of course, I'm ready to discuss the PR and make any necessary changes. All comments and reviews are most welcome. I've tested this locally on Linux (3.10.0-957.10.1.el7.x86_64) with the latest Kamailio master as of 2023/03/23. Thanks! You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3404 -- Commit Summary -- * core: add socket timestamp of received packets and keep track of receive delay * pv: add $TV(RD) to get the new information "receive delay" -- File Changes -- M src/core/ip_addr.h (1) M src/core/parser/msg_parser.h (1) M src/core/receive.c (8) M src/core/udp_server.c (60) M src/core/ut.h (34) M src/modules/pv/pv_time.c (15) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3404.patch https://github.com/kamailio/kamailio/pull/3404.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3404 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3404(a)github.com>

5 8

git:master:10aa4442: core: cfg.y - copy number string value with memcpy()
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: 10aa4442ac68024e062f7776000cfc0b93129c5a URL: https://github.com/kamailio/kamailio/commit/10aa4442ac68024e062f7776000cfc0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T13:52:03+01:00 core: cfg.y - copy number string value with memcpy() --- Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/10aa4442ac68024e062f7776000cfc0… Patch: https://github.com/kamailio/kamailio/commit/10aa4442ac68024e062f7776000cfc0… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index 9cfce12ce94..b9e293aa923 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -2761,11 +2761,13 @@ host_if_id: ID | NUM_ID | NUMBER { /* get string version */ - $$=pkg_malloc(strlen(yy_number_str)+1); + i_tmp = strlen(yy_number_str); + $$=pkg_malloc(i_tmp + 1); if ($$==0) { PKG_MEM_ERROR; } else { - strcpy($$, yy_number_str); + memcpy($$, yy_number_str, i_tmp); + $$[i_tmp] = '\0'; } } ;

1 0

git:master:4b11820c: rtpproxy: print the ip address directly to local buffer
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: 4b11820cb4337718854f1b80963e204764bc23b1 URL: https://github.com/kamailio/kamailio/commit/4b11820cb4337718854f1b80963e204… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T13:27:33+01:00 rtpproxy: print the ip address directly to local buffer - avoid extra copy --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/4b11820cb4337718854f1b80963e204… Patch: https://github.com/kamailio/kamailio/commit/4b11820cb4337718854f1b80963e204… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 74da691e705..f6ea6b1b12d 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -1815,11 +1815,11 @@ static int rtpproxy_manage2(struct sip_msg *msg, char *flags, char *ip) static int rtpproxy_offer1_helper_f(struct sip_msg *msg, char *flags) { - char *cp; char newip[IP_ADDR_MAX_STR_SIZE]; + int len; - cp = ip_addr2a(&msg->rcv.dst_ip); - strcpy(newip, cp); + len = ip_addr2sbuf(&msg->rcv.dst_ip, newip, IP_ADDR_MAX_STR_SIZE - 1); + newip[len] = 0; return force_rtp_proxy(msg, flags, newip, 1, 0); }

1 0

Route $hfl negative index strange behaviour:
by Xenofon Karamanos 20 Nov '23

20 Nov '23

Hello, I am working on extending $hfl and $hflc supporting some more headers. During some experimentation, i stumbled in some weird behavior regarding $(hfl(Route)[-1]) and negative indexing of $hfl pseudo-variable. Here is a breakdown of what's happening: in kamailio.cfg: request_route { xlog("L_INFO", "Route headers hdr: $hdr(Route)\n"); xlog("L_INFO", "Route headers hfl: $hfl(Route)\n"); xlog("L_INFO", "Route headers count: $hflc(Route)\n"); xlog("L_INFO", "Route headers 0: $(hfl(Route)[0])\n"); xlog("L_INFO", "Route headers 1: $(hfl(Route)[1])\n"); xlog("L_INFO", "Route headers 4: $(hfl(Route)[4])\n"); xlog("L_INFO", "Route headers -1: $(hfl(Route)[-1])\n"); xlog("L_INFO", "Route headers -2: $(hfl(Route)[-2])\n"); xlog("L_INFO", "Route headers -3: $(hfl(Route)[-3])\n"); ... } Now when sending a SIP message containing multiple headers that have comma separated values ie: OPTIONS_MSG_2CONTACTS="OPTIONS sip:example.com SIP/2.0 Via: SIP/2.0/UDP 192.168.1.100:5060;branch=z9hG4bK123456789 Max-Forwards: 70 From: <sip:bob@example.com>;tag=123456789 To: <sip:alice@example.com> Call-ID: 987654321(a)192.168.1.100 CSeq: 1 OPTIONS Contact: <sip:bob@example.com>;expires=3600,<sip:bob2@example.com>;expires=3600,<sip:bob3@example.com>;expires=3600 Route: <sip:server1.example.com;lr;ftag=1234>, <sip:server2.example.com;lr;ftag=5678>, <sip:server3.example.com;lr;ftag=9012> Route: <sip:server4.example.com;lr;ftag=1234>, <sip:server5.example.com;lr;ftag=5678> Content-Length: 0 " the logs show the weird behavior: Negative -1 should print the last header found and so on (as stated by https://www.kamailio.org/wikidocs/cookbooks/devel/pseudovariables/#hflname-… $hdr $hfl doc). Currently, -1 prints null and -2 prints the last one, -3 second to last and so on. This is probably a bug and not the expected behavior, or am i missing something? INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers hdr: <sip:server1.example.com;lr;ftag=1234>, <sip:server2.example.com;lr;ftag=5678>, <sip:server3.example.com;lr;ftag=9012> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers hfl: <sip:server1.example.com;lr;ftag=1234> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers count: 5 INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers 0: <sip:server1.example.com;lr;ftag=1234> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers 1: <sip:server2.example.com;lr;ftag=5678> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers 4: <sip:server5.example.com;lr;ftag=5678> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers -1: <null> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers -2: <sip:server5.example.com;lr;ftag=5678> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers -3: <sip:server4.example.com;lr;ftag=1234> Thanks, Xenofon

1 0

git:master:71969c61: mohqueue: switch to use snprintf() for a couple of string formatting cases
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: 71969c6126e6885f2ba312c692c9c646d8f870ef URL: https://github.com/kamailio/kamailio/commit/71969c6126e6885f2ba312c692c9c64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T13:03:52+01:00 mohqueue: switch to use snprintf() for a couple of string formatting cases --- Modified: src/modules/mohqueue/mohq_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/71969c6126e6885f2ba312c692c9c64… Patch: https://github.com/kamailio/kamailio/commit/71969c6126e6885f2ba312c692c9c64… --- diff --git a/src/modules/mohqueue/mohq_funcs.c b/src/modules/mohqueue/mohq_funcs.c index 530137a2afb..75130381746 100644 --- a/src/modules/mohqueue/mohq_funcs.c +++ b/src/modules/mohqueue/mohq_funcs.c @@ -183,7 +183,7 @@ void ack_msg(sip_msg_t *pmsg, call_lst *pcall) **********/ pcall->call_hash = pcall->call_label = 0; - sprintf(pcall->call_addr, "%s %s", + snprintf(pcall->call_addr, IP_ADDR_MAX_STR_SIZE + 4, "%s %s", pmsg->rcv.dst_ip.af == AF_INET ? "IP4" : "IP6", ip_addr2a(&pmsg->rcv.dst_ip)); pcall->call_state = CLSTA_INQUEUE; @@ -412,12 +412,12 @@ void close_call(sip_msg_t *pmsg, call_lst *pcall) + strlen(pcall->call_via) // Via + strlen(pcall->call_route) // Route + strlen(pquri); // Contact - phdr = pkg_malloc(npos1); + phdr = pkg_malloc(npos1 + 1); if(!phdr) { LM_ERR("%sNo more memory!\n", pfncname); goto bye_err; } - sprintf(phdr, pbyemsg, + snprintf(phdr, npos1 + 1, pbyemsg, pcall->call_via, // Via pcall->call_route, // Route pquri); // Contact @@ -1097,15 +1097,16 @@ void first_invite_msg(sip_msg_t *pmsg, call_lst *pcall) str pcontact[1]; char *pcontacthdr = "Contact: <%s>" SIPEOL; - pcontact->s = - pkg_malloc(strlen(pcall->pmohq->mohq_uri) + strlen(pcontacthdr)); + int tblen; + tblen = strlen(pcall->pmohq->mohq_uri) + strlen(pcontacthdr); + pcontact->s = pkg_malloc(tblen + 1); if(!pcontact->s) { LM_ERR("%sNo more memory!\n", pfncname); end_RTP(pmsg, pcall); delete_call(pcall); return; } - sprintf(pcontact->s, pcontacthdr, pcall->pmohq->mohq_uri); + snprintf(pcontact->s, tblen + 1, pcontacthdr, pcall->pmohq->mohq_uri); pcontact->len = strlen(pcontact->s); if(!add_lump_rpl2(pmsg, pcontact->s, pcontact->len, LUMP_RPL_HDR)) { LM_ERR("%sUnable to add contact (%s) to call (%s)!\n", pfncname, @@ -1557,12 +1558,12 @@ int refer_call(call_lst *pcall, mohq_lock *plock) + strlen(pcall->pmohq->mohq_uri) // Contact + puri->len // Refer-To + strlen(pcall->pmohq->mohq_uri); // Referred-By - char *pbuf = pkg_malloc(npos1); + char *pbuf = pkg_malloc(npos1 + 1); if(!pbuf) { LM_ERR("%sNo more memory!\n", pfncname); goto refererr; } - sprintf(pbuf, prefermsg, + snprintf(pbuf, npos1 + 1, prefermsg, pcall->call_via, // Via pcall->call_route, // Route pcall->pmohq->mohq_uri, // Contact @@ -1863,7 +1864,7 @@ int send_prov_rsp(sip_msg_t *pmsg, call_lst *pcall) char phdrtmp[200]; char *phdrtmplt = "Accept-Language: en" SIPEOL "Require: 100rel" SIPEOL "RSeq: %d" SIPEOL; - sprintf(phdrtmp, phdrtmplt, pcall->call_cseq); + snprintf(phdrtmp, 200, phdrtmplt, pcall->call_cseq); struct lump_rpl **phdrlump = add_lump_rpl2(pmsg, phdrtmp, strlen(phdrtmp), LUMP_RPL_HDR); if(!phdrlump) { @@ -2006,7 +2007,7 @@ int send_rtp_answer(sip_msg_t *pmsg, call_lst *pcall) npos1 += pparse[npos2].len; } char pbodylen[30]; - sprintf(pbodylen, "%s: %d\r\n\r\n", pclenhdr, pSDP->len); + snprintf(pbodylen, 30, "%s: %d\r\n\r\n", pclenhdr, pSDP->len); npos1 += pextrahdr->len + strlen(pbodylen) + pSDP->len + 1; char *pnewbuf = pkg_malloc(npos1); if(!pnewbuf) { @@ -2858,4 +2859,4 @@ int mohq_send(sip_msg_t *pmsg, char *pqueue) return -1; } return 1; -} \ No newline at end of file +}

1 0

git:master:1eb94377: core: review and update/remove old comments
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: 1eb943773f52ea659c8dd812226ad07bcd15caaa URL: https://github.com/kamailio/kamailio/commit/1eb943773f52ea659c8dd812226ad07… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T10:43:19+01:00 core: review and update/remove old comments --- Modified: src/core/dns_cache.c Modified: src/core/fix_lumps.h Modified: src/core/forward.c Modified: src/core/globals.h Modified: src/core/local_timer.c Modified: src/core/mem/q_malloc.c Modified: src/core/msg_translator.c Modified: src/core/proxy.c Modified: src/core/pv_core.c Modified: src/core/raw_sock.c Modified: src/core/tcp_read.c Modified: src/core/tcp_stats.h Modified: src/core/timer.c Modified: src/core/usr_avp.c Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/1eb943773f52ea659c8dd812226ad07… Patch: https://github.com/kamailio/kamailio/commit/1eb943773f52ea659c8dd812226ad07…

1 0

git:master:34edbfa0: core: tcp_main - remove old comments
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: 34edbfa0194ba29e0e671551d44df3710beb93b6 URL: https://github.com/kamailio/kamailio/commit/34edbfa0194ba29e0e671551d44df37… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T10:18:58+01:00 core: tcp_main - remove old comments --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/34edbfa0194ba29e0e671551d44df37… Patch: https://github.com/kamailio/kamailio/commit/34edbfa0194ba29e0e671551d44df37… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 00a1796ec5a..855b2d80617 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -4373,7 +4373,6 @@ inline static int send2child(struct tcp_connection *tcpconn) tcpconn->s) <= 0)) { if((errno == EAGAIN) || (errno == EWOULDBLOCK)) { - /* FIXME: remove after debugging */ LM_CRIT("tcp child %d, socket %d: queue full, %d requests queued " "(total handled %d)\n", idx, tcp_children[idx].unix_sock, min_busy, @@ -4556,23 +4555,7 @@ inline static int handle_tcpconn_ev( int empty_q; int bytes; #endif /* TCP_ASYNC */ - /* is refcnt!=0 really necessary? - * No, in fact it's a bug: I can have the following situation: a send only - * tcp connection used by n processes simultaneously => refcnt = n. In - * the same time I can have a read event and this situation is perfectly - * valid. -- andrei - */ -#if 0 - if ((tcpconn->refcnt!=0)){ - /* FIXME: might be valid for sigio_rt iff fd flags are not cleared - * (there is a short window in which it could generate a sig - * that would be caught by tcp_main) */ - LM_CRIT("handle_tcpconn_ev: io event on referenced" - " tcpconn (%p), refcnt=%d, fd=%d\n", - tcpconn, tcpconn->refcnt, tcpconn->s); - return -1; - } -#endif + /* pass it to child, so remove it from the io watch list and the local * timer */ #ifdef TCP_ASYNC @@ -4627,7 +4610,7 @@ inline static int handle_tcpconn_ev( (void)dst_blocklist_su(BLST_ERR_SEND, tcpconn->rcv.proto, &tcpconn->rcv.src_su, &tcpconn->send_flags, 0); #endif /* USE_DST_BLOCKLIST */ - TCP_STATS_CON_RESET(); /* FIXME: it could != RST */ + TCP_STATS_CON_RESET(); /* note: it could != RST */ } } if(unlikely(!tcpconn_try_unhash(tcpconn))) {

1 0

git:master:e51ccd11: core: set proto on fixing forward actions
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: e51ccd11fe51f2d53dd7719b8fdec561a6ba7494 URL: https://github.com/kamailio/kamailio/commit/e51ccd11fe51f2d53dd7719b8fdec56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T10:07:50+01:00 core: set proto on fixing forward actions --- Modified: src/core/route.c --- Diff: https://github.com/kamailio/kamailio/commit/e51ccd11fe51f2d53dd7719b8fdec56… Patch: https://github.com/kamailio/kamailio/commit/e51ccd11fe51f2d53dd7719b8fdec56… --- diff --git a/src/core/route.c b/src/core/route.c index f6c8c681d29..a03330b6c04 100644 --- a/src/core/route.c +++ b/src/core/route.c @@ -619,6 +619,7 @@ int fix_actions(struct action *a) enum rval_type rve_type, err_type, expected_type; struct rvalue *rv; int rve_param_no; + int proto; if(a == 0) { LM_CRIT("null pointer\n"); @@ -646,8 +647,23 @@ int fix_actions(struct action *a) case STRING_ST: s.s = t->val[0].u.string; s.len = strlen(s.s); - p = add_proxy( - &s, t->val[1].u.number, 0); /* FIXME proto*/ + switch(t->type) { + case FORWARD_TCP_T: + proto = PROTO_TCP; + break; + case FORWARD_TLS_T: + proto = PROTO_TCP; + break; + case FORWARD_SCTP_T: + proto = PROTO_TCP; + break; + case FORWARD_UDP_T: + proto = PROTO_TCP; + break; + default: + proto = 0; + } + p = add_proxy(&s, t->val[1].u.number, proto); if(p == 0) { ret = E_BAD_ADDRESS; goto error;

1 0

git:master:c9fbf264: xcap: clang format
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: c9fbf2640ad74e9f42b43bded80877f8c4ce3f5d URL: https://github.com/kamailio/kamailio/commit/c9fbf2640ad74e9f42b43bded80877f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T09:43:15+01:00 xcap: clang format --- Modified: src/lib/xcap/common_policy.c Modified: src/lib/xcap/common_policy.h Modified: src/lib/xcap/msg_rules.c Modified: src/lib/xcap/msg_rules.h Modified: src/lib/xcap/parse_common_rules.c Modified: src/lib/xcap/parse_common_rules.h Modified: src/lib/xcap/parse_msg_rules.c Modified: src/lib/xcap/parse_pres_rules.c Modified: src/lib/xcap/pres_rules.c Modified: src/lib/xcap/pres_rules.h Modified: src/lib/xcap/resource_list.c Modified: src/lib/xcap/resource_list.h Modified: src/lib/xcap/resource_lists_parser.c Modified: src/lib/xcap/resource_lists_parser.h Modified: src/lib/xcap/rls_services_parser.c Modified: src/lib/xcap/rls_services_parser.h Modified: src/lib/xcap/xcap_client.c Modified: src/lib/xcap/xcap_client.h Modified: src/lib/xcap/xcap_result_codes.h Modified: src/lib/xcap/xml_utils.c Modified: src/lib/xcap/xml_utils.h --- Diff: https://github.com/kamailio/kamailio/commit/c9fbf2640ad74e9f42b43bded80877f… Patch: https://github.com/kamailio/kamailio/commit/c9fbf2640ad74e9f42b43bded80877f…

1 0

git:master:a84e8bf0: srdb2: clang format
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: a84e8bf031994d1b8d71e7b778204df0cbd7475b URL: https://github.com/kamailio/kamailio/commit/a84e8bf031994d1b8d71e7b778204df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T09:43:15+01:00 srdb2: clang format --- Modified: src/lib/srdb2/db.h Modified: src/lib/srdb2/db_cmd.c Modified: src/lib/srdb2/db_cmd.h Modified: src/lib/srdb2/db_con.c Modified: src/lib/srdb2/db_con.h Modified: src/lib/srdb2/db_ctx.c Modified: src/lib/srdb2/db_ctx.h Modified: src/lib/srdb2/db_drv.c Modified: src/lib/srdb2/db_drv.h Modified: src/lib/srdb2/db_fld.c Modified: src/lib/srdb2/db_fld.h Modified: src/lib/srdb2/db_gen.c Modified: src/lib/srdb2/db_gen.h Modified: src/lib/srdb2/db_pool.c Modified: src/lib/srdb2/db_pool.h Modified: src/lib/srdb2/db_rec.c Modified: src/lib/srdb2/db_rec.h Modified: src/lib/srdb2/db_res.c Modified: src/lib/srdb2/db_res.h Modified: src/lib/srdb2/db_uri.c Modified: src/lib/srdb2/db_uri.h --- Diff: https://github.com/kamailio/kamailio/commit/a84e8bf031994d1b8d71e7b778204df… Patch: https://github.com/kamailio/kamailio/commit/a84e8bf031994d1b8d71e7b778204df…

1 0

git:master:4d4311b3: srdb1: clang format
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: 4d4311b355b111ec4b22c748f8d9dd0960ae4c4f URL: https://github.com/kamailio/kamailio/commit/4d4311b355b111ec4b22c748f8d9dd0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T09:43:15+01:00 srdb1: clang format --- Modified: src/lib/srdb1/db.c Modified: src/lib/srdb1/db.h Modified: src/lib/srdb1/db_cap.h Modified: src/lib/srdb1/db_con.h Modified: src/lib/srdb1/db_id.c Modified: src/lib/srdb1/db_id.h Modified: src/lib/srdb1/db_key.h Modified: src/lib/srdb1/db_locking.h Modified: src/lib/srdb1/db_op.h Modified: src/lib/srdb1/db_pool.c Modified: src/lib/srdb1/db_pool.h Modified: src/lib/srdb1/db_pooling.h Modified: src/lib/srdb1/db_query.c Modified: src/lib/srdb1/db_query.h Modified: src/lib/srdb1/db_res.c Modified: src/lib/srdb1/db_res.h Modified: src/lib/srdb1/db_row.c Modified: src/lib/srdb1/db_row.h Modified: src/lib/srdb1/db_ut.c Modified: src/lib/srdb1/db_ut.h Modified: src/lib/srdb1/db_val.c Modified: src/lib/srdb1/db_val.h --- Diff: https://github.com/kamailio/kamailio/commit/4d4311b355b111ec4b22c748f8d9dd0… Patch: https://github.com/kamailio/kamailio/commit/4d4311b355b111ec4b22c748f8d9dd0…

1 0

git:master:3893cea9: shm_regex: clang format
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: 3893cea9ebf83513ed68d2064113dd4fa67900bc URL: https://github.com/kamailio/kamailio/commit/3893cea9ebf83513ed68d2064113dd4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T09:43:15+01:00 shm_regex: clang format --- Modified: src/lib/shm_regex/shm_regex.c Modified: src/lib/shm_regex/shm_regex.h --- Diff: https://github.com/kamailio/kamailio/commit/3893cea9ebf83513ed68d2064113dd4… Patch: https://github.com/kamailio/kamailio/commit/3893cea9ebf83513ed68d2064113dd4…

1 0

git:master:3539a0c4: print: clang format
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: 3539a0c4d3579055172f1c12a81bb804d3fabbe7 URL: https://github.com/kamailio/kamailio/commit/3539a0c4d3579055172f1c12a81bb80… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T09:43:15+01:00 print: clang format --- Modified: src/lib/print/print.c Modified: src/lib/print/print.h --- Diff: https://github.com/kamailio/kamailio/commit/3539a0c4d3579055172f1c12a81bb80… Patch: https://github.com/kamailio/kamailio/commit/3539a0c4d3579055172f1c12a81bb80… --- diff --git a/src/lib/print/print.c b/src/lib/print/print.c index 2cfb08ba87f..c2783d096f9 100644 --- a/src/lib/print/print.c +++ b/src/lib/print/print.c @@ -3,10 +3,9 @@ */ - #include <stdio.h> -int stderr_println(char* text) +int stderr_println(char *text) { fprintf(stderr, "%s\n", text); return 0; diff --git a/src/lib/print/print.h b/src/lib/print/print.h index 0e7e04580f8..4fd823c5002 100644 --- a/src/lib/print/print.h +++ b/src/lib/print/print.h @@ -2,6 +2,6 @@ #ifndef _print_h #define _print_h -int stderr_println(char* text); +int stderr_println(char *text); #endif

1 0

git:master:62fafc25: presence: clang format
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: 62fafc2501bb6f213e8bc68f5485a25f8737b0bb URL: https://github.com/kamailio/kamailio/commit/62fafc2501bb6f213e8bc68f5485a25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T09:43:15+01:00 presence: clang format --- Modified: src/lib/presence/domain_maintainer.c Modified: src/lib/presence/domain_maintainer.h Modified: src/lib/presence/lpidf.c Modified: src/lib/presence/lpidf.h Modified: src/lib/presence/notifier.h Modified: src/lib/presence/notifier_domain.c Modified: src/lib/presence/notifier_domain.h Modified: src/lib/presence/pidf.c Modified: src/lib/presence/pidf.h Modified: src/lib/presence/pres_doc.c Modified: src/lib/presence/pres_doc.h Modified: src/lib/presence/qsa.c Modified: src/lib/presence/qsa.h Modified: src/lib/presence/qsa_params.c Modified: src/lib/presence/qsa_params.h Modified: src/lib/presence/subscriber.h Modified: src/lib/presence/subscription_info.h Modified: src/lib/presence/utils.c Modified: src/lib/presence/xml_utils.c Modified: src/lib/presence/xml_utils.h Modified: src/lib/presence/xpidf.c Modified: src/lib/presence/xpidf.h --- Diff: https://github.com/kamailio/kamailio/commit/62fafc2501bb6f213e8bc68f5485a25… Patch: https://github.com/kamailio/kamailio/commit/62fafc2501bb6f213e8bc68f5485a25…

1 0

git:master:dbe5851e: ims: clang format
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: dbe5851eaab6de1e56caf2eb3063a487d23bbd2c URL: https://github.com/kamailio/kamailio/commit/dbe5851eaab6de1e56caf2eb3063a48… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T09:43:15+01:00 ims: clang format --- Modified: src/lib/ims/ims_getters.c Modified: src/lib/ims/ims_getters.h Modified: src/lib/ims/useful_defs.h --- Diff: https://github.com/kamailio/kamailio/commit/dbe5851eaab6de1e56caf2eb3063a48… Patch: https://github.com/kamailio/kamailio/commit/dbe5851eaab6de1e56caf2eb3063a48…

1 0

git:master:f2173298: cds: clang format
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: f21732981789fa8317327a7e8c8edd7901df6d74 URL: https://github.com/kamailio/kamailio/commit/f21732981789fa8317327a7e8c8edd7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T09:43:15+01:00 cds: clang format --- Modified: src/lib/cds/base64.c Modified: src/lib/cds/base64.h Modified: src/lib/cds/cds.h Modified: src/lib/cds/dbid.c Modified: src/lib/cds/dbid.h Modified: src/lib/cds/dstring.c Modified: src/lib/cds/dstring.h Modified: src/lib/cds/hash_table.c Modified: src/lib/cds/hash_table.h Modified: src/lib/cds/list.h Modified: src/lib/cds/logger.h Modified: src/lib/cds/memory.c Modified: src/lib/cds/memory.h Modified: src/lib/cds/msg_queue.c Modified: src/lib/cds/msg_queue.h Modified: src/lib/cds/ptr_vector.c Modified: src/lib/cds/ref_cntr.c Modified: src/lib/cds/ref_cntr.h Modified: src/lib/cds/rr_serialize.c Modified: src/lib/cds/ser_profile.c Modified: src/lib/cds/ser_profile.h Modified: src/lib/cds/serialize.c Modified: src/lib/cds/serialize.h Modified: src/lib/cds/simple_profile.c Modified: src/lib/cds/simple_profile.h Modified: src/lib/cds/sip_utils.c Modified: src/lib/cds/sstr.c Modified: src/lib/cds/sstr.h Modified: src/lib/cds/sync.h Modified: src/lib/cds/vector.c Modified: src/lib/cds/vector.h --- Diff: https://github.com/kamailio/kamailio/commit/f21732981789fa8317327a7e8c8edd7… Patch: https://github.com/kamailio/kamailio/commit/f21732981789fa8317327a7e8c8edd7…

1 0

git:master:e70a5294: binrpc: clang format
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: e70a52944af73fba31981f529101b28fe635e16e URL: https://github.com/kamailio/kamailio/commit/e70a52944af73fba31981f529101b28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T09:43:15+01:00 binrpc: clang format --- Modified: src/lib/binrpc/binrpc_api.c Modified: src/lib/binrpc/binrpc_api.h --- Diff: https://github.com/kamailio/kamailio/commit/e70a52944af73fba31981f529101b28… Patch: https://github.com/kamailio/kamailio/commit/e70a52944af73fba31981f529101b28…

1 0

git:master:c99f0f49: lib/trie: clang format
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: c99f0f49a5aca0181a5d24e5798361b37a28cea3 URL: https://github.com/kamailio/kamailio/commit/c99f0f49a5aca0181a5d24e5798361b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T09:43:15+01:00 lib/trie: clang format --- Modified: src/lib/trie/dtrie.c Modified: src/lib/trie/dtrie.h --- Diff: https://github.com/kamailio/kamailio/commit/c99f0f49a5aca0181a5d24e5798361b… Patch: https://github.com/kamailio/kamailio/commit/c99f0f49a5aca0181a5d24e5798361b…

1 0

git:master:f967d2ba: lib/trie: proper support for very long numbers
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: f967d2ba2f0f6699fddf25c587fa007493d9b727 URL: https://github.com/kamailio/kamailio/commit/f967d2ba2f0f6699fddf25c587fa007… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T09:43:15+01:00 lib/trie: proper support for very long numbers --- Modified: src/lib/trie/dtrie.c --- Diff: https://github.com/kamailio/kamailio/commit/f967d2ba2f0f6699fddf25c587fa007… Patch: https://github.com/kamailio/kamailio/commit/f967d2ba2f0f6699fddf25c587fa007… --- diff --git a/src/lib/trie/dtrie.c b/src/lib/trie/dtrie.c index 905ddead201..02107023080 100644 --- a/src/lib/trie/dtrie.c +++ b/src/lib/trie/dtrie.c @@ -126,7 +126,8 @@ int dtrie_insert(struct dtrie_node_t *root, const char *number, void *data, const unsigned int branches) { struct dtrie_node_t *node = root; - unsigned char digit, i=0; + unsigned char digit; + unsigned i=0; if (root == NULL) return -1; if (number == NULL) return -1; @@ -233,7 +234,8 @@ void **dtrie_longest_match(struct dtrie_node_t *root, const char *number, const unsigned int branches) { struct dtrie_node_t *node = root; - unsigned char digit, i = 0; + unsigned char digit; + unsigned int i = 0; void **ret = NULL; if (root == NULL) return NULL;

1 0

git:master:a59bc67c: pv: transformation number parmeter kept long value to match pv field type
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: a59bc67cd4bd1df3e81bdb494896b5a076f9d40d URL: https://github.com/kamailio/kamailio/commit/a59bc67cd4bd1df3e81bdb494896b5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T09:43:15+01:00 pv: transformation number parmeter kept long value to match pv field type --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/a59bc67cd4bd1df3e81bdb494896b5a… Patch: https://github.com/kamailio/kamailio/commit/a59bc67cd4bd1df3e81bdb494896b5a… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 48557ca977d..2c60cc7e656 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -2563,7 +2563,7 @@ int tr_eval_val( && (*_p == ' ' || *_p == '\t' || *_p == '\n')) \ _p++; \ while(is_in_str(_p, _in) && *_p >= '0' && *_p <= '9') { \ - if(_n > ((INT_MAX / 10) - 10)) { \ + if(_n > ((LONG_MAX / 10) - 10)) { \ LM_ERR("number value is too large\n"); \ goto error; \ } \ @@ -2577,7 +2577,7 @@ int tr_eval_val( } \ memset(_tp, 0, sizeof(tr_param_t)); \ _tp->type = TR_PARAM_NUMBER; \ - _tp->v.n = sign * n; \ + _tp->v.n = n * sign; \ } else { \ LM_ERR("tinvalid param in transformation: %.*s!!\n", _in->len, \ _in->s); \ @@ -2660,7 +2660,7 @@ char *tr_parse_string(str *in, trans_t *t) str name; str s; pv_spec_t *spec = NULL; - int n; + long n; int sign; tr_param_t *tp = NULL; @@ -3323,7 +3323,7 @@ char *tr_parse_paramlist(str *in, trans_t *t) char *start_pos; str s; str name; - int n; + long n; int sign; pv_spec_t *spec = NULL; tr_param_t *tp = NULL; @@ -3560,7 +3560,7 @@ char *tr_parse_line(str *in, trans_t *t) char *ps; str s; str name; - int n; + long n; int sign; pv_spec_t *spec = NULL; tr_param_t *tp = NULL;

1 0

git:master:6cc8f126: app_jsdt: length checks for resolving js module path
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: 6cc8f126391476a05f8d90a35d6d57eec7c4e8d8 URL: https://github.com/kamailio/kamailio/commit/6cc8f126391476a05f8d90a35d6d57e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T09:43:15+01:00 app_jsdt: length checks for resolving js module path --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/6cc8f126391476a05f8d90a35d6d57e… Patch: https://github.com/kamailio/kamailio/commit/6cc8f126391476a05f8d90a35d6d57e… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index 8ad015c89d9..68dc38f1b23 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -1072,23 +1072,42 @@ duk_ret_t cb_resolve_module(duk_context *JJ) const char *parent_id = duk_get_string(JJ, 1); char requested_path[PATH_MAX]; + char resolved_id[PATH_MAX]; + char *ptr = NULL; + + if(requested_id == NULL) { + return duk_generic_error(JJ, "Invalid parameter"); + } + if(strlen(requested_id) >= PATH_MAX) { + return duk_generic_error(JJ, "Parameter too long"); + } + requested_path[0] = '\0'; if(requested_id[0] == '/') { // absolute strcpy(requested_path, requested_id); } else if(strncmp(requested_id, "./", 2) || strncmp(requested_id, "../", 3)) { - if(strlen(parent_id)) { + if(parent_id != NULL && strlen(parent_id) > 0) { + if(strlen(parent_id) >= PATH_MAX) { + return duk_generic_error(JJ, "Second parameter too long"); + } // relative to parent strcpy(requested_path, parent_id); } else { + if(strlen(_sr_jsdt_load_file.s) >= PATH_MAX) { + return duk_generic_error(JJ, "Load file path too long"); + } // no parent so relative to jsdt_load_file strcpy(requested_path, _sr_jsdt_load_file.s); } - char *ptr = strrchr(requested_path, '/'); + ptr = strrchr(requested_path, '/'); if(ptr) { ptr++; *ptr = '\0'; } + if(strlen(requested_path) + strlen(requested_id) >= PATH_MAX) { + return duk_generic_error(JJ, "Path too long"); + } strcat(requested_path, requested_id); } else { LM_INFO("cb_resolve_module - TODO resolve pathless module names"); @@ -1096,9 +1115,11 @@ duk_ret_t cb_resolve_module(duk_context *JJ) } // if missing add .js ext if(strcmp(strrchr(requested_path, '\0') - 3, ".js")) { + if(strlen(requested_path) + 3 >= PATH_MAX) { + return duk_generic_error(JJ, "Path too long"); + } strcat(requested_path, ".js"); } - char resolved_id[PATH_MAX]; if(realpath(requested_path, resolved_id)) { duk_push_string(JJ, resolved_id); return 1; /*nrets*/

1 0

git:master:e54a4187: tls_wolfssl: enable building with external package
by SPChan 18 Nov '23

18 Nov '23

Module: kamailio Branch: master Commit: e54a41874de6393d71b50368ffb8a4982aed2d2d URL: https://github.com/kamailio/kamailio/commit/e54a41874de6393d71b50368ffb8a49… Author: SPChan <shihping.chan(a)gmail.com> Committer: SPChan <shihping.chan(a)gmail.com> Date: 2023-11-18T21:14:06+08:00 tls_wolfssl: enable building with external package - build with git submodule: make ...WOLFSSL_INTERNAL=yes... - the default - build with external package: make ...WOLFSSL_INTERNAL=no... Debian recommended environment is libwolfssl41 5.6.4, libwolfssl-dev 5.6.4 --- Modified: src/modules/tls_wolfssl/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/e54a41874de6393d71b50368ffb8a49… Patch: https://github.com/kamailio/kamailio/commit/e54a41874de6393d71b50368ffb8a49… --- diff --git a/src/modules/tls_wolfssl/Makefile b/src/modules/tls_wolfssl/Makefile index fe2e7d8d4ed..1a6254ea7b2 100644 --- a/src/modules/tls_wolfssl/Makefile +++ b/src/modules/tls_wolfssl/Makefile @@ -8,6 +8,13 @@ include ../../Makefile.defs auto_gen= NAME=tls_wolfssl.so +# make WOLFSSL_INTERNAL=yes... for internal submodule +# make WOLFSSL_INTERNAL=no... for system package +# default: yes + +WOLFSSL_INTERNAL ?= yes + +ifeq ($(WOLFSSL_INTERNAL),yes) WOLFSSL_PREFIX = ../../../misc/external/wolfssl/build WOLFSSL_SRC = ../../../misc/external/wolfssl/wolfssl @@ -34,6 +41,15 @@ $(WOLFSSL_PREFIX)/include/wolfssl/options.h $(WOLFSSL_PREFIX)/lib/libwolfssl.a: $(NAME): $(WOLFSSL_PREFIX)/lib/libwolfssl.a +else +WOLFSSL_LIBS ?= $(shell pkg-config wolfssl --libs) +WOLFSSL_INCLUDES ?= $(shell pkg-config wolfssl --cflags) + +LIBS += $(WOLFSSL_LIBS) +INCLUDES += $(WOLFSSL_INCLUDES) +include ../../Makefile.modules +endif + clean-wolfssl: @rm -rf $(WOLFSSL_PREFIX)/{bin,include,share,lib}; \ (cd $(WOLFSSL_SRC); make distclean) || /bin/true

1 0

git:master:38aa7e5f: tls_wolfssl: update internal submodule to v5.6.4, and target 5.6.x for distro package
by SPChan 18 Nov '23

18 Nov '23

Module: kamailio Branch: master Commit: 38aa7e5fffcb68979a9bb5771aaa6ef9e14b517d URL: https://github.com/kamailio/kamailio/commit/38aa7e5fffcb68979a9bb5771aaa6ef… Author: SPChan <shihping.chan(a)gmail.com> Committer: SPChan <shihping.chan(a)gmail.com> Date: 2023-11-18T19:07:59+08:00 tls_wolfssl: update internal submodule to v5.6.4, and target 5.6.x for distro package --- Modified: misc/external/wolfssl/wolfssl --- Diff: https://github.com/kamailio/kamailio/commit/38aa7e5fffcb68979a9bb5771aaa6ef… Patch: https://github.com/kamailio/kamailio/commit/38aa7e5fffcb68979a9bb5771aaa6ef… --- diff --git a/misc/external/wolfssl/wolfssl b/misc/external/wolfssl/wolfssl index 3b3c175af0e..37884f864d6 160000 --- a/misc/external/wolfssl/wolfssl +++ b/misc/external/wolfssl/wolfssl @@ -1 +1 @@ -Subproject commit 3b3c175af0e993ffaae251871421e206cc41963f +Subproject commit 37884f864d6fd9b04f44677cb04da15d0c9d6526

1 0

git:master:dea9b252: tls_wolfssl: re-enable optimizations as qm/fm default to 16-byte alignment
by SPChan 18 Nov '23

18 Nov '23

Module: kamailio Branch: master Commit: dea9b25299ee273e45b0e08acacff8de87b7ceb9 URL: https://github.com/kamailio/kamailio/commit/dea9b25299ee273e45b0e08acacff8d… Author: SPChan <shihping.chan(a)gmail.com> Committer: SPChan <shihping.chan(a)gmail.com> Date: 2023-11-18T12:21:03+08:00 tls_wolfssl: re-enable optimizations as qm/fm default to 16-byte alignment --- Modified: src/modules/tls_wolfssl/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/dea9b25299ee273e45b0e08acacff8d… Patch: https://github.com/kamailio/kamailio/commit/dea9b25299ee273e45b0e08acacff8d… --- diff --git a/src/modules/tls_wolfssl/Makefile b/src/modules/tls_wolfssl/Makefile index 730076023a9..fe2e7d8d4ed 100644 --- a/src/modules/tls_wolfssl/Makefile +++ b/src/modules/tls_wolfssl/Makefile @@ -25,7 +25,7 @@ $(WOLFSSL_PREFIX)/include/wolfssl/options.h $(WOLFSSL_PREFIX)/lib/libwolfssl.a: if [ ! -f "Makefile" ]; then \ env -u DEFS -u CFLAGS -u LDFLAGS -u LIBS EXTRA_CFLAGS="-g -O2 -fPIC" ./configure \ --enable-all --enable-pkcs11 --enable-static --enable-writedup \ - --disable-aligndata --disable-shared --disable-examples \ + --disable-shared --disable-examples \ --disable-jni --disable-crl-monitor \ --prefix=$(CURDIR)/$(WOLFSSL_PREFIX) \ --exec-prefix=$(CURDIR)/$(WOLFSSL_PREFIX); \

1 0

[kamailio/kamailio] topos: BYE sent by caller before call was connected was badly managed (PR #3644)
by Frédéric Gaisnon 17 Nov '23

17 Nov '23

#### 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 - [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  When caller sent a BYE instead a CANCEL into a non connected call, route are badly reappend by topos. regression introduced by patch 091dc9a76bcec5c8a4bc73e863ed10b1b9d76c92 topos: fix early-dialog b-side UPDATE requests routing (GH #3437) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3644 -- Commit Summary -- * topos: BYE sent by caller before call was connected was badly managed -- File Changes -- M src/modules/topos/tps_msg.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3644.patch https://github.com/kamailio/kamailio/pull/3644.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3644 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3644(a)github.com>

3 8

git:master:9898c586: topos: BYE sent by caller before call was connected was badly managed
by Henning Westerholt 17 Nov '23

17 Nov '23

Module: kamailio Branch: master Commit: 9898c586095bd75cd31f0ca383ba0a347bfc4891 URL: https://github.com/kamailio/kamailio/commit/9898c586095bd75cd31f0ca383ba0a3… Author: frederic <frederic.gaisnon(a)mmtt.fr> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-11-17T14:48:35+01:00 topos: BYE sent by caller before call was connected was badly managed regression introduced by patch 091dc9a76bcec5c8a4bc73e863ed10b1b9d76c92 topos: fix early-dialog b-side UPDATE requests routing (GH #3437) --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/9898c586095bd75cd31f0ca383ba0a3… Patch: https://github.com/kamailio/kamailio/commit/9898c586095bd75cd31f0ca383ba0a3… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 942629568b9..4d680e53f45 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -962,7 +962,7 @@ int tps_request_received(sip_msg_t *msg, int dialog) LM_DBG("use branch for routing information, request from direction " "%d\n", direction); - if(tps_reappend_route(msg, &stsd, &stsd.s_rr, 1) < 0) { + if(tps_reappend_route(msg, &stsd, &stsd.s_rr, (direction == TPS_DIR_UPSTREAM) ? 0 : 1) < 0) { LM_ERR("failed to reappend s-route\n"); return -1; }

1 0

Problems with fsn
by aaron.soto＠dialapplet.com 17 Nov '23

17 Nov '23

Hello to all, I am having a problem that when I send an invite from kamailio, when I change the variable $fsn by an alias it takes the ip well, but the port sends it by a random port, when observing the capture with the sngrep it is shown as the source port is completely random. If someone can help me, let me know what kind of information you can help. Thanks

1 0

Kamailio v5.7.3 Released
by Daniel-Constantin Mierla 17 Nov '23

17 Nov '23

Hello, Kamailio SIP Server v5.7.3 stable release is out. This is a maintenance release of the latest stable branch, 5.7, that includes fixes since the release of v5.7.2. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.7.x. Deployments running previous v5.7.x versions are strongly recommended to be upgraded to v5.7.3. For more details about version 5.7.3 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2023/11/kamailio-v5-7-3-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - www.kamailioworld.com

1 0

[kamailio/kamailio] Allow function set_advertised_address to receive variable as parameter (#2137)
by pwakano 17 Nov '23

17 Nov '23

### Description Currently the functions set_advertised_address and set_advertised_port only accept strings as parameters. Trying to use it with variable causes an error. Having the function using a hard coded value is not a good practice and in order to add flexibility to the script in different installations it would be nice to have this function accepting variables. Also, the 'advertise' option on the 'listen' parameter is not always desired because it apply for all messages sent via the socket, and there are situations where different advertised IP for the same interface are necessary. ### Expected behavior set_advertised_address should receive a variable as parameter and use its value to change the SIP headers. ### Actual observed behavior Kamailio won't start if set_advertised_address is used with a variable due to script parse error or it will set the SIP message with the literal string "$var(test)" for example, instead of using the value of $var(test). ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` # kamailio -v version: kamailio 5.2.2 (x86_64/linux) 67f967 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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 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: 67f967 compiled on 11:40:41 Mar 11 2019 with gcc 4.8.5 ``` * **Operating System**:  ``` # uname -a Linux voice-conn-kamailio-1 3.10.0-514.21.2.el7.x86_64 #1 SMP Tue Jun 20 12:24:47 UTC 2017 x86_64 x86_64 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/2137

7 9

git:5.7:e4d96bd4: ChangeLog: content updated for v5.7.3
by Daniel-Constantin Mierla 17 Nov '23

17 Nov '23

Module: kamailio Branch: 5.7 Commit: e4d96bd4f7cdf6482ac5c08400ccd09f241541bf URL: https://github.com/kamailio/kamailio/commit/e4d96bd4f7cdf6482ac5c08400ccd09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-17T10:24:45+01:00 ChangeLog: content updated for v5.7.3 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/e4d96bd4f7cdf6482ac5c08400ccd09… Patch: https://github.com/kamailio/kamailio/commit/e4d96bd4f7cdf6482ac5c08400ccd09…

1 0

git:5.7:1ec50936: Makefile.defs: version set to 5.7.3
by Daniel-Constantin Mierla 17 Nov '23

17 Nov '23

Module: kamailio Branch: 5.7 Commit: 1ec5093657959b4af1c9d4e0ea48879ed1105f4d URL: https://github.com/kamailio/kamailio/commit/1ec5093657959b4af1c9d4e0ea48879… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-17T09:56:00+01:00 Makefile.defs: version set to 5.7.3 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/1ec5093657959b4af1c9d4e0ea48879… Patch: https://github.com/kamailio/kamailio/commit/1ec5093657959b4af1c9d4e0ea48879… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 287efecafa3..5d485bb2c74 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 7 -SUBLEVEL = 2 +SUBLEVEL = 3 EXTRAVERSION = # memory manager switcher

1 0

git:5.7:2fa62091: pkg: deb specs updated for v5.7.3
by Daniel-Constantin Mierla 17 Nov '23

17 Nov '23

Module: kamailio Branch: 5.7 Commit: 2fa620918979548af5182114f8d44df67776b76f URL: https://github.com/kamailio/kamailio/commit/2fa620918979548af5182114f8d44df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-17T09:52:09+01:00 pkg: deb specs updated for v5.7.3 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jammy/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/2fa620918979548af5182114f8d44df… Patch: https://github.com/kamailio/kamailio/commit/2fa620918979548af5182114f8d44df…

1 0

git:5.7:ec6c7ac6: pkg: version set to 5.7.3 for rpms and alpine specs
by Daniel-Constantin Mierla 17 Nov '23

17 Nov '23

Module: kamailio Branch: 5.7 Commit: ec6c7ac6c7758cf2ff2a554985204315bd72859a URL: https://github.com/kamailio/kamailio/commit/ec6c7ac6c7758cf2ff2a55498520431… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-17T09:47:30+01:00 pkg: version set to 5.7.3 for rpms and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/ec6c7ac6c7758cf2ff2a55498520431… Patch: https://github.com/kamailio/kamailio/commit/ec6c7ac6c7758cf2ff2a55498520431… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 45ae00469f5..bf51c6ce047 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.7.2 +pkgver=5.7.3 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index d57ec65039a..28ebdc70ee4 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.7.2 +%define ver 5.7.3 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

Releasing v5.7.3
by Daniel-Constantin Mierla 17 Nov '23

17 Nov '23

Hello, I am considering to release Kamailio v5.7.3 (out of branch 5.7) soon (likely on Friday 17 or during the beginning of next week). If anyone is aware of issues not yet on the bug tracker, report them there asap in order to have a better chance to be fixed. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - www.kamailioworld.com

1 1

git:5.7:5879b5d1: core: copy the value between quotes for #!defexps
by Daniel-Constantin Mierla 16 Nov '23

16 Nov '23

Module: kamailio Branch: 5.7 Commit: 5879b5d10d41f8a8a7b458873a4afaf7777fe27d URL: https://github.com/kamailio/kamailio/commit/5879b5d10d41f8a8a7b458873a4afaf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-16T20:06:10+01:00 core: copy the value between quotes for #!defexps - GH #3631 (cherry picked from commit c26e9877419ac53fb109a24aefb3fcd711fae1d7) --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/5879b5d10d41f8a8a7b458873a4afaf… Patch: https://github.com/kamailio/kamailio/commit/5879b5d10d41f8a8a7b458873a4afaf… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index ba7c1263fab..262a7931cd2 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -523,7 +523,7 @@ char *pp_defexp_eval(char *exval, int exlen, int qmode) } if(qmode == 1) { res[0] = '"'; - memcpy(res, sval.s + 1, sval.len); + memcpy(res + 1, sval.s, sval.len); res[sval.len + 1] = '"'; res[sval.len + 2] = '\0'; LM_DBG("expression quoted string result: [%s]\n", res);

1 0

[kamailio/kamailio] config file: defexps not working in modparam (Issue #3631)
by space88man 16 Nov '23

16 Nov '23

### Description When an ID is defined using `!#defexps` it cannot be used in modparam ### Troubleshooting ``` #!define TEST1 "key=s:value" ## this works modparam("pv", "varset", TEST1) # in shell: export TEST2='key=s:value' #!defenvs TEST2 modparam("pv", "varset", TEST2) # this does not work #!defexps TEST3 "key=s:value" modparam("pv", "varset", TEST3) 0(2437437) CRITICAL: <core> [core/cfg.y:3900]: yyerror_at(): parse error in config file kamailio.cfg, line 85, column 26-32: syntax error ``` #### Reproduction * in config file, define ID with `#!defexps` then use in `modparam()` #### Debugging Data -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3631 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3631(a)github.com>

3 4

git:master:c26e9877: core: copy the value between quotes for #!defexps
by Daniel-Constantin Mierla 16 Nov '23

16 Nov '23

Module: kamailio Branch: master Commit: c26e9877419ac53fb109a24aefb3fcd711fae1d7 URL: https://github.com/kamailio/kamailio/commit/c26e9877419ac53fb109a24aefb3fcd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-16T19:50:13+01:00 core: copy the value between quotes for #!defexps - GH #3631 --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/c26e9877419ac53fb109a24aefb3fcd… Patch: https://github.com/kamailio/kamailio/commit/c26e9877419ac53fb109a24aefb3fcd… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index ba7c1263fab..262a7931cd2 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -523,7 +523,7 @@ char *pp_defexp_eval(char *exval, int exlen, int qmode) } if(qmode == 1) { res[0] = '"'; - memcpy(res, sval.s + 1, sval.len); + memcpy(res + 1, sval.s, sval.len); res[sval.len + 1] = '"'; res[sval.len + 2] = '\0'; LM_DBG("expression quoted string result: [%s]\n", res);

1 0

git:master:996b61eb: kamctl: missing space from previous commit
by Daniel-Constantin Mierla 16 Nov '23

16 Nov '23

Module: kamailio Branch: master Commit: 996b61ebfdabcae8729725b5d06f268aefcd33a4 URL: https://github.com/kamailio/kamailio/commit/996b61ebfdabcae8729725b5d06f268… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-16T18:26:27+01:00 kamctl: missing space from previous commit --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/996b61ebfdabcae8729725b5d06f268… Patch: https://github.com/kamailio/kamailio/commit/996b61ebfdabcae8729725b5d06f268… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 197c6e43035..47a96e1b488 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -44,7 +44,7 @@ if [ $RC_FILE_SOURCED = "false" ] && [ -f /etc/kamailio/kamctlrc -a -r /etc/kama . /etc/kamailio/kamctlrc RC_FILE_SOURCED="true" fi -if[ $RC_FILE_SOURCED = "false" ] && [ -f /usr/local/etc/kamailio/kamctlrc -a -r /usr/local/etc/kamailio/kamctlrc ]; then +if [ $RC_FILE_SOURCED = "false" ] && [ -f /usr/local/etc/kamailio/kamctlrc -a -r /usr/local/etc/kamailio/kamctlrc ]; then . /usr/local/etc/kamailio/kamctlrc RC_FILE_SOURCED="true" fi

1 0

git:master:64cd9336: kamctl: Fix source order
by Daniel-Constantin Mierla 16 Nov '23

16 Nov '23

Module: kamailio Branch: master Commit: 64cd9336039bc05944fd9693e08edfab5fbd2f14 URL: https://github.com/kamailio/kamailio/commit/64cd9336039bc05944fd9693e08edfa… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-16T18:25:23+01:00 kamctl: Fix source order - Add check for already sourced rc file in kamctl --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/64cd9336039bc05944fd9693e08edfa… Patch: https://github.com/kamailio/kamailio/commit/64cd9336039bc05944fd9693e08edfa… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index ad4262b7fc0..197c6e43035 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -18,6 +18,7 @@ else fi ### include config files +RC_FILE_SOURCED="false" # check for rc file at same location with kamctl which greadlink >/dev/null 2>&1 @@ -39,11 +40,13 @@ if [ -n "$KAMCTLFULLPATH" ] ; then fi # check for rc file at standard locations -if [ -f /etc/kamailio/kamctlrc -a -r /etc/kamailio/kamctlrc ]; then +if [ $RC_FILE_SOURCED = "false" ] && [ -f /etc/kamailio/kamctlrc -a -r /etc/kamailio/kamctlrc ]; then . /etc/kamailio/kamctlrc + RC_FILE_SOURCED="true" fi -if [ -f /usr/local/etc/kamailio/kamctlrc -a -r /usr/local/etc/kamailio/kamctlrc ]; then +if[ $RC_FILE_SOURCED = "false" ] && [ -f /usr/local/etc/kamailio/kamctlrc -a -r /usr/local/etc/kamailio/kamctlrc ]; then . /usr/local/etc/kamailio/kamctlrc + RC_FILE_SOURCED="true" fi if [ -f ~/.kamctlrc -a -r ~/.kamctlrc ]; then . ~/.kamctlrc @@ -3255,4 +3258,3 @@ case $1 in exit 1 ;; esac -

1 0

[kamailio/kamailio] kamctl: Source only one kamctlrc (PR #3594)
by Xenofon Karamanos 16 Nov '23

16 Nov '23

#### 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 - [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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  kamctl now sources the kamctlrc from only one location if available in this order: 1. same folder as kamctl, 2. {intstall_prefix}/etc/kamailio/, 3. ~/.kamctlrc 4. /etc/kamailio/. If no kamctlrc is found, it continues just like before. Should it stop? #### Issue description `kamctl` uses env variables from all the config files above, and retains the env value of the latest config that declares it. Let's say we have 3 kamctlrc files right now: ``` # first config file (same folder that kamctl resides) # {prefix_install}/sbin/kamctlrc ... SIP_DOMAIN=kamailio.org DBENGINE is commented ... ``` ``` # second config file # /etc/kamailio/kamctlrc ... SIP_DOMAIN=kam02.tst.nbg.gilawa.net DBENGINE=MYSQL ... ``` ``` # third config file # {prefix_install}/etc/kamailio/kamctlrc ... SIP_DOMAIN is commented DBENGINE=MYSQL ... ``` Running `{install_prefix}/sbin/kamctl` (before changes in order) it prints : ``` Loading config file /home/xenofon/kamailio-source-install/sbin/kamctlrc Loading config file /etc/kamailio/kamctlrc Loading config file /home/xenofon/kamailio-source-install/etc/kamailio//kamctlrc SIP_DOMAIN env var is kam02.tst.nbg.gilawa.net DBENGINE env var is MYSQL ``` suggesting that env variables from multiple sources are gathered and overwritten in cases. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3594 -- Commit Summary -- * kamctl: Source only one kamctlrc -- File Changes -- M utils/kamctl/kamctl (23) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3594.patch https://github.com/kamailio/kamailio/pull/3594.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3594 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3594(a)github.com>

3 19

Obsoleting unmaintained modules
by Daniel-Constantin Mierla 16 Nov '23

16 Nov '23

Hello, during the Kamailio Developers Meeting 2023 in Dusseldorf that took place last week, it was proposed to obsolete modules that seem to be unmaintained and no activity about them was noticed during the past years. It is quite some overhead in packaging them and trying to keep them compiling when they have external dependencies, therefore such step should spare some resources in the future. The list (see below) was built based on the options of those present at the meeting, now we want to discuss it on the larger communities of developers and users. If you are using any of these modules or you think any of them worth keeping, reply with the names of the modules that you want to be kept. The proposed action is to relocate the obsoleted modules to a new git repository "kamailio-obsolete" to still keep some visibility to them and in the eventually of future interest on any of them, it can be reintroduced in the main repository. Next is the initial list of modules proposed to be considered obsolete: - app_java - app_lua_sr - app_mono - app_python - app_sqlang - auth_identity - call_control - db2_ldap - db2_ops - db_cassandra - db_perldvdb - dnssec - domainpolicy - h350 - mediaproxy - osp - peering - print - print_lib - pua_xmpp - ratelimit - uid_auth_db - uid_avp_db - uid_domain - uid_gflags - uid_uri_db - uri_db - xmpp - xprint Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy and Development Services Kamailio Advanced Training -- asipto.com

3 4

git:master:06ce65a2: topos: detect direction for early dialog NOTIFY
by Daniel-Constantin Mierla 16 Nov '23

16 Nov '23

Module: kamailio Branch: master Commit: 06ce65a2bbea826b890a3712cf1ac4f8b53e54cd URL: https://github.com/kamailio/kamailio/commit/06ce65a2bbea826b890a3712cf1ac4f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-16T17:39:11+01:00 topos: detect direction for early dialog NOTIFY --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/06ce65a2bbea826b890a3712cf1ac4f… Patch: https://github.com/kamailio/kamailio/commit/06ce65a2bbea826b890a3712cf1ac4f… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 0e697e8580e..942629568b9 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -915,7 +915,7 @@ int tps_request_received(sip_msg_t *msg, int dialog) | METHOD_NOTIFY)) && stsd.b_contact.len <= 0) { /* no B-side contact, look for INVITE transaction record */ - if(metid & (METHOD_BYE | METHOD_UPDATE)) { + if(metid & (METHOD_BYE | METHOD_UPDATE | METHOD_NOTIFY)) { /* detect direction - via from-tag */ if(tps_dlg_detect_direction(msg, &stsd, &direction) < 0) { goto error;

1 0

git:5.7:3e979157: core: fix indentation on tcp_main.c
by Ovidiu Sas 16 Nov '23

16 Nov '23

Module: kamailio Branch: 5.7 Commit: 3e9791570645dee833737077b3326ca6acde6aef URL: https://github.com/kamailio/kamailio/commit/3e9791570645dee833737077b3326ca… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2023-11-16T11:29:18-05:00 core: fix indentation on tcp_main.c (cherry picked from commit 243951bc487c5c67c81062445d4f4d7ee725684f) --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/3e9791570645dee833737077b3326ca… Patch: https://github.com/kamailio/kamailio/commit/3e9791570645dee833737077b3326ca… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 49ad05a7fbb..d7bd4534d59 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3162,7 +3162,7 @@ int tcp_init(struct socket_info *sock_info) #if !defined(TCP_DONT_REUSEADDR) /* Stevens, "Network Programming", Section 7.5, "Generic Socket - * Options": "...server started,..a child continues..on existing + * Options": "...server started,..a child continues..on existing * connection..listening server is restarted...call to bind fails * ... ALL TCP servers should specify the SO_REUSEADDRE option * to allow the server to be restarted in this situation

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev