From: Ondřej Surý <ondrej@isc.org>
Date: Thu, 23 Mar 2023 21:48:41 +0000 (+0100)
Subject: Cleanup already defunct tlsconnect netievent
X-Git-Tag: v9.19.12~66^2~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3d4d099ac8a69862fae1974267d7ef041a08d3c6;p=thirdparty%2Fbind9.git

Cleanup already defunct tlsconnect netievent

The netievent used for TLS connect was already defunct, just cleanup the
cruft.
---

diff --git a/lib/isc/netmgr/netmgr-int.h b/lib/isc/netmgr/netmgr-int.h
index 4283ac062c2..06c1987e8c6 100644
--- a/lib/isc/netmgr/netmgr-int.h
+++ b/lib/isc/netmgr/netmgr-int.h
@@ -250,7 +250,6 @@ struct isc_nmhandle {
 };
 
 typedef enum isc__netievent_type {
-	netievent_tlsconnect,
 	netievent_tlsdobio,
 
 	netievent_httpclose,
@@ -518,13 +517,6 @@ typedef struct isc__netievent__socket_quota {
 		isc__nm_put_netievent(worker, ievent);                         \
 	}
 
-typedef struct isc__netievent_tlsconnect {
-	NETIEVENT__SOCKET;
-	SSL_CTX *ctx;
-	isc_sockaddr_t local; /* local address */
-	isc_sockaddr_t peer;  /* peer address */
-} isc__netievent_tlsconnect_t;
-
 typedef struct isc__netievent {
 	isc__netievent_type type;
 	ISC_LINK(isc__netievent_t) link;
@@ -628,7 +620,6 @@ typedef union {
 	isc__netievent__socket_t nis;
 	isc__netievent__socket_req_t nisr;
 	isc__netievent__socket_quota_t nisq;
-	isc__netievent_tlsconnect_t nitc;
 	isc__netievent__tlsctx_t nitls;
 #ifdef HAVE_LIBNGHTTP2
 	isc__netievent__http_eps_t nihttpeps;
@@ -1663,8 +1654,6 @@ isc__nmsocket_stop(isc_nmsocket_t *listener);
  * typedef all the netievent types
  */
 
-/* NETIEVENT_SOCKET_TYPE(tlsconnect); */ /* unique type, defined independently
-					  */
 NETIEVENT_SOCKET_TYPE(tlsdobio);
 
 #ifdef HAVE_LIBNGHTTP2
@@ -1683,7 +1672,6 @@ NETIEVENT_SOCKET_TYPE(sockstop);
 
 /* Now declared the helper functions */
 
-NETIEVENT_SOCKET_DECL(tlsconnect);
 NETIEVENT_SOCKET_DECL(tlsdobio);
 
 #ifdef HAVE_LIBNGHTTP2
diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c
index bc4f50f8d9f..b033f9fae27 100644
--- a/lib/isc/netmgr/netmgr.c
+++ b/lib/isc/netmgr/netmgr.c
@@ -474,7 +474,6 @@ isc__nm_put_netievent(isc__networker_t *worker, void *ievent) {
 	isc__networker_unref(worker);
 }
 
-NETIEVENT_SOCKET_DEF(tlsconnect);
 NETIEVENT_SOCKET_DEF(tlsdobio);
 
 #ifdef HAVE_LIBNGHTTP2