]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Cleanup already defunct tlsconnect netievent
authorOndřej Surý <ondrej@isc.org>
Thu, 23 Mar 2023 21:48:41 +0000 (22:48 +0100)
committerOndřej Surý <ondrej@isc.org>
Fri, 24 Mar 2023 06:58:52 +0000 (07:58 +0100)
The netievent used for TLS connect was already defunct, just cleanup the
cruft.

lib/isc/netmgr/netmgr-int.h
lib/isc/netmgr/netmgr.c

index 4283ac062c2cc559d81a82c1799430ac35100553..06c1987e8c6061ffaaff1048d8c65b9e4746b327 100644 (file)
@@ -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
index bc4f50f8d9f44ec9fd0156f638b049768ad919b6..b033f9fae27e93ca7211d238ffc9af5a24bbb2ef 100644 (file)
@@ -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