Move WHOIS code to libclients.la (#1554)

No logic changes

diff --git a/src/FwdState.cc b/src/FwdState.cc
index f8991db0cf0f4294fe0ae997a7969c9ddfcc09e1..509127fc52567ece65d677db4925df1588d769bf 100644 (file)
--- 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 78b9a971205ad57b850f9202a08adaacaf323ffe..2c3fdc069dd86f38af07bf03a4ed466cfa6f83e9 100644 (file)
--- 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 1ee7af5d76d24eb2a65181119a15c3237fa6dbfb..a1f49efd48b14dd5ebf0aca9b051b75d57ca3cbf 100644 (file)
--- 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 8f67337b91463116aed186b696958fba64bb75fd..82bb775b72dd8041d0b2974c443d9318b28c9724 100644 (file)
--- 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 0b63a835861ac5966c7cb485fc0640b3b325b9b3..1c9b6d7c933e2f24d6e768d59f9f696ed3166553 100644 (file)
--- 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 (file)
index 21448c8..0000000
--- 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
-