From: Witold Kręcicki <wpk@isc.org>
Date: Wed, 1 Jul 2020 10:25:35 +0000 (+0200)
Subject: Add missing libisc.def definitions, netmgr version of isc_sockettype_t.
X-Git-Tag: v9.17.3~20^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25f84ffc688072a79ba11d6c89042a71e317a97f;p=thirdparty%2Fbind9.git

Add missing libisc.def definitions, netmgr version of isc_sockettype_t.
---

diff --git a/lib/isc/include/isc/netmgr.h b/lib/isc/include/isc/netmgr.h
index 67d95f38760..99d41f01f48 100644
--- a/lib/isc/include/isc/netmgr.h
+++ b/lib/isc/include/isc/netmgr.h
@@ -12,17 +12,19 @@
 #pragma once
 
 #include <isc/mem.h>
+#include <isc/region.h>
 #include <isc/result.h>
 #include <isc/types.h>
 
+/*
+ * Replacement for isc_sockettype_t provided by socket.h.
+ */
 typedef enum {
-	NMEV_READ,
-	NMEV_WRITE,
-	NMEV_ACCEPT,
-	NMEV_CONNECTED,
-	NMEV_CANCELLED,
-	NMEV_SHUTDOWN
-} isc_nm_eventtype;
+	isc_socktype_tcp = 1,
+	isc_socktype_udp = 2,
+	isc_socktype_unix = 3,
+	isc_socktype_raw = 4
+} isc_socktype_t;
 
 typedef void (*isc_nm_recv_cb_t)(isc_nmhandle_t *handle, isc_result_t eresult,
 				 isc_region_t *region, void *cbarg);
diff --git a/lib/isc/win32/libisc.def.in b/lib/isc/win32/libisc.def.in
index 3f37ede289e..7313a73acb2 100644
--- a/lib/isc/win32/libisc.def.in
+++ b/lib/isc/win32/libisc.def.in
@@ -454,8 +454,10 @@ isc_nm_closedown
 isc_nm_destroy
 isc_nm_detach
 isc_nm_listentcpdns
+isc_nm_listentcp
 isc_nm_listenudp
 isc_nm_maxudp
+isc_nm_read
 isc_nm_send
 isc_nm_setstats
 isc_nm_start