Extract opening a pre_warm connection

iocore/aio/CMakeLists.txt

@@ -17,5 +17,9 @@
 
 
 add_library(aio STATIC)
+add_library(ts::aio ALIAS aio)
+
 target_sources(aio PRIVATE AIO.cc Inline.cc)
 target_include_directories(aio PRIVATE ${CMAKE_SOURCE_DIR}/iocore/eventsystem ${CMAKE_SOURCE_DIR}/iocore/io_uring)
+
+target_link_libraries(aio PUBLIC ts::tscore)

iocore/cache/CMakeLists.txt

@@ -31,13 +31,12 @@ add_library(inkcache STATIC
     RamCacheLRU.cc
     Store.cc
 )
+add_library(ts::inkcache ALIAS inkcache)
+
 if(BUILD_REGRESSION_TESTING)
     target_sources(inkcache PRIVATE CacheTest.cc)
 endif()
-target_link_libraries(inkcache PRIVATE ZLIB::ZLIB)
-if(HAVE_LZMA_H)
-    target_link_libraries(inkcache PRIVATE LibLZMA::LibLZMA)
-endif()
+
 target_include_directories(inkcache PRIVATE
         ${CMAKE_SOURCE_DIR}/iocore/eventsystem
         ${CMAKE_SOURCE_DIR}/iocore/io_uring
@@ -52,3 +51,15 @@ target_include_directories(inkcache PRIVATE
         ${CMAKE_SOURCE_DIR}/proxy/hdrs
         ${CMAKE_SOURCE_DIR}/lib
 )
+
+target_link_libraries(inkcache
+    PUBLIC
+        ts::tscore
+    PRIVATE
+        fastlz
+        ZLIB::ZLIB
+)
+
+if(HAVE_LZMA_H)
+    target_link_libraries(inkcache PRIVATE LibLZMA::LibLZMA)
+endif()

iocore/dns/CMakeLists.txt

@@ -22,6 +22,8 @@ add_library(inkdns STATIC
     Inline.cc
     SplitDNS.cc
 )
+add_library(ts::inkdns ALIAS inkdns)
+
 target_include_directories(inkdns PRIVATE
         ${CMAKE_SOURCE_DIR}/iocore/eventsystem
         ${CMAKE_SOURCE_DIR}/iocore/dns
@@ -34,3 +36,5 @@ target_include_directories(inkdns PRIVATE
         ${CMAKE_SOURCE_DIR}/proxy/http
         ${CMAKE_SOURCE_DIR}/proxy/hdrs
 )
+
+target_link_libraries(inkdns PUBLIC ts::tscore)

iocore/hostdb/CMakeLists.txt

@@ -23,6 +23,8 @@ add_library(inkhostdb STATIC
     HostFile.cc
     HostDBInfo.cc
 )
+add_library(ts::inkhostdb ALIAS inkhostdb)
+
 target_include_directories(inkhostdb PRIVATE
         ${CMAKE_SOURCE_DIR}/iocore/eventsystem
         ${CMAKE_SOURCE_DIR}/iocore/io_uring
@@ -35,3 +37,5 @@ target_include_directories(inkhostdb PRIVATE
         ${CMAKE_SOURCE_DIR}/proxy/http
         ${CMAKE_SOURCE_DIR}/proxy/hdrs
 )
+
+target_link_libraries(inkhostdb PUBLIC ts::tscore)

iocore/hostdb/test_HostFile.cc

@@ -175,4 +175,5 @@ HostDBRecord::alloc(swoc::TextView query_name, unsigned int rr_count, size_t srv
 void
 HostDBRecord::free()
 {
+  delete this;
 }

iocore/io_uring/CMakeLists.txt

@@ -31,10 +31,11 @@ include_directories(
 add_executable(test_iouring
         unit_tests/test_diskIO.cc)
 target_link_libraries(test_iouring
+    PUBLIC
+        ts::tscore
     PRIVATE
         inkuring
         libswoc
-        ts::tscore
         tscpputil
         uring
 )

iocore/net/CMakeLists.txt

@@ -30,6 +30,7 @@ add_library(inknet STATIC
         NetVCOptions.cc
         NetVConnection.cc
         PollCont.cc
+        PreWarmManager.cc
         ProxyProtocol.cc
         Socks.cc
         SSLCertLookup.cc
@@ -97,7 +98,7 @@ if(BUILD_REGRESSION_TESTING)
     target_sources(inknet PRIVATE NetVCTest.cc)
 endif()
 
-target_link_libraries(inknet PUBLIC inkevent records)
+
 target_compile_options(inknet PUBLIC -Wno-deprecated-declarations)
 target_include_directories(inknet PUBLIC
         ${CMAKE_SOURCE_DIR}/iocore/eventsystem
@@ -117,6 +118,13 @@ target_include_directories(inknet PUBLIC
         ${YAML_INCLUDE_DIRS}
         )
 
+target_link_libraries(inknet
+    PUBLIC
+        ts::inkevent
+        ts::records
+        ts::tscore
+)
+
 # Fails to link because of circular dep with proxy (ParentSelection)
 # add_executable(test_net unit_tests/test_ProxyProtocol.cc)
 # target_link_libraries(test_net records_p inknet inkevent tscore yaml-cpp libswoc)

iocore/net/Makefile.am

@@ -195,6 +195,7 @@ libinknet_a_SOURCES = \
 	P_UnixUDPConnection.h \
 	PollCont.h \
 	PollCont.cc \
+	PreWarmManager.cc \
 	ProxyProtocol.h \
 	ProxyProtocol.cc \
 	Socks.cc \

iocore/net/P_SNIActionPerformer.h

@@ -453,7 +453,12 @@ class OutboundSNIPolicy : public ActionItem
 class ServerMaxEarlyData : public ActionItem
 {
 public:
-  ServerMaxEarlyData(uint32_t value) : server_max_early_data(value) {}
+  ServerMaxEarlyData(uint32_t value)
+#if TS_HAS_TLS_EARLY_DATA
+    : server_max_early_data(value)
+#endif
+  {
+  }
   ~ServerMaxEarlyData() override {}
 
   int
@@ -472,6 +477,8 @@ class ServerMaxEarlyData : public ActionItem
     return SSL_TLSEXT_ERR_OK;
   }
 
+#if TS_HAS_TLS_EARLY_DATA
 private:
   uint32_t server_max_early_data = 0;
+#endif
 };

iocore/net/TLSTunnelSupport.cc

@@ -22,12 +22,16 @@
   limitations under the License.
  */
 
+#include "SSLTypes.h"
+#include "PreWarmManager.h"
 #include "TLSTunnelSupport.h"
 #include "tscore/ink_assert.h"
 #include "tscore/Diags.h"
 
 #include "swoc/IPEndpoint.h"
 
+#include <memory>
+
 int TLSTunnelSupport::_ex_data_index = -1;
 
 void
@@ -77,3 +81,10 @@ TLSTunnelSupport::set_tunnel_destination(const std::string_view &destination, SN
     Warning("Invalid destination \"%.*s\" in SNI configuration.", int(destination.size()), destination.data());
   }
 }
+
+PreWarm::SPtrConstDst
+TLSTunnelSupport::create_dst(int pid) const
+{
+  return std::make_shared<const PreWarm::Dst>(get_tunnel_host(), get_tunnel_port(),
+                                              is_upstream_tls() ? SNIRoutingType::PARTIAL_BLIND : SNIRoutingType::FORWARD, pid);
+}

iocore/net/TLSTunnelSupport.h

@@ -25,6 +25,8 @@
 #pragma once
 
 #include <openssl/ssl.h>
+
+#include "PreWarmManager.h"
 #include "tscore/ink_memory.h"
 #include "tscore/ink_inet.h"
 #include "YamlSNIConfig.h"
@@ -54,6 +56,8 @@ class TLSTunnelSupport
                               YamlSNIConfig::TunnelPreWarm prewarm);
   YamlSNIConfig::TunnelPreWarm get_tunnel_prewarm_configuration() const;
 
+  PreWarm::SPtrConstDst create_dst(int pid) const;
+
 protected:
   void _clear();
 

iocore/utils/CMakeLists.txt

@@ -31,3 +31,5 @@ target_include_directories(inkutils PRIVATE
         ${CMAKE_SOURCE_DIR}/proxy/http
         ${CMAKE_SOURCE_DIR}/proxy/hdrs
         )
+
+target_link_libraries(inkutils PUBLIC ts::tscore)

mgmt/config/CMakeLists.txt

@@ -19,10 +19,14 @@ add_library(configmanager STATIC
         FileManager.cc
         AddConfigFilesHere.cc
 )
+add_library(ts::configmanager ALIAS configmanager)
+
 include_directories(
         ${CMAKE_SOURCE_DIR}/mgmt
         ${CMAKE_SOURCE_DIR}/proxy
         ${CMAKE_SOURCE_DIR}/proxy/hdrs
         ${CMAKE_SOURCE_DIR}/proxy/http
         ${IOCORE_INCLUDE_DIRS}
-)
+)
+
+target_link_libraries(configmanager PUBLIC ts::tscore)

mgmt/rpc/CMakeLists.txt

@@ -31,13 +31,19 @@ add_library(jsonrpc_protocol STATIC
         jsonrpc/JsonRPCManager.cc
         jsonrpc/Context.cc
 )
+add_library(ts::jsonrpc_protocol ALIAS jsonrpc_protocol)
+
+target_link_libraries(jsonrpc_protocol PUBLIC ts::tscore)
 
 add_library(jsonrpc_server STATIC
         server/RPCServer.cc
         server/CommBase.cc
         server/IPCSocketServer.cc
         config/JsonRPCConfig.cc
 )
+add_library(ts::jsonrpc_server ALIAS jsonrpc_server)
+
+target_link_libraries(jsonrpc_server PUBLIC ts::tscore)
 
 add_library(rpcpublichandlers STATIC
         handlers/common/RecordsUtils.cc
@@ -47,3 +53,6 @@ add_library(rpcpublichandlers STATIC
         handlers/server/Server.cc
         handlers/plugins/Plugins.cc
 )
+add_library(ts::rpcpublichandlers ALIAS rpcpublichandlers)
+
+target_link_libraries(rpcpublichandlers PUBLIC ts::tscore)

plugins/CMakeLists.txt

@@ -22,7 +22,6 @@ function(add_atsplugin name)
   target_link_libraries(${name} PRIVATE traffic_server)
   set_target_properties(${name} PROPERTIES PREFIX "")
   set_target_properties(${name} PROPERTIES SUFFIX ".so")
-  set_target_properties(${name} PROPERTIES LINK_FLAGS "-Wl,-rpath,${CMAKE_INSTALL_PREFIX}/lib")
   install(TARGETS ${name} DESTINATION libexec/trafficserver)
 endfunction()
 

plugins/experimental/slice/CMakeLists.txt

@@ -32,7 +32,7 @@ add_atsplugin(slice
     util.cc
 )
 
-target_link_libraries(access_control PRIVATE PCRE::PCRE)
+target_link_libraries(slice PRIVATE ts::tscore)
 
 if(BUILD_TESTING)
     add_subdirectory(unit-tests)

plugins/header_rewrite/conditions.cc

@@ -90,6 +90,8 @@ ConditionMethod::initialize(Parser &p)
 
   match->set(p.get_arg());
   _matcher = match;
+
+  require_resources(RSRC_CLIENT_REQUEST_HEADERS);
 }
 
 bool

plugins/s3_auth/CMakeLists.txt

@@ -19,4 +19,6 @@ project(s3_auth)
 
 add_atsplugin(s3_auth s3_auth.cc aws_auth_v4.cc)
 
+target_link_libraries(s3_auth PRIVATE ts::tscore)
+
 add_subdirectory(unit_tests)

proxy/CMakeLists.txt

@@ -58,6 +58,8 @@ target_include_directories(proxy PUBLIC
         ${CMAKE_SOURCE_DIR}/lib/yamlcpp/include
         )
 
+target_link_libraries(proxy PUBLIC ts::tscore)
+
 add_subdirectory(hdrs)
 add_subdirectory(shared)
 add_subdirectory(http)

proxy/http/CMakeLists.txt

@@ -39,7 +39,6 @@ add_library(http STATIC
         ConnectingEntry.cc
         ForwardedConfig.cc
         PreWarmConfig.cc
-        PreWarmManager.cc
 )
 add_library(ts::http ALIAS http)
 
@@ -56,6 +55,8 @@ target_include_directories(http
         ${YAMLCPP_INCLUDE_DIR}
 )
 
+target_link_libraries(http PUBLIC ts::tscore)
+
 if(TS_USE_QUIC)
     target_link_libraries(http PRIVATE ts::http3)
 endif()