ChangeLogTag:Thu Sep 20 12:16:13 2001 Ossama Othman <ossama@uci.edu>

3 files changed, 30 insertions, 26 deletions

diff --git a/ace/SSL/SSL_SOCK.cpp b/ace/SSL/SSL_SOCK.cpp
index 8a1729bbcea..4a2f37e3fc1 100644
--- a/ace/SSL/SSL_SOCK.cpp
+++ b/ace/SSL/SSL_SOCK.cpp
@@ -9,7 +9,9 @@
 #include "SSL_SOCK.i"
 #endif
 
-ACE_RCSID(ACE_SSL, SSL_SOCK, "$Id$")
+ACE_RCSID (ACE_SSL,
+           SSL_SOCK,
+           "$Id$")
 
 
 ACE_SSL_SOCK::ACE_SSL_SOCK (void)
@@ -42,7 +44,6 @@ ACE_SSL_SOCK::enable (int value) const
     default:
       return -1;
     }
-  return 0;
 }
 
 int
@@ -64,5 +65,4 @@ ACE_SSL_SOCK::disable (int value) const
     default:
       return -1;
     }
-  return 0;
 }
diff --git a/ace/SSL/SSL_SOCK_Stream.cpp b/ace/SSL/SSL_SOCK_Stream.cpp
index f9acf6fd97d..d4dd9ddfd82 100644
--- a/ace/SSL/SSL_SOCK_Stream.cpp
+++ b/ace/SSL/SSL_SOCK_Stream.cpp
@@ -3,6 +3,7 @@
 // $Id$
 
 #include "ace/Handle_Set.h"
+#include "ace/Log_Msg.h"
 
 #include <openssl/err.h>
 
@@ -18,6 +19,32 @@ ACE_RCSID (ACE_SSL,
 
 ACE_ALLOC_HOOK_DEFINE(ACE_SSL_SOCK_Stream)
 
+ACE_SSL_SOCK_Stream::ACE_SSL_SOCK_Stream (ACE_SSL_Context *context)
+  : ssl_ (0),
+    stream_ ()
+{
+  ACE_TRACE ("ACE_SSL_SOCK_Stream::ACE_SSL_SOCK_Stream");
+
+  ACE_SSL_Context * ctx =
+    (context == 0 ? ACE_SSL_Context::instance () : context);
+
+  this->ssl_ = ::SSL_new (ctx->context ());
+
+  if (this->ssl_ != 0)
+    {
+      ::SSL_set_verify (this->ssl_,
+                        ctx->default_verify_mode (),
+                        0);
+    }
+  else
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "(%P|%t) ACE_SSL_SOCK_Stream "
+                  "- cannot allocate new SSL structure %p\n",
+                  ACE_TEXT ("")));
+    }
+}
+
 ssize_t
 ACE_SSL_SOCK_Stream::sendv (const iovec iov[], size_t n) const
 {
diff --git a/ace/SSL/SSL_SOCK_Stream.i b/ace/SSL/SSL_SOCK_Stream.i
index f2792ae9b3a..50ed83a2cea 100644
--- a/ace/SSL/SSL_SOCK_Stream.i
+++ b/ace/SSL/SSL_SOCK_Stream.i
@@ -21,29 +21,6 @@ ACE_SSL_SOCK_Stream::set_handle (ACE_HANDLE fd)
 }
 
 ASYS_INLINE
-ACE_SSL_SOCK_Stream::ACE_SSL_SOCK_Stream (ACE_SSL_Context *context)
-  : ssl_ (0),
-    stream_ ()
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Stream::ACE_SSL_SOCK_Stream");
-
-  ACE_SSL_Context * ctx =
-    (context == 0 ? ACE_SSL_Context::instance () : context);
-
-  this->ssl_ = ::SSL_new (ctx->context ());
-
-  if (this->ssl_ == 0)
-    ACE_ERROR ((LM_ERROR,
-		"(%P|%t) ACE_SSL_SOCK_Stream "
-                "- cannot allocate new SSL structure %p\n",
-		ACE_TEXT ("")));
-
-  ::SSL_set_verify (this->ssl_,
-                    ctx->default_verify_mode (),
-                    0);
-}
-
-ASYS_INLINE
 ACE_SSL_SOCK_Stream::~ACE_SSL_SOCK_Stream (void)
 {
   ACE_TRACE ("ACE_SSL_SOCK_Stream::~ACE_SSL_SOCK_Stream");