moved header files to include/api

lzx404243 · lzx404243 · commit f7f2ac1ce5e2 · 2023-09-07T15:12:31.000Z
diff --git a/include/api/FetchSM.h b/include/api/FetchSM.h
diff --git a/include/api/InkAPIInternal.h b/include/api/InkAPIInternal.h
diff --git a/iocore/aio/test_AIO.cc b/iocore/aio/test_AIO.cc
@@ -22,7 +22,7 @@
  */
 
 #include "P_AIO.h"
-#include "InkAPIInternal.h"
+#include "api/InkAPIInternal.h"
 #include "tscore/ink_hw.h"
 #include "tscore/I_Layout.h"
 #include "tscore/TSSystemState.h"
diff --git a/iocore/cache/Cache.cc b/iocore/cache/Cache.cc
@@ -33,7 +33,7 @@
 #include "HttpTransactCache.h"
 #include "HttpSM.h"
 #include "HttpCacheSM.h"
-#include "InkAPIInternal.h"
+#include "api/InkAPIInternal.h"
 
 #include "tscore/hugepages.h"
 
diff --git a/iocore/cache/test/stub.cc b/iocore/cache/test/stub.cc
@@ -38,7 +38,7 @@ initialize_thread_for_http_sessions(EThread *, int)
   ink_assert(false);
 }
 
-#include "InkAPIInternal.h"
+#include "api/InkAPIInternal.h"
 void
 APIHooks::append(INKContInternal *cont)
 {
@@ -213,7 +213,7 @@ INKVConnInternal::INKVConnInternal() : INKContInternal() {}
 
 INKVConnInternal::INKVConnInternal(TSEventFunc funcp, TSMutex mutexp) : INKContInternal(funcp, mutexp) {}
 
-#include "../src/api/FetchSM.h"
+#include "api/FetchSM.h"
 ClassAllocator<FetchSM> FetchSMAllocator("unusedFetchSMAllocator");
 void
 FetchSM::ext_launch()
diff --git a/iocore/net/Makefile.am b/iocore/net/Makefile.am
@@ -29,7 +29,6 @@ AM_CPPFLAGS += \
 	-I$(abs_top_srcdir)/proxy/shared \
 	-I$(abs_top_srcdir)/proxy/http \
 	-I$(abs_top_srcdir)/proxy/http/remap \
-	-I$(abs_top_srcdir)/src/api \
 	$(TS_INCLUDES) \
 	@OPENSSL_INCLUDES@ \
 	@YAMLCPP_INCLUDES@ \
diff --git a/iocore/net/OCSPStapling.cc b/iocore/net/OCSPStapling.cc
@@ -31,7 +31,7 @@
 #include "P_SSLConfig.h"
 #include "P_SSLUtils.h"
 #include "SSLStats.h"
-#include "FetchSM.h"
+#include "api/FetchSM.h"
 
 // Macros for ASN1 and the code in TS_OCSP_* functions were borrowed from OpenSSL 3.1.0 (a92271e03a8d0dee507b6f1e7f49512568b2c7ad),
 // and were modified to make them compilable with BoringSSL and C++ compiler.
diff --git a/iocore/net/QUICNetVConnection.cc b/iocore/net/QUICNetVConnection.cc
@@ -30,7 +30,7 @@
 #include "P_QUICNetVConnection.h"
 #include "P_QUICPacketHandler.h"
 #include "P_Net.h"
-#include "InkAPIInternal.h" // Added to include the quic_hook definitions
+#include "api/InkAPIInternal.h" // Added to include the quic_hook definitions
 
 #include "P_SSLNextProtocolSet.h"
 #include "QUICMultiCertConfigLoader.h"
diff --git a/iocore/net/SSLConfig.cc b/iocore/net/SSLConfig.cc
@@ -37,7 +37,7 @@
 #include "tscore/ink_config.h"
 #include <openssl/pem.h>
 
-#include "InkAPIInternal.h" // Added to include the ssl_hook and lifestyle_hook definitions
+#include "api/InkAPIInternal.h" // Added to include the ssl_hook and lifestyle_hook definitions
 
 #include "tscore/ink_platform.h"
 #include "tscore/I_Layout.h"
diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc
@@ -26,7 +26,7 @@
 #include "tscore/I_Layout.h"
 #include "tscore/TSSystemState.h"
 
-#include "InkAPIInternal.h" // Added to include the ssl_hook definitions
+#include "api/InkAPIInternal.h" // Added to include the ssl_hook definitions
 #include "HttpTunnel.h"
 #include "ProxyProtocol.h"
 #include "HttpConfig.h"
diff --git a/iocore/net/SSLSecret.cc b/iocore/net/SSLSecret.cc
@@ -21,7 +21,7 @@
 
 #include "swoc/swoc_file.h"
 
-#include "InkAPIInternal.h" // Added to include the ssl_hook and lifestyle_hook definitions
+#include "api/InkAPIInternal.h" // Added to include the ssl_hook and lifestyle_hook definitions
 #include "P_SSLConfig.h"
 
 #include <utility>
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
@@ -35,7 +35,7 @@
 #include "records/I_RecHttp.h"
 
 #include "P_Net.h"
-#include "InkAPIInternal.h"
+#include "api/InkAPIInternal.h"
 
 #include "P_OCSPStapling.h"
 #include "P_SSLConfig.h"
diff --git a/iocore/net/TLSSessionResumptionSupport.cc b/iocore/net/TLSSessionResumptionSupport.cc
@@ -33,7 +33,7 @@
 #ifdef HAVE_SSL_CTX_SET_TLSEXT_TICKET_KEY_EVP_CB
 #include <openssl/core_names.h>
 #endif
-#include "InkAPIInternal.h"
+#include "api/InkAPIInternal.h"
 #include "tscore/ink_config.h"
 
 // Remove this when drop OpenSSL 1.0.2 support
diff --git a/iocore/net/libinknet_stub.cc b/iocore/net/libinknet_stub.cc
@@ -71,7 +71,7 @@ ParentConfigParams::nextParent(HttpRequestData *, ParentResult *, unsigned int,
   ink_assert(false);
 }
 
-#include "InkAPIInternal.h"
+#include "api/InkAPIInternal.h"
 int
 APIHook::invoke(int, void *) const
 {
@@ -156,7 +156,7 @@ PreWarmManager::reconfigure()
 
 PreWarmManager prewarmManager;
 
-#include "../src/api/FetchSM.h"
+#include "api/FetchSM.h"
 ClassAllocator<FetchSM> FetchSMAllocator("unusedFetchSMAllocator");
 void
 FetchSM::ext_launch()
diff --git a/mgmt/config/FileManager.cc b/mgmt/config/FileManager.cc
@@ -25,7 +25,7 @@
 #include <vector>
 #include <algorithm>
 
-#include "InkAPIInternal.h" // TODO: this brings a lot of dependencies, double check this.
+#include "api/InkAPIInternal.h" // TODO: this brings a lot of dependencies, double check this.
 
 #include "tscore/ink_platform.h"
 #include "tscore/ink_file.h"
diff --git a/mgmt/rpc/handlers/plugins/Plugins.cc b/mgmt/rpc/handlers/plugins/Plugins.cc
@@ -21,7 +21,7 @@
 #include "Plugins.h"
 #include "rpc/handlers/common/ErrorUtils.h"
 
-#include "InkAPIInternal.h"
+#include "api/InkAPIInternal.h"
 
 namespace
 {
diff --git a/proxy/Plugin.cc b/proxy/Plugin.cc
@@ -27,7 +27,7 @@
 #include "tscore/ParseRules.h"
 #include "records/I_RecCore.h"
 #include "tscore/I_Layout.h"
-#include "InkAPIInternal.h"
+#include "api/InkAPIInternal.h"
 #include "Plugin.h"
 #include "tscore/ink_cap.h"
 #include "tscore/Filenames.h"
diff --git a/proxy/ProxySession.h b/proxy/ProxySession.h
@@ -28,7 +28,7 @@
 #include "tscore/TSSystemState.h"
 #include <string_view>
 #include <memory>
-#include "InkAPIInternal.h"
+#include "api/InkAPIInternal.h"
 #include "http/HttpSessionAccept.h"
 #include "IPAllow.h"
 #include "private/SSLProxySession.h"
diff --git a/proxy/Transform.h b/proxy/Transform.h
@@ -25,7 +25,7 @@
 
 #include "I_EventSystem.h"
 #include "HTTP.h"
-#include "InkAPIInternal.h"
+#include "api/InkAPIInternal.h"
 
 #define TRANSFORM_READ_READY (TRANSFORM_EVENTS_START + 0)
 
diff --git a/proxy/http/Http1ClientSession.h b/proxy/http/Http1ClientSession.h
@@ -31,7 +31,7 @@
 
 #pragma once
 
-#include "InkAPIInternal.h"
+#include "api/InkAPIInternal.h"
 #include "HTTP.h"
 #include "HttpConfig.h"
 #include "IPAllow.h"
diff --git a/proxy/http/HttpSM.h b/proxy/http/HttpSM.h
@@ -43,7 +43,7 @@
 #include "HttpVCTable.h"
 #include "UrlRewrite.h"
 #include "HttpTunnel.h"
-#include "InkAPIInternal.h"
+#include "api/InkAPIInternal.h"
 #include "../ProxyTransaction.h"
 #include "HdrUtils.h"
 #include "tscore/History.h"
diff --git a/proxy/http/remap/unit-tests/nexthop_test_stubs.cc b/proxy/http/remap/unit-tests/nexthop_test_stubs.cc
@@ -166,7 +166,7 @@ HttpRequestData::get_client_ip()
   return &src_ip.sa;
 }
 
-#include "InkAPIInternal.h"
+#include "api/InkAPIInternal.h"
 void
 ConfigUpdateCbTable::invoke(char const *p)
 {
diff --git a/src/api/FetchSM.cc b/src/api/FetchSM.cc
@@ -22,7 +22,7 @@
  */
 
 #include "tscore/ink_config.h"
-#include "FetchSM.h"
+#include "api/FetchSM.h"
 #include <cstdio>
 #include "HTTP.h"
 #include "PluginVC.h"
diff --git a/src/api/InkAPI.cc b/src/api/InkAPI.cc
@@ -36,7 +36,7 @@
 #include "tscore/Diags.h"
 #include "api/Metrics.h"
 
-#include "InkAPIInternal.h"
+#include "api/InkAPIInternal.h"
 #include "Log.h"
 #include "URL.h"
 #include "MIME.h"
@@ -65,7 +65,7 @@
 #include "PluginVC.h"
 #include "HttpSessionAccept.h"
 #include "PluginVC.h"
-#include "FetchSM.h"
+#include "api/FetchSM.h"
 #include "HttpDebugNames.h"
 #include "I_AIO.h"
 #include "I_Tasks.h"
diff --git a/src/traffic_quic/traffic_quic.cc b/src/traffic_quic/traffic_quic.cc
@@ -173,7 +173,7 @@ ParentConfigParams::nextParent(HttpRequestData *, ParentResult *, unsigned int,
   ink_assert(false);
 }
 
-#include "InkAPIInternal.h"
+#include "api/InkAPIInternal.h"
 
 APIHook *
 APIHook::next() const
@@ -347,7 +347,7 @@ PreWarmManager::reconfigure()
 
 PreWarmManager prewarmManager;
 
-#include "../src/api/FetchSM.h"
+#include "api/FetchSM.h"
 ClassAllocator<FetchSM> FetchSMAllocator("unusedFetchSMAllocator");
 void
 FetchSM::ext_launch()
diff --git a/src/traffic_server/traffic_server.cc b/src/traffic_server/traffic_server.cc
@@ -98,7 +98,7 @@ extern "C" int plock(int);
 #include "RemapPluginInfo.h"
 #include "RemapProcessor.h"
 #include "I_Tasks.h"
-#include "InkAPIInternal.h"
+#include "api/InkAPIInternal.h"
 #include "HTTP2.h"
 #include "tscore/ink_config.h"
 #include "P_SSLClientUtils.h"

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ initialize_thread_for_http_sessions(EThread *, int)`
`38`	`38`	`ink_assert(false);`
`39`	`39`	`}`
`40`	`40`
`41`		`-#include "InkAPIInternal.h"`
	`41`	`+#include "api/InkAPIInternal.h"`
`42`	`42`	`void`
`43`	`43`	`APIHooks::append(INKContInternal *cont)`
`44`	`44`	`{`
`@@ -213,7 +213,7 @@ INKVConnInternal::INKVConnInternal() : INKContInternal() {}`
`213`	`213`
`214`	`214`	`INKVConnInternal::INKVConnInternal(TSEventFunc funcp, TSMutex mutexp) : INKContInternal(funcp, mutexp) {}`
`215`	`215`
`216`		`-#include "../src/api/FetchSM.h"`
	`216`	`+#include "api/FetchSM.h"`
`217`	`217`	`ClassAllocator<FetchSM> FetchSMAllocator("unusedFetchSMAllocator");`
`218`	`218`	`void`
`219`	`219`	`FetchSM::ext_launch()`