Merge pull request syslog-ng#4544 from alexb271/proxied-socket

Add common proxy solution for all the supported transport methods that works transparently in the network() and the syslog() sources

Author: HofiOne

lib/logproto/CMakeLists.txt

@@ -11,7 +11,6 @@ set(LOGPROTO_HEADERS
     logproto/logproto-server.h
     logproto/logproto-text-client.h
     logproto/logproto-text-server.h
-    logproto/logproto-proxied-text-server.h
     PARENT_SCOPE)
 
 set(LOGPROTO_SOURCES
@@ -26,7 +25,6 @@ set(LOGPROTO_SOURCES
     logproto/logproto-server.c
     logproto/logproto-text-client.c
     logproto/logproto-text-server.c
-    logproto/logproto-proxied-text-server.c
     PARENT_SCOPE)
 
 add_test_subdirectory(tests)

lib/logproto/Makefile.am

@@ -11,7 +11,6 @@ logprotoinclude_HEADERS = \
 	lib/logproto/logproto-framed-server.h	\
 	lib/logproto/logproto-text-client.h  \
 	lib/logproto/logproto-text-server.h	\
-	lib/logproto/logproto-proxied-text-server.h	\
 	lib/logproto/logproto-multiline-server.h \
 	lib/logproto/logproto-record-server.h \
 	lib/logproto/logproto-builtins.h	\
@@ -26,7 +25,6 @@ logproto_sources = \
 	lib/logproto/logproto-framed-server.c	\
 	lib/logproto/logproto-text-client.c  \
 	lib/logproto/logproto-text-server.c	\
-	lib/logproto/logproto-proxied-text-server.c	\
 	lib/logproto/logproto-multiline-server.c \
 	lib/logproto/logproto-record-server.c \
 	lib/logproto/logproto-builtins.c

lib/logproto/logproto-builtins.c

@@ -24,7 +24,6 @@
 #include "logproto-dgram-server.h"
 #include "logproto-text-client.h"
 #include "logproto-text-server.h"
-#include "logproto-proxied-text-server.h"
 #include "logproto-framed-client.h"
 #include "logproto-framed-server.h"
 #include "plugin.h"
@@ -38,8 +37,6 @@ DEFINE_LOG_PROTO_SERVER(log_proto_dgram);
 DEFINE_LOG_PROTO_CLIENT(log_proto_text);
 DEFINE_LOG_PROTO_SERVER(log_proto_text);
 DEFINE_LOG_PROTO_SERVER(log_proto_text_with_nuls);
-DEFINE_LOG_PROTO_SERVER(log_proto_proxied_text);
-DEFINE_LOG_PROTO_SERVER(log_proto_proxied_text_tls_passthrough, .use_multitransport = TRUE);
 DEFINE_LOG_PROTO_CLIENT(log_proto_framed);
 DEFINE_LOG_PROTO_SERVER(log_proto_framed);
 
@@ -51,8 +48,6 @@ static Plugin framed_server_plugins[] =
   LOG_PROTO_CLIENT_PLUGIN(log_proto_text, "text"),
   LOG_PROTO_SERVER_PLUGIN(log_proto_text, "text"),
   LOG_PROTO_SERVER_PLUGIN(log_proto_text_with_nuls, "text-with-nuls"),
-  LOG_PROTO_SERVER_PLUGIN(log_proto_proxied_text, "proxied-tcp"),
-  LOG_PROTO_SERVER_PLUGIN(log_proto_proxied_text_tls_passthrough, "proxied-tls-passthrough"),
   LOG_PROTO_CLIENT_PLUGIN(log_proto_framed, "framed"),
   LOG_PROTO_SERVER_PLUGIN(log_proto_framed, "framed"),
 };

lib/logproto/tests/CMakeLists.txt

@@ -6,8 +6,7 @@ set(TEST_LOGPROTO_SOURCES
   test-dgram-server.c
   test-framed-server.c
   test-indented-multiline-server.c
-  test-regexp-multiline-server.c
-  test-proxy-proto.c)
+  test-regexp-multiline-server.c)
 
 add_unit_test(LIBTEST CRITERION
   TARGET test_logproto

lib/logproto/tests/Makefile.am

@@ -18,8 +18,7 @@ lib_logproto_tests_test_logproto_SOURCES = 			\
 	lib/logproto/tests/test-dgram-server.c			\
 	lib/logproto/tests/test-framed-server.c			\
 	lib/logproto/tests/test-indented-multiline-server.c	\
-	lib/logproto/tests/test-regexp-multiline-server.c	\
-	lib/logproto/tests/test-proxy-proto.c
+	lib/logproto/tests/test-regexp-multiline-server.c
 
 lib_logproto_tests_test_findeom_CFLAGS	= \
 	$(TEST_CFLAGS) \

lib/logproto/tests/test-proxy-proto.c

@@ -5,6 +5,8 @@ set(TRANSPORT_HEADERS
     transport/transport-file.h
     transport/transport-pipe.h
     transport/transport-socket.h
+    transport/transport-socket-proxy.h
+    transport/transport-socket-proxy-private.h
     transport/transport-udp-socket.h
     transport/transport-factory-id.h
     transport/transport-factory.h
@@ -23,6 +25,7 @@ set(TRANSPORT_SOURCES
     transport/transport-file.c
     transport/transport-pipe.c
     transport/transport-socket.c
+    transport/transport-socket-proxy.c
     transport/transport-udp-socket.c
     transport/transport-tls.c
     transport/transport-factory-id.c

lib/transport/CMakeLists.txt

@@ -9,6 +9,8 @@ transportinclude_HEADERS = \
 	lib/transport/transport-file.h	\
 	lib/transport/transport-pipe.h	\
 	lib/transport/transport-socket.h \
+	lib/transport/transport-socket-proxy.h \
+	lib/transport/transport-socket-proxy-private.h \
 	lib/transport/transport-udp-socket.h \
 	lib/transport/transport-factory-id.h \
 	lib/transport/transport-factory.h \
@@ -26,6 +28,7 @@ transport_sources = \
 	lib/transport/transport-file.c	\
 	lib/transport/transport-pipe.c	\
 	lib/transport/transport-socket.c \
+	lib/transport/transport-socket-proxy.c \
 	lib/transport/transport-udp-socket.c \
 	lib/transport/transport-factory-id.c \
 	lib/transport/transport-factory-registry.c \

lib/transport/Makefile.am

@@ -36,6 +36,10 @@ _do_transport_switch(MultiTransport *self, LogTransport *new_transport, const Tr
 {
   self->super.fd = log_transport_release_fd(self->active_transport);
   self->super.cond = new_transport->cond;
+  /* At this point the proxy of the active transport must be released, and would be nice to handle the ownership passing here, but
+   *   - the proxy is not in the LogTransport, it is socket only now, and
+   *   - multitransport is a generic class, can handle none LogTransportSocket based transports
+   */
   log_transport_free(self->active_transport);
   self->active_transport = new_transport;
   self->active_transport_factory = new_transport_factory;

lib/transport/multitransport.c

@@ -3,3 +3,4 @@ add_unit_test(CRITERION TARGET test_transport_factory_id)
 add_unit_test(CRITERION TARGET test_transport_factory)
 add_unit_test(CRITERION TARGET test_transport_factory_registry)
 add_unit_test(CRITERION TARGET test_multitransport)
+add_unit_test(CRITERION TARGET test_transport_socket_proxy)