Move template specializations into I_NetVConnection.h

Author: maskit

iocore/net/ALPNSupport.cc

@@ -22,19 +22,11 @@
  */
 
 #include "P_ALPNSupport.h"
-#include "I_NetVConnection.h"
 #include "P_SSLNextProtocolSet.h"
 #include "records/I_RecHttp.h"
 
 int ALPNSupport::_ex_data_index = -1;
 
-template <>
-ALPNSupport *
-NetVConnection::get_service() const
-{
-  return static_cast<ALPNSupport *>(this->_get_service(NetVConnection::Service::TLS_ALPN));
-}
-
 void
 ALPNSupport::initialize()
 {

iocore/net/I_NetVConnection.h

@@ -574,3 +574,59 @@ NetVConnection::_set_service(enum NetVConnection::Service service, void *instanc
 {
   this->_services[static_cast<unsigned int>(service)] = instance;
 }
+
+class ALPNSupport;
+template <>
+inline ALPNSupport *
+NetVConnection::get_service() const
+{
+  return static_cast<ALPNSupport *>(this->_get_service(NetVConnection::Service::TLS_ALPN));
+}
+
+class TLSBasicSupport;
+template <>
+inline TLSBasicSupport *
+NetVConnection::get_service() const
+{
+  return static_cast<TLSBasicSupport *>(this->_get_service(NetVConnection::Service::TLS_Basic));
+}
+
+class TLSEarlyDataSupport;
+template <>
+inline TLSEarlyDataSupport *
+NetVConnection::get_service() const
+{
+  return static_cast<TLSEarlyDataSupport *>(this->_get_service(NetVConnection::Service::TLS_EarlyData));
+}
+
+class TLSCertSwitchSupport;
+template <>
+inline TLSCertSwitchSupport *
+NetVConnection::get_service() const
+{
+  return static_cast<TLSCertSwitchSupport *>(this->_get_service(NetVConnection::Service::TLS_CertSwitch));
+}
+
+class TLSSNISupport;
+template <>
+inline TLSSNISupport *
+NetVConnection::get_service() const
+{
+  return static_cast<TLSSNISupport *>(this->_get_service(NetVConnection::Service::TLS_SNI));
+}
+
+class TLSSessionResumptionSupport;
+template <>
+inline TLSSessionResumptionSupport *
+NetVConnection::get_service() const
+{
+  return static_cast<TLSSessionResumptionSupport *>(this->_get_service(NetVConnection::Service::TLS_SessionResumption));
+}
+
+class TLSTunnelSupport;
+template <>
+inline TLSTunnelSupport *
+NetVConnection::get_service() const
+{
+  return static_cast<TLSTunnelSupport *>(this->_get_service(NetVConnection::Service::TLS_Tunnel));
+}

iocore/net/TLSBasicSupport.cc

@@ -23,18 +23,10 @@
  */
 
 #include "TLSBasicSupport.h"
-#include "I_NetVConnection.h"
 #include "SSLStats.h"
 
 int TLSBasicSupport::_ex_data_index = -1;
 
-template <>
-TLSBasicSupport *
-NetVConnection::get_service() const
-{
-  return static_cast<TLSBasicSupport *>(this->_get_service(NetVConnection::Service::TLS_Basic));
-}
-
 void
 TLSBasicSupport::initialize()
 {

iocore/net/TLSCertSwitchSupport.cc

@@ -20,18 +20,10 @@
  */
 
 #include "TLSCertSwitchSupport.h"
-#include "I_NetVConnection.h"
 #include "P_SSLCertLookup.h"
 
 int TLSCertSwitchSupport::_ex_data_index = -1;
 
-template <>
-TLSCertSwitchSupport *
-NetVConnection::get_service() const
-{
-  return static_cast<TLSCertSwitchSupport *>(this->_get_service(NetVConnection::Service::TLS_CertSwitch));
-}
-
 void
 TLSCertSwitchSupport::initialize()
 {

iocore/net/TLSEarlyDataSupport.cc

@@ -24,18 +24,10 @@
 
 #include <openssl/ssl.h>
 #include "TLSEarlyDataSupport.h"
-#include "I_NetVConnection.h"
 #include "tscore/ink_assert.h"
 
 int TLSEarlyDataSupport::_ex_data_index = -1;
 
-template <>
-TLSEarlyDataSupport *
-NetVConnection::get_service() const
-{
-  return static_cast<TLSEarlyDataSupport *>(this->_get_service(NetVConnection::Service::TLS_EarlyData));
-}
-
 void
 TLSEarlyDataSupport::initialize()
 {

iocore/net/TLSSNISupport.cc

@@ -23,20 +23,12 @@
 #include "P_SSLNextProtocolAccept.h"
 #include "SSLSNIConfig.h"
 #include "TLSSNISupport.h"
-#include "I_NetVConnection.h"
 #include "tscore/ink_assert.h"
 #include "tscore/ink_inet.h"
 #include "tscore/Diags.h"
 
 int TLSSNISupport::_ex_data_index = -1;
 
-template <>
-TLSSNISupport *
-NetVConnection::get_service() const
-{
-  return static_cast<TLSSNISupport *>(this->_get_service(NetVConnection::Service::TLS_SNI));
-}
-
 void
 TLSSNISupport::initialize()
 {

iocore/net/TLSSessionResumptionSupport.cc

@@ -49,13 +49,6 @@ char mac_param_digest[] = "sha256";
 
 int TLSSessionResumptionSupport::_ex_data_index = -1;
 
-template <>
-TLSSessionResumptionSupport *
-NetVConnection::get_service() const
-{
-  return static_cast<TLSSessionResumptionSupport *>(this->_get_service(NetVConnection::Service::TLS_SessionResumption));
-}
-
 static bool
 is_ssl_session_timed_out(SSL_SESSION *session)
 {

iocore/net/TLSTunnelSupport.cc

@@ -23,21 +23,13 @@
  */
 
 #include "TLSTunnelSupport.h"
-#include "I_NetVConnection.h"
 #include "tscore/ink_assert.h"
 #include "tscore/Diags.h"
 
 #include "swoc/IPEndpoint.h"
 
 int TLSTunnelSupport::_ex_data_index = -1;
 
-template <>
-TLSTunnelSupport *
-NetVConnection::get_service() const
-{
-  return static_cast<TLSTunnelSupport *>(this->_get_service(NetVConnection::Service::TLS_Tunnel));
-}
-
 void
 TLSTunnelSupport::initialize()
 {