Skip to content

Commit

Permalink
[XrdTls] Cleaning up XrdTlsSocket.
Browse files Browse the repository at this point in the history
  • Loading branch information
simonmichal authored and osschar committed Oct 10, 2019
1 parent 56c73ec commit 868fe93
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 20 deletions.
14 changes: 5 additions & 9 deletions src/XrdTls/XrdTlsSocket.cc
Expand Up @@ -33,6 +33,11 @@

#include <stdexcept>


/******************************************************************************/
/* X r d T l s S o c k e t I m p l */
/******************************************************************************/

struct XrdTlsSocketImpl
{
XrdTlsSocketImpl() : tlsctx(0), ssl(0), traceID(0), sFD(-1),
Expand Down Expand Up @@ -561,15 +566,6 @@ void XrdTlsSocket::Shutdown(XrdTlsSocket::SDType sdType)
return SSL_get_version(pImpl->ssl);
}

/******************************************************************************/
/* C a s t t o S S L */
/******************************************************************************/

XrdTlsSocket::operator SSL*()
{
return pImpl->ssl;
}

/******************************************************************************/
/* Private: W a i t 4 O K */
/******************************************************************************/
Expand Down
16 changes: 5 additions & 11 deletions src/XrdTls/XrdTlsSocket.hh
Expand Up @@ -24,16 +24,18 @@

#include <openssl/ssl.h>

//----------------------------------------------------------------------------
// Forward declarations
//----------------------------------------------------------------------------

class XrdSysError;
class XrdTlsContext;
struct XrdTlsSocketImpl;

//----------------------------------------------------------------------------
//! Socket wrapper for TLS I/O
//----------------------------------------------------------------------------

struct XrdTlsSocketImpl;
//struct SSL;

class XrdTlsSocket
{
public:
Expand Down Expand Up @@ -236,14 +238,6 @@ enum HS_Mode

const char *Version();

//------------------------------------------------------------------------
//! Conversion to native OpenSSL connection object
//!
//! @return : SSL connection object
//------------------------------------------------------------------------

operator SSL*();

private:

int Diagnose(int sslrc);
Expand Down

0 comments on commit 868fe93

Please sign in to comment.