sr-dev August 2023

sr-dev@lists.kamailio.org

15 participants
207 discussions

git:master:2475dfa2: rabbitmq: Enabling rabbitmq_publish for any route and disabling peer

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2475dfa2564346b7c0790012e72cd17a5d9ca7f6 URL: https://github.com/kamailio/kamailio/commit/2475dfa2564346b7c0790012e72cd17… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-12T13:39:24+02:00 rabbitmq: Enabling rabbitmq_publish for any route and disabling peer verification Enabling rabbitmq_publish function on any route so we can send events on reply reception. Also disabling peer verification on the TLS handshake if no CA file is configured. --- Modified: src/modules/rabbitmq/doc/rabbitmq_admin.xml Modified: src/modules/rabbitmq/rabbitmq.c --- Diff: https://github.com/kamailio/kamailio/commit/2475dfa2564346b7c0790012e72cd17… Patch: https://github.com/kamailio/kamailio/commit/2475dfa2564346b7c0790012e72cd17… --- diff --git a/src/modules/rabbitmq/doc/rabbitmq_admin.xml b/src/modules/rabbitmq/doc/rabbitmq_admin.xml index 18bd4676021..8ed436a6bfa 100644 --- a/src/modules/rabbitmq/doc/rabbitmq_admin.xml +++ b/src/modules/rabbitmq/doc/rabbitmq_admin.xml @@ -204,7 +204,7 @@ modparam("rabbitmq", "direct_reply_to", 1) </itemizedlist> <para> - This function can be used from REQUEST_ROUTE. + This function can be used from any route. </para> <example> diff --git a/src/modules/rabbitmq/rabbitmq.c b/src/modules/rabbitmq/rabbitmq.c index 94341070508..50d143723e6 100644 --- a/src/modules/rabbitmq/rabbitmq.c +++ b/src/modules/rabbitmq/rabbitmq.c @@ -120,7 +120,7 @@ static int rbmq_fixup_free_params(void **param, int param_no) /* module commands */ static cmd_export_t cmds[] = { {"rabbitmq_publish", (cmd_function)rabbitmq_publish, 4, fixup_spve_all, - fixup_free_spve_all, REQUEST_ROUTE}, + fixup_free_spve_all, ANY_ROUTE}, {"rabbitmq_publish_consume", (cmd_function)rabbitmq_publish_consume, 5, rbmq_fixup_params, rbmq_fixup_free_params, REQUEST_ROUTE}, {0, 0, 0, 0, 0, 0}}; @@ -597,10 +597,10 @@ static int rabbitmq_connect(amqp_connection_state_t *conn) } #if AMQP_VERSION_MAJOR == 0 && AMQP_VERSION_MINOR < 8 - amqp_ssl_socket_set_verify(amqp_sock, 1); + amqp_ssl_socket_set_verify(amqp_sock, (rmq_amqps_ca_file) ? 1 : 0); #else - amqp_ssl_socket_set_verify_peer(amqp_sock, 1); - amqp_ssl_socket_set_verify_hostname(amqp_sock, 1); + amqp_ssl_socket_set_verify_peer(amqp_sock, (rmq_amqps_ca_file) ? 1 : 0); + amqp_ssl_socket_set_verify_hostname(amqp_sock, (rmq_amqps_ca_file) ? 1 : 0); #endif ret = amqp_socket_open(amqp_sock, amqp_info.host, amqp_info.port);

1 year, 3 months

git:master:170067e6: xhttp: note about available variables during http request processing

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 170067e633ef32ea7b17adad46fdfe2c85fadda0 URL: https://github.com/kamailio/kamailio/commit/170067e633ef32ea7b17adad46fdfe2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-12T13:31:15+02:00 xhttp: note about available variables during http request processing --- Modified: src/modules/xhttp/doc/xhttp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/170067e633ef32ea7b17adad46fdfe2… Patch: https://github.com/kamailio/kamailio/commit/170067e633ef32ea7b17adad46fdfe2… --- diff --git a/src/modules/xhttp/doc/xhttp_admin.xml b/src/modules/xhttp/doc/xhttp_admin.xml index f0e6d3fdeb8..1c7d29a051a 100644 --- a/src/modules/xhttp/doc/xhttp_admin.xml +++ b/src/modules/xhttp/doc/xhttp_admin.xml @@ -22,7 +22,7 @@ Via header. </para> <para> - The <module>xmlrpc</module> module uses the same concept. + The xmlrpc module uses the same concept. The xHTTP module offers a generic way of handling the <acronym>HTTP</acronym> protocol, by calling <emphasis>event_route[xhttp:request]</emphasis> in your config. You can check the HTTP URL via the config variable @@ -228,7 +228,10 @@ event_route[xhttp:request] { <function moreinfo="none">xhttp:request</function> </title> <para> - The event route is executed when a new HTTP request is received. + The event route is executed when a new HTTP request is received. Most + of the variables related to a SIP request can be used inside this event + route to get HTTP request attributes (e.g., $si - source IP, $hdr(X) + - body of header X, $rm - request method, $rb - request body, ...). </para> <programlisting format="linespecific"> ...

1 year, 3 months

git:master:e60ce488: modules: readme files regenerated - http_async_client ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: e60ce488db239f717803b0f4f83180646ee47200 URL: https://github.com/kamailio/kamailio/commit/e60ce488db239f717803b0f4f831806… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-08-12T12:31:22+02:00 modules: readme files regenerated - http_async_client ... [skip ci] --- Modified: src/modules/http_async_client/README --- Diff: https://github.com/kamailio/kamailio/commit/e60ce488db239f717803b0f4f831806… Patch: https://github.com/kamailio/kamailio/commit/e60ce488db239f717803b0f4f831806… --- diff --git a/src/modules/http_async_client/README b/src/modules/http_async_client/README index 57eff8a890f..0caa3d4631f 100644 --- a/src/modules/http_async_client/README +++ b/src/modules/http_async_client/README @@ -146,7 +146,8 @@ Chapter 1. Admin Guide The following libraries or applications must be installed before running Kamailio with this module loaded: - * libcurl libev + * libcurl - https://curl.se/libcurl/ + * libevent - https://libevent.org/ 3. Parameters

1 year, 3 months

git:master:f16d2658: http_async_client: docs - dependency on libevent

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f16d2658bbefb7a9f43076cbaa958fb3a27f6a0c URL: https://github.com/kamailio/kamailio/commit/f16d2658bbefb7a9f43076cbaa958fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-12T12:16:37+02:00 http_async_client: docs - dependency on libevent - list style for dependencies and links to projects --- Modified: src/modules/http_async_client/doc/http_async_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f16d2658bbefb7a9f43076cbaa958fb… Patch: https://github.com/kamailio/kamailio/commit/f16d2658bbefb7a9f43076cbaa958fb… --- diff --git a/src/modules/http_async_client/doc/http_async_client_admin.xml b/src/modules/http_async_client/doc/http_async_client_admin.xml index f514986725d..e03b0208915 100644 --- a/src/modules/http_async_client/doc/http_async_client_admin.xml +++ b/src/modules/http_async_client/doc/http_async_client_admin.xml @@ -48,8 +48,12 @@ <itemizedlist> <listitem> <para> - <emphasis>libcurl</emphasis> - <emphasis>libev</emphasis> + <emphasis>libcurl</emphasis> - https://curl.se/libcurl/ + </para> + </listitem> + <listitem> + <para> + <emphasis>libevent</emphasis> - https://libevent.org/ </para> </listitem> </itemizedlist>

1 year, 3 months

git:master:18ae7720: pkg/kamailio/deb: rule to print excluded modules [skip ci]

by Victor Seva

Module: kamailio Branch: master Commit: 18ae77207409b816d6dffb13b41e3be9c251d62c URL: https://github.com/kamailio/kamailio/commit/18ae77207409b816d6dffb13b41e3be… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-08-10T09:56:30+02:00 pkg/kamailio/deb: rule to print excluded modules [skip ci] --- Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jammy/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/18ae77207409b816d6dffb13b41e3be… Patch: https://github.com/kamailio/kamailio/commit/18ae77207409b816d6dffb13b41e3be…

1 year, 3 months

git:master:5c7de00b: regex: convert to memory error logging helper

by Victor Seva

Module: kamailio Branch: master Commit: 5c7de00bc0826cf739577010ba7b4882e83819cc URL: https://github.com/kamailio/kamailio/commit/5c7de00bc0826cf739577010ba7b488… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-08-09T13:21:05+02:00 regex: convert to memory error logging helper --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5c7de00bc0826cf739577010ba7b488… Patch: https://github.com/kamailio/kamailio/commit/5c7de00bc0826cf739577010ba7b488… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index e9943dc57e0..2860e11a413 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -198,13 +198,13 @@ static int mod_init(void) /* Pointer to pcres */ if((pcres_addr = shm_malloc(sizeof(pcre **))) == 0) { - LM_ERR("no memory for pcres_addr\n"); + SHM_MEM_ERROR; goto err; } /* Integer containing the number of pcres */ if((num_pcres = shm_malloc(sizeof(int))) == 0) { - LM_ERR("no memory for num_pcres\n"); + SHM_MEM_ERROR; goto err; } @@ -425,14 +425,14 @@ static int load_pcres(int action) shm_free(pcres); } if((pcres = shm_malloc(sizeof(pcre *) * num_pcres_tmp)) == 0) { - LM_ERR("no more memory for pcres\n"); + SHM_MEM_ERROR; goto err; } memset(pcres, 0, sizeof(pcre *) * num_pcres_tmp); for(i = 0; i < num_pcres_tmp; i++) { pcre_rc = pcre_fullinfo(pcres_tmp[i], NULL, PCRE_INFO_SIZE, &pcre_size); if((pcres[i] = shm_malloc(pcre_size)) == 0) { - LM_ERR("no more memory for pcres[%i]\n", i); + SHM_MEM_ERROR; goto err; } memcpy(pcres[i], pcres_tmp[i], pcre_size);

1 year, 3 months

[kamailio/kamailio] fix warnings detected via codeql (PR #3497)

by Victor Seva

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3497 -- Commit Summary -- * sipcapture: use memcpy instead of strncpy for coherence * rtpproxy: use memcpy instead of strcpy for coherence -- File Changes -- M src/modules/rtpproxy/rtpproxy.c (40) M src/modules/sipcapture/sipcapture.c (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3497.patch https://github.com/kamailio/kamailio/pull/3497.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3497 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3497(a)github.com>

1 year, 3 months

git:master:11b24eb3: ctl: use snprintf() to set boundaries

by Victor Seva

Module: kamailio Branch: master Commit: 11b24eb35f4bb1e9825b3191d8f6e0fc9c0a3e28 URL: https://github.com/kamailio/kamailio/commit/11b24eb35f4bb1e9825b3191d8f6e0f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-08-09T13:20:52+02:00 ctl: use snprintf() to set boundaries > https://github.com/kamailio/kamailio/security/code-scanning/1839 --- Modified: src/modules/ctl/ctl.c --- Diff: https://github.com/kamailio/kamailio/commit/11b24eb35f4bb1e9825b3191d8f6e0f… Patch: https://github.com/kamailio/kamailio/commit/11b24eb35f4bb1e9825b3191d8f6e0f… --- diff --git a/src/modules/ctl/ctl.c b/src/modules/ctl/ctl.c index 87654c8534c..5e289cfa8d9 100644 --- a/src/modules/ctl/ctl.c +++ b/src/modules/ctl/ctl.c @@ -212,6 +212,7 @@ static int mod_init(void) { struct id_list *l; char ctl_socket_path[CTL_SOCKET_PATH_SIZE]; + int len; binrpc_callbacks_init(); @@ -226,17 +227,14 @@ static int mod_init(void) if(strcmp(runtime_dir, RUN_DIR) == 0) { add_binrpc_socket(PARAM_STRING, DEFAULT_CTL_SOCKET); } else { - if(sizeof(DEFAULT_CTL_SOCKET_PROTO) - + sizeof(DEFAULT_CTL_SOCKET_NAME) - + strlen(runtime_dir) + 4 - > CTL_SOCKET_PATH_SIZE) { + len = sizeof(DEFAULT_CTL_SOCKET_PROTO) + + sizeof(DEFAULT_CTL_SOCKET_NAME) + strlen(runtime_dir) + 4; + if(len > CTL_SOCKET_PATH_SIZE) { LM_ERR("ctl socket path is too big\n"); return -1; } - strcpy(ctl_socket_path, DEFAULT_CTL_SOCKET_PROTO); - strcat(ctl_socket_path, runtime_dir); - strcat(ctl_socket_path, "/"); - strcat(ctl_socket_path, DEFAULT_CTL_SOCKET_NAME); + snprintf(ctl_socket_path, len, "%s%s/%s", DEFAULT_CTL_SOCKET_PROTO, + runtime_dir, DEFAULT_CTL_SOCKET_NAME); add_binrpc_socket(PARAM_STRING, ctl_socket_path); } }

1 year, 3 months

[kamailio/kamailio] Halo Experts, really appreciated if I can get some assistance on the start failure issue when doing patching from kamailio 5.5.4 to 5.5.6 with the error, 'terminating due to SIGCHLD' . Thanks a lot! (Issue #3533)

by Louis Liu

### 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/3533 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3533(a)github.com>

1 year, 3 months

Question for not_empty() config function

by Stefan-Cristian Mititelu

Hello, I have a question for [1] config function. Can I extend it to work with INTs too? e.g. if pv not NULL and INT flag, return 1. This would help, because one won't need to know the type of the pvar beforehand, for using this function. Or is it meant to be used only with string pv only? [1] https://www.kamailio.org/docs/modules/devel/modules/pv.html#pv.f.not_empty Thank you, Stefan

1 year, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2023