QPID-4272: Large amounts of code are duplicated between the SSL and TCP transports

Add the security related functions to the Socket/Asynch interfaces

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1401560 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 5 insertions, 7 deletions

diff --git a/cpp/src/qpid/sys/ssl/SslHandler.cpp b/cpp/src/qpid/sys/ssl/SslHandler.cpp
index 6e079a8094..f6605da953 100644
--- a/cpp/src/qpid/sys/ssl/SslHandler.cpp
+++ b/cpp/src/qpid/sys/ssl/SslHandler.cpp
@@ -69,7 +69,7 @@ SslHandler::~SslHandler() {
     delete codec;
 }
 
-void SslHandler::init(SslIO* a, Timer& timer, uint32_t maxTime) {
+void SslHandler::init(AsynchIO* a, Timer& timer, uint32_t maxTime) {
     aio = a;
 
     // Start timer for this connection
@@ -209,7 +209,7 @@ void SslHandler::idle(AsynchIO&){
         aio->queueWriteClose();
 }
 
-SecuritySettings SslHandler::getSecuritySettings(SslIO* aio)
+SecuritySettings SslHandler::getSecuritySettings(AsynchIO* aio)
 {
     SecuritySettings settings = aio->getSecuritySettings();
     settings.nodict = nodict;
diff --git a/cpp/src/qpid/sys/ssl/SslHandler.h b/cpp/src/qpid/sys/ssl/SslHandler.h
index d25304b37e..aedfea1888 100644
--- a/cpp/src/qpid/sys/ssl/SslHandler.h
+++ b/cpp/src/qpid/sys/ssl/SslHandler.h
@@ -44,11 +44,9 @@ class TimerTask;
 
 namespace ssl {
 
-class SslIO;
-
 class SslHandler : public OutputControl {
     std::string identifier;
-    SslIO* aio;
+    AsynchIO* aio;
     ConnectionCodec::Factory* factory;
     ConnectionCodec* codec;
     bool readError;
@@ -57,12 +55,12 @@ class SslHandler : public OutputControl {
     boost::intrusive_ptr<sys::TimerTask> timeoutTimerTask;
 
     void write(const framing::ProtocolInitiation&);
-    qpid::sys::SecuritySettings getSecuritySettings(SslIO* aio);
+    qpid::sys::SecuritySettings getSecuritySettings(AsynchIO* aio);
 
   public:
     SslHandler(std::string id, ConnectionCodec::Factory* f, bool nodict);
     ~SslHandler();
-    void init(SslIO* a, Timer& timer, uint32_t maxTime);
+    void init(AsynchIO* a, Timer& timer, uint32_t maxTime);
 
     void setClient() { isClient = true; }