From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 9 Dec 2020 10:37:04 +0000 (+0100)
Subject: Remove useless tcp_read_fd member from struct
X-Git-Tag: release-1.13.2rc1~254^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=275f18cc8ed4a6ea4c8792dfc5c7356e8496e54f;p=thirdparty%2Funbound.git

Remove useless tcp_read_fd member from struct
---

diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
index e8b8fdbd6..823d56fd3 100644
--- a/services/listen_dnsport.c
+++ b/services/listen_dnsport.c
@@ -139,7 +139,7 @@ verbose_print_unbound_socket(struct unbound_socket* ub_sock)
 	if(verbosity >= VERB_ALGO) {
 		log_info("listing of unbound_socket structure:");
 		verbose_print_addr(ub_sock->addr);
-		log_info("s is: %d, fam is: %s, tcp_read_fd is: %d", ub_sock->s, ub_sock->fam == AF_INET?"AF_INET":"AF_INET6", ub_sock->tcp_read_fd);
+		log_info("s is: %d, fam is: %s", ub_sock->s, ub_sock->fam == AF_INET?"AF_INET":"AF_INET6");
 	}
 }
 
@@ -972,7 +972,6 @@ make_sock(int stype, const char* ifname, const char* port,
 	(*ub_sock)->addr = res;
 	(*ub_sock)->s = s;
 	(*ub_sock)->fam = hints->ai_family;
-	(*ub_sock)->tcp_read_fd = -1;
 
 	return s;
 }
diff --git a/services/listen_dnsport.h b/services/listen_dnsport.h
index 82f0d9ec6..692391ed2 100644
--- a/services/listen_dnsport.h
+++ b/services/listen_dnsport.h
@@ -112,8 +112,6 @@ struct unbound_socket {
         int                     s;
 	/** address family (AF_INET/IF_INET6) */
         int                     fam;
-        /** descriptor returned by accept() syscall for further usage. TODO: actually it might be useless here unlike in NSD where we have no comm_points mechanism with callback pointers for every created communication point */
-        int                     tcp_read_fd;
 };
 
 /**