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

Refactor to unify the various SSL and TCP interfaces:
- Make ssl listen have the same signature as regular sockets
- Give ssl connect same interface as tcp
- Unify the SSL and TCP IO interfaces some more

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

1 files changed, 10 insertions, 8 deletions

diff --git a/cpp/src/qpid/sys/ssl/SslHandler.h b/cpp/src/qpid/sys/ssl/SslHandler.h
index 14814b0281..d25304b37e 100644
--- a/cpp/src/qpid/sys/ssl/SslHandler.h
+++ b/cpp/src/qpid/sys/ssl/SslHandler.h
@@ -24,6 +24,7 @@
 
 #include "qpid/sys/ConnectionCodec.h"
 #include "qpid/sys/OutputControl.h"
+#include "qpid/sys/SecuritySettings.h"
 
 #include <boost/intrusive_ptr.hpp>
 
@@ -35,14 +36,15 @@ namespace framing {
 
 namespace sys {
 
+class AsynchIO;
+struct AsynchIOBufferBase;
+class Socket;
 class Timer;
 class TimerTask;
 
 namespace ssl {
 
 class SslIO;
-struct SslIOBufferBase;
-class SslSocket;
 
 class SslHandler : public OutputControl {
     std::string identifier;
@@ -70,14 +72,14 @@ class SslHandler : public OutputControl {
     void giveReadCredit(int32_t);
 
     // Input side
-    void readbuff(SslIO& aio, SslIOBufferBase* buff);
-    void eof(SslIO& aio);
-    void disconnect(SslIO& aio);
+    void readbuff(qpid::sys::AsynchIO&, qpid::sys::AsynchIOBufferBase* buff);
+    void eof(qpid::sys::AsynchIO&);
+    void disconnect(qpid::sys::AsynchIO& a);
 
     // Notifications
-    void nobuffs(SslIO& aio);
-    void idle(SslIO& aio);
-    void closedSocket(SslIO& aio, const SslSocket& s);
+    void nobuffs(qpid::sys::AsynchIO&);
+    void idle(qpid::sys::AsynchIO&);
+    void closedSocket(qpid::sys::AsynchIO&, const qpid::sys::Socket& s);
 };
 
 }}} // namespace qpid::sys::ssl