Skip to content

Commit

Permalink
[XrdCl] Refactor away tls specific socket handler.
Browse files Browse the repository at this point in the history
  • Loading branch information
simonmichal committed Oct 16, 2019
1 parent 9a07fdc commit b67fb34
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 134 deletions.
1 change: 0 additions & 1 deletion src/XrdCl/CMakeLists.txt
Expand Up @@ -64,7 +64,6 @@ add_library(
XrdClClassicCopyJob.cc XrdClClassicCopyJob.hh
XrdClThirdPartyCopyJob.cc XrdClThirdPartyCopyJob.hh
XrdClAsyncSocketHandler.cc XrdClAsyncSocketHandler.hh
XrdClAsyncTlsSocketHandler.cc XrdClAsyncTlsSocketHandler.hh
XrdClChannelHandlerList.cc XrdClChannelHandlerList.hh
XrdClForkHandler.cc XrdClForkHandler.hh
XrdClCheckSumManager.cc XrdClCheckSumManager.hh
Expand Down
16 changes: 15 additions & 1 deletion src/XrdCl/XrdClAsyncSocketHandler.cc
Expand Up @@ -55,7 +55,8 @@ namespace XrdCl
pOutMsgDone( false ),
pOutHandler( 0 ),
pIncMsgSize( 0 ),
pOutMsgSize( 0 )
pOutMsgSize( 0 ),
encrypt( false )
{
Env *env = DefaultEnv::GetEnv();

Expand Down Expand Up @@ -370,6 +371,19 @@ namespace XrdCl
Status( stFatal, errPollerError ) );
return;
}

//--------------------------------------------------------------------------
// TODO this is temporary
//--------------------------------------------------------------------------
if( encrypt )
{
if( !pSocket->EnableEncryption( this ).IsOK() )
{
pStream->OnConnectError( pSubStreamNum,
Status( stFatal, errSocketError ) );
return;
}
}
}

//----------------------------------------------------------------------------
Expand Down
5 changes: 4 additions & 1 deletion src/XrdCl/XrdClAsyncSocketHandler.hh
Expand Up @@ -150,7 +150,8 @@ namespace XrdCl

Status EnableEncryption()
{
return pSocket->EnableEncryption( this );
encrypt = true;
return Status();
}

protected:
Expand Down Expand Up @@ -293,6 +294,8 @@ namespace XrdCl
uint32_t pIncMsgSize;
uint32_t pOutMsgSize;
time_t pLastActivity;

bool encrypt;
};
}

Expand Down
68 changes: 0 additions & 68 deletions src/XrdCl/XrdClAsyncTlsSocketHandler.cc

This file was deleted.

63 changes: 0 additions & 63 deletions src/XrdCl/XrdClAsyncTlsSocketHandler.hh

This file was deleted.

0 comments on commit b67fb34

Please sign in to comment.