sr-dev

sr-dev@lists.kamailio.org

16 participants
45406 discussions

git:master:522fa2fa: sipt: KEMI support
by Victor Seva 17 Mar '25

17 Mar '25

Module: kamailio Branch: master Commit: 522fa2fabe1d4ec8fe53a25b2af95cbf8031cbad URL: https://github.com/kamailio/kamailio/commit/522fa2fabe1d4ec8fe53a25b2af95cb… Author: Boris Korzun <drtr0jan(a)yandex.ru> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-03-17T18:18:42+01:00 sipt: KEMI support - GH #3264 --- Modified: src/modules/sipt/sipt.c --- Diff: https://github.com/kamailio/kamailio/commit/522fa2fabe1d4ec8fe53a25b2af95cb… Patch: https://github.com/kamailio/kamailio/commit/522fa2fabe1d4ec8fe53a25b2af95cb…

1 0

[kamailio/kamailio] pua_reginfo: handle_notify - fix AoR key parsing (PR #4165)
by João Capucho 17 Mar '25

17 Mar '25

#### 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 This PR aims to fix what seems like a discrepancy in the generated AoR key when using `handle_notify` from the `pua_reginfo` module. I'm not familiar with the codebase but it seems like the AoR key should not include the domain when usrloc's `use_domain` isn't enabled. This seems to match with usrloc documentation and with the fact that the address is being parsed and the username selected from the parse result. However, the string length is then set with `strlen` and since `parse_uri` doesn't allocate strings but simply slices the input string, the result is that the everything after (and including) the username is set as the AoR key. For example the uri `sip:bob@domain` currently generates the AoR key `bob@domain`, when it seems like it should generate a key with only `bob`. This PR fixes it by inheriting both the pointer and length of the username part of the parsed uri. #### Additional notes There also seems to be a problem with multi domain support, as it uses the `uri` variable, but this variable isn't set anywhere except for a null byte. This causes all AoR keys to be empty strings. I've confirmed this in practice. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4165 -- Commit Summary -- * pua_reginfo: handle_notify - fix AoR key parsing -- File Changes -- M src/modules/pua_reginfo/notify.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4165.patch https://github.com/kamailio/kamailio/pull/4165.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4165 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4165(a)github.com>

2 1

git:master:b7e16294: pua_reginfo: handle_notify - fix AoR key parsing
by Victor Seva 17 Mar '25

17 Mar '25

Module: kamailio Branch: master Commit: b7e16294ae1bbfe8cc469facf59fc9e3960ff2a4 URL: https://github.com/kamailio/kamailio/commit/b7e16294ae1bbfe8cc469facf59fc9e… Author: JoÃ£o Capucho <capucho(a)jcapucho.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-03-17T12:18:56+01:00 pua_reginfo: handle_notify - fix AoR key parsing - The AoR key generated by handle_notify no longer includes the domain of the AoR when usrloc use_domain isn't enabled --- Modified: src/modules/pua_reginfo/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/b7e16294ae1bbfe8cc469facf59fc9e… Patch: https://github.com/kamailio/kamailio/commit/b7e16294ae1bbfe8cc469facf59fc9e… --- diff --git a/src/modules/pua_reginfo/notify.c b/src/modules/pua_reginfo/notify.c index a390a00f238..23b44caaee9 100644 --- a/src/modules/pua_reginfo/notify.c +++ b/src/modules/pua_reginfo/notify.c @@ -305,10 +305,10 @@ int process_body(str notify_body, udomain_t *domain) if(reginfo_use_domain) { aor_key.s = uri; + aor_key.len = strlen(uri); } else { - aor_key.s = parsed_aor.user.s; + aor_key = parsed_aor.user; } - aor_key.len = strlen(aor_key.s); /* Now let's lock that domain for this AOR: */ ul.lock_udomain(domain, &aor_key); /* and retrieve the user-record for this user: */

1 0

[kamailio/kamailio] [microhttpd] POST request with body can't get return message (Issue #4176)
by QuincyGao 17 Mar '25

17 Mar '25

QuincyGao created an issue (kamailio/kamailio#4176)  ### Description  I confirmed the problem again， HTTP GET, POST without body is ok, HTTP post with json body can't return message and block. microhttpd1.0.1 installed. ``` curl -d '{"test":"2", "test2":"1"}' -H "Content-Type: application/json" -X POST http://172.16.4.111:8284 ``` kamailio.cfg ``` loadmodule "microhttpd.so" modparam("microhttpd", "listen_addr", "172.16.4.111") modparam("microhttpd", "listen_port", 8284) event_route[microhttpd:request] { xinfo("request: $mhttpd(method) - url: $mhttpd(url) - data: [$mhttpd(data)]\n"); mhttpd_reply("200", "OK", "text/html","<html><body>OK</body></html>"); #mhttpd_reply("200", "OK", "application/json","\{\"code\":0\}"); } ``` ``` ldd /usr/local/lib64/kamailio/modules/microhttpd.so linux-vdso.so.1 => (0x00007ffda77fc000) libdl.so.2 => /lib64/libdl.so.2 (0x00007f5c6d357000) libm.so.6 => /lib64/libm.so.6 (0x00007f5c6d055000) librt.so.1 => /lib64/librt.so.1 (0x00007f5c6ce4d000) libmicrohttpd.so.12 => /usr/local/lib64/libmicrohttpd.so.12 (0x00007f5c6cc1a000) libpthread.so.0 => /lib64/libpthread.so.0 (0x00007f5c6c9fe000) libc.so.6 => /lib64/libc.so.6 (0x00007f5c6c630000) /lib64/ld-linux-x86-64.so.2 (0x00007f5c6d765000) ll /usr/local/lib64/libmicrohttpd.* -rw-r--r--. 1 root root 1902020 Mar 6 11:19 /usr/local/lib64/libmicrohttpd.a -rwxr-xr-x. 1 root root 998 Mar 6 11:19 /usr/local/lib64/libmicrohttpd.la lrwxrwxrwx. 1 root root 24 Mar 6 11:19 /usr/local/lib64/libmicrohttpd.so -> libmicrohttpd.so.12.62.1 lrwxrwxrwx. 1 root root 24 Mar 6 11:19 /usr/local/lib64/libmicrohttpd.so.12 -> libmicrohttpd.so.12.62.1 -rwxr-xr-x. 1 root root 992136 Mar 6 11:19 /usr/local/lib64/libmicrohttpd.so.12.62.1 ``` ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` 25(2379) DEBUG: microhttpd [microhttpd_mod.c:475]: ksr_microhttpd_request(): executing event_route[microhttpd:request] (3) 25(2379) exec: *** cfgtrace:dbg_cfg_trace(): request_route=[microhttpd:request] c=[/usr/local/bin/../etc/kamailio/conf/kamailio.cfg] l=1181 a=25 n=xinfo 25(2379) INFO: <script>: request: POST - url: / - data: [{"test":"2", "test2":"1"}] 25(2379) exec: *** cfgtrace:dbg_cfg_trace(): request_route=[microhttpd:request] c=[/usr/local/bin/../etc/kamailio/conf/kamailio.cfg] l=1182 a=28 n=mhttpd_reply ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.8.5 (x86_64/linux) ``` * **Operating System**:  ``` Centos7.9 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4176 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4176(a)github.com>

2 3

git:master:96392eda: microhttpd: handle all incoming body data
by Daniel-Constantin Mierla 17 Mar '25

17 Mar '25

Module: kamailio Branch: master Commit: 96392eda8fac1cb075e7f407c0155085acc92c5f URL: https://github.com/kamailio/kamailio/commit/96392eda8fac1cb075e7f407c015508… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-03-17T09:15:39+01:00 microhttpd: handle all incoming body data - GH #4176 --- Modified: src/modules/microhttpd/microhttpd_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/96392eda8fac1cb075e7f407c015508… Patch: https://github.com/kamailio/kamailio/commit/96392eda8fac1cb075e7f407c015508… --- diff --git a/src/modules/microhttpd/microhttpd_mod.c b/src/modules/microhttpd/microhttpd_mod.c index eaf2820ce68..2853b7b1b5a 100644 --- a/src/modules/microhttpd/microhttpd_mod.c +++ b/src/modules/microhttpd/microhttpd_mod.c @@ -177,6 +177,13 @@ static void mod_destroy(void) { } +typedef struct ksr_mhd_cstream +{ + int ctype; + int rcvmode; + str data; +} ksr_mhd_cstream_t; + typedef struct ksr_mhttpd_ctx { struct MHD_Connection *connection; @@ -450,23 +457,68 @@ static int fixup_free_mhttpd_send_reply(void **param, int param_no) return 0; } + static enum MHD_Result ksr_microhttpd_request(void *cls, struct MHD_Connection *connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **ptr) { - static int _first_callback; sr_kemi_eng_t *keng = NULL; str evname = str_init("microhttpd:request"); sip_msg_t *fmsg = NULL; run_act_ctx_t ctx; int rtb; + ksr_mhd_cstream_t *cstream = NULL; + + cstream = (ksr_mhd_cstream_t *)*ptr; + if(cstream == NULL) { + cstream = (ksr_mhd_cstream_t *)malloc(sizeof(ksr_mhd_cstream_t)); + if(cstream == NULL) { + LM_ERR("no more system memroy\n"); + return MHD_NO; + } + memset(cstream, 0, sizeof(ksr_mhd_cstream_t)); + *ptr = cstream; + } - if(&_first_callback != *ptr) { + if(cstream->rcvmode == 0) { + cstream->rcvmode = 1; /* the first time only the headers are valid, - do not respond in the first round... */ - *ptr = &_first_callback; + * do not respond in the first round */ return MHD_YES; + } else { + if(*upload_data_size != 0) { + char *buf = NULL; + int bsize = 0; + if(cstream->data.s != NULL) { + bsize = *upload_data_size + cstream->data.len + 1; + } else { + bsize = *upload_data_size + 1; + } + buf = (char *)malloc(sizeof(char) * bsize); + if(buf == NULL) { + if(cstream->data.s != NULL) { + free(cstream->data.s); + free(cstream); + *ptr = NULL; + return MHD_NO; + } + } + if(cstream->data.s != NULL) { + snprintf(buf, bsize, "%s%s", cstream->data.s, upload_data); + free(cstream->data.s); + } else { + snprintf(buf, bsize, "%s", upload_data); + } + cstream->data.s = buf; + cstream->data.len = bsize - 1; + *upload_data_size = 0; + return MHD_YES; + } else { + LM_DBG("incoming data: [%.*s]\n", + cstream->data.len <= 64 ? cstream->data.len : 64, + cstream->data.s); + } } *ptr = NULL; /* clear context pointer */ @@ -477,13 +529,19 @@ static enum MHD_Result ksr_microhttpd_request(void *cls, _ksr_mhttpd_ctx.url.len = strlen(_ksr_mhttpd_ctx.url.s); _ksr_mhttpd_ctx.httpversion.s = (char *)version; _ksr_mhttpd_ctx.httpversion.len = strlen(_ksr_mhttpd_ctx.httpversion.s); - if(*upload_data_size > 0) { - _ksr_mhttpd_ctx.data.s = (char *)upload_data; - _ksr_mhttpd_ctx.data.len = (int)(*upload_data_size); + if(_ksr_mhttpd_ctx.data.s != NULL) { + free(_ksr_mhttpd_ctx.data.s); + } + if(cstream->data.len > 0) { + if(_ksr_mhttpd_ctx.data.s != NULL) { + free(_ksr_mhttpd_ctx.data.s); + } + _ksr_mhttpd_ctx.data = cstream->data; } else { _ksr_mhttpd_ctx.data.s = NULL; _ksr_mhttpd_ctx.data.len = 0; } + free(cstream); _ksr_mhttpd_ctx.cinfo = MHD_get_connection_info( connection, MHD_CONNECTION_INFO_CLIENT_ADDRESS); _ksr_mhttpd_ctx.srcip.s = NULL;

1 0

git:master:1569a7b7: microhttpd: create response with MHD_RESPMEM_MUST_COPY flag
by Daniel-Constantin Mierla 17 Mar '25

17 Mar '25

Module: kamailio Branch: master Commit: 1569a7b71af26f5b3cb7cb25de7d2425c75f5587 URL: https://github.com/kamailio/kamailio/commit/1569a7b71af26f5b3cb7cb25de7d242… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-03-16T08:50:52+01:00 microhttpd: create response with MHD_RESPMEM_MUST_COPY flag --- Modified: src/modules/microhttpd/microhttpd_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1569a7b71af26f5b3cb7cb25de7d242… Patch: https://github.com/kamailio/kamailio/commit/1569a7b71af26f5b3cb7cb25de7d242… --- diff --git a/src/modules/microhttpd/microhttpd_mod.c b/src/modules/microhttpd/microhttpd_mod.c index 9a913b449bb..eaf2820ce68 100644 --- a/src/modules/microhttpd/microhttpd_mod.c +++ b/src/modules/microhttpd/microhttpd_mod.c @@ -360,7 +360,7 @@ static int ksr_mhttpd_send_reply( } response = MHD_create_response_from_buffer( - sbody->len, sbody->s, MHD_RESPMEM_PERSISTENT); + sbody->len, sbody->s, MHD_RESPMEM_MUST_COPY); if(response == NULL) { LM_ERR("failed to create the response\n"); return -1;

1 0

git:master:7a793a25: microhttpd: debug message for http response queue
by Daniel-Constantin Mierla 17 Mar '25

17 Mar '25

Module: kamailio Branch: master Commit: 7a793a257b12f946e54bca3d3d92b6c07602fb20 URL: https://github.com/kamailio/kamailio/commit/7a793a257b12f946e54bca3d3d92b6c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-03-16T08:27:24+01:00 microhttpd: debug message for http response queue --- Modified: src/modules/microhttpd/microhttpd_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7a793a257b12f946e54bca3d3d92b6c… Patch: https://github.com/kamailio/kamailio/commit/7a793a257b12f946e54bca3d3d92b6c… --- diff --git a/src/modules/microhttpd/microhttpd_mod.c b/src/modules/microhttpd/microhttpd_mod.c index 0ef4b36284e..9a913b449bb 100644 --- a/src/modules/microhttpd/microhttpd_mod.c +++ b/src/modules/microhttpd/microhttpd_mod.c @@ -372,6 +372,9 @@ static int ksr_mhttpd_send_reply( _ksr_mhttpd_ctx.connection, (unsigned int)rcode, response); MHD_destroy_response(response); + LM_DBG("queue response return: %d (%s)\n", ret, + (ret == MHD_YES) ? "YES" : "XYZ"); + return (ret == MHD_YES) ? 1 : -1; }

1 0

git:6.0:e4781f25: cdp: fix cmake build
by Henning Westerholt 14 Mar '25

14 Mar '25

Module: kamailio Branch: 6.0 Commit: e4781f256cc0fbfc8ad4b4345934da7c8899b47e URL: https://github.com/kamailio/kamailio/commit/e4781f256cc0fbfc8ad4b4345934da7… Author: Lyubomir Yatanski <lyubomir.yatanski(a)flolive.net> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-03-14T10:36:41Z cdp: fix cmake build - fix runtime Error relocating cdp.so: TLS_client_method: symbol not found when building with cmake (cherry picked from commit ba13699faba8938ff547a34af9f05631d0b8a9cd) --- Modified: src/modules/cdp/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/e4781f256cc0fbfc8ad4b4345934da7… Patch: https://github.com/kamailio/kamailio/commit/e4781f256cc0fbfc8ad4b4345934da7… --- diff --git a/src/modules/cdp/CMakeLists.txt b/src/modules/cdp/CMakeLists.txt index 41758eb30c6..7d48b3af4d4 100644 --- a/src/modules/cdp/CMakeLists.txt +++ b/src/modules/cdp/CMakeLists.txt @@ -3,5 +3,6 @@ file(GLOB MODULE_SOURCES "*.c") add_library(${module_name} SHARED ${MODULE_SOURCES}) find_package(LibXml2 REQUIRED) +find_package(OpenSSL REQUIRED) -target_link_libraries(${module_name} PRIVATE LibXml2::LibXml2) +target_link_libraries(${module_name} PRIVATE LibXml2::LibXml2 OpenSSL::SSL)

1 0

[kamailio/kamailio] cdp: fix cmake build (PR #4163)
by Lyubomir Yatanski 14 Mar '25

14 Mar '25

- fix runtime Error relocating cdp.so: TLS_client_method: symbol not found when building with cmake   #### Pre-Submission Checklist    - [ ] 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/4163 -- Commit Summary -- * cdp: fix cmake build -- File Changes -- M src/modules/cdp/CMakeLists.txt (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4163.patch https://github.com/kamailio/kamailio/pull/4163.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4163 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4163(a)github.com>

3 4

git:master:ba13699f: cdp: fix cmake build
by Henning Westerholt 14 Mar '25

14 Mar '25

Module: kamailio Branch: master Commit: ba13699faba8938ff547a34af9f05631d0b8a9cd URL: https://github.com/kamailio/kamailio/commit/ba13699faba8938ff547a34af9f0563… Author: Lyubomir Yatanski <lyubomir.yatanski(a)flolive.net> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-03-14T11:35:43+01:00 cdp: fix cmake build - fix runtime Error relocating cdp.so: TLS_client_method: symbol not found when building with cmake --- Modified: src/modules/cdp/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/ba13699faba8938ff547a34af9f0563… Patch: https://github.com/kamailio/kamailio/commit/ba13699faba8938ff547a34af9f0563… --- diff --git a/src/modules/cdp/CMakeLists.txt b/src/modules/cdp/CMakeLists.txt index 41758eb30c6..7d48b3af4d4 100644 --- a/src/modules/cdp/CMakeLists.txt +++ b/src/modules/cdp/CMakeLists.txt @@ -3,5 +3,6 @@ file(GLOB MODULE_SOURCES "*.c") add_library(${module_name} SHARED ${MODULE_SOURCES}) find_package(LibXml2 REQUIRED) +find_package(OpenSSL REQUIRED) -target_link_libraries(${module_name} PRIVATE LibXml2::LibXml2) +target_link_libraries(${module_name} PRIVATE LibXml2::LibXml2 OpenSSL::SSL)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev