From fa0a60dd93e4485c1f62ffcc87fa9e6b195ce795 Mon Sep 17 00:00:00 2001
From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
Date: Tue, 8 Aug 2023 14:29:40 +0200
Subject: [PATCH 1/5] Remove unused boost signals2 from torcontrol

---
 src/torcontrol.cpp | 2 +-
 src/torcontrol.h   | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
index a8d6fb4b3f..d0630428c4 100644
--- a/src/torcontrol.cpp
+++ b/src/torcontrol.cpp
@@ -85,9 +85,9 @@ void TorControlConnection::readcb(struct bufferevent *bev, void *ctx)
         if (ch == ' ') {
             // Final line, dispatch reply and clean up
             if (self->message.code >= 600) {
+                // (currently unused)
                 // Dispatch async notifications to async handler
                 // Synchronous and asynchronous messages are never interleaved
-                self->async_handler(*self, self->message);
             } else {
                 if (!self->reply_handlers.empty()) {
                     // Invoke reply handler with message
diff --git a/src/torcontrol.h b/src/torcontrol.h
index afc5413db0..8c48cc14e8 100644
--- a/src/torcontrol.h
+++ b/src/torcontrol.h
@@ -11,7 +11,6 @@
 #include <netaddress.h>
 #include <util/fs.h>
 
-#include <boost/signals2/signal.hpp>
 
 #include <event2/bufferevent.h>
 #include <event2/event.h>
@@ -83,8 +82,6 @@ public:
      */
     bool Command(const std::string &cmd, const ReplyHandlerCB& reply_handler);
 
-    /** Response handlers for async replies */
-    boost::signals2::signal<void(TorControlConnection &,const TorControlReply &)> async_handler;
 private:
     /** Callback when ready for use */
     std::function<void(TorControlConnection&)> connected;

From faab76c1c01e6d3fff8ac1bc71baeecd8846dc32 Mon Sep 17 00:00:00 2001
From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
Date: Tue, 8 Aug 2023 14:55:46 +0200
Subject: [PATCH 2/5] iwyu on torcontrol

---
 src/compat/compat.h | 24 ++++++++++++------------
 src/torcontrol.cpp  | 12 ++++++++++++
 src/torcontrol.h    |  8 ++------
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/compat/compat.h b/src/compat/compat.h
index 8195bceaec..f1c4dedc04 100644
--- a/src/compat/compat.h
+++ b/src/compat/compat.h
@@ -22,19 +22,19 @@
 #include <ws2tcpip.h>
 #include <cstdint>
 #else
-#include <fcntl.h>
-#include <sys/mman.h>
-#include <sys/select.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <ifaddrs.h>
+#include <fcntl.h>// IWYU pragma: export
+#include <sys/mman.h>// IWYU pragma: export
+#include <sys/select.h>// IWYU pragma: export
+#include <sys/socket.h>// IWYU pragma: export
+#include <sys/types.h>// IWYU pragma: export
+#include <net/if.h>// IWYU pragma: export
+#include <netinet/in.h>// IWYU pragma: export
+#include <netinet/tcp.h>// IWYU pragma: export
+#include <arpa/inet.h>// IWYU pragma: export
+#include <ifaddrs.h>// IWYU pragma: export
 #include <limits.h>
-#include <netdb.h>
-#include <unistd.h>
+#include <netdb.h>// IWYU pragma: export
+#include <unistd.h>// IWYU pragma: export
 #endif
 
 // We map Linux / BSD error functions and codes, to the equivalent
diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
index d0630428c4..5aaf52f576 100644
--- a/src/torcontrol.cpp
+++ b/src/torcontrol.cpp
@@ -14,14 +14,26 @@
 #include <net.h>
 #include <netaddress.h>
 #include <netbase.h>
+#include <random.h>
+#include <tinyformat.h>
+#include <util/check.h>
+#include <util/fs.h>
 #include <util/readwritefile.h>
 #include <util/strencodings.h>
+#include <util/string.h>
 #include <util/thread.h>
 #include <util/time.h>
 
+#include <algorithm>
+#include <cassert>
+#include <cstdlib>
 #include <deque>
 #include <functional>
+#include <map>
+#include <optional>
 #include <set>
+#include <thread>
+#include <utility>
 #include <vector>
 
 #include <event2/buffer.h>
diff --git a/src/torcontrol.h b/src/torcontrol.h
index 8c48cc14e8..1a9065b01a 100644
--- a/src/torcontrol.h
+++ b/src/torcontrol.h
@@ -11,18 +11,14 @@
 #include <netaddress.h>
 #include <util/fs.h>
 
+#include <event2/util.h>
 
-#include <event2/bufferevent.h>
-#include <event2/event.h>
-
-#include <cstdlib>
+#include <cstdint>
 #include <deque>
 #include <functional>
 #include <string>
 #include <vector>
 
-class CService;
-
 extern const std::string DEFAULT_TOR_CONTROL;
 static const bool DEFAULT_LISTEN_ONION = true;
 

From fa32af22b323e7c58b6b20af6517f4795a72cdc5 Mon Sep 17 00:00:00 2001
From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
Date: Tue, 8 Aug 2023 15:09:32 +0200
Subject: [PATCH 3/5] Replace LocaleIndependentAtoi with ToIntegral

No need for saturating behavior when the int is composed of 3 digits.
---
 src/torcontrol.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
index 5aaf52f576..9cf976a700 100644
--- a/src/torcontrol.cpp
+++ b/src/torcontrol.cpp
@@ -91,7 +91,7 @@ void TorControlConnection::readcb(struct bufferevent *bev, void *ctx)
         if (s.size() < 4) // Short line
             continue;
         // <status>(-|+| )<data><CRLF>
-        self->message.code = LocaleIndependentAtoi<int>(s.substr(0,3));
+        self->message.code = ToIntegral<int>(s.substr(0, 3)).value_or(0);
         self->message.lines.push_back(s.substr(4));
         char ch = s[3]; // '-','+' or ' '
         if (ch == ' ') {

From fa91a23d63dcbf222bd70d05ed49cf1f8e4edce0 Mon Sep 17 00:00:00 2001
From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
Date: Tue, 8 Aug 2023 17:49:17 +0200
Subject: [PATCH 4/5] remove unused limits.h include in compat.h

---
 src/compat/compat.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/compat/compat.h b/src/compat/compat.h
index f1c4dedc04..211d46e6ba 100644
--- a/src/compat/compat.h
+++ b/src/compat/compat.h
@@ -32,7 +32,6 @@
 #include <netinet/tcp.h>// IWYU pragma: export
 #include <arpa/inet.h>// IWYU pragma: export
 #include <ifaddrs.h>// IWYU pragma: export
-#include <limits.h>
 #include <netdb.h>// IWYU pragma: export
 #include <unistd.h>// IWYU pragma: export
 #endif

From faaba770e11352ddf6414b9855f4baa46a967580 Mon Sep 17 00:00:00 2001
From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
Date: Tue, 8 Aug 2023 17:52:53 +0200
Subject: [PATCH 5/5] Sort includes in compat.h

Can be reviewed with:
--color-moved=blocks  --color-moved-ws=ignore-all-space --ignore-all-space
---
 src/compat/compat.h | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/compat/compat.h b/src/compat/compat.h
index 211d46e6ba..435a403552 100644
--- a/src/compat/compat.h
+++ b/src/compat/compat.h
@@ -22,18 +22,18 @@
 #include <ws2tcpip.h>
 #include <cstdint>
 #else
-#include <fcntl.h>// IWYU pragma: export
-#include <sys/mman.h>// IWYU pragma: export
-#include <sys/select.h>// IWYU pragma: export
-#include <sys/socket.h>// IWYU pragma: export
-#include <sys/types.h>// IWYU pragma: export
-#include <net/if.h>// IWYU pragma: export
-#include <netinet/in.h>// IWYU pragma: export
-#include <netinet/tcp.h>// IWYU pragma: export
-#include <arpa/inet.h>// IWYU pragma: export
-#include <ifaddrs.h>// IWYU pragma: export
-#include <netdb.h>// IWYU pragma: export
-#include <unistd.h>// IWYU pragma: export
+#include <arpa/inet.h>   // IWYU pragma: export
+#include <fcntl.h>       // IWYU pragma: export
+#include <ifaddrs.h>     // IWYU pragma: export
+#include <net/if.h>      // IWYU pragma: export
+#include <netdb.h>       // IWYU pragma: export
+#include <netinet/in.h>  // IWYU pragma: export
+#include <netinet/tcp.h> // IWYU pragma: export
+#include <sys/mman.h>    // IWYU pragma: export
+#include <sys/select.h>  // IWYU pragma: export
+#include <sys/socket.h>  // IWYU pragma: export
+#include <sys/types.h>   // IWYU pragma: export
+#include <unistd.h>      // IWYU pragma: export
 #endif
 
 // We map Linux / BSD error functions and codes, to the equivalent