From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Tue, 17 Dec 2024 14:54:26 +0000 (+0100)
Subject: Don't explictly close control channel
X-Git-Tag: dnsdist-2.0.0-alpha1~96^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be57617405366f32f7306c2281ab38c5ecb562da;p=thirdparty%2Fpdns.git

Don't explictly close control channel
---

diff --git a/pdns/recursordist/rec-main.cc b/pdns/recursordist/rec-main.cc
index 06cc138422..7d60e5dc51 100644
--- a/pdns/recursordist/rec-main.cc
+++ b/pdns/recursordist/rec-main.cc
@@ -2454,7 +2454,6 @@ static void handleRCC(int fileDesc, FDMultiplexer::funcparam_t& /* var */)
     command();
     if (command == doExitNicely) {
       g_rcc.send(clientfd, answer);
-      g_rcc.~RecursorControlChannel();
     }
   }
   catch (const std::exception& e) {
diff --git a/pdns/recursordist/rec_channel_rec.cc b/pdns/recursordist/rec_channel_rec.cc
index f0a7ded6d7..8d398e9fb4 100644
--- a/pdns/recursordist/rec_channel_rec.cc
+++ b/pdns/recursordist/rec_channel_rec.cc
@@ -1390,7 +1390,7 @@ void doExitGeneric(bool nicely)
       std::unique_lock lock(doneRunning.mutex);
       doneRunning.condVar.wait(lock, [] { return doneRunning.done.load(); });
     }
-    // g_rcc.~RecursorControlChannel() do not call, will be done by caller!
+    // g_rcc.~RecursorControlChannel() do not call, caller still needs it!
   }
   else {
     g_rcc.~RecursorControlChannel();