Skip to content

Remove dependency for SSL stuff from P_Net.h #7531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maskit merged 1 commit into from
Feb 19, 2021
Merged

Remove dependency for SSL stuff from P_Net.h #7531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions iocore/net/P_Net.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,6 @@ extern RecRawStatBlock *net_rsb;
#include "P_CompletionUtil.h"
#include "P_NetVCTest.h"

#include "P_SSLNetVConnection.h"
#include "P_SSLNetProcessor.h"
#include "P_SSLNetAccept.h"
#include "P_SSLCertLookup.h"

static constexpr ts::ModuleVersion NET_SYSTEM_MODULE_INTERNAL_VERSION(NET_SYSTEM_MODULE_PUBLIC_VERSION, ts::ModuleVersion::PRIVATE);

// For very verbose iocore debugging.
Expand Down
1 change: 1 addition & 0 deletions iocore/net/SSLClientUtils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

#include "P_Net.h"
#include "P_SSLClientUtils.h"
#include "P_SSLNetVConnection.h"
#include "YamlSNIConfig.h"
#include "SSLDiags.h"

Expand Down
1 change: 1 addition & 0 deletions iocore/net/SSLDiags.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

#include "P_Net.h"
#include "SSLStats.h"
#include "P_SSLNetVConnection.h"

// return true if we have a stat for the error
static bool
Expand Down
1 change: 1 addition & 0 deletions iocore/net/SSLNetAccept.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

#include "tscore/ink_config.h"
#include "P_Net.h"
#include "P_SSLNetAccept.h"

SSLNetAccept::SSLNetAccept(const NetProcessor::AcceptOptions &opt) : NetAccept(opt) {}

Expand Down
3 changes: 3 additions & 0 deletions iocore/net/SSLNetProcessor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
#include "P_SSLUtils.h"
#include "P_OCSPStapling.h"
#include "SSLStats.h"
#include "P_SSLNetProcessor.h"
#include "P_SSLNetAccept.h"
#include "P_SSLNetVConnection.h"
#include "P_SSLClientCoordinator.h"

//
Expand Down
2 changes: 2 additions & 0 deletions proxy/http/Http1ClientSession.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
#include "Plugin.h"
#include "PoolableSession.h"

#include "P_SSLNetVConnection.h"

#define HttpSsnDebug(fmt, ...) SsnDebug(this, "http_cs", fmt, __VA_ARGS__)

#define STATE_ENTER(state_name, event, vio) \
Expand Down
2 changes: 2 additions & 0 deletions proxy/http2/Http2ClientSession.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
#include "HttpDebugNames.h"
#include "tscore/ink_base64.h"

#include "P_SSLNetVConnection.h"

#define REMEMBER(e, r) \
{ \
this->remember(MakeSourceLocation(), e, r); \
Expand Down
1 change: 1 addition & 0 deletions proxy/private/SSLProxySession.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

#include "SSLProxySession.h"
#include "P_Net.h"
#include "P_SSLNetVConnection.h"

void
SSLProxySession::init(SSLNetVConnection const &new_vc)
Expand Down
3 changes: 3 additions & 0 deletions src/traffic_quic/traffic_quic.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
#include "diags.h"
#include "quic_client.h"

#include "P_SSLUtils.h"
#include "P_SSLConfig.h"

#define THREADS 1

constexpr size_t stacksize = 1048576;
Expand Down