- sr-dev - kamailio.org

git:master:e535cc5e: tls: fix OpenSSL 1.1.1 engine keys
by S-P Chan 29 Feb '24

29 Feb '24

Module: kamailio Branch: master Commit: e535cc5eb2d81a67d00931bb53328953ec8ef492 URL: https://github.com/kamailio/kamailio/commit/e535cc5eb2d81a67d00931bb5332895… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-29T19:01:14+08:00 tls: fix OpenSSL 1.1.1 engine keys --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e535cc5eb2d81a67d00931bb5332895… Patch: https://github.com/kamailio/kamailio/commit/e535cc5eb2d81a67d00931bb5332895… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 550a1bcc2b5..322be20bd8e 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -728,6 +728,7 @@ static int tls_engine_init() * We are in the child process and the global engine linked-list * is initialized in the parent. */ + ENGINE_load_builtin_engines(); e = ENGINE_by_id("dynamic"); if(!e) { err = "Error loading dynamic engine";

1 0

git:5.8:f53c6b49: tls: fix OpenSSL 1.1.1 engine keys
by S-P Chan 29 Feb '24

29 Feb '24

Module: kamailio Branch: 5.8 Commit: f53c6b49e158203ba0783ec6a6fbadd76c5fdde9 URL: https://github.com/kamailio/kamailio/commit/f53c6b49e158203ba0783ec6a6fbadd… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-29T19:02:03+08:00 tls: fix OpenSSL 1.1.1 engine keys Cherry-pick from e535cc5eb2 --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f53c6b49e158203ba0783ec6a6fbadd… Patch: https://github.com/kamailio/kamailio/commit/f53c6b49e158203ba0783ec6a6fbadd… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 550a1bcc2b5..322be20bd8e 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -728,6 +728,7 @@ static int tls_engine_init() * We are in the child process and the global engine linked-list * is initialized in the parent. */ + ENGINE_load_builtin_engines(); e = ENGINE_by_id("dynamic"); if(!e) { err = "Error loading dynamic engine";

1 0

[kamailio/kamailio] Fixes related to contact updation and searching in P-CSCF modules (PR #3771)
by Supreeth Herle 28 Feb '24

28 Feb '24

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3771 -- Commit Summary -- * ims_usrloc: make matching of username in contact conditional * ims_registrar_pcscf: update registered state to pending registration if contact exists -- File Changes -- M src/modules/ims_registrar_pcscf/save.c (11) M src/modules/ims_usrloc_pcscf/udomain.c (58) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3771.patch https://github.com/kamailio/kamailio/pull/3771.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3771 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3771(a)github.com>

2 2

git:master:4fb8accc: ims_registrar_pcscf: update registered state to pending registration if contact exists
by Daniel-Constantin Mierla 28 Feb '24

28 Feb '24

Module: kamailio Branch: master Commit: 4fb8accc6747ad56fec3dc84d70cb2b8bbd7316e URL: https://github.com/kamailio/kamailio/commit/4fb8accc6747ad56fec3dc84d70cb2b… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-28T17:24:15+01:00 ims_registrar_pcscf: update registered state to pending registration if contact exists --- Modified: src/modules/ims_registrar_pcscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/4fb8accc6747ad56fec3dc84d70cb2b… Patch: https://github.com/kamailio/kamailio/commit/4fb8accc6747ad56fec3dc84d70cb2b… --- diff --git a/src/modules/ims_registrar_pcscf/save.c b/src/modules/ims_registrar_pcscf/save.c index 7e425230d0d..679abc99ca5 100644 --- a/src/modules/ims_registrar_pcscf/save.c +++ b/src/modules/ims_registrar_pcscf/save.c @@ -477,8 +477,15 @@ int save_pending(struct sip_msg *_m, udomain_t *_d) ul.unlock_udomain(_d, &ci.via_host, ci.via_port, ci.via_prot); return -2; } - } else { - LM_DBG("Contact already exists - not doing anything for now\n"); + } else if(pcontact->reg_state == PCONTACT_DEREG_PENDING_PUBLISH) { + LM_DBG("Contact already exists - Updating contact [%.*s]: setting " + "state to PCONTACT_REG_PENDING\n", + pcontact->aor.len, pcontact->aor.s); + + memset(&ci_, 0, sizeof(struct pcontact_info)); + ci_.reg_state = PCONTACT_REG_PENDING; + ci_.num_service_routes = 0; + ul.update_pcontact(_d, &ci_, pcontact); } }

1 0

git:master:17bdbd34: ims_usrloc: make matching of username in contact conditional
by Daniel-Constantin Mierla 28 Feb '24

28 Feb '24

Module: kamailio Branch: master Commit: 17bdbd34b1038de936f14c1a41ce55f571e6402a URL: https://github.com/kamailio/kamailio/commit/17bdbd34b1038de936f14c1a41ce55f… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-28T17:24:15+01:00 ims_usrloc: make matching of username in contact conditional --- Modified: src/modules/ims_usrloc_pcscf/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/17bdbd34b1038de936f14c1a41ce55f… Patch: https://github.com/kamailio/kamailio/commit/17bdbd34b1038de936f14c1a41ce55f… --- diff --git a/src/modules/ims_usrloc_pcscf/udomain.c b/src/modules/ims_usrloc_pcscf/udomain.c index 0d7c14390ac..3c754a6f17f 100644 --- a/src/modules/ims_usrloc_pcscf/udomain.c +++ b/src/modules/ims_usrloc_pcscf/udomain.c @@ -616,32 +616,40 @@ int get_pcontact_from_cache(udomain_t *_d, pcontact_info_t *contact_info, continue; } } - if((contact_info->aor.len > 0) && (needle_uri.user.len != 0)) { - if((needle_uri.user.len != c->contact_user.len) - || (memcmp(needle_uri.user.s, c->contact_user.s, - needle_uri.user.len) - != 0)) { - LM_ERR("user name does not match - no match here...\n"); - LM_DBG("found pcontact username [%d]: [%.*s]\n", i, - c->contact_user.len, c->contact_user.s); - LM_DBG("incoming contact username: [%.*s]\n", - needle_uri.user.len, needle_uri.user.s); - c = c->next; - continue; - } - if((contact_info->aor.len >= 4) - && (memcmp(contact_info->aor.s, c->aor.s, 4) - != 0)) { // do not mix up sip- and tel-URIs. - LM_ERR("scheme does not match - no match here...\n"); - LM_DBG("found pcontact scheme [%d]: [%.*s]\n", i, 4, - c->aor.s); - LM_DBG("incoming contact scheme: [%.*s]\n", 4, - contact_info->aor.s); - c = c->next; - continue; + + // perform full contact match + if(match_contact_host_port == 0) { + if((contact_info->aor.len > 0) + && (needle_uri.user.len != 0)) { + if((needle_uri.user.len != c->contact_user.len) + || (memcmp(needle_uri.user.s, c->contact_user.s, + needle_uri.user.len) + != 0)) { + LM_ERR("user name does not match - no match " + "here...\n"); + LM_DBG("found pcontact username [%d]: [%.*s]\n", i, + c->contact_user.len, c->contact_user.s); + LM_DBG("incoming contact username: [%.*s]\n", + needle_uri.user.len, needle_uri.user.s); + c = c->next; + continue; + } + if((contact_info->aor.len >= 4) + && (memcmp(contact_info->aor.s, c->aor.s, 4) + != 0)) { // do not mix up sip- and tel-URIs. + LM_ERR("scheme does not match - no match " + "here...\n"); + LM_DBG("found pcontact scheme [%d]: [%.*s]\n", i, 4, + c->aor.s); + LM_DBG("incoming contact scheme: [%.*s]\n", 4, + contact_info->aor.s); + c = c->next; + continue; + } + } else { + LM_DBG("No user name present - abort user name " + "check\n"); } - } else { - LM_DBG("No user name present - abort user name check\n"); }

1 0

git:5.8:59ab5855: file_out: Fix leaks
by Xenofon Karamanos 28 Feb '24

28 Feb '24

Module: kamailio Branch: 5.8 Commit: 59ab58551e5895b710893985d0072c8c510c672c URL: https://github.com/kamailio/kamailio/commit/59ab58551e5895b710893985d0072c8… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-02-27T14:25:32Z file_out: Fix leaks (cherry picked from commit 8af509ae280b2ef155f1946acac5a7d977bb5c14) --- Modified: src/modules/file_out/file_out.c Modified: src/modules/file_out/types.c --- Diff: https://github.com/kamailio/kamailio/commit/59ab58551e5895b710893985d0072c8… Patch: https://github.com/kamailio/kamailio/commit/59ab58551e5895b710893985d0072c8… --- diff --git a/src/modules/file_out/file_out.c b/src/modules/file_out/file_out.c index 832420f0276..ad055f1852c 100644 --- a/src/modules/file_out/file_out.c +++ b/src/modules/file_out/file_out.c @@ -250,6 +250,14 @@ static void fo_log_writer_process(int rank) LM_ERR("Failed to flush file with err {%s}\n", strerror(errno)); } + if(log_message.prefix != NULL) { + if(log_message.prefix->s != NULL) { + shm_free(log_message.prefix->s); + } + shm_free(log_message.prefix); + log_message.prefix = NULL; + } + if(log_message.message != NULL) { if(log_message.message->s != NULL) { shm_free(log_message.message->s); diff --git a/src/modules/file_out/types.c b/src/modules/file_out/types.c index e2c93b4f502..6dedfd201e1 100644 --- a/src/modules/file_out/types.c +++ b/src/modules/file_out/types.c @@ -132,7 +132,19 @@ void fo_free_queue(fo_queue_t *q) { fo_log_message_t data; while(fo_dequeue(q, &data) > 0) { - shm_free(data.message); + if(data.prefix != NULL) { + if(data.prefix->s != NULL) { + shm_free(data.prefix->s); + } + shm_free(data.prefix); + } + + if(data.message != NULL) { + if(data.message->s != NULL) { + shm_free(data.message->s); + } + shm_free(data.message); + } } shm_free(q); }

1 0

git:5.8:6721fb7a: file_out: Add header guards
by Xenofon Karamanos 28 Feb '24

28 Feb '24

Module: kamailio Branch: 5.8 Commit: 6721fb7aae373d42c4059a630fc79815d2f709b7 URL: https://github.com/kamailio/kamailio/commit/6721fb7aae373d42c4059a630fc7981… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-02-27T14:25:16Z file_out: Add header guards (cherry picked from commit 967fb30b14fb63bcb396956f9e9ed0ca92028682) --- Modified: src/modules/file_out/types.h --- Diff: https://github.com/kamailio/kamailio/commit/6721fb7aae373d42c4059a630fc7981… Patch: https://github.com/kamailio/kamailio/commit/6721fb7aae373d42c4059a630fc7981… --- diff --git a/src/modules/file_out/types.h b/src/modules/file_out/types.h index 782a6bcb31d..641da360dad 100644 --- a/src/modules/file_out/types.h +++ b/src/modules/file_out/types.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef _FO_TYPES_H +#define _FO_TYPES_H + #include "../../core/locking.h" #include "../../core/pvar.h" @@ -61,3 +64,5 @@ typedef struct fo_file_properties } fo_file_properties_t; int fo_file_properties_destroy(fo_file_properties_t *fp); + +#endif

1 0

[kamailio/kamailio] Library libjson-c-dev 0.15.2 not compatible with pua_json module (Issue #3376)
by Henning Westerholt 28 Feb '24

28 Feb '24

There seems to be an incompatibility in the pua_json module related to the libjson-c-dev" version. The module crashes on startup on version 0.15.2 (e.g. from Debian bullseye). It works with version 0.12 (e.g. Debian buster). Backtrace below: ``` #0 __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:50 #1 0x00007f6d265e5537 in __GI_abort () at abort.c:79 #2 0x00007f6d265e540f in __assert_fail_base (fmt=0x7f6d2675d6a8 "%s%s%s:%u: %s%sAssertion `%s' failed.\n%n", assertion=0x7f6d2322c091 "jso->_ref_count > 0", file=0x7f6d2322c064 "./json_object.c", line=308, function=<optimized out>) at assert.c:92 #3 0x00007f6d265f4662 in __GI___assert_fail (assertion=0x7f6d2322c091 "jso->_ref_count > 0", file=0x7f6d2322c064 "./json_object.c", line=308, function=0x7f6d2322c480 "json_object_put") at assert.c:101 #4 0x00007f6d23224732 in json_object_put () from /lib/x86_64-linux-gnu/libjson-c.so.5 #5 0x00007f6d25842362 in pua_json_publish (msg=0x7fffb3fffb20, json=0x7f6d25ff5778 "{\"Call-ID\":\"111\",\"Event-Category\":\"presence\",\"Event-Name\":\"update\",\"Event-Package\":\"message-summary\",\"Expires\":\"3600\",\"To\":\"sip:103@XXX.YYY.55.208\",\"To-User\":\"103\",\"To-Realm\":\"XXX.YYY.55.208\",\"From\":\""...) at pua_json_publish.c:383 #6 0x00007f6d2583e74a in w_pua_json_publish (msg=0x7fffb3fffb20, p1pjson=0x7f6d25ff5988 "xW\377%m\177", p2=0x0) at pua_json_mod.c:100 #7 0x0000563199d1c47e in do_action () #8 0x0000563199d29ae6 in run_actions () #9 0x00007f6d2324444e in ?? () from /usr/lib/x86_64-linux-gnu/kamailio/modules/xhttp.so #10 0x00007f6d23246005 in ?? () from /usr/lib/x86_64-linux-gnu/kamailio/modules/xhttp.so #11 0x0000563199e6cb10 in nonsip_msg_run_hooks () #12 0x0000563199ede538 in receive_msg () #13 0x0000563199cac4f2 in receive_tcp_msg () #14 0x0000563199caeb51 in tcp_read_req () #15 0x0000563199cb2028 in ?? () #16 0x0000563199c9da4f in ?? () #17 0x0000563199cb4f8c in tcp_receive_loop () #18 0x0000563199e2330b in tcp_init_children () #19 0x0000563199c8967f in main_loop () #20 0x0000563199c9446e in main () ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3376 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3376(a)github.com>

3 11

git:master:8af509ae: file_out: Fix leaks
by Xenofon Karamanos 27 Feb '24

27 Feb '24

Module: kamailio Branch: master Commit: 8af509ae280b2ef155f1946acac5a7d977bb5c14 URL: https://github.com/kamailio/kamailio/commit/8af509ae280b2ef155f1946acac5a7d… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-02-27T15:18:57+02:00 file_out: Fix leaks --- Modified: src/modules/file_out/file_out.c Modified: src/modules/file_out/types.c --- Diff: https://github.com/kamailio/kamailio/commit/8af509ae280b2ef155f1946acac5a7d… Patch: https://github.com/kamailio/kamailio/commit/8af509ae280b2ef155f1946acac5a7d… --- diff --git a/src/modules/file_out/file_out.c b/src/modules/file_out/file_out.c index 832420f0276..ad055f1852c 100644 --- a/src/modules/file_out/file_out.c +++ b/src/modules/file_out/file_out.c @@ -250,6 +250,14 @@ static void fo_log_writer_process(int rank) LM_ERR("Failed to flush file with err {%s}\n", strerror(errno)); } + if(log_message.prefix != NULL) { + if(log_message.prefix->s != NULL) { + shm_free(log_message.prefix->s); + } + shm_free(log_message.prefix); + log_message.prefix = NULL; + } + if(log_message.message != NULL) { if(log_message.message->s != NULL) { shm_free(log_message.message->s); diff --git a/src/modules/file_out/types.c b/src/modules/file_out/types.c index e2c93b4f502..6dedfd201e1 100644 --- a/src/modules/file_out/types.c +++ b/src/modules/file_out/types.c @@ -132,7 +132,19 @@ void fo_free_queue(fo_queue_t *q) { fo_log_message_t data; while(fo_dequeue(q, &data) > 0) { - shm_free(data.message); + if(data.prefix != NULL) { + if(data.prefix->s != NULL) { + shm_free(data.prefix->s); + } + shm_free(data.prefix); + } + + if(data.message != NULL) { + if(data.message->s != NULL) { + shm_free(data.message->s); + } + shm_free(data.message); + } } shm_free(q); }

1 0

git:master:967fb30b: file_out: Add header guards
by Xenofon Karamanos 27 Feb '24

27 Feb '24

Module: kamailio Branch: master Commit: 967fb30b14fb63bcb396956f9e9ed0ca92028682 URL: https://github.com/kamailio/kamailio/commit/967fb30b14fb63bcb396956f9e9ed0c… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-02-27T15:18:57+02:00 file_out: Add header guards --- Modified: src/modules/file_out/types.h --- Diff: https://github.com/kamailio/kamailio/commit/967fb30b14fb63bcb396956f9e9ed0c… Patch: https://github.com/kamailio/kamailio/commit/967fb30b14fb63bcb396956f9e9ed0c… --- diff --git a/src/modules/file_out/types.h b/src/modules/file_out/types.h index 782a6bcb31d..641da360dad 100644 --- a/src/modules/file_out/types.h +++ b/src/modules/file_out/types.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef _FO_TYPES_H +#define _FO_TYPES_H + #include "../../core/locking.h" #include "../../core/pvar.h" @@ -61,3 +64,5 @@ typedef struct fo_file_properties } fo_file_properties_t; int fo_file_properties_destroy(fo_file_properties_t *fp); + +#endif

1 0

[kamailio/kamailio] file_out: Free allocated memory (PR #3770)
by Xenofon Karamanos 27 Feb '24

27 Feb '24

#### 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  This PR free allocated memory and add heder guards. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3770 -- Commit Summary -- * file_out: Add header guards * file_out: Fix leaks -- File Changes -- M src/modules/file_out/file_out.c (8) M src/modules/file_out/types.c (14) M src/modules/file_out/types.h (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3770.patch https://github.com/kamailio/kamailio/pull/3770.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3770 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3770(a)github.com>

1 1

[kamailio/kamailio] Hello I am Facing issue while Installing Kamilio from Herulspreet brach. It is showing multiple definitions under CDP module. (Issue #3769)
by Shailesh192 27 Feb '24

27 Feb '24

### Description  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3769 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3769(a)github.com>

2 2

git:master:c3d75388: tcpops: if connection not found, return attributes from sip msg rcv
by Daniel-Constantin Mierla 27 Feb '24

27 Feb '24

Module: kamailio Branch: master Commit: c3d753885b3cd1bc0cb9f46986e5798dfb5f6552 URL: https://github.com/kamailio/kamailio/commit/c3d753885b3cd1bc0cb9f46986e5798… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-27T09:50:05+01:00 tcpops: if connection not found, return attributes from sip msg rcv --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c3d753885b3cd1bc0cb9f46986e5798… Patch: https://github.com/kamailio/kamailio/commit/c3d753885b3cd1bc0cb9f46986e5798… --- diff --git a/src/modules/tcpops/tcpops_mod.c b/src/modules/tcpops/tcpops_mod.c index 15e39993d64..aad29665d72 100644 --- a/src/modules/tcpops/tcpops_mod.c +++ b/src/modules/tcpops/tcpops_mod.c @@ -762,41 +762,50 @@ static int pv_get_tcp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return -1; } + con = tcpconn_get(msg->rcv.proto_reserved1, 0, 0, 0, 0); switch(param->pvn.u.isname.name.n) { - case 1: - sval.s = ip_addr2a(&msg->rcv.src_ip); + case 1: /* c_si */ + if(con == NULL) { + sval.s = ip_addr2a(&msg->rcv.src_ip); + sval.len = strlen(sval.s); + return pv_get_strval(msg, param, res, &sval); + } + sval.s = ip_addr2a(&con->cinfo.src_ip); + tcpconn_put(con); sval.len = strlen(sval.s); return pv_get_strval(msg, param, res, &sval); - case 2: - ival = msg->rcv.src_port; + case 2: /* c_sp */ + if(con == NULL) { + ival = msg->rcv.src_port; + return pv_get_sintval(msg, param, res, ival); + } + ival = con->cinfo.src_port; + tcpconn_put(con); return pv_get_sintval(msg, param, res, ival); - case 3: - if((con = tcpconn_get(msg->rcv.proto_reserved1, 0, 0, 0, 0)) - == NULL) { + case 3: /* ac_si */ + if(con == NULL) { return pv_get_null(msg, param, res); } sval.s = ip_addr2a(&con->cinfo.src_ip); tcpconn_put(con); sval.len = strlen(sval.s); return pv_get_strval(msg, param, res, &sval); - case 4: - if((con = tcpconn_get(msg->rcv.proto_reserved1, 0, 0, 0, 0)) - == NULL) { + case 4: /* ac_sp */ + if(con == NULL) { return pv_get_null(msg, param, res); } ival = con->cinfo.src_port; tcpconn_put(con); return pv_get_sintval(msg, param, res, ival); - case 5: - if((con = tcpconn_get(msg->rcv.proto_reserved1, 0, 0, 0, 0)) - == NULL) { + case 5: /* aconid */ + if(con == NULL) { return pv_get_null(msg, param, res); } ival = con->id; tcpconn_put(con); return pv_get_sintval(msg, param, res, ival); - default: + default: /* conid */ return pv_get_sintval(msg, param, res, msg->rcv.proto_reserved1); } }

1 0

git:master:59230a07: tcpops: variables to get active connection attributes
by Daniel-Constantin Mierla 27 Feb '24

27 Feb '24

Module: kamailio Branch: master Commit: 59230a07b8c6a79c4a574890bae775c3d166c471 URL: https://github.com/kamailio/kamailio/commit/59230a07b8c6a79c4a574890bae775c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-27T07:58:14+01:00 tcpops: variables to get active connection attributes --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/59230a07b8c6a79c4a574890bae775c… Patch: https://github.com/kamailio/kamailio/commit/59230a07b8c6a79c4a574890bae775c… --- diff --git a/src/modules/tcpops/tcpops_mod.c b/src/modules/tcpops/tcpops_mod.c index d8953c4345f..15e39993d64 100644 --- a/src/modules/tcpops/tcpops_mod.c +++ b/src/modules/tcpops/tcpops_mod.c @@ -762,24 +762,42 @@ static int pv_get_tcp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return -1; } - if((con = tcpconn_get(msg->rcv.proto_reserved1, 0, 0, 0, 0)) == NULL) { - return pv_get_null(msg, param, res); - } switch(param->pvn.u.isname.name.n) { case 1: + sval.s = ip_addr2a(&msg->rcv.src_ip); + sval.len = strlen(sval.s); + return pv_get_strval(msg, param, res, &sval); + case 2: + ival = msg->rcv.src_port; + return pv_get_sintval(msg, param, res, ival); + case 3: + if((con = tcpconn_get(msg->rcv.proto_reserved1, 0, 0, 0, 0)) + == NULL) { + return pv_get_null(msg, param, res); + } sval.s = ip_addr2a(&con->cinfo.src_ip); tcpconn_put(con); sval.len = strlen(sval.s); return pv_get_strval(msg, param, res, &sval); - case 2: + case 4: + if((con = tcpconn_get(msg->rcv.proto_reserved1, 0, 0, 0, 0)) + == NULL) { + return pv_get_null(msg, param, res); + } ival = con->cinfo.src_port; tcpconn_put(con); return pv_get_sintval(msg, param, res, ival); - default: + case 5: + if((con = tcpconn_get(msg->rcv.proto_reserved1, 0, 0, 0, 0)) + == NULL) { + return pv_get_null(msg, param, res); + } ival = con->id; tcpconn_put(con); return pv_get_sintval(msg, param, res, ival); + default: + return pv_get_sintval(msg, param, res, msg->rcv.proto_reserved1); } } @@ -805,6 +823,17 @@ static int pv_parse_tcp_name(pv_spec_p sp, str *in) case 5: if(strncmp(in->s, "conid", 5) == 0) { sp->pvp.pvn.u.isname.name.n = 0; + } else if(strncmp(in->s, "ac_si", 5) == 0) { + sp->pvp.pvn.u.isname.name.n = 3; + } else if(strncmp(in->s, "ac_sp", 5) == 0) { + sp->pvp.pvn.u.isname.name.n = 4; + } else { + goto error; + } + break; + case 6: + if(strncmp(in->s, "aconid", 6) == 0) { + sp->pvp.pvn.u.isname.name.n = 5; } else { goto error; }

1 0

git:5.7:1d9ea67e: http_async_client: libssl refactor thread executors for curl
by S-P Chan 27 Feb '24

27 Feb '24

Module: kamailio Branch: 5.7 Commit: 1d9ea67eb29b4fd45c00a00581e7b73a9b42c8ce URL: https://github.com/kamailio/kamailio/commit/1d9ea67eb29b4fd45c00a00581e7b73… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-27T12:40:11+08:00 http_async_client: libssl refactor thread executors for curl Cherry-pick from 6a0c86bba8 --- Modified: src/modules/http_async_client/http_async_client_mod.c Modified: src/modules/http_async_client/http_multi.c --- Diff: https://github.com/kamailio/kamailio/commit/1d9ea67eb29b4fd45c00a00581e7b73… Patch: https://github.com/kamailio/kamailio/commit/1d9ea67eb29b4fd45c00a00581e7b73… --- diff --git a/src/modules/http_async_client/http_async_client_mod.c b/src/modules/http_async_client/http_async_client_mod.c index e9f6cb0d26b..4b984d3efdc 100644 --- a/src/modules/http_async_client/http_async_client_mod.c +++ b/src/modules/http_async_client/http_async_client_mod.c @@ -50,6 +50,9 @@ #include "../../core/cfg/cfg_struct.h" #include "../../core/fmsg.h" #include "../../core/kemi.h" +#define KSR_RTHREAD_NEED_V +#define KSR_RTHREAD_SKIP_P +#include "../../core/rthreads.h" #include "../../modules/tm/tm_load.h" #include "../../modules/pv/pv_api.h" @@ -285,7 +288,7 @@ static int mod_init(void) return -1; } - set_curl_mem_callbacks(); + run_threadV((_thread_protoV)&set_curl_mem_callbacks); /* init faked sip msg */ if(faked_msg_init() < 0) { diff --git a/src/modules/http_async_client/http_multi.c b/src/modules/http_async_client/http_multi.c index a0ee1c877cf..a57aba9c951 100644 --- a/src/modules/http_async_client/http_multi.c +++ b/src/modules/http_async_client/http_multi.c @@ -32,9 +32,6 @@ #include "../../core/mem/mem.h" #include "../../core/ut.h" #include "../../core/hashes.h" -#define KSR_RTHREAD_NEED_4L -#define KSR_RTHREAD_SKIP_P -#include "../../core/rthreads.h" #include "http_multi.h" extern int hash_size; @@ -392,8 +389,7 @@ void set_curl_mem_callbacks(void) break; case 1: LM_DBG("Initilizing cURL with sys malloc\n"); - rc = run_thread4L( - (_thread_proto4L)curl_global_init, CURL_GLOBAL_ALL); + rc = curl_global_init(CURL_GLOBAL_ALL); if(rc != 0) { LM_ERR("Cannot initialize cURL: %d\n", rc); }

1 0

git:5.8:bc4c2069: http_async_client: libssl refactor thread executors for curl
by S-P Chan 27 Feb '24

27 Feb '24

Module: kamailio Branch: 5.8 Commit: bc4c206999094ed74e77c73f5537e857111d0a30 URL: https://github.com/kamailio/kamailio/commit/bc4c206999094ed74e77c73f5537e85… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-27T12:39:52+08:00 http_async_client: libssl refactor thread executors for curl Cherry-pick from 6a0c86bba8 --- Modified: src/modules/http_async_client/http_async_client_mod.c Modified: src/modules/http_async_client/http_multi.c --- Diff: https://github.com/kamailio/kamailio/commit/bc4c206999094ed74e77c73f5537e85… Patch: https://github.com/kamailio/kamailio/commit/bc4c206999094ed74e77c73f5537e85… --- diff --git a/src/modules/http_async_client/http_async_client_mod.c b/src/modules/http_async_client/http_async_client_mod.c index 983a9e387f1..97a5c5dd420 100644 --- a/src/modules/http_async_client/http_async_client_mod.c +++ b/src/modules/http_async_client/http_async_client_mod.c @@ -50,6 +50,9 @@ #include "../../core/cfg/cfg_struct.h" #include "../../core/fmsg.h" #include "../../core/kemi.h" +#define KSR_RTHREAD_NEED_V +#define KSR_RTHREAD_SKIP_P +#include "../../core/rthreads.h" #include "../../modules/tm/tm_load.h" #include "../../modules/pv/pv_api.h" @@ -285,7 +288,7 @@ static int mod_init(void) return -1; } - set_curl_mem_callbacks(); + run_threadV((_thread_protoV)&set_curl_mem_callbacks); /* init faked sip msg */ if(faked_msg_init() < 0) { diff --git a/src/modules/http_async_client/http_multi.c b/src/modules/http_async_client/http_multi.c index a0ee1c877cf..a57aba9c951 100644 --- a/src/modules/http_async_client/http_multi.c +++ b/src/modules/http_async_client/http_multi.c @@ -32,9 +32,6 @@ #include "../../core/mem/mem.h" #include "../../core/ut.h" #include "../../core/hashes.h" -#define KSR_RTHREAD_NEED_4L -#define KSR_RTHREAD_SKIP_P -#include "../../core/rthreads.h" #include "http_multi.h" extern int hash_size; @@ -392,8 +389,7 @@ void set_curl_mem_callbacks(void) break; case 1: LM_DBG("Initilizing cURL with sys malloc\n"); - rc = run_thread4L( - (_thread_proto4L)curl_global_init, CURL_GLOBAL_ALL); + rc = curl_global_init(CURL_GLOBAL_ALL); if(rc != 0) { LM_ERR("Cannot initialize cURL: %d\n", rc); }

1 0

git:master:6a0c86bb: http_async_client: libssl refactor thread executors for curl
by S-P Chan 27 Feb '24

27 Feb '24

Module: kamailio Branch: master Commit: 6a0c86bba8ff1200b8fe9197f2a76688a9948808 URL: https://github.com/kamailio/kamailio/commit/6a0c86bba8ff1200b8fe9197f2a7668… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-27T12:38:09+08:00 http_async_client: libssl refactor thread executors for curl --- Modified: src/modules/http_async_client/http_async_client_mod.c Modified: src/modules/http_async_client/http_multi.c --- Diff: https://github.com/kamailio/kamailio/commit/6a0c86bba8ff1200b8fe9197f2a7668… Patch: https://github.com/kamailio/kamailio/commit/6a0c86bba8ff1200b8fe9197f2a7668… --- diff --git a/src/modules/http_async_client/http_async_client_mod.c b/src/modules/http_async_client/http_async_client_mod.c index 983a9e387f1..97a5c5dd420 100644 --- a/src/modules/http_async_client/http_async_client_mod.c +++ b/src/modules/http_async_client/http_async_client_mod.c @@ -50,6 +50,9 @@ #include "../../core/cfg/cfg_struct.h" #include "../../core/fmsg.h" #include "../../core/kemi.h" +#define KSR_RTHREAD_NEED_V +#define KSR_RTHREAD_SKIP_P +#include "../../core/rthreads.h" #include "../../modules/tm/tm_load.h" #include "../../modules/pv/pv_api.h" @@ -285,7 +288,7 @@ static int mod_init(void) return -1; } - set_curl_mem_callbacks(); + run_threadV((_thread_protoV)&set_curl_mem_callbacks); /* init faked sip msg */ if(faked_msg_init() < 0) { diff --git a/src/modules/http_async_client/http_multi.c b/src/modules/http_async_client/http_multi.c index a0ee1c877cf..a57aba9c951 100644 --- a/src/modules/http_async_client/http_multi.c +++ b/src/modules/http_async_client/http_multi.c @@ -32,9 +32,6 @@ #include "../../core/mem/mem.h" #include "../../core/ut.h" #include "../../core/hashes.h" -#define KSR_RTHREAD_NEED_4L -#define KSR_RTHREAD_SKIP_P -#include "../../core/rthreads.h" #include "http_multi.h" extern int hash_size; @@ -392,8 +389,7 @@ void set_curl_mem_callbacks(void) break; case 1: LM_DBG("Initilizing cURL with sys malloc\n"); - rc = run_thread4L( - (_thread_proto4L)curl_global_init, CURL_GLOBAL_ALL); + rc = curl_global_init(CURL_GLOBAL_ALL); if(rc != 0) { LM_ERR("Cannot initialize cURL: %d\n", rc); }

1 0

git:5.7:8098136c: xcap_client: libssl thread executor for curl_global_init()
by S-P Chan 26 Feb '24

26 Feb '24

Module: kamailio Branch: 5.7 Commit: 8098136ccbe2050b499d3d962c44d58203afc370 URL: https://github.com/kamailio/kamailio/commit/8098136ccbe2050b499d3d962c44d58… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-27T05:11:36+08:00 xcap_client: libssl thread executor for curl_global_init() Cherry-pick from f5164b39c8 --- Modified: src/modules/xcap_client/xcap_client.c --- Diff: https://github.com/kamailio/kamailio/commit/8098136ccbe2050b499d3d962c44d58… Patch: https://github.com/kamailio/kamailio/commit/8098136ccbe2050b499d3d962c44d58… --- diff --git a/src/modules/xcap_client/xcap_client.c b/src/modules/xcap_client/xcap_client.c index ac77228bfde..4de2d367b63 100644 --- a/src/modules/xcap_client/xcap_client.c +++ b/src/modules/xcap_client/xcap_client.c @@ -41,6 +41,9 @@ #include "../../core/mem/shm_mem.h" #include "../../core/rpc.h" #include "../../core/rpc_lookup.h" +#define KSR_RTHREAD_NEED_4L +#define KSR_RTHREAD_SKIP_P +#include "../../core/rthreads.h" #include "../presence/utils_func.h" #include "xcap_functions.h" #include "xcap_client.h" @@ -140,7 +143,7 @@ static int mod_init(void) xcap_dbf.close(xcap_db); xcap_db = NULL; - curl_global_init(CURL_GLOBAL_ALL); + run_thread4L((_thread_proto4L)curl_global_init, CURL_GLOBAL_ALL); if(periodical_query) { register_timer(query_xcap_update, 0, query_period);

1 0

git:5.7:d9285fc7: http_client: libssl thread executor for curl_global_init()
by S-P Chan 26 Feb '24

26 Feb '24

Module: kamailio Branch: 5.7 Commit: d9285fc741c2a3c3995e037c23393df108e94bf1 URL: https://github.com/kamailio/kamailio/commit/d9285fc741c2a3c3995e037c23393df… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-27T05:11:33+08:00 http_client: libssl thread executor for curl_global_init() Cherry-pick from f58225950c --- Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/d9285fc741c2a3c3995e037c23393df… Patch: https://github.com/kamailio/kamailio/commit/d9285fc741c2a3c3995e037c23393df… --- diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index 430933e23d2..3cf662820f5 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -64,6 +64,9 @@ #include "../../core/lvalue.h" #include "../../core/pt.h" /* Process table */ #include "../../core/kemi.h" +#define KSR_RTHREAD_NEED_4L +#define KSR_RTHREAD_SKIP_P +#include "../../core/rthreads.h" #include "functions.h" #include "curlcon.h" @@ -278,7 +281,7 @@ static int mod_init(void) LM_DBG("init curl module\n"); /* Initialize curl */ - if(curl_global_init(CURL_GLOBAL_ALL)) { + if(run_thread4L((_thread_proto4L)&curl_global_init, CURL_GLOBAL_ALL)) { LM_ERR("curl_global_init failed\n"); return -1; }

1 0

git:5.7:d01b6e22: http_async_client: libssl thread executor for curl_global_init()
by S-P Chan 26 Feb '24

26 Feb '24

Module: kamailio Branch: 5.7 Commit: d01b6e22e083c6fab457f8fbe1c8ac2526a37d30 URL: https://github.com/kamailio/kamailio/commit/d01b6e22e083c6fab457f8fbe1c8ac2… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-27T05:11:23+08:00 http_async_client: libssl thread executor for curl_global_init() Cherry-pick from 514635dc3e --- Modified: src/modules/http_async_client/http_multi.c --- Diff: https://github.com/kamailio/kamailio/commit/d01b6e22e083c6fab457f8fbe1c8ac2… Patch: https://github.com/kamailio/kamailio/commit/d01b6e22e083c6fab457f8fbe1c8ac2… --- diff --git a/src/modules/http_async_client/http_multi.c b/src/modules/http_async_client/http_multi.c index a57aba9c951..a0ee1c877cf 100644 --- a/src/modules/http_async_client/http_multi.c +++ b/src/modules/http_async_client/http_multi.c @@ -32,6 +32,9 @@ #include "../../core/mem/mem.h" #include "../../core/ut.h" #include "../../core/hashes.h" +#define KSR_RTHREAD_NEED_4L +#define KSR_RTHREAD_SKIP_P +#include "../../core/rthreads.h" #include "http_multi.h" extern int hash_size; @@ -389,7 +392,8 @@ void set_curl_mem_callbacks(void) break; case 1: LM_DBG("Initilizing cURL with sys malloc\n"); - rc = curl_global_init(CURL_GLOBAL_ALL); + rc = run_thread4L( + (_thread_proto4L)curl_global_init, CURL_GLOBAL_ALL); if(rc != 0) { LM_ERR("Cannot initialize cURL: %d\n", rc); }

1 0

git:5.7:0f1d78a2: core/rthreads.h: add thread executor for curl_global_init()
by S-P Chan 26 Feb '24

26 Feb '24

Module: kamailio Branch: 5.7 Commit: 0f1d78a22aeefef7601d0cf646ec154f5e52c175 URL: https://github.com/kamailio/kamailio/commit/0f1d78a22aeefef7601d0cf646ec154… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-27T05:11:08+08:00 core/rthreads.h: add thread executor for curl_global_init() Cherry-pick from db05449932 --- Modified: src/core/rthreads.h --- Diff: https://github.com/kamailio/kamailio/commit/0f1d78a22aeefef7601d0cf646ec154… Patch: https://github.com/kamailio/kamailio/commit/0f1d78a22aeefef7601d0cf646ec154… --- diff --git a/src/core/rthreads.h b/src/core/rthreads.h index e96f45c9395..0f4f0cf8b8a 100644 --- a/src/core/rthreads.h +++ b/src/core/rthreads.h @@ -254,3 +254,41 @@ static int run_thread4P5I2P2(_thread_proto4P5I2P2 fn, void *arg1, void *arg2, #endif } #endif + +/* + * prototype: CURLcode curl_global_init(long flags) { ... } + */ +#ifdef KSR_RTHREAD_NEED_4L +typedef int (*_thread_proto4L)(long); +struct _thread_args4L +{ + _thread_proto4L fn; + long arg1; + int *ret; +}; +static void *run_thread_wrap4L(struct _thread_args4L *args) +{ + *args->ret = (*args->fn)(args->arg1); + return NULL; +} + +static int run_thread4L(_thread_proto4L fn, long arg1) +{ +#ifdef USE_TLS + pthread_t tid; + int ret; + + if(likely(ksr_tls_threads_mode == 0 + || (ksr_tls_threads_mode == 1 && process_no > 0))) { + return fn(arg1); + } + pthread_create(&tid, NULL, (_thread_proto)run_thread_wrap4L, + &(struct _thread_args4L){fn, arg1, &ret}); + pthread_join(tid, NULL); + + return ret; +#else + return fn(arg1) +#endif +} +#endif

1 0

git:5.7:f850f4ee: Revert ed9d7bc58b - split into per module commits
by S-P Chan 26 Feb '24

26 Feb '24

Module: kamailio Branch: 5.7 Commit: f850f4eef66b6461bb93ede9bf67b52458e18856 URL: https://github.com/kamailio/kamailio/commit/f850f4eef66b6461bb93ede9bf67b52… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-27T05:07:27+08:00 Revert ed9d7bc58b - split into per module commits --- Modified: src/core/rthreads.h Modified: src/modules/http_async_client/http_multi.c Modified: src/modules/http_client/http_client.c Modified: src/modules/xcap_client/xcap_client.c --- Diff: https://github.com/kamailio/kamailio/commit/f850f4eef66b6461bb93ede9bf67b52… Patch: https://github.com/kamailio/kamailio/commit/f850f4eef66b6461bb93ede9bf67b52… --- diff --git a/src/core/rthreads.h b/src/core/rthreads.h index 0f4f0cf8b8a..e96f45c9395 100644 --- a/src/core/rthreads.h +++ b/src/core/rthreads.h @@ -254,41 +254,3 @@ static int run_thread4P5I2P2(_thread_proto4P5I2P2 fn, void *arg1, void *arg2, #endif } #endif - -/* - * prototype: CURLcode curl_global_init(long flags) { ... } - */ -#ifdef KSR_RTHREAD_NEED_4L -typedef int (*_thread_proto4L)(long); -struct _thread_args4L -{ - _thread_proto4L fn; - long arg1; - int *ret; -}; -static void *run_thread_wrap4L(struct _thread_args4L *args) -{ - *args->ret = (*args->fn)(args->arg1); - return NULL; -} - -static int run_thread4L(_thread_proto4L fn, long arg1) -{ -#ifdef USE_TLS - pthread_t tid; - int ret; - - if(likely(ksr_tls_threads_mode == 0 - || (ksr_tls_threads_mode == 1 && process_no > 0))) { - return fn(arg1); - } - pthread_create(&tid, NULL, (_thread_proto)run_thread_wrap4L, - &(struct _thread_args4L){fn, arg1, &ret}); - pthread_join(tid, NULL); - - return ret; -#else - return fn(arg1) -#endif -} -#endif diff --git a/src/modules/http_async_client/http_multi.c b/src/modules/http_async_client/http_multi.c index a0ee1c877cf..a57aba9c951 100644 --- a/src/modules/http_async_client/http_multi.c +++ b/src/modules/http_async_client/http_multi.c @@ -32,9 +32,6 @@ #include "../../core/mem/mem.h" #include "../../core/ut.h" #include "../../core/hashes.h" -#define KSR_RTHREAD_NEED_4L -#define KSR_RTHREAD_SKIP_P -#include "../../core/rthreads.h" #include "http_multi.h" extern int hash_size; @@ -392,8 +389,7 @@ void set_curl_mem_callbacks(void) break; case 1: LM_DBG("Initilizing cURL with sys malloc\n"); - rc = run_thread4L( - (_thread_proto4L)curl_global_init, CURL_GLOBAL_ALL); + rc = curl_global_init(CURL_GLOBAL_ALL); if(rc != 0) { LM_ERR("Cannot initialize cURL: %d\n", rc); } diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index 3cf662820f5..430933e23d2 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -64,9 +64,6 @@ #include "../../core/lvalue.h" #include "../../core/pt.h" /* Process table */ #include "../../core/kemi.h" -#define KSR_RTHREAD_NEED_4L -#define KSR_RTHREAD_SKIP_P -#include "../../core/rthreads.h" #include "functions.h" #include "curlcon.h" @@ -281,7 +278,7 @@ static int mod_init(void) LM_DBG("init curl module\n"); /* Initialize curl */ - if(run_thread4L((_thread_proto4L)&curl_global_init, CURL_GLOBAL_ALL)) { + if(curl_global_init(CURL_GLOBAL_ALL)) { LM_ERR("curl_global_init failed\n"); return -1; } diff --git a/src/modules/xcap_client/xcap_client.c b/src/modules/xcap_client/xcap_client.c index 4de2d367b63..ac77228bfde 100644 --- a/src/modules/xcap_client/xcap_client.c +++ b/src/modules/xcap_client/xcap_client.c @@ -41,9 +41,6 @@ #include "../../core/mem/shm_mem.h" #include "../../core/rpc.h" #include "../../core/rpc_lookup.h" -#define KSR_RTHREAD_NEED_4L -#define KSR_RTHREAD_SKIP_P -#include "../../core/rthreads.h" #include "../presence/utils_func.h" #include "xcap_functions.h" #include "xcap_client.h" @@ -143,7 +140,7 @@ static int mod_init(void) xcap_dbf.close(xcap_db); xcap_db = NULL; - run_thread4L((_thread_proto4L)curl_global_init, CURL_GLOBAL_ALL); + curl_global_init(CURL_GLOBAL_ALL); if(periodical_query) { register_timer(query_xcap_update, 0, query_period);

1 0

git:5.8:53398940: xcap_client: libssl thread executor for curl_global_init()
by S-P Chan 26 Feb '24

26 Feb '24

Module: kamailio Branch: 5.8 Commit: 533989406d0fa1e57ff007fd8d7f702f5831dacd URL: https://github.com/kamailio/kamailio/commit/533989406d0fa1e57ff007fd8d7f702… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-27T05:05:54+08:00 xcap_client: libssl thread executor for curl_global_init() Cherry-pick from f5164b39c8 --- Modified: src/modules/xcap_client/xcap_client.c --- Diff: https://github.com/kamailio/kamailio/commit/533989406d0fa1e57ff007fd8d7f702… Patch: https://github.com/kamailio/kamailio/commit/533989406d0fa1e57ff007fd8d7f702… --- diff --git a/src/modules/xcap_client/xcap_client.c b/src/modules/xcap_client/xcap_client.c index ac77228bfde..4de2d367b63 100644 --- a/src/modules/xcap_client/xcap_client.c +++ b/src/modules/xcap_client/xcap_client.c @@ -41,6 +41,9 @@ #include "../../core/mem/shm_mem.h" #include "../../core/rpc.h" #include "../../core/rpc_lookup.h" +#define KSR_RTHREAD_NEED_4L +#define KSR_RTHREAD_SKIP_P +#include "../../core/rthreads.h" #include "../presence/utils_func.h" #include "xcap_functions.h" #include "xcap_client.h" @@ -140,7 +143,7 @@ static int mod_init(void) xcap_dbf.close(xcap_db); xcap_db = NULL; - curl_global_init(CURL_GLOBAL_ALL); + run_thread4L((_thread_proto4L)curl_global_init, CURL_GLOBAL_ALL); if(periodical_query) { register_timer(query_xcap_update, 0, query_period);

1 0

git:5.8:49c3290f: http_client: libssl thread executor for curl_global_init()
by S-P Chan 26 Feb '24

26 Feb '24

Module: kamailio Branch: 5.8 Commit: 49c3290fc6eb50de0b08661c50ff42663ff3de6b URL: https://github.com/kamailio/kamailio/commit/49c3290fc6eb50de0b08661c50ff426… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-27T05:05:40+08:00 http_client: libssl thread executor for curl_global_init() Cherry-pick from f58225950c --- Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/49c3290fc6eb50de0b08661c50ff426… Patch: https://github.com/kamailio/kamailio/commit/49c3290fc6eb50de0b08661c50ff426… --- diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index 48844246984..ca605ec1729 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -64,6 +64,9 @@ #include "../../core/lvalue.h" #include "../../core/pt.h" /* Process table */ #include "../../core/kemi.h" +#define KSR_RTHREAD_NEED_4L +#define KSR_RTHREAD_SKIP_P +#include "../../core/rthreads.h" #include "functions.h" #include "curlcon.h" @@ -76,8 +79,10 @@ MODULE_VERSION #define CURL_USER_AGENT_LEN (sizeof(CURL_USER_AGENT) - 1) /* Module parameter variables */ -unsigned int default_connection_timeout = 0; /*!< 0 = not user configured - the default (4 seconds) will be used */ -unsigned int timeout_mode = 1; /*!< 0 = timeout disabled, 1 (default) = timeout in seconds, 2 = timeout in ms */ +unsigned int default_connection_timeout = + 0; /*!< 0 = not user configured - the default (4 seconds) will be used */ +unsigned int timeout_mode = + 1; /*!< 0 = timeout disabled, 1 (default) = timeout in seconds, 2 = timeout in ms */ char *default_tls_cacert = NULL; /*!< File name: Default CA cert to use for curl TLS connection */ str default_tls_clientcert = @@ -280,7 +285,7 @@ static int mod_init(void) LM_DBG("init curl module\n"); /* Initialize curl */ - if(curl_global_init(CURL_GLOBAL_ALL)) { + if(run_thread4L((_thread_proto4L)&curl_global_init, CURL_GLOBAL_ALL)) { LM_ERR("curl_global_init failed\n"); return -1; } @@ -317,16 +322,16 @@ static int mod_init(void) * - 1 (default) : timeout value is in seconds. * - 2 : timeout value is in milliseconds. */ - if (!(timeout_mode == 1 || timeout_mode == 2)) { - if (default_connection_timeout > 0) { + if(!(timeout_mode == 1 || timeout_mode == 2)) { + if(default_connection_timeout > 0) { LM_WARN("configured connection_timeout is ignored " - "because timeouts are disabled (timeout_mode)\n"); + "because timeouts are disabled (timeout_mode)\n"); } - } else if (default_connection_timeout == 0) { + } else if(default_connection_timeout == 0) { LM_INFO("curl connection timeout set to zero. Using default 4 secs\n"); - if (timeout_mode == 1) { /* timeout is in seconds (default) */ + if(timeout_mode == 1) { /* timeout is in seconds (default) */ default_connection_timeout = 4; - } else if (timeout_mode == 2) { /* timeout is in milliseconds */ + } else if(timeout_mode == 2) { /* timeout is in milliseconds */ default_connection_timeout = 4000; } }

1 0

git:5.8:5d4fae5c: http_async_client: libssl thread executor for curl_global_init()
by S-P Chan 26 Feb '24

26 Feb '24

Module: kamailio Branch: 5.8 Commit: 5d4fae5c24eb4f13d585e1af4cb1753ea5a784c5 URL: https://github.com/kamailio/kamailio/commit/5d4fae5c24eb4f13d585e1af4cb1753… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-27T05:05:20+08:00 http_async_client: libssl thread executor for curl_global_init() Cherry-pick from 514635dc3e --- Modified: src/modules/http_async_client/http_multi.c --- Diff: https://github.com/kamailio/kamailio/commit/5d4fae5c24eb4f13d585e1af4cb1753… Patch: https://github.com/kamailio/kamailio/commit/5d4fae5c24eb4f13d585e1af4cb1753… --- diff --git a/src/modules/http_async_client/http_multi.c b/src/modules/http_async_client/http_multi.c index a57aba9c951..a0ee1c877cf 100644 --- a/src/modules/http_async_client/http_multi.c +++ b/src/modules/http_async_client/http_multi.c @@ -32,6 +32,9 @@ #include "../../core/mem/mem.h" #include "../../core/ut.h" #include "../../core/hashes.h" +#define KSR_RTHREAD_NEED_4L +#define KSR_RTHREAD_SKIP_P +#include "../../core/rthreads.h" #include "http_multi.h" extern int hash_size; @@ -389,7 +392,8 @@ void set_curl_mem_callbacks(void) break; case 1: LM_DBG("Initilizing cURL with sys malloc\n"); - rc = curl_global_init(CURL_GLOBAL_ALL); + rc = run_thread4L( + (_thread_proto4L)curl_global_init, CURL_GLOBAL_ALL); if(rc != 0) { LM_ERR("Cannot initialize cURL: %d\n", rc); }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev