apache · maskit · Nov 8, 2023 · Nov 7, 2023 · Nov 8, 2023
diff --git a/src/iocore/net/BIO_fastopen.cc b/src/iocore/net/BIO_fastopen.cc
@@ -25,7 +25,7 @@
 #include "iocore/eventsystem/SocketManager.h"
 #include "tscore/ink_assert.h"
 
-#include "iocore/net/BIO_fastopen.h"
+#include "BIO_fastopen.h"
 
 // For BoringSSL, which for some reason doesn't have this function.
 // (In BoringSSL, sock_read() and sock_write() use the internal

diff --git a/include/iocore/net/BIO_fastopen.h → src/iocore/net/BIO_fastopen.h b/include/iocore/net/BIO_fastopen.h → src/iocore/net/BIO_fastopen.h
diff --git a/src/iocore/net/BoringSSLUtils.cc b/src/iocore/net/BoringSSLUtils.cc
@@ -22,7 +22,7 @@
 // Borrowed from Envoy
 // https://github.com/envoyproxy/envoy/blob/329b2491949fc52f4dc5c4a778ea158bfe6fe979/source/extensions/transport_sockets/tls/context_impl.cc#L962
 
-#include "iocore/net/BoringSSLUtils.h"
+#include "BoringSSLUtils.h"
 
 #ifdef OPENSSL_IS_BORINGSSL
 namespace BoringSSLUtils

diff --git a/include/iocore/net/BoringSSLUtils.h → src/iocore/net/BoringSSLUtils.h b/include/iocore/net/BoringSSLUtils.h → src/iocore/net/BoringSSLUtils.h
diff --git a/src/iocore/net/OCSPStapling.cc b/src/iocore/net/OCSPStapling.cc
@@ -33,7 +33,7 @@
 #include "P_Net.h"
 #include "P_SSLConfig.h"
 #include "P_SSLUtils.h"
-#include "iocore/net/SSLStats.h"
+#include "SSLStats.h"
 #include "api/FetchSM.h"
 
 // Macros for ASN1 and the code in TS_OCSP_* functions were borrowed from OpenSSL 3.1.0 (a92271e03a8d0dee507b6f1e7f49512568b2c7ad),

diff --git a/src/iocore/net/P_SSLConfig.h b/src/iocore/net/P_SSLConfig.h
@@ -39,7 +39,7 @@
 #include "tscore/ink_inet.h"
 #include "iocore/eventsystem/ConfigProcessor.h"
 
-#include "iocore/net/SSLSessionCache.h"
+#include "SSLSessionCache.h"
 #include "iocore/net/YamlSNIConfig.h"
 
 #include "P_SSLUtils.h"

diff --git a/src/iocore/net/SSLCertLookup.cc b/src/iocore/net/SSLCertLookup.cc
@@ -41,7 +41,7 @@
 
 #include "P_SSLUtils.h"
 #include "P_SSLConfig.h"
-#include "iocore/net/SSLSessionTicket.h"
+#include "SSLSessionTicket.h"
 
 #include <unordered_map>
 #include <utility>

diff --git a/src/iocore/net/SSLClientUtils.cc b/src/iocore/net/SSLClientUtils.cc
@@ -32,7 +32,7 @@
 #include "P_TLSKeyLogger.h"
 #include "iocore/net/YamlSNIConfig.h"
 #include "iocore/net/SSLDiags.h"
-#include "iocore/net/SSLSessionCache.h"
+#include "SSLSessionCache.h"
 
 #include <openssl/err.h>
 #include <openssl/pem.h>

diff --git a/src/iocore/net/SSLConfig.cc b/src/iocore/net/SSLConfig.cc
@@ -48,8 +48,8 @@
 #include "P_SSLCertLookup.h"
 #include "P_TLSKeyLogger.h"
 #include "iocore/net/SSLDiags.h"
-#include "iocore/net/SSLSessionCache.h"
-#include "iocore/net/SSLSessionTicket.h"
+#include "SSLSessionCache.h"
+#include "SSLSessionTicket.h"
 #include "iocore/net/YamlSNIConfig.h"
 
 int SSLConfig::config_index                                 = 0;

diff --git a/src/iocore/net/SSLDiags.cc b/src/iocore/net/SSLDiags.cc
@@ -26,7 +26,7 @@
 #include <openssl/err.h>
 
 #include "P_Net.h"
-#include "iocore/net/SSLStats.h"
+#include "SSLStats.h"
 #include "P_SSLNetVConnection.h"
 
 static DbgCtl ssl_diags_dbg_ctl{"ssl-diag"};

diff --git a/include/iocore/net/SSLDynlock.h → src/iocore/net/SSLDynlock.h b/include/iocore/net/SSLDynlock.h → src/iocore/net/SSLDynlock.h
diff --git a/src/iocore/net/SSLNetProcessor.cc b/src/iocore/net/SSLNetProcessor.cc
@@ -26,7 +26,7 @@
 #include "records/RecHttp.h"
 #include "P_SSLUtils.h"
 #include "P_OCSPStapling.h"
-#include "iocore/net/SSLStats.h"
+#include "SSLStats.h"
 #include "P_SSLNetProcessor.h"
 #include "P_SSLNetAccept.h"
 #include "P_SSLNetVConnection.h"

diff --git a/src/iocore/net/SSLNetVConnection.cc b/src/iocore/net/SSLNetVConnection.cc
@@ -37,9 +37,9 @@
 #include "P_SSLConfig.h"
 #include "P_SSLClientUtils.h"
 #include "P_SSLNetVConnection.h"
-#include "iocore/net/BIO_fastopen.h"
+#include "BIO_fastopen.h"
 #include "iocore/net/SSLAPIHooks.h"
-#include "iocore/net/SSLStats.h"
+#include "SSLStats.h"
 #include "iocore/net/TLSALPNSupport.h"
 
 #include <netinet/in.h>

diff --git a/src/iocore/net/SSLSessionCache.cc b/src/iocore/net/SSLSessionCache.cc
@@ -20,8 +20,8 @@
  */
 
 #include "P_SSLConfig.h"
-#include "iocore/net/SSLSessionCache.h"
-#include "iocore/net/SSLStats.h"
+#include "SSLSessionCache.h"
+#include "SSLStats.h"
 
 #include <cstring>
 #include <memory>

diff --git a/include/iocore/net/SSLSessionCache.h → src/iocore/net/SSLSessionCache.h b/include/iocore/net/SSLSessionCache.h → src/iocore/net/SSLSessionCache.h
diff --git a/src/iocore/net/SSLSessionTicket.cc b/src/iocore/net/SSLSessionTicket.cc
@@ -21,7 +21,7 @@
   limitations under the License.
  */
 
-#include "iocore/net/SSLSessionTicket.h"
+#include "SSLSessionTicket.h"
 
 #if TS_HAS_TLS_SESSION_TICKET
 

diff --git a/include/iocore/net/SSLSessionTicket.h → src/iocore/net/SSLSessionTicket.h b/include/iocore/net/SSLSessionTicket.h → src/iocore/net/SSLSessionTicket.h
diff --git a/src/iocore/net/SSLStats.cc b/src/iocore/net/SSLStats.cc
@@ -21,7 +21,7 @@
   limitations under the License.
  */
 
-#include "iocore/net/SSLStats.h"
+#include "SSLStats.h"
 
 #include <openssl/err.h>
 

diff --git a/include/iocore/net/SSLStats.h → src/iocore/net/SSLStats.h b/include/iocore/net/SSLStats.h → src/iocore/net/SSLStats.h
diff --git a/src/iocore/net/SSLUtils.cc b/src/iocore/net/SSLUtils.cc
@@ -40,14 +40,14 @@
 #include "P_OCSPStapling.h"
 #include "P_SSLConfig.h"
 #include "P_TLSKeyLogger.h"
-#include "iocore/net/BoringSSLUtils.h"
+#include "BoringSSLUtils.h"
 #include "iocore/net/ProxyProtocol.h"
 #include "iocore/net/SSLAPIHooks.h"
-#include "iocore/net/SSLSessionCache.h"
-#include "iocore/net/SSLSessionTicket.h"
-#include "iocore/net/SSLDynlock.h"
+#include "SSLSessionCache.h"
+#include "SSLSessionTicket.h"
+#include "SSLDynlock.h"
 #include "iocore/net/SSLDiags.h"
-#include "iocore/net/SSLStats.h"
+#include "SSLStats.h"
 #include "iocore/net/TLSSessionResumptionSupport.h"
 #if TS_USE_QUIC == 1
 #include "iocore/net/QUICSupport.h"

diff --git a/src/iocore/net/TLSBasicSupport.cc b/src/iocore/net/TLSBasicSupport.cc
@@ -23,7 +23,7 @@
  */
 
 #include "iocore/net/TLSBasicSupport.h"
-#include "iocore/net/SSLStats.h"
+#include "SSLStats.h"
 
 int TLSBasicSupport::_ex_data_index = -1;
 

diff --git a/src/iocore/net/TLSSessionResumptionSupport.cc b/src/iocore/net/TLSSessionResumptionSupport.cc
@@ -28,7 +28,7 @@
 #include "iocore/net/SSLAPIHooks.h"
 
 #include "P_SSLConfig.h"
-#include "iocore/net/SSLStats.h"
+#include "SSLStats.h"
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
 #ifdef HAVE_SSL_CTX_SET_TLSEXT_TICKET_KEY_EVP_CB