From: Willy Tarreau <w@1wt.eu>
Date: Wed, 16 Sep 2020 13:07:22 +0000 (+0200)
Subject: MEDIUM: log-forward: use "dgram-bind" instead of "bind" for the listener
X-Git-Tag: v2.3-dev5~89
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=76aaa7f5b7ae1bba6d4870ced9b5bb32f26a570e;p=thirdparty%2Fhaproxy.git

MEDIUM: log-forward: use "dgram-bind" instead of "bind" for the listener

The use of "bind" wasn't that wise but was temporary. The problem is that
it will not allow to coexist with tcp. Let's explicitly call it "dgram-bind"
so that datagram listeners are expected here, leaving some room for stream
listeners later. This is the only change.
---

diff --git a/doc/configuration.txt b/doc/configuration.txt
index 075d3d5c8a..af3c634155 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -2749,11 +2749,12 @@ haproxy will forward all received log messages to a log servers list.
 log-forward <name>
   Creates a new log forwarder proxy identified as <name>.
 
-bind <addr> [param*]
-  Used to configure a log udp listener to receive messages to forward.
-  Only udp listeners are allowed, address must be prefixed using
-  'udp@', 'udp4@' or 'udp6@'. This supports for all "bind" parameters
-  found in 5.1 paragraph but most of them are irrelevant for udp/syslog case.
+dgram-bind <addr> [param*]
+  Used to configure a UDP log listener to receive messages to forward. Only UDP
+  listeners are allowed, the address must be prefixed using "udp@", "udp4@" or
+  "udp6@". This supports for some of the "bind" parameters found in 5.1
+  paragraph among which "interface", "namespace" or "transparent", the other
+  ones being silently ignored as irrelevant for UDP/syslog case.
 
 log global
 log <address> [len <length>] [format <format>] [sample <ranges>:<smp_size>]
diff --git a/src/log.c b/src/log.c
index e8b172d48f..984a31a262 100644
--- a/src/log.c
+++ b/src/log.c
@@ -3610,7 +3610,7 @@ int cfg_parse_log_forward(const char *file, int linenum, char **args, int kwm)
 		px->id = strdup(args[1]);
 
 	}
-	else if (strcmp(args[0], "bind") == 0) {
+	else if (strcmp(args[0], "dgram-bind") == 0) {
 		int cur_arg;
 		static int kws_dumped;
 		struct bind_conf *bind_conf;