remove dns_client_request() and related code

continues the cleanup of dns_client started in the previous commit.
2021-03-22 18:14:37 -07:00
parent fb2a352e7c
commit 1beb05f3e2
12 changed files with 1 additions and 1745 deletions
--- a/bin/win32/BINDInstall/BINDInstall.vcxproj.in
+++ b/bin/win32/BINDInstall/BINDInstall.vcxproj.in
@@ -305,9 +305,6 @@
    <ProjectReference Include="..\..\..\lib\samples\win32\gai.vcxproj">
      <Project>{D42B8670-8DF6-4D90-90F7-DB5FB845AFAE}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\..\..\lib\samples\win32\nsprobe.vcxproj">
-      <Project>{CB2A29F6-E73B-40AB-8AC4-2C1AAE7280BD}</Project>
-    </ProjectReference>
    <ProjectReference Include="..\..\..\lib\samples\win32\resolve.vcxproj">
      <Project>{F66D8B7E-721D-4602-99AD-820D19AD1313}</Project>
    </ProjectReference>
--- a/lib/dns/client.c
+++ b/lib/dns/client.c
@@ -56,9 +56,6 @@
 #define RCTX_MAGIC    ISC_MAGIC('R', 'c', 't', 'x')
 #define RCTX_VALID(c) ISC_MAGIC_VALID(c, RCTX_MAGIC)

-#define REQCTX_MAGIC	ISC_MAGIC('R', 'q', 'c', 'x')
-#define REQCTX_VALID(c) ISC_MAGIC_VALID(c, REQCTX_MAGIC)
-
 #define UCTX_MAGIC    ISC_MAGIC('U', 'c', 't', 'x')
 #define UCTX_VALID(c) ISC_MAGIC_VALID(c, UCTX_MAGIC)

@@ -103,7 +100,6 @@ struct dns_client {
 	/* Locked */
 	dns_viewlist_t viewlist;
 	ISC_LIST(struct resctx) resctxs;
-	ISC_LIST(struct reqctx) reqctxs;
 };

 #define DEF_FIND_TIMEOUT    5
@@ -157,39 +153,6 @@ typedef struct resarg {
 	bool canceled;
 } resarg_t;

-/*%
- * Internal state for a single DNS request
- */
-typedef struct reqctx {
-	/* Unlocked */
-	unsigned int magic;
-	isc_mutex_t lock;
-	dns_client_t *client;
-	unsigned int parseoptions;
-
-	/* Locked */
-	ISC_LINK(struct reqctx) link;
-	bool canceled;
-	dns_tsigkey_t *tsigkey;
-	dns_request_t *request;
-	dns_clientreqevent_t *event;
-} reqctx_t;
-
-/*%
- * Argument of an internal event for synchronous DNS request.
- */
-typedef struct reqarg {
-	/* Unlocked */
-	isc_appctx_t *actx;
-	dns_client_t *client;
-	isc_mutex_t lock;
-
-	/* Locked */
-	isc_result_t result;
-	dns_clientreqtrans_t *trans;
-	bool canceled;
-} reqarg_t;
-
 static void
 client_resfind(resctx_t *rctx, dns_fetchevent_t *event);

@@ -415,7 +378,6 @@ dns_client_createx(isc_mem_t *mctx, isc_appctx_t *actx, isc_taskmgr_t *taskmgr,
 	dns_view_freeze(view); /* too early? */

 	ISC_LIST_INIT(client->resctxs);
-	ISC_LIST_INIT(client->reqctxs);

 	client->mctx = NULL;
 	isc_mem_attach(mctx, &client->mctx);
@@ -1404,302 +1366,3 @@ cleanup:
 	}
 	return (result);
 }
-
-/*%
- * Simple request routines
- */
-static void
-request_done(isc_task_t *task, isc_event_t *event) {
-	dns_requestevent_t *reqev = NULL;
-	dns_request_t *request;
-	isc_result_t result, eresult;
-	reqctx_t *ctx;
-
-	UNUSED(task);
-
-	REQUIRE(event->ev_type == DNS_EVENT_REQUESTDONE);
-	reqev = (dns_requestevent_t *)event;
-	request = reqev->request;
-	result = eresult = reqev->result;
-	ctx = reqev->ev_arg;
-	REQUIRE(REQCTX_VALID(ctx));
-
-	isc_event_free(&event);
-
-	LOCK(&ctx->lock);
-
-	if (eresult == ISC_R_SUCCESS) {
-		result = dns_request_getresponse(request, ctx->event->rmessage,
-						 ctx->parseoptions);
-	}
-
-	if (ctx->tsigkey != NULL) {
-		dns_tsigkey_detach(&ctx->tsigkey);
-	}
-
-	if (ctx->canceled) {
-		ctx->event->result = ISC_R_CANCELED;
-	} else {
-		ctx->event->result = result;
-	}
-	task = ctx->event->ev_sender;
-	ctx->event->ev_sender = ctx;
-	isc_task_sendanddetach(&task, ISC_EVENT_PTR(&ctx->event));
-
-	UNLOCK(&ctx->lock);
-}
-
-static void
-localrequest_done(isc_task_t *task, isc_event_t *event) {
-	reqarg_t *reqarg = event->ev_arg;
-	dns_clientreqevent_t *rev = (dns_clientreqevent_t *)event;
-
-	UNUSED(task);
-
-	REQUIRE(event->ev_type == DNS_EVENT_CLIENTREQDONE);
-
-	LOCK(&reqarg->lock);
-
-	reqarg->result = rev->result;
-	dns_client_destroyreqtrans(&reqarg->trans);
-	isc_event_free(&event);
-
-	if (!reqarg->canceled) {
-		UNLOCK(&reqarg->lock);
-
-		/* Exit from the internal event loop */
-		isc_app_ctxsuspend(reqarg->actx);
-	} else {
-		/*
-		 * We have already exited from the loop (due to some
-		 * unexpected event).  Just clean the arg up.
-		 */
-		UNLOCK(&reqarg->lock);
-		isc_mutex_destroy(&reqarg->lock);
-		isc_mem_put(reqarg->client->mctx, reqarg, sizeof(*reqarg));
-	}
-}
-
-isc_result_t
-dns_client_request(dns_client_t *client, dns_message_t *qmessage,
-		   dns_message_t *rmessage, const isc_sockaddr_t *server,
-		   unsigned int options, unsigned int parseoptions,
-		   dns_tsec_t *tsec, unsigned int timeout,
-		   unsigned int udptimeout, unsigned int udpretries) {
-	isc_appctx_t *actx;
-	reqarg_t *reqarg;
-	isc_result_t result;
-
-	REQUIRE(DNS_CLIENT_VALID(client));
-	REQUIRE(qmessage != NULL);
-	REQUIRE(rmessage != NULL);
-
-	if ((client->attributes & DNS_CLIENTATTR_OWNCTX) == 0 &&
-	    (options & DNS_CLIENTREQOPT_ALLOWRUN) == 0)
-	{
-		/*
-		 * If the client is run under application's control, we need
-		 * to create a new running (sub)environment for this
-		 * particular resolution.
-		 */
-		return (ISC_R_NOTIMPLEMENTED); /* XXXTBD */
-	} else {
-		actx = client->actx;
-	}
-
-	reqarg = isc_mem_get(client->mctx, sizeof(*reqarg));
-
-	isc_mutex_init(&reqarg->lock);
-
-	reqarg->actx = actx;
-	reqarg->client = client;
-	reqarg->trans = NULL;
-	reqarg->canceled = false;
-
-	result = dns_client_startrequest(
-		client, qmessage, rmessage, server, options, parseoptions, tsec,
-		timeout, udptimeout, udpretries, client->task,
-		localrequest_done, reqarg, &reqarg->trans);
-	if (result != ISC_R_SUCCESS) {
-		isc_mutex_destroy(&reqarg->lock);
-		isc_mem_put(client->mctx, reqarg, sizeof(*reqarg));
-		return (result);
-	}
-
-	/*
-	 * Start internal event loop.  It blocks until the entire process
-	 * is completed.
-	 */
-	result = isc_app_ctxrun(actx);
-
-	LOCK(&reqarg->lock);
-	if (result == ISC_R_SUCCESS || result == ISC_R_SUSPEND) {
-		result = reqarg->result;
-	}
-	if (reqarg->trans != NULL) {
-		/*
-		 * Unusual termination (perhaps due to signal).  We need some
-		 * tricky cleanup process.
-		 */
-		reqarg->canceled = true;
-		dns_client_cancelresolve(reqarg->trans);
-
-		UNLOCK(&reqarg->lock);
-
-		/* reqarg will be freed in the event handler. */
-	} else {
-		UNLOCK(&reqarg->lock);
-
-		isc_mutex_destroy(&reqarg->lock);
-		isc_mem_put(client->mctx, reqarg, sizeof(*reqarg));
-	}
-
-	return (result);
-}
-
-isc_result_t
-dns_client_startrequest(dns_client_t *client, dns_message_t *qmessage,
-			dns_message_t *rmessage, const isc_sockaddr_t *server,
-			unsigned int options, unsigned int parseoptions,
-			dns_tsec_t *tsec, unsigned int timeout,
-			unsigned int udptimeout, unsigned int udpretries,
-			isc_task_t *task, isc_taskaction_t action, void *arg,
-			dns_clientreqtrans_t **transp) {
-	isc_result_t result;
-	dns_view_t *view = NULL;
-	isc_task_t *tclone = NULL;
-	dns_clientreqevent_t *event = NULL;
-	reqctx_t *ctx = NULL;
-	dns_tsectype_t tsectype = dns_tsectype_none;
-	unsigned int reqoptions;
-
-	REQUIRE(DNS_CLIENT_VALID(client));
-	REQUIRE(qmessage != NULL);
-	REQUIRE(rmessage != NULL);
-	REQUIRE(transp != NULL && *transp == NULL);
-
-	if (tsec != NULL) {
-		tsectype = dns_tsec_gettype(tsec);
-		if (tsectype != dns_tsectype_tsig) {
-			return (ISC_R_NOTIMPLEMENTED); /* XXX */
-		}
-	}
-
-	LOCK(&client->lock);
-	result = dns_viewlist_find(&client->viewlist, DNS_CLIENTVIEW_NAME,
-				   qmessage->rdclass, &view);
-	UNLOCK(&client->lock);
-	if (result != ISC_R_SUCCESS) {
-		return (result);
-	}
-
-	reqoptions = 0;
-	if ((options & DNS_CLIENTREQOPT_TCP) != 0) {
-		reqoptions |= DNS_REQUESTOPT_TCP;
-	}
-
-	tclone = NULL;
-	isc_task_attach(task, &tclone);
-	event = (dns_clientreqevent_t *)isc_event_allocate(
-		client->mctx, tclone, DNS_EVENT_CLIENTREQDONE, action, arg,
-		sizeof(*event));
-
-	ctx = isc_mem_get(client->mctx, sizeof(*ctx));
-	isc_mutex_init(&ctx->lock);
-
-	ctx->client = client;
-	ISC_LINK_INIT(ctx, link);
-	ctx->parseoptions = parseoptions;
-	ctx->canceled = false;
-	ctx->event = event;
-	ctx->event->rmessage = rmessage;
-	ctx->tsigkey = NULL;
-	if (tsec != NULL) {
-		dns_tsec_getkey(tsec, &ctx->tsigkey);
-	}
-
-	ctx->magic = REQCTX_MAGIC;
-
-	LOCK(&client->lock);
-	ISC_LIST_APPEND(client->reqctxs, ctx, link);
-	isc_refcount_increment(&client->references);
-	UNLOCK(&client->lock);
-
-	ctx->request = NULL;
-	result = dns_request_createvia(view->requestmgr, qmessage, NULL, server,
-				       -1, reqoptions, ctx->tsigkey, timeout,
-				       udptimeout, udpretries, client->task,
-				       request_done, ctx, &ctx->request);
-	if (result == ISC_R_SUCCESS) {
-		dns_view_detach(&view);
-		*transp = (dns_clientreqtrans_t *)ctx;
-		return (ISC_R_SUCCESS);
-	}
-
-	isc_refcount_decrement1(&client->references);
-
-	LOCK(&client->lock);
-	ISC_LIST_UNLINK(client->reqctxs, ctx, link);
-	UNLOCK(&client->lock);
-	isc_mutex_destroy(&ctx->lock);
-	isc_mem_put(client->mctx, ctx, sizeof(*ctx));
-
-	isc_event_free(ISC_EVENT_PTR(&event));
-	isc_task_detach(&tclone);
-	dns_view_detach(&view);
-
-	return (result);
-}
-
-void
-dns_client_cancelrequest(dns_clientreqtrans_t *trans) {
-	reqctx_t *ctx;
-
-	REQUIRE(trans != NULL);
-	ctx = (reqctx_t *)trans;
-	REQUIRE(REQCTX_VALID(ctx));
-
-	LOCK(&ctx->lock);
-
-	if (!ctx->canceled) {
-		ctx->canceled = true;
-		if (ctx->request != NULL) {
-			dns_request_cancel(ctx->request);
-		}
-	}
-
-	UNLOCK(&ctx->lock);
-}
-
-void
-dns_client_destroyreqtrans(dns_clientreqtrans_t **transp) {
-	reqctx_t *ctx;
-	isc_mem_t *mctx;
-	dns_client_t *client;
-
-	REQUIRE(transp != NULL);
-	ctx = (reqctx_t *)*transp;
-	*transp = NULL;
-	REQUIRE(REQCTX_VALID(ctx));
-	client = ctx->client;
-	REQUIRE(DNS_CLIENT_VALID(client));
-	REQUIRE(ctx->event == NULL);
-	REQUIRE(ctx->request != NULL);
-
-	dns_request_destroy(&ctx->request);
-	mctx = client->mctx;
-
-	LOCK(&client->lock);
-
-	INSIST(ISC_LINK_LINKED(ctx, link));
-	ISC_LIST_UNLINK(client->reqctxs, ctx, link);
-
-	UNLOCK(&client->lock);
-
-	isc_mutex_destroy(&ctx->lock);
-	ctx->magic = 0;
-
-	isc_mem_put(mctx, ctx, sizeof(*ctx));
-
-	dns_client_destroy(&client);
-}
--- a/lib/dns/win32/libdns.def.in
+++ b/lib/dns/win32/libdns.def.in
@@ -133,19 +133,14 @@ dns_catz_zones_merge
 dns_cert_fromtext
 dns_cert_totext
 dns_client_addtrustedkey
-dns_client_cancelrequest
 dns_client_cancelresolve
 dns_client_clearservers
 dns_client_createx
 dns_client_destroy
-dns_client_destroyreqtrans
 dns_client_destroyrestrans
 dns_client_freeresanswer
-dns_client_mctx
-dns_client_request
 dns_client_resolve
 dns_client_setservers
-dns_client_startrequest
 dns_client_startresolve
 dns_clientinfo_init
 dns_clientinfomethods_init
--- a/lib/samples/.gitignore
+++ b/lib/samples/.gitignore
@@ -1,4 +1,3 @@
-nsprobe
 process
 resolve
 sample-async
--- a/lib/samples/Makefile.am
+++ b/lib/samples/Makefile.am
@@ -7,14 +7,10 @@ AM_CPPFLAGS +=			\

 noinst_PROGRAMS =		\
 	resolve			\
-	sample-async		\
-	nsprobe
+	sample-async

 resolve_SOURCES = resolve.c
 resolve_LDADD = $(LIBISC_LIBS) $(LIBIRS_LIBS) $(LIBDNS_LIBS)

 sample_async_SOURCES = sample-async.c
 sample_async_LDADD = $(LIBISC_LIBS) $(LIBDNS_LIBS)
-
-nsprobe_SOURCES = nsprobe.c
-nsprobe_LDADD = $(LIBISC_LIBS) $(LIBDNS_LIBS)
--- a/lib/samples/nsprobe.c
+++ b/lib/samples/nsprobe.c
--- a/lib/samples/win32/nsprobe.vcxproj.filters.in
+++ b/lib/samples/win32/nsprobe.vcxproj.filters.in
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\nsprobe.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
--- a/lib/samples/win32/nsprobe.vcxproj.in
+++ b/lib/samples/win32/nsprobe.vcxproj.in
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="@TOOLS_VERSION@" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|@PLATFORM@">
-      <Configuration>Debug</Configuration>
-      <Platform>@PLATFORM@</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|@PLATFORM@">
-      <Configuration>Release</Configuration>
-      <Platform>@PLATFORM@</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{CB2A29F6-E73B-40AB-8AC4-2C1AAE7280BD}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>nsprobe</RootNamespace>
-    @WINDOWS_TARGET_PLATFORM_VERSION@
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-    @PLATFORM_TOOLSET@
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    @PLATFORM_TOOLSET@
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>
-    <IntDir>.\$(Configuration)\</IntDir>
-    <IntDirSharingDetected>None</IntDirSharingDetected>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>
-    <IntDir>.\$(Configuration)\</IntDir>
-    <IntDirSharingDetected>None</IntDirSharingDetected>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>false</TreatWarningAsError>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <ForcedIncludeFiles>..\..\..\config.h</ForcedIncludeFiles>
-      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;..\..\dns\win32\include;..\..\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
-    <ClCompile>
-      <WarningLevel>Level1</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <StringPooling>true</StringPooling>
-      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <ForcedIncludeFiles>..\..\..\config.h</ForcedIncludeFiles>
-      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;..\..\dns\win32\include;..\..\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\nsprobe.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\lib\isc\win32\libisc.vcxproj">
-      <Project>{3840E563-D180-4761-AA9C-E6155F02EAFF}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\lib\dns\win32\libdns.vcxproj">
-      <Project>{5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
--- a/lib/samples/win32/nsprobe.vcxproj.user
+++ b/lib/samples/win32/nsprobe.vcxproj.user
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
--- a/util/copyrights
+++ b/util/copyrights
@@ -2189,16 +2189,12 @@
 ./lib/ns/win32/libns.vcxproj.in			X	2017,2018,2019,2020
 ./lib/ns/win32/libns.vcxproj.user		X	2017,2018,2019,2020,2021
 ./lib/ns/xfrout.c				C	2017,2018,2019,2020,2021
-./lib/samples/nsprobe.c				C	2009,2010,2011,2012,2013,2014,2015,2016,2018,2019,2020,2021
 ./lib/samples/resolve.c				C	2009,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021
 ./lib/samples/rootkey.sh			SH	2013,2016,2018,2019,2020,2021
 ./lib/samples/sample-async.c			C	2009,2013,2014,2015,2016,2018,2019,2020,2021
 ./lib/samples/win32/async.vcxproj.filters.in	X	2014,2015,2018,2019,2020
 ./lib/samples/win32/async.vcxproj.in		X	2014,2015,2016,2017,2018,2019,2020
 ./lib/samples/win32/async.vcxproj.user		X	2014,2018,2019,2020,2021
-./lib/samples/win32/nsprobe.vcxproj.filters.in	X	2014,2015,2018,2019,2020
-./lib/samples/win32/nsprobe.vcxproj.in		X	2014,2015,2016,2017,2018,2019,2020
-./lib/samples/win32/nsprobe.vcxproj.user	X	2014,2018,2019,2020,2021
 ./lib/samples/win32/resolve.vcxproj.filters.in	X	2014,2015,2018,2019,2020
 ./lib/samples/win32/resolve.vcxproj.in		X	2014,2015,2016,2017,2018,2019,2020
 ./lib/samples/win32/resolve.vcxproj.user	X	2014,2018,2019,2020,2021
--- a/win32utils/Configure
+++ b/win32utils/Configure
@@ -133,8 +133,6 @@ my @projectlist = ("../bin/check/win32/checkconf.vcxproj",
                   "../lib/samples/win32/resolve.vcxproj.filters",
                   "../lib/samples/win32/async.vcxproj",
                   "../lib/samples/win32/async.vcxproj.filters",
-                   "../lib/samples/win32/nsprobe.vcxproj",
-                   "../lib/samples/win32/nsprobe.vcxproj.filters",
                   "../lib/win32/bindevt/bindevt.vcxproj",
                   "../lib/win32/bindevt/bindevt.vcxproj.filters",
                   "bind9.sln");
--- a/win32utils/bind9.sln.in
+++ b/win32utils/bind9.sln.in
@@ -29,8 +29,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "async", "..\lib\samples\win
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gai", "..\lib\samples\win32\gai.vcxproj", "{D42B8670-8DF6-4D90-90F7-DB5FB845AFAE}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nsprobe", "..\lib\samples\win32\nsprobe.vcxproj", "{CB2A29F6-E73B-40AB-8AC4-2C1AAE7280BD}"
-EndProject
@END SAMPLES
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "named", "..\bin\named\win32\named.vcxproj", "{723C65DA-A96C-4BA3-A34E-44F11CA346F9}"
 EndProject