From: Willy Tarreau <w@1wt.eu>
Date: Wed, 16 Sep 2020 08:43:38 +0000 (+0200)
Subject: MINOR: config: do not test an inherited socket again
X-Git-Tag: v2.3-dev5~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=804f11fdf8ae3d55a1dd39599e6ae12000a42f46;p=thirdparty%2Fhaproxy.git

MINOR: config: do not test an inherited socket again

Since previous patch we know that a successfully bound fd@XXX socket
is returned as its own protocol family from str2sa_range() and not as
AF_CUST_EXISTING_FD anymore o we don't need to check for that case
in str2listener().
---

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 59827f4581..7b5102452d 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -133,25 +133,7 @@ int str2listener(char *str, struct proxy *curproxy, struct bind_conf *bind_conf,
 		if (!ss2)
 			goto fail;
 
-		if (ss2->ss_family == AF_CUST_EXISTING_FD) {
-			socklen_t addr_len;
-
-			/* We want to attach to an already bound fd whose number
-			 * is in the addr part of ss2 when cast to sockaddr_in.
-			 * Note that by definition there is a single listener.
-			 * We still have to determine the address family to
-			 * register the correct protocol.
-			 */
-			fd = ((struct sockaddr_in *)ss2)->sin_addr.s_addr;
-			addr_len = sizeof(*ss2);
-			if (getsockname(fd, (struct sockaddr *)ss2, &addr_len) == -1) {
-				memprintf(err, "cannot use file descriptor '%d' : %s.\n", fd, strerror(errno));
-				goto fail;
-			}
-
-			port = end = get_host_port(ss2);
-
-		} else if (ss2->ss_family == AF_CUST_SOCKPAIR) {
+		if (ss2->ss_family == AF_CUST_SOCKPAIR) {
 			socklen_t addr_len;
 
 			fd = ((struct sockaddr_in *)ss2)->sin_addr.s_addr;