Module: kamailio
Branch: master
Commit: 8ebae54cff261b95fcece3be3719da511cc35084
URL: https://github.com/kamailio/kamailio/commit/8ebae54cff261b95fcece3be3719da5…
Author: Xenofon Karamanos <xk(a)gilawa.com>
Committer: Xenofon Karamanos <xk(a)gilawa.com>
Date: 2025-01-29T10:07:24Z
cmake: Use pkg-config instead for json-c dev package.
---
Modified: src/modules/nsq/CMakeLists.txt
---
Diff: https://github.com/kamailio/kamailio/commit/8ebae54cff261b95fcece3be3719da5…
Patch: https://github.com/kamailio/kamailio/commit/8ebae54cff261b95fcece3be3719da5…
---
diff --git a/src/modules/nsq/CMakeLists.txt b/src/modules/nsq/CMakeLists.txt
index b4a482c2a47..e6acfa9a2f7 100644
--- a/src/modules/nsq/CMakeLists.txt
+++ b/src/modules/nsq/CMakeLists.txt
@@ -4,13 +4,19 @@ add_library(${module_name} SHARED ${MODULE_SOURCES})
find_package(Libev REQUIRED)
-find_package(json-c QUIET)
-if(NOT json-c_FOUND)
- message(STATUS "json-c not found. looking with pkg-config")
- find_package(PkgConfig REQUIRED)
- pkg_check_modules(json-c REQUIRED IMPORTED_TARGET json-c)
- add_library(json-c::json-c ALIAS PkgConfig::json-c)
-endif()
+# TODO: When we have a proper cmake config file for json-c for most OS, we can
+# use that instead of pkg-config.
+# json-c v 0.14 and 0.15 have wrong include directories in their cmake config
+# files. uncomment the following line when we have a proper cmake config file
+# for json-c for most OS.
+# find_package(json-c 0.16 CONFIG)
+
+# if(NOT json-c_FOUND)
+# message(STATUS "json-c not found. looking with pkg-config")
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(json-c REQUIRED IMPORTED_TARGET json-c)
+add_library(json-c::json-c ALIAS PkgConfig::json-c)
+# endif()
find_package(CURL REQUIRED)
Module: kamailio
Branch: 6.0
Commit: 60c9bafc287bfabe7860b389197e8801e26a6bfb
URL: https://github.com/kamailio/kamailio/commit/60c9bafc287bfabe7860b389197e880…
Author: Alexander Bakker <ab(a)alexbakker.me>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2025-01-29T10:31:48+01:00
outbound: encode bind address into flow token as destination
This is an attempt to fix the combination of the outbound/rr modules and
``tcp_accept_haproxy=yes``. This combination is currently broken, as
previously reported on the mailing list:
https://www.mail-archive.com/sr-users@lists.kamailio.org/msg21854.html
The issue is that the destination address/port combo of the haproxy side is
encoded into the flow token. When the rr module decodes the flow token and tries
to look up the listening socket using ``find_si``, it cannot be found, because
it is given the destination address/port combo of the connection of the haproxy
side, not the address/port combo that Kamailio is actually listening on.
This patch fixes the issue by encoding the ``bind_address`` of the socket the
connection was received on into the flow token as the destination address. The
source address remains unchanged, as it *can* be used to look up the TCP
connection (with a minor patch to ``_tcpconn_find`` in ``tcp_main.c``)
(cherry picked from commit b918e09e9c3e06bddfd7a205f64abb603d589f1c)
---
Modified: src/modules/outbound/outbound_mod.c
---
Diff: https://github.com/kamailio/kamailio/commit/60c9bafc287bfabe7860b389197e880…
Patch: https://github.com/kamailio/kamailio/commit/60c9bafc287bfabe7860b389197e880…
---
diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c
index f2e0c7dbc3d..a5f17e4ef99 100644
--- a/src/modules/outbound/outbound_mod.c
+++ b/src/modules/outbound/outbound_mod.c
@@ -180,15 +180,25 @@ int encode_flow_token(str *flow_token, struct receive_info *rcv)
return -1;
}
+ /* By encoding the bind address into the flow token as the destination
+ address, we make sure that we'll still be able to find the socket when
+ decoding it even if there's an haproxy in front */
+ struct ip_addr dst_ip = rcv->dst_ip;
+ unsigned short dst_port = rcv->dst_port;
+ if(rcv->bind_address) {
+ dst_ip = rcv->bind_address->address;
+ dst_port = rcv->bind_address->port_no;
+ }
+
/* Encode protocol information */
unenc_flow_token[pos++] =
- (rcv->dst_ip.af == AF_INET6 ? 0x80 : 0x00) | rcv->proto;
+ (dst_ip.af == AF_INET6 ? 0x80 : 0x00) | rcv->proto;
/* Encode destination address */
- for(i = 0; i < (rcv->dst_ip.af == AF_INET6 ? 16 : 4); i++)
- unenc_flow_token[pos++] = rcv->dst_ip.u.addr[i];
- unenc_flow_token[pos++] = (rcv->dst_port >> 8) & 0xff;
- unenc_flow_token[pos++] = rcv->dst_port & 0xff;
+ for(i = 0; i < (dst_ip.af == AF_INET6 ? 16 : 4); i++)
+ unenc_flow_token[pos++] = dst_ip.u.addr[i];
+ unenc_flow_token[pos++] = (dst_port >> 8) & 0xff;
+ unenc_flow_token[pos++] = dst_port & 0xff;
/* Encode source address */
for(i = 0; i < (rcv->src_ip.af == AF_INET6 ? 16 : 4); i++)