This is an automated email from the ASF dual-hosted git repository.
maskit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new e13cca15ed Move back private header files into src directory (#10748)
e13cca15ed is described below
commit e13cca15ed80b9c17d78362ec37b216b975c3be8
Author: Masakazu Kitajo <mas...@apache.org>
AuthorDate: Thu Nov 9 01:24:55 2023 +0900
Move back private header files into src directory (#10748)
* Move back private header files into src directory
This commits move these files
- BIO_fastopen.h
- BoringSSLUtils.h
- SSLStats.h
* Move more files
- SSLDynlock.h
- SSLSessionCache.h
- SSLSessionTicket.h
---
src/iocore/net/BIO_fastopen.cc | 2 +-
{include => src}/iocore/net/BIO_fastopen.h | 0
src/iocore/net/BoringSSLUtils.cc | 2 +-
{include => src}/iocore/net/BoringSSLUtils.h | 0
src/iocore/net/OCSPStapling.cc | 2 +-
src/iocore/net/P_SSLConfig.h | 2 +-
src/iocore/net/SSLCertLookup.cc | 2 +-
src/iocore/net/SSLClientUtils.cc | 2 +-
src/iocore/net/SSLConfig.cc | 4 ++--
src/iocore/net/SSLDiags.cc | 2 +-
{include => src}/iocore/net/SSLDynlock.h | 0
src/iocore/net/SSLNetProcessor.cc | 2 +-
src/iocore/net/SSLNetVConnection.cc | 4 ++--
src/iocore/net/SSLSessionCache.cc | 4 ++--
{include => src}/iocore/net/SSLSessionCache.h | 0
src/iocore/net/SSLSessionTicket.cc | 2 +-
{include => src}/iocore/net/SSLSessionTicket.h | 0
src/iocore/net/SSLStats.cc | 2 +-
{include => src}/iocore/net/SSLStats.h | 0
src/iocore/net/SSLUtils.cc | 10 +++++-----
src/iocore/net/TLSBasicSupport.cc | 2 +-
src/iocore/net/TLSSessionResumptionSupport.cc | 2 +-
22 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/iocore/net/BIO_fastopen.cc b/src/iocore/net/BIO_fastopen.cc
index 9b68141a4a..822d7e81ef 100644
--- 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 b/src/iocore/net/BIO_fastopen.h
similarity index 100%
rename from include/iocore/net/BIO_fastopen.h
rename to src/iocore/net/BIO_fastopen.h
diff --git a/src/iocore/net/BoringSSLUtils.cc b/src/iocore/net/BoringSSLUtils.cc
index ff2cdb92d2..a5a63499ac 100644
--- 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
b/src/iocore/net/BoringSSLUtils.h
similarity index 100%
rename from include/iocore/net/BoringSSLUtils.h
rename to src/iocore/net/BoringSSLUtils.h
diff --git a/src/iocore/net/OCSPStapling.cc b/src/iocore/net/OCSPStapling.cc
index 49743c7e67..f427cf8549 100644
--- 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
index 7295ee80bb..7870bf9467 100644
--- 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
index 1db515c4e7..57cd2fe9f2 100644
--- 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
index a8dfd3e168..8fe247d74a 100644
--- 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
index 72b552a4a8..00e00a4931 100644
--- 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
index 17b13b4eeb..d2e5483bfc 100644
--- 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 b/src/iocore/net/SSLDynlock.h
similarity index 100%
rename from include/iocore/net/SSLDynlock.h
rename to src/iocore/net/SSLDynlock.h
diff --git a/src/iocore/net/SSLNetProcessor.cc
b/src/iocore/net/SSLNetProcessor.cc
index 94ceddf864..00ec6363a5 100644
--- 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
index 78a943c9c1..4f36f41ff1 100644
--- 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
index 317b3df253..e978ffc3d2 100644
--- 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
b/src/iocore/net/SSLSessionCache.h
similarity index 100%
rename from include/iocore/net/SSLSessionCache.h
rename to src/iocore/net/SSLSessionCache.h
diff --git a/src/iocore/net/SSLSessionTicket.cc
b/src/iocore/net/SSLSessionTicket.cc
index c27dc05adb..4d8442eb58 100644
--- 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
b/src/iocore/net/SSLSessionTicket.h
similarity index 100%
rename from include/iocore/net/SSLSessionTicket.h
rename to src/iocore/net/SSLSessionTicket.h
diff --git a/src/iocore/net/SSLStats.cc b/src/iocore/net/SSLStats.cc
index 2de69d56d0..6518d937f6 100644
--- 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 b/src/iocore/net/SSLStats.h
similarity index 100%
rename from include/iocore/net/SSLStats.h
rename to src/iocore/net/SSLStats.h
diff --git a/src/iocore/net/SSLUtils.cc b/src/iocore/net/SSLUtils.cc
index 2b9e72abf4..793e1b8e7d 100644
--- 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
index 098859421b..5bae93d005 100644
--- 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
index 3616828a4b..1e213eb7db 100644
--- 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
