From: Amos Jeffries <yadij@users.noreply.github.com>
Date: Tue, 31 Oct 2023 14:37:39 +0000 (+0000)
Subject: Move WHOIS code to libclients.la (#1554)
X-Git-Tag: SQUID_7_0_1~305
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=28873eef5b0bc6f8381236c60c209097b90d38ab;p=thirdparty%2Fsquid.git

Move WHOIS code to libclients.la (#1554)

No logic changes
---

diff --git a/src/FwdState.cc b/src/FwdState.cc
index f8991db0cf..509127fc52 100644
--- a/src/FwdState.cc
+++ b/src/FwdState.cc
@@ -21,6 +21,7 @@
 #include "client_side.h"
 #include "clients/forward.h"
 #include "clients/HttpTunneler.h"
+#include "clients/WhoisGateway.h"
 #include "comm/Connection.h"
 #include "comm/ConnOpener.h"
 #include "comm/Loops.h"
@@ -55,7 +56,6 @@
 #include "Store.h"
 #include "StoreClient.h"
 #include "urn.h"
-#include "whois.h"
 #if USE_OPENSSL
 #include "ssl/cert_validate_message.h"
 #include "ssl/Config.h"
diff --git a/src/Makefile.am b/src/Makefile.am
index 78b9a97120..2c3fdc069d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -442,8 +442,6 @@ squid_SOURCES = \
 	wccp.h \
 	wccp2.cc \
 	wccp2.h \
-	whois.cc \
-	whois.h \
 	wordlist.cc \
 	wordlist.h
 
@@ -1911,8 +1909,6 @@ tests_test_http_range_SOURCES = \
 	urn.h \
 	tests/stub_wccp2.cc \
 	wccp2.h \
-	tests/stub_whois.cc \
-	whois.h \
 	wordlist.cc \
 	wordlist.h
 nodist_tests_test_http_range_SOURCES = \
@@ -2296,8 +2292,6 @@ tests_testHttpRequest_SOURCES = \
 	urn.h \
 	tests/stub_wccp2.cc \
 	wccp2.h \
-	tests/stub_whois.cc \
-	whois.h \
 	wordlist.cc \
 	wordlist.h
 nodist_tests_testHttpRequest_SOURCES = \
@@ -2592,8 +2586,6 @@ tests_testCacheManager_SOURCES = \
 	urn.h \
 	tests/stub_wccp2.cc \
 	wccp2.h \
-	tests/stub_whois.cc \
-	whois.h \
 	wordlist.cc \
 	wordlist.h
 nodist_tests_testCacheManager_SOURCES = \
diff --git a/src/clients/Makefile.am b/src/clients/Makefile.am
index 1ee7af5d76..a1f49efd48 100644
--- a/src/clients/Makefile.am
+++ b/src/clients/Makefile.am
@@ -20,4 +20,6 @@ libclients_la_SOURCES = \
 	HttpTunneler.h \
 	HttpTunnelerAnswer.cc \
 	HttpTunnelerAnswer.h \
+	WhoisGateway.cc \
+	WhoisGateway.h \
 	forward.h
diff --git a/src/whois.cc b/src/clients/WhoisGateway.cc
similarity index 99%
rename from src/whois.cc
rename to src/clients/WhoisGateway.cc
index 8f67337b91..82bb775b72 100644
--- a/src/whois.cc
+++ b/src/clients/WhoisGateway.cc
@@ -9,6 +9,7 @@
 /* DEBUG: section 75    WHOIS protocol */
 
 #include "squid.h"
+#include "clients/WhoisGateway.h"
 #include "comm.h"
 #include "comm/Read.h"
 #include "comm/Write.h"
@@ -20,7 +21,6 @@
 #include "StatCounters.h"
 #include "Store.h"
 #include "tools.h"
-#include "whois.h"
 
 #include <cerrno>
 
diff --git a/src/whois.h b/src/clients/WhoisGateway.h
similarity index 100%
rename from src/whois.h
rename to src/clients/WhoisGateway.h
diff --git a/src/tests/Stub.am b/src/tests/Stub.am
index 0b63a83586..1c9b6d7c93 100644
--- a/src/tests/Stub.am
+++ b/src/tests/Stub.am
@@ -89,5 +89,4 @@ STUB_SOURCE = \
 	tests/stub_tools.cc \
 	tests/stub_tunnel.cc \
 	tests/stub_wccp2.cc \
-	tests/stub_whois.cc \
 	tests/stub_wordlist.cc
diff --git a/src/tests/stub_whois.cc b/src/tests/stub_whois.cc
deleted file mode 100644
index 21448c8098..0000000000
--- a/src/tests/stub_whois.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (C) 1996-2023 The Squid Software Foundation and contributors
- *
- * Squid software is distributed under GPLv2+ license and includes
- * contributions from numerous individuals and organizations.
- * Please see the COPYING and CONTRIBUTORS files for details.
- */
-
-#include "squid.h"
-#include "FwdState.h"
-#include "whois.h"
-
-#define STUB_API "whois.cc"
-#include "tests/STUB.h"
-
-void whoisStart(FwdState *) STUB
-