From 4dfabfed134a79d67c9810387c0bd1a6ea04d344 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Wed, 16 Sep 2020 21:44:42 +0200 Subject: [PATCH] MINOR: listener: make sock_find_compatible_fd() check the socket type sock_find_compatible_fd() can now access the protocol via the receiver hence it can access its socket type and know whether the receiver has dgram or stream sockets, so we don't need to hack around AF_CUST_UDP* anymore there. --- src/sock.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/sock.c b/src/sock.c index 8bdc3eaff..3e7ba708a 100644 --- a/src/sock.c +++ b/src/sock.c @@ -366,10 +366,7 @@ int sock_find_compatible_fd(const struct listener *l) if (!l->rx.proto->addrcmp) return -1; - /* WT: this is not the right way to do it, it is temporary for the - * transition to receivers. - */ - if (l->rx.addr.ss_family == AF_CUST_UDP4 || l->rx.addr.ss_family == AF_CUST_UDP6) + if (l->rx.proto->sock_type == SOCK_DGRAM) options |= SOCK_XFER_OPT_DGRAM; if (l->options & LI_O_FOREIGN)