From: Christopher Faulet <cfaulet@haproxy.com>
Date: Wed, 8 Aug 2018 08:25:57 +0000 (+0200)
Subject: MINOR: mux: Improve the message with the list of existing mux protocols
X-Git-Tag: v1.9-dev2~178
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c9ef03bf4877b69a8f85972afcacf0db6f609ae;p=thirdparty%2Fhaproxy.git

MINOR: mux: Improve the message with the list of existing mux protocols

Because there can be several default multiplexers (without name), they are now
reported with the name "<default>". And a message warns they cannot be
referenced with the "proto" keyword on a bind line or a server line.
---

diff --git a/include/proto/connection.h b/include/proto/connection.h
index 27edff947a..fe4c0705fe 100644
--- a/include/proto/connection.h
+++ b/include/proto/connection.h
@@ -980,7 +980,8 @@ static inline void list_mux_proto(FILE *out)
 	struct ist proto;
 	char *mode, *side;
 
-	fprintf(out, "Available multiplexer protocols :\n");
+	fprintf(out, "Available multiplexer protocols :\n"
+		"(protocols markes as <default> cannot be specified using 'proto' keyword)\n");
 	list_for_each_entry(item, &mux_proto_list.list, list) {
 		proto = item->token;
 
@@ -1003,7 +1004,7 @@ static inline void list_mux_proto(FILE *out)
 			side = "NONE";
 
 		fprintf(out, " %15s : mode=%-10s side=%s\n",
-			(proto.len ? proto.ptr : "pass-through"), mode, side);
+			(proto.len ? proto.ptr : "<default>"), mode, side);
 	}
 }