From 94320859f9024e29791f097f550f57b67273326f Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Tue, 1 Sep 2020 18:48:35 +0200 Subject: [PATCH] MINOR: protocol: do not call proto->bind_all() anymore All protocols only iterate over their own listeners list and start the listeners using a direct call to their ->bind() function. This code duplication doesn't make sense and prevents us from centralizing the startup error handling. Worse, it's not even symmetric because there's an unbind_all_listeners() function common to all protocols without any equivalent for binding. Let's start by directly calling each protocol's bind() function from protocol_bind_all(). --- src/protocol.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/protocol.c b/src/protocol.c index af13f42e7..faa634192 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -57,14 +58,15 @@ void protocol_unregister(struct protocol *proto) int protocol_bind_all(char *errmsg, int errlen) { struct protocol *proto; + struct listener *listener; int err; err = 0; HA_SPIN_LOCK(PROTO_LOCK, &proto_lock); list_for_each_entry(proto, &protocols, list) { - if (proto->bind_all) { - err |= proto->bind_all(proto, errmsg, errlen); - if ( err & ERR_ABORT ) + list_for_each_entry(listener, &proto->listeners, proto_list) { + err |= proto->bind(listener, errmsg, errlen); + if (err & ERR_ABORT) break; } }