mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-08 08:07:10 +02:00
Code Issues Projects Releases Wiki Activity

MEDIUM: protocol: explicitly start the receiver before the listener

Browse Source 
Now protocol_bind_all() starts the receivers before their respective
listeners so that ultimately we won't need the listeners for non-
connected protocols.

We still have to resort to an ugly trick to set the I/O handler in
case of syslog over UDP because for now it's still not set in the
receiver, so we hard-code it.
This commit is contained in:
Willy Tarreau 2020-09-02 18:22:11 +02:00
parent 9eda7a6d62
commit fc974887ce
1 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/protocol.c
View File

@ -60,16 +60,54 @@ int protocol_bind_all(int verbose)
{
struct protocol *proto;
struct listener *listener;
struct receiver *receiver;
char msg[100];
char *errmsg;
void *handler;
int err, lerr;
err = 0;
HA_SPIN_LOCK(PROTO_LOCK, &proto_lock);
list_for_each_entry(proto, &protocols, list) {
list_for_each_entry(listener, &proto->listeners, rx.proto_list) {
lerr = proto->listen(listener, msg, sizeof(msg));
list_for_each_entry(receiver, &proto->listeners, proto_list) {
listener = LIST_ELEM(receiver, struct listener *, rx);
/* FIXME: horrible hack, we don't have a way to register
* a handler when creating the receiver yet, so we still
* have to take care of special cases here.
*/
handler = listener->rx.proto->accept;
if (!handler && listener->bind_conf->frontend->mode == PR_MODE_SYSLOG) {
extern void syslog_fd_handler(int);
handler = syslog_fd_handler;
}
lerr = proto->bind(receiver, handler, &errmsg);
err |= lerr;
/* errors are reported if <verbose> is set or if they are fatal */
if (verbose || (lerr & (ERR_FATAL | ERR_ABORT))) {
struct proxy *px = listener->bind_conf->frontend;
if (lerr & ERR_ALERT)
ha_alert("Starting %s %s: %s\n",
proxy_type_str(px), px->id, errmsg);
else if (lerr & ERR_WARN)
ha_warning("Starting %s %s: %s\n",
proxy_type_str(px), px->id, errmsg);
free(errmsg); errmsg = NULL;
}
if (lerr & ERR_ABORT)
break;
if (lerr & ~ERR_WARN)
continue;
/* for now there's still always a listening function */
BUG_ON(!proto->listen);
lerr = proto->listen(listener, msg, sizeof(msg));
err |= lerr;
if (verbose || (lerr & (ERR_FATAL | ERR_ABORT))) {
struct proxy *px = listener->bind_conf->frontend;
@ -80,8 +118,6 @@ int protocol_bind_all(int verbose)
ha_warning("Starting %s %s: %s\n",
proxy_type_str(px), px->id, msg);
}
err |= lerr;
if (lerr & ERR_ABORT)
break;
}