From: Willy Tarreau <w@1wt.eu>
Date: Thu, 14 Oct 2021 09:59:15 +0000 (+0200)
Subject: MINOR: protocol: uniformize protocol errors
X-Git-Tag: v2.5-dev10~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6823a3acee3e35f80c6ab9ab20149e62f4182d9c;p=thirdparty%2Fhaproxy.git

MINOR: protocol: uniformize protocol errors

Some protocols fail with "error blah [ip:port]" and other fail with
"[ip:port] error blah". All this already appears in a "starting" or
"binding" context after a proxy name. Let's choose a more universal
approach like below where the ip:port remains at the end of the line
prefixed with "for".

  [WARNING]  (18632) : Binding [binderr.cfg:10] for proxy http: cannot bind receiver to device 'eth2' (No such device) for [0.0.0.0:1080]
  [WARNING]  (18632) : Starting [binderr.cfg:10] for proxy http: cannot set MSS to 12 for [0.0.0.0:1080]
---

diff --git a/src/proto_quic.c b/src/proto_quic.c
index 257a49204b..58679eb3ab 100644
--- a/src/proto_quic.c
+++ b/src/proto_quic.c
@@ -607,7 +607,7 @@ static int quic_bind_listener(struct listener *listener, char *errmsg, int errle
 		char pn[INET6_ADDRSTRLEN];
 
 		addr_to_str(&listener->rx.addr, pn, sizeof(pn));
-		snprintf(errmsg, errlen, "%s [%s:%d]", msg, pn, get_host_port(&listener->rx.addr));
+		snprintf(errmsg, errlen, "%s for [%s:%d]", msg, pn, get_host_port(&listener->rx.addr));
 	}
 	return err;
 }
diff --git a/src/proto_sockpair.c b/src/proto_sockpair.c
index 216700b40d..11cf3537fa 100644
--- a/src/proto_sockpair.c
+++ b/src/proto_sockpair.c
@@ -162,7 +162,7 @@ int sockpair_bind_receiver(struct receiver *rx, char **errmsg)
 
  bind_return:
 	if (errmsg && *errmsg)
-		memprintf(errmsg, "%s [fd %d]", *errmsg, rx->fd);
+		memprintf(errmsg, "%s for [fd %d]", *errmsg, rx->fd);
 
 	return err;
 
diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index 95466538b2..18e9b80e49 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -734,7 +734,7 @@ int tcp_bind_listener(struct listener *listener, char *errmsg, int errlen)
 		char pn[INET6_ADDRSTRLEN];
 
 		addr_to_str(&listener->rx.addr, pn, sizeof(pn));
-		snprintf(errmsg, errlen, "[%s:%d]: %s", pn, get_host_port(&listener->rx.addr), msg->area);
+		snprintf(errmsg, errlen, "%s for [%s:%d]", msg->area, pn, get_host_port(&listener->rx.addr));
 	}
 	free_trash_chunk(msg);
 	msg = NULL;
diff --git a/src/proto_udp.c b/src/proto_udp.c
index f07170f297..c5ecfacd0f 100644
--- a/src/proto_udp.c
+++ b/src/proto_udp.c
@@ -148,7 +148,7 @@ int udp_bind_listener(struct listener *listener, char *errmsg, int errlen)
 		char pn[INET6_ADDRSTRLEN];
 
 		addr_to_str(&listener->rx.addr, pn, sizeof(pn));
-		snprintf(errmsg, errlen, "%s [%s:%d]", msg, pn, get_host_port(&listener->rx.addr));
+		snprintf(errmsg, errlen, "%s for [%s:%d]", msg, pn, get_host_port(&listener->rx.addr));
 	}
 	return err;
 }
diff --git a/src/proto_uxdg.c b/src/proto_uxdg.c
index 7eb5a6252a..b0efe867c4 100644
--- a/src/proto_uxdg.c
+++ b/src/proto_uxdg.c
@@ -103,7 +103,7 @@ int uxdg_bind_listener(struct listener *listener, char *errmsg, int errlen)
  uxdg_return:
 	if (msg && errlen) {
 		const char *path = ((struct sockaddr_un *)&listener->rx.addr)->sun_path;
-                snprintf(errmsg, errlen, "%s [%s]", msg, path);
+                snprintf(errmsg, errlen, "%s for [%s]", msg, path);
 	}
 	return err;
 }
diff --git a/src/proto_uxst.c b/src/proto_uxst.c
index 47a9992435..45cb56f369 100644
--- a/src/proto_uxst.c
+++ b/src/proto_uxst.c
@@ -141,7 +141,7 @@ static int uxst_bind_listener(struct listener *listener, char *errmsg, int errle
  uxst_return:
 	if (msg && errlen) {
 		const char *path = ((struct sockaddr_un *)&listener->rx.addr)->sun_path;
-		snprintf(errmsg, errlen, "%s [%s]", msg, path);
+		snprintf(errmsg, errlen, "%s for [%s]", msg, path);
 	}
 	return err;
 }
diff --git a/src/sock_inet.c b/src/sock_inet.c
index 1402dd076d..fd8f648933 100644
--- a/src/sock_inet.c
+++ b/src/sock_inet.c
@@ -402,7 +402,7 @@ int sock_inet_bind_receiver(struct receiver *rx, char **errmsg)
 		char pn[INET6_ADDRSTRLEN];
 
 		addr_to_str(&addr_inet, pn, sizeof(pn));
-		memprintf(errmsg, "%s [%s:%d]", *errmsg, pn, get_host_port(&addr_inet));
+		memprintf(errmsg, "%s for [%s:%d]", *errmsg, pn, get_host_port(&addr_inet));
 	}
 	return err;