- sr-dev - kamailio.org

git:master:88bcd44e: cdp: log message when failing to set nonblock on socket
by Daniel-Constantin Mierla 14 Jun '23

14 Jun '23

Module: kamailio Branch: master Commit: 88bcd44e07b43b723bb0ddc7b828f605179ae893 URL: https://github.com/kamailio/kamailio/commit/88bcd44e07b43b723bb0ddc7b828f60… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-14T08:44:35+02:00 cdp: log message when failing to set nonblock on socket --- Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/88bcd44e07b43b723bb0ddc7b828f60… Patch: https://github.com/kamailio/kamailio/commit/88bcd44e07b43b723bb0ddc7b828f60… --- diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index dccfcd5bd29..9124c4eef49 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -949,7 +949,9 @@ int peer_connect(peer *p) { // Connect with timeout int x; x = fcntl(sock, F_GETFL, 0); - fcntl(sock, F_SETFL, x | O_NONBLOCK); + if(fcntl(sock, F_SETFL, x | O_NONBLOCK) < 0) { + LM_WARN("failed to set O_NONBLOCK on socket %d\n", sock); + } int res = connect(sock, ainfo->ai_addr, ainfo->ai_addrlen); if(res < 0) { if(errno == EINPROGRESS) {

1 0

git:master:81ee6f7e: cdp: dedicated log messages for timeout events
by Daniel-Constantin Mierla 14 Jun '23

14 Jun '23

Module: kamailio Branch: master Commit: 81ee6f7e9eb23c24fb06dd2c201f3246d6044c4d URL: https://github.com/kamailio/kamailio/commit/81ee6f7e9eb23c24fb06dd2c201f324… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-14T08:28:58+02:00 cdp: dedicated log messages for timeout events --- Modified: src/modules/cdp/peerstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/81ee6f7e9eb23c24fb06dd2c201f324… Patch: https://github.com/kamailio/kamailio/commit/81ee6f7e9eb23c24fb06dd2c201f324… --- diff --git a/src/modules/cdp/peerstatemachine.c b/src/modules/cdp/peerstatemachine.c index 9419b77134c..2cdba653d56 100644 --- a/src/modules/cdp/peerstatemachine.c +++ b/src/modules/cdp/peerstatemachine.c @@ -157,6 +157,9 @@ int sm_process( case Timeout: Error(p, p->I_sock); p->state = Closed; + LM_ERR("in state %s timeout event %s\n", + dp_states[p->state], dp_events[event - 101]); + goto error; default: LM_ERR("sm_process(): In state %s invalid event %s\n", dp_states[p->state], dp_events[event - 101]); @@ -344,6 +347,9 @@ int sm_process( if(p->R_sock >= 0) Error(p, p->R_sock); p->state = Closed; + LM_ERR("in state %s timeout event %s\n", + dp_states[p->state], dp_events[event - 101]); + goto error; default: LM_ERR("sm_process(): In state %s invalid event %s\n", dp_states[p->state], dp_events[event - 101]);

1 0

git:master:eaa4b177: cdp: safety check on diameter msg processing
by Daniel-Constantin Mierla 14 Jun '23

14 Jun '23

Module: kamailio Branch: master Commit: eaa4b177652259efda4e61aac9dd039ebde253c9 URL: https://github.com/kamailio/kamailio/commit/eaa4b177652259efda4e61aac9dd039… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-14T08:33:23+02:00 cdp: safety check on diameter msg processing --- Modified: src/modules/cdp/peerstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/eaa4b177652259efda4e61aac9dd039… Patch: https://github.com/kamailio/kamailio/commit/eaa4b177652259efda4e61aac9dd039… --- diff --git a/src/modules/cdp/peerstatemachine.c b/src/modules/cdp/peerstatemachine.c index 2cdba653d56..24d5aed959e 100644 --- a/src/modules/cdp/peerstatemachine.c +++ b/src/modules/cdp/peerstatemachine.c @@ -1338,6 +1338,11 @@ void Rcv_Process(peer *p, AAAMessage *msg) { AAASession *session = 0; int nput = 0; + + if(!msg) { + return; + } + if(msg->sessionId) session = cdp_get_session(msg->sessionId->data); @@ -1408,8 +1413,7 @@ void Rcv_Process(peer *p, AAAMessage *msg) } if(!nput && !put_task(p, msg)) { LM_ERR("Rcv_Process(): Queue refused task\n"); - if(msg) - AAAFreeMessage(&msg); + AAAFreeMessage(&msg); } //if (msg) LM_ERR("Rcv_Process(): task added to queue command %d, flags %#1x endtoend %u hopbyhop %u\n",msg->commandCode,msg->flags,msg->endtoendId,msg->hopbyhopId);

1 0

git:master:f8bfc8d2: cdp: reworked same code execution in if branches
by Daniel-Constantin Mierla 14 Jun '23

14 Jun '23

Module: kamailio Branch: master Commit: f8bfc8d2c9f8b366e6a0d8d3b1790077ccca5b7e URL: https://github.com/kamailio/kamailio/commit/f8bfc8d2c9f8b366e6a0d8d3b179007… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-14T07:58:54+02:00 cdp: reworked same code execution in if branches --- Modified: src/modules/cdp/peerstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/f8bfc8d2c9f8b366e6a0d8d3b179007… Patch: https://github.com/kamailio/kamailio/commit/f8bfc8d2c9f8b366e6a0d8d3b179007… --- diff --git a/src/modules/cdp/peerstatemachine.c b/src/modules/cdp/peerstatemachine.c index c09ac06fc2b..9419b77134c 100644 --- a/src/modules/cdp/peerstatemachine.c +++ b/src/modules/cdp/peerstatemachine.c @@ -929,10 +929,10 @@ void Snd_DWR(peer *p) return; dwr->hopbyhopId = next_hopbyhop(); dwr->endtoendId = next_endtoend(); - if(p->state == I_Open) - peer_send_msg(p, dwr); - else - peer_send_msg(p, dwr); + if(p->state == I_Open) { + LM_DBG("sending in state I_Open\n"); + } + peer_send_msg(p, dwr); } /** @@ -981,10 +981,10 @@ void Snd_DPR(peer *p) AAACreateAndAddAVPToMessage( dpr, AVP_Disconnect_Cause, AAA_AVP_FLAG_MANDATORY, 0, x, 4); - if(p->state == I_Open) - peer_send_msg(p, dpr); - else - peer_send_msg(p, dpr); + if(p->state == I_Open) { + LM_DBG("sending in state I_Open\n"); + } + peer_send_msg(p, dpr); } /**

1 0

[kamailio/kamailio] Memory leaks (Issue #3483)
by mengrj 14 Jun '23

14 Jun '23

Hello, we found many memory leaks while running kamailio-a2209018fb03d. The following is the bug report from Valgrind: ``` ==66== 10 bytes in 1 blocks are definitely lost in loss record 28 of 162 [65/169] ==66== at 0x483B7F3: malloc (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so) ==66== by 0x582196: yyparse (cfg.y:688) ==66== by 0x1488A5: main (main.c:2512) ==66== ==66== 24 bytes in 1 blocks are definitely lost in loss record 49 of 162 ==66== at 0x483B7F3: malloc (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so) ==66== by 0x58CAB3: yyparse (cfg.y:2181) ==66== by 0x1488A5: main (main.c:2512) ==66== ==66== 128 bytes in 1 blocks are definitely lost in loss record 93 of 162 ==66== at 0x483B7F3: malloc (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so) ==66== by 0x57580F: addstr (cfg.lex:1717) ==66== by 0x57108E: yylex (cfg.lex:1475) ==66== by 0x581BAC: yyparse (cfg.tab.c:5411) ==66== by 0x1488A5: main (main.c:2512) ==66== ==66== 204 bytes in 20 blocks are definitely lost in loss record 97 of 162 ==66== at 0x483B7F3: malloc (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so) ==66== by 0x4395D8: rval_get_str (rvalue.c:1319) ==66== by 0x59E79B: mod_f_params_pre_fixup (cfg.y:4321) ==66== by 0x599F41: yyparse (cfg.y:3769) ==66== by 0x1488A5: main (main.c:2512) ==66== ==66== 256 bytes in 2 blocks are definitely lost in loss record 113 of 162 ==66== at 0x483B7F3: malloc (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so) ==66== by 0x57580F: addstr (cfg.lex:1717) ==66== by 0x56F0B5: yylex (cfg.lex:1155) ==66== by 0x581BAC: yyparse (cfg.tab.c:5411) ==66== by 0x1488A5: main (main.c:2512) ==66== ==66== 401 bytes in 15 blocks are definitely lost in loss record 118 of 162 ==66== at 0x483B7F3: malloc (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so) ==66== by 0x285B99: ksr_locate_module (sr_module.c:457) ==66== by 0x28779F: ksr_load_module (sr_module.c:577) ==66== by 0x58A4E3: yyparse (cfg.y:2054) ==66== by 0x1488A5: main (main.c:2512) ==66== ==66== 512 bytes in 4 blocks are definitely lost in loss record 124 of 162 ==66== at 0x483B7F3: malloc (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so) ==66== by 0x57580F: addstr (cfg.lex:1717) ==66== by 0x56F266: yylex (cfg.lex:1173) ==66== by 0x581BAC: yyparse (cfg.tab.c:5411) ==66== by 0x1488A5: main (main.c:2512) ==66== ==66== 896 bytes in 7 blocks are definitely lost in loss record 129 of 162 ==66== at 0x483B7F3: malloc (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so) ==66== by 0x57580F: addstr (cfg.lex:1717) ==66== by 0x5703ED: yylex (cfg.lex:1376) ==66== by 0x581BAC: yyparse (cfg.tab.c:5411) ==66== by 0x1488A5: main (main.c:2512) ==66== ==66== 1,232 bytes in 1 blocks are possibly lost in loss record 132 of 162 ==66== at 0x483B7F3: malloc (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so) ==66== by 0x281E80: register_module (sr_module.c:264) ==66== by 0x28A20F: ksr_load_module (sr_module.c:673) ==66== by 0x58A4E3: yyparse (cfg.y:2054) ==66== by 0x1488A5: main (main.c:2512) ==66== 1,440 (928 direct, 512 indirect) bytes in 4 blocks are definitely lost in loss record 134 of 162 [6/169] ==66== at 0x483B7F3: malloc (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so) ==66== by 0x191C22: mk_action (route_struct.c:117) ==66== by 0x59A5F4: yyparse (cfg.y:3832) ==66== by 0x1488A5: main (main.c:2512) ==66== ==66== 3,864 bytes in 4 blocks are definitely lost in loss record 144 of 162 ==66== at 0x483B7F3: malloc (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so) ==66== by 0x281E80: register_module (sr_module.c:264) ==66== by 0x28A20F: ksr_load_module (sr_module.c:673) ==66== by 0x58A4E3: yyparse (cfg.y:2054) ==66== by 0x1488A5: main (main.c:2512) ==66== ==66== 5,215 (464 direct, 4,751 indirect) bytes in 2 blocks are definitely lost in loss record 149 of 162 ==66== at 0x483B7F3: malloc (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so) ==66== by 0x191C22: mk_action (route_struct.c:117) ==66== by 0x599723: yyparse (cfg.y:3753) ==66== by 0x1488A5: main (main.c:2512) ==66== ==66== 5,400 (64 direct, 5,336 indirect) bytes in 1 blocks are definitely lost in loss record 150 of 162 ==66== at 0x483B7F3: malloc (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so) ==66== by 0x59E378: mk_case_stm (cfg.y:4193) ==66== by 0x590762: yyparse (cfg.y:2840) ==66== by 0x1488A5: main (main.c:2512) ==66== ==66== 6,784 bytes in 53 blocks are definitely lost in loss record 151 of 162 ==66== at 0x483B7F3: malloc (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so) ==66== by 0x57580F: addstr (cfg.lex:1717) ==66== by 0x570B6A: yylex (cfg.lex:1444) ==66== by 0x581BAC: yyparse (cfg.tab.c:5411) ==66== by 0x1488A5: main (main.c:2512) ==66== ==66== 9,728 bytes in 76 blocks are definitely lost in loss record 152 of 162 ==66== at 0x483B7F3: malloc (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so) ==66== by 0x57580F: addstr (cfg.lex:1717) ==66== by 0x575754: addchar (cfg.lex:1701) ==66== by 0x56FBD6: yylex (cfg.lex:1299) ==66== by 0x581BAC: yyparse (cfg.tab.c:5411) ==66== by 0x1488A5: main (main.c:2512) ==66== ==66== 31,152 (464 direct, 30,688 indirect) bytes in 2 blocks are definitely lost in loss record 158 of 162 ==66== at 0x483B7F3: malloc (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so) ==66== by 0x191C22: mk_action (route_struct.c:117) ==66== by 0x5964F5: yyparse (cfg.y:3583) ==66== by 0x1488A5: main (main.c:2512) ==66== ==66== 95,727 (1,392 direct, 94,335 indirect) bytes in 6 blocks are definitely lost in loss record 161 of 162 ==66== at 0x483B7F3: malloc (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so) ==66== by 0x191C22: mk_action (route_struct.c:117) ==66== by 0x5903A5: yyparse (cfg.y:2791) ==66== by 0x1488A5: main (main.c:2512) ==66== ==66== LEAK SUMMARY: ==66== definitely lost: 26,119 bytes in 199 blocks ==66== indirectly lost: 135,622 bytes in 285 blocks ==66== possibly lost: 1,232 bytes in 1 blocks ==66== still reachable: 609,592 bytes in 186 blocks ==66== suppressed: 0 bytes in 0 blocks ==66== Reachable blocks (those to which a pointer was found) are not shown. ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3483 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3483(a)github.com>

2 2

git:master:57182dde: cdp: changed function export macro for better list building
by Daniel-Constantin Mierla 13 Jun '23

13 Jun '23

Module: kamailio Branch: master Commit: 57182ddeaba6244a904f3c9d530e2aa8bc652fbd URL: https://github.com/kamailio/kamailio/commit/57182ddeaba6244a904f3c9d530e2aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-13T14:27:02+02:00 cdp: changed function export macro for better list building - more readable exports formatting --- Modified: src/modules/cdp/cdp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/57182ddeaba6244a904f3c9d530e2aa… Patch: https://github.com/kamailio/kamailio/commit/57182ddeaba6244a904f3c9d530e2aa…

1 0

git:master:2f23b3cc: cdp_avp: aligned exports structures
by Daniel-Constantin Mierla 13 Jun '23

13 Jun '23

Module: kamailio Branch: master Commit: 2f23b3ccc2288e5d146aeac807935af24f5923b3 URL: https://github.com/kamailio/kamailio/commit/2f23b3ccc2288e5d146aeac807935af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-13T12:05:51+02:00 cdp_avp: aligned exports structures --- Modified: src/modules/cdp_avp/cdp_avp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2f23b3ccc2288e5d146aeac807935af… Patch: https://github.com/kamailio/kamailio/commit/2f23b3ccc2288e5d146aeac807935af…

1 0

build warnings on bookworm
by Juha Heinanen 13 Jun '23

13 Jun '23

Kamailio 5.7 build on Debian Bookworm gave me the following build warnings. The only curl related build dependency that I have is libcurl4-openssl-dev and the only openssl related build dependency is libssl-dev. -- Juha -------------------------------------- CC (gcc) [M http_client.so] functions.o functions.c: In function 'curL_request_url': functions.c:158:9: warning: 'CURLOPT_PROTOCOLS' is deprecated: since 7.85.0. Use CURLOPT_PROTOCOLS_STR [-Wdeprecated-declarations] 158 | res = curl_easy_setopt( | ^~~ In file included from http_client.h:36, from functions.c:45: /usr/include/x86_64-linux-gnu/curl/curl.h:1749:3: note: declared here 1749 | CURLOPTDEPRECATED(CURLOPT_PROTOCOLS, CURLOPTTYPE_LONG, 181, | ^~~~~~~~~~~~~~~~~ functions.c:160:9: warning: 'CURLOPT_REDIR_PROTOCOLS' is deprecated: since 7.85.0. Use CURLOPT_REDIR_PROTOCOLS_STR [-Wdeprecated-declarations] 160 | res = curl_easy_setopt( | ^~~ /usr/include/x86_64-linux-gnu/curl/curl.h:1755:3: note: declared here 1755 | CURLOPTDEPRECATED(CURLOPT_REDIR_PROTOCOLS, CURLOPTTYPE_LONG, 182, | ^~~~~~~~~~~~~~~~~ functions.c:387:17: warning: 'CURLINFO_SIZE_DOWNLOAD' is deprecated: since 7.55.0. Use CURLINFO_SIZE_DOWNLOAD_T [-Wdeprecated-declarations] 387 | curl_easy_getinfo(curl, CURLINFO_SIZE_DOWNLOAD, &download_size); | ^~~~~~~~~~~~~~~~~ /usr/include/x86_64-linux-gnu/curl/curl.h:2841:3: note: declared here 2841 | CURLINFO_SIZE_DOWNLOAD | ^~~~~~~~~~~~~~~~~~~~~~ CC (gcc) [M tls.so] tls_mod.o tls_mod.c: In function 'mod_child': tls_mod.c:455:25: warning: 'OPENSSL_fork_prepare' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 455 | OPENSSL_fork_prepare(); | ^~~~~~~~~~~~~~~~~~~~ In file included from /usr/include/openssl/comp.h:22, from /usr/include/openssl/ssl.h:28, from tls_init.h:30, from tls_mod.c:45: /usr/include/openssl/crypto.h:427:28: note: declared here 427 | OSSL_DEPRECATEDIN_3_0 void OPENSSL_fork_prepare(void); | ^~~~~~~~~~~~~~~~~~~~ tls_mod.c:467:25: warning: 'OPENSSL_fork_parent' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 467 | OPENSSL_fork_parent(); | ^~~~~~~~~~~~~~~~~~~ /usr/include/openssl/crypto.h:428:28: note: declared here 428 | OSSL_DEPRECATEDIN_3_0 void OPENSSL_fork_parent(void); | ^~~~~~~~~~~~~~~~~~~ tls_mod.c:471:25: warning: 'OPENSSL_fork_child' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 471 | OPENSSL_fork_child(); | ^~~~~~~~~~~~~~~~~~ /usr/include/openssl/crypto.h:429:28: note: declared here 429 | OSSL_DEPRECATEDIN_3_0 void OPENSSL_fork_child(void); | ^~~~~~~~~~~~~~~~~~ tls_mod.c: In function 'ksr_rand_engine_param': tls_mod.c:514:17: warning: 'RAND_set_rand_method' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 514 | RAND_set_rand_method(RAND_ksr_krand_method()); | ^~~~~~~~~~~~~~~~~~~~ In file included from tls_rand.h:26, from tls_mod.c:54: /usr/include/openssl/rand.h:49:27: note: declared here 49 | OSSL_DEPRECATEDIN_3_0 int RAND_set_rand_method(const RAND_METHOD *meth); | ^~~~~~~~~~~~~~~~~~~~ tls_mod.c:517:17: warning: 'RAND_set_rand_method' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 517 | RAND_set_rand_method(RAND_ksr_fastrand_method()); | ^~~~~~~~~~~~~~~~~~~~ /usr/include/openssl/rand.h:49:27: note: declared here 49 | OSSL_DEPRECATEDIN_3_0 int RAND_set_rand_method(const RAND_METHOD *meth); | ^~~~~~~~~~~~~~~~~~~~ tls_mod.c:520:17: warning: 'RAND_set_rand_method' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 520 | RAND_set_rand_method(RAND_ksr_cryptorand_method()); | ^~~~~~~~~~~~~~~~~~~~ /usr/include/openssl/rand.h:49:27: note: declared here 49 | OSSL_DEPRECATEDIN_3_0 int RAND_set_rand_method(const RAND_METHOD *meth); | ^~~~~~~~~~~~~~~~~~~~ tls_mod.c:523:17: warning: 'RAND_set_rand_method' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 523 | RAND_set_rand_method(RAND_ksr_kxlibssl_method()); | ^~~~~~~~~~~~~~~~~~~~ /usr/include/openssl/rand.h:49:27: note: declared here 49 | OSSL_DEPRECATEDIN_3_0 int RAND_set_rand_method(const RAND_METHOD *meth); | ^~~~~~~~~~~~~~~~~~~~ tls_mod.c: In function 'mod_register': tls_mod.c:674:9: warning: 'RAND_set_rand_method' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 674 | RAND_set_rand_method(RAND_ksr_cryptorand_method()); | ^~~~~~~~~~~~~~~~~~~~ /usr/include/openssl/rand.h:49:27: note: declared here 49 | OSSL_DEPRECATEDIN_3_0 int RAND_set_rand_method(const RAND_METHOD *meth); | ^~~~~~~~~~~~~~~~~~~~ tls_mod.c: In function 'tls_engine_init': tls_mod.c:708:9: warning: 'ENGINE_by_id' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 708 | e = ENGINE_by_id("dynamic"); | ^ In file included from tls_mod.c:153: /usr/include/openssl/engine.h:336:31: note: declared here 336 | OSSL_DEPRECATEDIN_3_0 ENGINE *ENGINE_by_id(const char *id); | ^~~~~~~~~~~~ tls_mod.c:727:9: warning: 'ENGINE_ctrl_cmd_string' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 727 | if (!ENGINE_ctrl_cmd_string(e, "SO_PATH", NCONF_get_string(config, engine_section, "dynamic_path"), 0)) { | ^~ /usr/include/openssl/engine.h:479:5: note: declared here 479 | int ENGINE_ctrl_cmd_string(ENGINE *e, const char *cmd_name, const char *arg, | ^~~~~~~~~~~~~~~~~~~~~~ tls_mod.c:731:9: warning: 'ENGINE_ctrl_cmd_string' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 731 | if (!ENGINE_ctrl_cmd_string(e, "ID", engine_id, 0)) { | ^~ /usr/include/openssl/engine.h:479:5: note: declared here 479 | int ENGINE_ctrl_cmd_string(ENGINE *e, const char *cmd_name, const char *arg, | ^~~~~~~~~~~~~~~~~~~~~~ tls_mod.c:735:9: warning: 'ENGINE_ctrl_cmd' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 735 | if (!ENGINE_ctrl_cmd(e, "LOAD", 1, NULL, NULL, 0)) { | ^~ /usr/include/openssl/engine.h:450:27: note: declared here 450 | OSSL_DEPRECATEDIN_3_0 int ENGINE_ctrl_cmd(ENGINE *e, const char *cmd_name, | ^~~~~~~~~~~~~~~ tls_mod.c:742:17: warning: 'ENGINE_ctrl_cmd_string' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 742 | if (!ENGINE_ctrl_cmd_string(e, confval->name, confval->value, 0)) { | ^~ /usr/include/openssl/engine.h:479:5: note: declared here 479 | int ENGINE_ctrl_cmd_string(ENGINE *e, const char *cmd_name, const char *arg, | ^~~~~~~~~~~~~~~~~~~~~~ tls_mod.c:748:9: warning: 'ENGINE_init' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 748 | if (!ENGINE_init(e)) { | ^~ /usr/include/openssl/engine.h:620:27: note: declared here 620 | OSSL_DEPRECATEDIN_3_0 int ENGINE_init(ENGINE *e); | ^~~~~~~~~~~ tls_mod.c:753:17: warning: 'ENGINE_set_default_string' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 753 | rc = ENGINE_set_default_string(e, tls_engine_settings.engine_algorithms.s); | ^~ /usr/include/openssl/engine.h:685:27: note: declared here 685 | OSSL_DEPRECATEDIN_3_0 int ENGINE_set_default_string(ENGINE *e, | ^~~~~~~~~~~~~~~~~~~~~~~~~ tls_mod.c:759:9: warning: 'ENGINE_free' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 759 | ENGINE_free(e); | ^~~~~~~~~~~ /usr/include/openssl/engine.h:493:27: note: declared here 493 | OSSL_DEPRECATEDIN_3_0 int ENGINE_free(ENGINE *e); | ^~~~~~~~~~~ tls_mod.c: In function 'tls_engine_private_key': tls_mod.c:768:9: warning: 'ENGINE_load_private_key' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 768 | return ENGINE_load_private_key(ksr_tls_engine, key_id, NULL, NULL); | ^~~~~~ /usr/include/openssl/engine.h:638:11: note: declared here 638 | EVP_PKEY *ENGINE_load_private_key(ENGINE *e, const char *key_id, | ^~~~~~~~~~~~~~~~~~~~~~~ CC (gcc) [M tls.so] tls_rand.o tls_rand.c: In function 'ksr_kxlibssl_init': tls_rand.c:197:17: warning: 'RAND_get_rand_method' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 197 | _ksr_kxlibssl_local_method = RAND_get_rand_method(); | ^~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from tls_rand.h:26, from tls_rand.c:30: /usr/include/openssl/rand.h:50:42: note: declared here 50 | OSSL_DEPRECATEDIN_3_0 const RAND_METHOD *RAND_get_rand_method(void); | ^~~~~~~~~~~~~~~~~~~~

1 0

git:master:1128df71: cdp: safety checks on error cleanup for diameter_peer_init_real()
by Daniel-Constantin Mierla 13 Jun '23

13 Jun '23

Module: kamailio Branch: master Commit: 1128df71dcba1cd97898c2970e7cd3221256adb1 URL: https://github.com/kamailio/kamailio/commit/1128df71dcba1cd97898c2970e7cd32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-13T09:45:13+02:00 cdp: safety checks on error cleanup for diameter_peer_init_real() --- Modified: src/modules/cdp/diameter_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/1128df71dcba1cd97898c2970e7cd32… Patch: https://github.com/kamailio/kamailio/commit/1128df71dcba1cd97898c2970e7cd32… --- diff --git a/src/modules/cdp/diameter_peer.c b/src/modules/cdp/diameter_peer.c index bea1d1f0717..294d8d640ea 100644 --- a/src/modules/cdp/diameter_peer.c +++ b/src/modules/cdp/diameter_peer.c @@ -151,7 +151,6 @@ int diameter_peer_init_real() if(!cdp_sessions_init(config->sessions_hash_size)) goto error; - /* add callback for messages - used to implement the API */ cb_add(api_callback, 0); @@ -162,16 +161,20 @@ int diameter_peer_init_real() shm_free(shutdownx); if(config) free_dp_config(config); - i = pid_list->head; - while(i) { - j = i->next; - shm_free(i); - i = j; + if(pid_list) { + i = pid_list->head; + while(i) { + j = i->next; + shm_free(i); + i = j; + } + shm_free(pid_list); + } + if(pid_list_lock) { + lock_get(pid_list_lock); + lock_destroy(pid_list_lock); + lock_dealloc((void *)pid_list_lock); } - shm_free(pid_list); - lock_get(pid_list_lock); - lock_destroy(pid_list_lock); - lock_dealloc((void *)pid_list_lock); return 0; }

1 0

git:master:759d7681: cdp: fix always true condition in peer_timer()
by Daniel-Constantin Mierla 13 Jun '23

13 Jun '23

Module: kamailio Branch: master Commit: 759d76819b7c8ab31d71ab8a77a3863c1861e374 URL: https://github.com/kamailio/kamailio/commit/759d76819b7c8ab31d71ab8a77a3863… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-13T09:45:13+02:00 cdp: fix always true condition in peer_timer() - extended the log message --- Modified: src/modules/cdp/peermanager.c --- Diff: https://github.com/kamailio/kamailio/commit/759d76819b7c8ab31d71ab8a77a3863… Patch: https://github.com/kamailio/kamailio/commit/759d76819b7c8ab31d71ab8a77a3863… --- diff --git a/src/modules/cdp/peermanager.c b/src/modules/cdp/peermanager.c index f1d9751c5a..e8f2de12df 100644 --- a/src/modules/cdp/peermanager.c +++ b/src/modules/cdp/peermanager.c @@ -286,9 +286,10 @@ int peer_timer(time_t now, void *ptr) lock_get(p->lock); n = p->next; - if(p->disabled && (p->state != Closed || p->state != Closing)) { - LM_DBG("Peer [%.*s] has been disabled - shutting down\n", - p->fqdn.len, p->fqdn.s); + if(p->disabled && p->state != Closed && p->state != Closing) { + LM_DBG("Peer [%.*s] has been disabled [state: %d] - shutting " + "down\n", + p->fqdn.len, p->fqdn.s, p->state); if(p->state == I_Open) sm_process(p, Stop, 0, 1, p->I_sock); if(p->state == R_Open)

1 0

git:master:10834bc7: cdp: log message when cleaning up inside auth_client_statefull_sm_process()
by Daniel-Constantin Mierla 13 Jun '23

13 Jun '23

Module: kamailio Branch: master Commit: 10834bc77188a8cbcc174429fee8f99d6e94752f URL: https://github.com/kamailio/kamailio/commit/10834bc77188a8cbcc174429fee8f99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-13T09:45:13+02:00 cdp: log message when cleaning up inside auth_client_statefull_sm_process() --- Modified: src/modules/cdp/authstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/10834bc77188a8cbcc174429fee8f99… Patch: https://github.com/kamailio/kamailio/commit/10834bc77188a8cbcc174429fee8f99… --- diff --git a/src/modules/cdp/authstatemachine.c b/src/modules/cdp/authstatemachine.c index 65157fabdfb..4a8d6f12ed9 100644 --- a/src/modules/cdp/authstatemachine.c +++ b/src/modules/cdp/authstatemachine.c @@ -353,9 +353,14 @@ int auth_client_statefull_sm_process( LM_DBG("In state AUTH_ST_PENDING and received " "AUTH_EV_RECV_ANS_UNSUCCESS - nothing to do but " "clean up session\n"); + cdp_session_cleanup(s, NULL); + s = 0; + break; case AUTH_EV_SESSION_TIMEOUT: case AUTH_EV_SERVICE_TERMINATED: case AUTH_EV_SESSION_GRACE_TIMEOUT: + LM_DBG("in state %d received event %d - clean up session", + x->state, event); cdp_session_cleanup(s, NULL); s = 0; break;

1 0

git:master:f1da698d: cdp: shortened log message for unkown type inside AAAConvertAVPToString()
by Daniel-Constantin Mierla 13 Jun '23

13 Jun '23

Module: kamailio Branch: master Commit: f1da698dd57b2cbe549f4b9083f66ebc336433c3 URL: https://github.com/kamailio/kamailio/commit/f1da698dd57b2cbe549f4b9083f66eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-13T09:45:13+02:00 cdp: shortened log message for unkown type inside AAAConvertAVPToString() --- Modified: src/modules/cdp/diameter_avp.c --- Diff: https://github.com/kamailio/kamailio/commit/f1da698dd57b2cbe549f4b9083f66eb… Patch: https://github.com/kamailio/kamailio/commit/f1da698dd57b2cbe549f4b9083f66eb… --- diff --git a/src/modules/cdp/diameter_avp.c b/src/modules/cdp/diameter_avp.c index 7d3530427e..d90829dbe6 100644 --- a/src/modules/cdp/diameter_avp.c +++ b/src/modules/cdp/diameter_avp.c @@ -500,11 +500,14 @@ char *AAAConvertAVPToString(AAA_AVP *avp, char *dest, unsigned int destLen) break; //case AAA_AVP_INTEGER64_TYPE: case AAA_AVP_TIME_TYPE: - default: - LM_WARN("AAAConvertAVPToString: don't know how to print" - " this data type [%d] -> tryng hexa\n", - avp->type); case AAA_AVP_DATA_TYPE: + /* print hexa values */ + for(i = 0; i < avp->data.len && l < destLen - 1; i++) + l += snprintf(dest + l, destLen - l - 1, "%x", + ((unsigned char *)avp->data.s)[i]); + break; + default: + LM_WARN("unknown avp data type [%d] -> printing hexa\n", avp->type); for(i = 0; i < avp->data.len && l < destLen - 1; i++) l += snprintf(dest + l, destLen - l - 1, "%x", ((unsigned char *)avp->data.s)[i]);

1 0

git:master:db31ddb5: cdp: remove unnecessary checks inside Send_ASR()
by Daniel-Constantin Mierla 13 Jun '23

13 Jun '23

Module: kamailio Branch: master Commit: db31ddb5d5af3d6add5c4aacb9da6cfede04bf04 URL: https://github.com/kamailio/kamailio/commit/db31ddb5d5af3d6add5c4aacb9da6cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-13T09:45:13+02:00 cdp: remove unnecessary checks inside Send_ASR() - updates to log messages --- Modified: src/modules/cdp/authstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/db31ddb5d5af3d6add5c4aacb9da6cf… Patch: https://github.com/kamailio/kamailio/commit/db31ddb5d5af3d6add5c4aacb9da6cf… --- diff --git a/src/modules/cdp/authstatemachine.c b/src/modules/cdp/authstatemachine.c index dcd56a4abf..65157fabdf 100644 --- a/src/modules/cdp/authstatemachine.c +++ b/src/modules/cdp/authstatemachine.c @@ -971,11 +971,12 @@ void Send_ASR(cdp_session_t *s, AAAMessage *msg) AAA_AVP *avp = 0; peer *p = 0; char x[4]; - LM_DBG("Send_ASR() : sending ASR\n"); + + LM_DBG("sending ASR\n"); asr = AAACreateRequest(s->application_id, IMS_ASR, Flag_Proxyable, s); if(!asr) { - LM_ERR("Send_ASR(): error creating ASR!\n"); + LM_ERR("error creating ASR!\n"); return; } @@ -992,14 +993,14 @@ void Send_ASR(cdp_session_t *s, AAAMessage *msg) p = get_routing_peer(s, asr); if(!p) { - LM_ERR("unable to get routing peer in Send_ASR \n"); - if(asr) - AAAFreeMessage(&asr); //needed in frequency + LM_ERR("unable to get routing peer\n"); + AAAFreeMessage(&asr); //needed in frequency } if(!peer_send_msg(p, asr)) { - if(asr) - AAAFreeMessage(&asr); //needed in frequency - } else + LM_ERR("unable to send message\n"); + AAAFreeMessage(&asr); //needed in frequency + } else { LM_DBG("success sending ASR\n"); + } }

1 0

[kamailio/kamailio] For Response to In-Dialog Invite the PVs $Ri $Rn etc are not getting updated. (Issue #3481)
by Harish S 13 Jun '23

13 Jun '23

For Response to In-Dialog Invite the PVs $Ri $Rn $Ri etc are not getting updated. But in case of initial invite and its responses these PVs are getting updated  in the reply_route[manage_reply] xlogs were taken and found the values of $Ri $Rn is same as the invite #### Reproduction  xlog for Indilaog invite 6(3739490) INFO: {1 1 INVITE 1800175371(a)xx.xxx.xx.xxx} <script>: ->tel:1111111 / tel:2222222 <- DIR: From Core external_soc 10.10.10.138 here external_soc is the $Rn and 10.10.10.138 is $Ri xlog for 200 OK 3(3739487) INFO: {2 1 INVITE 1800175371(a)xx.xxx.xx.xxx} <script>: ->tel:1111111 / tel:2222222 <- incoming reply==> 3(3739487) INFO: {2 1 INVITE 1800175371(a)xx.xxx.xx.xxx} <script>: ->tel:1111111 / tel:2222222 <- DIR: From Core external_soc 10.10.10.138  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` version: kamailio 5.6.1 (x86_64/linux) d8f98b-dirty 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_BLOCKLIST, 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: d8f98b -dirty compiled on 17:48:42 Sep 9 2022 with gcc 9.4.0 * **Operating System**:  ``` No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 20.04.2 LTS Release: 20.04 Codename: focal Linux a12f02s01 5.4.0-107-generic #121-Ubuntu SMP Thu Mar 24 16:04:27 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3481 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3481(a)github.com>

1 3

[kamailio/kamailio] fixed rabbitmq-c deprecation warning (PR #3465)
by sergey-safarov 12 Jun '23

12 Jun '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 - [x] Related to issue #3464 #### Description fixed rabbitmq-c deprecation warning You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3465 -- Commit Summary -- * kazoo: fixed rabbitmq-c deprecation warning * rabbitmq: fixed rabbitmq-c deprecation warning -- File Changes -- M src/modules/kazoo/Makefile (4) M src/modules/kazoo/kz_amqp.c (9) M src/modules/kazoo/kz_amqp.h (5) M src/modules/rabbitmq/Makefile (4) M src/modules/rabbitmq/rabbitmq.c (7) M src/modules/rabbitmq/utils.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3465.patch https://github.com/kamailio/kamailio/pull/3465.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3465 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3465(a)github.com>

2 3

git:master:6a19434d: modules: readme files regenerated - mqueue ... [skip ci]
by Kamailio Dev 12 Jun '23

12 Jun '23

Module: kamailio Branch: master Commit: 6a19434d4b93a8ec6e345b55ff1b83ff6bd38596 URL: https://github.com/kamailio/kamailio/commit/6a19434d4b93a8ec6e345b55ff1b83f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-06-12T18:16:32+02:00 modules: readme files regenerated - mqueue ... [skip ci] --- Modified: src/modules/mqueue/README --- Diff: https://github.com/kamailio/kamailio/commit/6a19434d4b93a8ec6e345b55ff1b83f… Patch: https://github.com/kamailio/kamailio/commit/6a19434d4b93a8ec6e345b55ff1b83f… --- diff --git a/src/modules/mqueue/README b/src/modules/mqueue/README index a8981a68aee..3db56e8f54b 100644 --- a/src/modules/mqueue/README +++ b/src/modules/mqueue/README @@ -176,12 +176,12 @@ val character varying(4096) DEFAULT "" NOT NULL + size: size of the queue. Specifies the maximum number of items in queue. If exceeded the oldest one is removed. If not set the queue will be limitless. - + dbmode: If set to 1, the content of the queue is written to - database table when the SIP server is stopped (i.e., ensure - persistency over restarts). If set to 2, it is written at - shutdown but not read at startup. If set to 3, it is read at - sartup but not written at shutdown. Default value is 0 (no db - table interaction). + + dbmode: If set to 1, the content of the queue is read from + database at startup and is written to database table when the + SIP server is stopped (i.e., ensure persistency over + restarts). If set to 2, it is read at startup but not written + at shutdown. If set to 3, it is written at shutdown but not + read at startup. Default value is 0 (no db table interaction). + addmode: how to add new (key,value) pairs. o 0: Will push all new (key,value) pairs at the end of the queue. (default)

1 0

git:master:23d43645: mqueue: fix documentation to match the code
by Ovidiu Sas 12 Jun '23

12 Jun '23

Module: kamailio Branch: master Commit: 23d43645332451ec1ec6dab11da777f9c3bfe304 URL: https://github.com/kamailio/kamailio/commit/23d43645332451ec1ec6dab11da777f… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2023-06-12T12:00:13-04:00 mqueue: fix documentation to match the code --- Modified: src/modules/mqueue/doc/mqueue_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/23d43645332451ec1ec6dab11da777f… Patch: https://github.com/kamailio/kamailio/commit/23d43645332451ec1ec6dab11da777f… --- diff --git a/src/modules/mqueue/doc/mqueue_admin.xml b/src/modules/mqueue/doc/mqueue_admin.xml index 750a54e7f45..ae3fa54f407 100644 --- a/src/modules/mqueue/doc/mqueue_admin.xml +++ b/src/modules/mqueue/doc/mqueue_admin.xml @@ -124,10 +124,11 @@ val character varying(4096) DEFAULT "" NOT NULL <listitem> <para> <emphasis>dbmode</emphasis>: If set to 1, the content of the queue + is read from database at startup and is written to database table when the SIP server is stopped (i.e., ensure persistency over restarts). - If set to 2, it is written at shutdown but not read at startup. - If set to 3, it is read at sartup but not written at shutdown. + If set to 2, it is read at startup but not written at shutdown. + If set to 3, it is written at shutdown but not read at startup. Default value is 0 (no db table interaction). </para> </listitem>

1 0

git:master:39f09877: cdp: check setsockopt() return code
by Daniel-Constantin Mierla 12 Jun '23

12 Jun '23

Module: kamailio Branch: master Commit: 39f09877e650d66e820ca7eb0d61416818d174fc URL: https://github.com/kamailio/kamailio/commit/39f09877e650d66e820ca7eb0d61416… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-12T17:16:53+02:00 cdp: check setsockopt() return code --- Modified: src/modules/cdp/tcp_accept.c --- Diff: https://github.com/kamailio/kamailio/commit/39f09877e650d66e820ca7eb0d61416… Patch: https://github.com/kamailio/kamailio/commit/39f09877e650d66e820ca7eb0d61416… --- diff --git a/src/modules/cdp/tcp_accept.c b/src/modules/cdp/tcp_accept.c index 968a245eb6a..43ff83c14a2 100644 --- a/src/modules/cdp/tcp_accept.c +++ b/src/modules/cdp/tcp_accept.c @@ -139,8 +139,11 @@ int create_socket( goto error; } option = 1; - setsockopt( - server_sock, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option)); + if(setsockopt(server_sock, SOL_SOCKET, SO_REUSEADDR, &option, + sizeof(option)) + < 0) { + LM_WARN("failed to set SO_REUSEADDR option for server socket\n"); + } if(bind(server_sock, ainfo->ai_addr, ainfo->ai_addrlen) == -1) { LM_ERR("create_socket(): error binding on %s port %s >"

1 0

git:master:fb19f0ea: auth_diameter: free req in some cases of errors
by Daniel-Constantin Mierla 12 Jun '23

12 Jun '23

Module: kamailio Branch: master Commit: fb19f0ea4c656afe7b60788efb8804e552fd37f9 URL: https://github.com/kamailio/kamailio/commit/fb19f0ea4c656afe7b60788efb8804e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-12T16:27:46+02:00 auth_diameter: free req in some cases of errors --- Modified: src/modules/auth_diameter/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/fb19f0ea4c656afe7b60788efb8804e… Patch: https://github.com/kamailio/kamailio/commit/fb19f0ea4c656afe7b60788efb8804e… --- diff --git a/src/modules/auth_diameter/authorize.c b/src/modules/auth_diameter/authorize.c index a3cc682b0c2..a15758754f6 100644 --- a/src/modules/auth_diameter/authorize.c +++ b/src/modules/auth_diameter/authorize.c @@ -255,12 +255,12 @@ int authorize(struct sip_msg *msg, pv_elem_t *realm, int hftype) /* * This function creates and submits diameter authentication request as per - * draft-srinivas-aaa-basic-digest-00.txt. + * draft-srinivas-aaa-basic-digest-00.txt. * Service type of the request is Authenticate-Only. * Returns: * 1 - success * -1 - error - * + * */ int diameter_authorize(struct hdr_field *hdr, str *p_method, sip_uri_t *uri, sip_uri_t *ruri, unsigned int m_id, rd_buf_t *rb) @@ -294,6 +294,7 @@ int diameter_authorize(struct hdr_field *hdr, str *p_method, sip_uri_t *uri, user_name.s = (char *)ad_malloc(user_name.len * sizeof(char)); if(!(user_name.s)) { PKG_MEM_ERROR; + AAAFreeMessage(&req); return -1; } memset(user_name.s, 0, user_name.len); @@ -417,6 +418,7 @@ int diameter_authorize(struct hdr_field *hdr, str *p_method, sip_uri_t *uri, user_name.s = (char *)ad_malloc(user_name.len * sizeof(char)); if(!(user_name.s)) { PKG_MEM_ERROR; + AAAFreeMessage(&req); return -1; } memset(user_name.s, 0, user_name.len);

1 0

git:master:f99b116e: dialplan: restructured condition on input and output params
by Daniel-Constantin Mierla 12 Jun '23

12 Jun '23

Module: kamailio Branch: master Commit: f99b116e876170709ad364ac2b8093969a939d4a URL: https://github.com/kamailio/kamailio/commit/f99b116e876170709ad364ac2b80939… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-12T15:53:38+02:00 dialplan: restructured condition on input and output params --- Modified: src/modules/dialplan/dialplan.c --- Diff: https://github.com/kamailio/kamailio/commit/f99b116e876170709ad364ac2b80939… Patch: https://github.com/kamailio/kamailio/commit/f99b116e876170709ad364ac2b80939… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index b7372769813..b5286d2b613 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -857,11 +857,14 @@ static int ki_dp_translate( return -1; } - if(input_spv == NULL && output_spv == NULL) { - pvs_i = pv_cache_get(&dp_default_param_s); + if(input_spv == NULL || input_spv->len <= 0) { pvs_o = pv_cache_get(&dp_default_param_s); } else { pvs_i = pv_cache_get(input_spv); + } + if(output_spv == NULL || output_spv->len <= 0) { + pvs_i = pv_cache_get(&dp_default_param_s); + } else { pvs_o = pv_cache_get(output_spv); }

1 0

[kamailio/kamailio] pdb: change log level for pdb query response time from LM_INFO to LM_DBG (PR #3296)
by mtryfoss 12 Jun '23

12 Jun '23

- using LM_INFO cause a lot of log events on a busy server with normal log level   #### 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Proposal to change log level of the query response time. If this is of interest, it should probably be monitored in some other metric and not flood the syslog. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3296 -- Commit Summary -- * pdb: change log level for pdb query response time from LM_INFO to LM_DBG -- File Changes -- M src/modules/pdb/pdb.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3296.patch https://github.com/kamailio/kamailio/pull/3296.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3296 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3296(a)github.com>

3 10

git:master:060a9605: modules: readme files regenerated - pdb ... [skip ci]
by Kamailio Dev 12 Jun '23

12 Jun '23

Module: kamailio Branch: master Commit: 060a96057309000592f126956cd343656a26ecba URL: https://github.com/kamailio/kamailio/commit/060a96057309000592f126956cd3436… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-06-12T14:01:24+02:00 modules: readme files regenerated - pdb ... [skip ci] --- Modified: src/modules/pdb/README --- Diff: https://github.com/kamailio/kamailio/commit/060a96057309000592f126956cd3436… Patch: https://github.com/kamailio/kamailio/commit/060a96057309000592f126956cd3436… --- diff --git a/src/modules/pdb/README b/src/modules/pdb/README index 60b329d8421..52ebab2e8ae 100644 --- a/src/modules/pdb/README +++ b/src/modules/pdb/README @@ -29,6 +29,7 @@ Pawel Kuzak 3.1. timeout (integer) 3.2. server (string) + 3.3. ll_info (int) 4. Functions @@ -44,10 +45,11 @@ Pawel Kuzak 1.1. Set timeout parameter 1.2. Set server parameter - 1.3. pdb_query usage - 1.4. pdb.status usage - 1.5. pdb.activate usage - 1.6. pdb.deactivate usage + 1.3. Set ll_info parameter + 1.4. pdb_query usage + 1.5. pdb.status usage + 1.6. pdb.activate usage + 1.7. pdb.deactivate usage Chapter 1. Admin Guide @@ -63,6 +65,7 @@ Chapter 1. Admin Guide 3.1. timeout (integer) 3.2. server (string) + 3.3. ll_info (int) 4. Functions @@ -113,6 +116,7 @@ Chapter 1. Admin Guide 3.1. timeout (integer) 3.2. server (string) + 3.3. ll_info (int) 3.1. timeout (integer) @@ -136,6 +140,19 @@ modparam("pdb", "timeout", 10) modparam("pdb", "server", "localhost:10001,host.name:10001,192.168.1.7:10002") ... +3.3. ll_info (int) + + Local log level (per module) for specific INFO messages. It has to be a + valid log level value (see xlog() function from xlog module for more + details). + + Default value is ��2��. + + Example 1.3. Set ll_info parameter +... +modparam("pdb", "ll_info", 3) +... + 4. Functions 4.1. pdb_query (string query, string dstavp) @@ -149,7 +166,7 @@ modparam("pdb", "server", "localhost:10001,host.name:10001,192.168.1.7:10002") a two byte integer value in network byte order. The integer value will be stored in the given AVP. - Example 1.3. pdb_query usage + Example 1.4. pdb_query usage ... # query external service for routing information if (!pdb_query("$rU", "$avp(i:82)")) @@ -169,7 +186,7 @@ cr_route("$avp(i:82)", "$rd", "$rU", "$rU", "call_id"); Prints the status of the module. This can either be "active" or "deactivated". - Example 1.4. pdb.status usage + Example 1.5. pdb.status usage ... kamcmd pdb.status ... @@ -178,7 +195,7 @@ kamcmd pdb.status Activates the module. This is the default after loading the module. - Example 1.5. pdb.activate usage + Example 1.6. pdb.activate usage ... kamcmd pdb.activate ... @@ -189,7 +206,7 @@ kamcmd pdb.activate activated again. As long as the module is deactivated, the pdb_query function will return -1. - Example 1.6. pdb.deactivate usage + Example 1.7. pdb.deactivate usage ... kamcmd pdb.deactivate ...

1 0

git:master:88d8c466: Makefile.modules: define MOD_NAMEID to module name without quotes
by Daniel-Constantin Mierla 12 Jun '23

12 Jun '23

Module: kamailio Branch: master Commit: 88d8c46603f6e45ba90c51b7c8d80acae7fb400a URL: https://github.com/kamailio/kamailio/commit/88d8c46603f6e45ba90c51b7c8d80ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-12T13:48:31+02:00 Makefile.modules: define MOD_NAMEID to module name without quotes --- Modified: src/Makefile.modules --- Diff: https://github.com/kamailio/kamailio/commit/88d8c46603f6e45ba90c51b7c8d80ac… Patch: https://github.com/kamailio/kamailio/commit/88d8c46603f6e45ba90c51b7c8d80ac… --- diff --git a/src/Makefile.modules b/src/Makefile.modules index 7c3722d03e1..3521d44a93d 100644 --- a/src/Makefile.modules +++ b/src/Makefile.modules @@ -58,7 +58,7 @@ override static_modules_path= # INCLUDES += -I$(COREPATH) # temporary def (visible only in the module, not exported) -DEFS += -DMOD_NAME='"$(MOD_NAME)"' +DEFS += -DMOD_NAME='"$(MOD_NAME)"' -DMOD_NAMEID='$(MOD_NAME)' ifneq ($(makefile_defs_included),1)

1 0

git:master:7d7e6dfc: pdb: docs for ll_info mod param
by Daniel-Constantin Mierla 12 Jun '23

12 Jun '23

Module: kamailio Branch: master Commit: 7d7e6dfcdaf21cae4b98ca5520e667b4f8f09145 URL: https://github.com/kamailio/kamailio/commit/7d7e6dfcdaf21cae4b98ca5520e667b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-12T13:54:34+02:00 pdb: docs for ll_info mod param --- Modified: src/modules/pdb/doc/pdb_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7d7e6dfcdaf21cae4b98ca5520e667b… Patch: https://github.com/kamailio/kamailio/commit/7d7e6dfcdaf21cae4b98ca5520e667b… --- diff --git a/src/modules/pdb/doc/pdb_admin.xml b/src/modules/pdb/doc/pdb_admin.xml index da2ecb3a01e..19b00bd99d8 100644 --- a/src/modules/pdb/doc/pdb_admin.xml +++ b/src/modules/pdb/doc/pdb_admin.xml @@ -94,6 +94,27 @@ modparam("pdb", "timeout", 10) <programlisting format="linespecific"> ... modparam("pdb", "server", "localhost:10001,host.name:10001,192.168.1.7:10002") +... + </programlisting> + </example> + </section> + <section> + <title><varname>ll_info</varname> (int)</title> + <para> + Local log level (per module) for specific INFO messages. It has to + be a valid log level value (see xlog() function from xlog module for + more details). + </para> + <para> + <emphasis> + Default value is <quote>2</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>ll_info</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("pdb", "ll_info", 3) ... </programlisting> </example>

1 0

git:master:03203d1b: core: new log macros allowing to use local log levels per module
by Daniel-Constantin Mierla 12 Jun '23

12 Jun '23

Module: kamailio Branch: master Commit: 03203d1baa5f185db8743a90f889e5483e90e911 URL: https://github.com/kamailio/kamailio/commit/03203d1baa5f185db8743a90f889e54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-12T13:43:31+02:00 core: new log macros allowing to use local log levels per module - a variable has to be defined inside module like: ksr_loglevels_t _ksr_loglevels_MODNAME = KSR_LOGLEVELS_DEFAULTS; - for example, for pdb module: ksr_loglevels_t _ksr_loglevels_pdb = KSR_LOGLEVELS_DEFAULTS; - then use LLM_XYZ() macro instead of LM_XYZ() - for example, use LLM_INFO() instead of LM_INFO() --- Modified: src/core/dprint.h --- Diff: https://github.com/kamailio/kamailio/commit/03203d1baa5f185db8743a90f889e54… Patch: https://github.com/kamailio/kamailio/commit/03203d1baa5f185db8743a90f889e54… --- diff --git a/src/core/dprint.h b/src/core/dprint.h index 993a6ebb826..13957b269c9 100644 --- a/src/core/dprint.h +++ b/src/core/dprint.h @@ -109,6 +109,22 @@ #define LOG2SYSLOG_LEVEL(level) \ (log_level_info[(level) - (L_ALERT)].syslog_level) +/** + * + */ +typedef struct ksr_loglevels { + int ll_alert; + int ll_bug; + int ll_crit; + int ll_err; + int ll_warn; + int ll_notice; + int ll_info; + int ll_dbg; +} ksr_loglevels_t; + +#define KSR_LOGLEVELS_DEFAULTS {L_ALERT, L_BUG, L_CRIT2, L_ERR, L_WARN, \ + L_NOTICE, L_INFO, L_DBG} /** * data fileds used for structured logging */ @@ -406,6 +422,21 @@ void log_prefix_init(void); /* obsolete, do not use */ #define DEBUG(...) DBG(__VA_ARGS__) +/* use local log level mapping (not implemented for sun) */ +#define LLM_ALERT(...) LOG(L_ALERT, __VA_ARGS__) +#define LLM_BUG(...) LOG(L_BUG, __VA_ARGS__) +#define LLM_ERR(...) LOG(L_ERR, __VA_ARGS__) +#define LLM_WARN(...) LOG(L_WARN, __VA_ARGS__) +#define LLM_NOTICE(...) LOG(L_NOTICE, __VA_ARGS__) +#define LLM_INFO(...) LOG(L_INFO, __VA_ARGS__) +#define LLM_CRIT(...) LOG(L_CRIT2, __VA_ARGS__) + +#ifdef NO_DEBUG +#define LLM_DBG(...) +#else +#define LLM_DBG(...) LOG(L_DBG, __VA_ARGS__) +#endif + #else /* ! __SUNPRO_C */ #define NPRL(fmt, args...) LOG(L_NPRL, fmt, ##args) #define ALERT(fmt, args...) LOG(L_ALERT, fmt, ##args) @@ -425,6 +456,29 @@ void log_prefix_init(void); /* obsolete, do not use */ #define DEBUG(fmt, args...) DBG(fmt, ##args) +#ifdef MOD_NAMEID + +#define KSR_LLMODVAR_COMBINEZ(X,Y) X##Y +#define KSR_LLMODVAR_COMBINE(X,Y) KSR_LLMODVAR_COMBINEZ(X,Y) +#define KSR_LLMODVAR KSR_LLMODVAR_COMBINE(_ksr_loglevels_,MOD_NAMEID) + +/* use local log level mapping */ +#define LLM_ALERT(fmt, args...) LOG(KSR_LLMODVAR.alert, fmt, ##args) +#define LLM_BUG(fmt, args...) LOG(KSR_LLMODVAR.buf, fmt, ##args) +#define LLM_ERR(fmt, args...) LOG(KSR_LLMODVAR.bug, fmt, ##args) +#define LLM_WARN(fmt, args...) LOG(KSR_LLMODVAR.warn, fmt, ##args) +#define LLM_NOTICE(fmt, args...) LOG(KSR_LLMODVAR.notice, fmt, ##args) +#define LLM_INFO(fmt, args...) LOG(KSR_LLMODVAR.ll_info, fmt, ##args) +#define LLM_CRIT(fmt, args...) LOG(KSR_LLMODVAR.crit, fmt, ##args) + +#ifdef NO_DEBUG +#define LLM_DBG(fmt, args...) +#else +#define LLM_DBG(fmt, args...) LOG(KSR_LLMODVAR.ll_dbg, fmt, ##args) +#endif + +#endif /* MOD_NAMEID */ + #endif /* __SUNPRO_C */

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev