Commit 6e49555e authored by Marco De Marco's avatar Marco De Marco
Browse files

GetSocket restored

parent 5ab8541f

src/PlainServer.cpp

+4 −4
Original line number Diff line number Diff line
@@ -53,11 +53,11 @@ void PlainServer::startAccept() 
{

    DEBUG_STREAM << "PlainServer::startAccept()" << endl;



    PlainSession::SP plainSession_sp = PlainSession::create(m_deviceImpl_p, m_ioService_sp);

    Session::SP session_sp = PlainSession::create(m_deviceImpl_p, m_ioService_sp);



    m_acceptor_sp->async_accept(plainSession_sp->getSocket(),

    m_acceptor_sp->async_accept(session_sp->getSocket(),

        boost::bind(&PlainServer::handleAccept, this,

        plainSession_sp, boost::asio::placeholders::error));

        session_sp, boost::asio::placeholders::error));

}



}   //namespace

src/PlainSession.cpp

+2 −2
Original line number Diff line number Diff line
@@ -34,10 +34,10 @@ PlainSession::~PlainSession() 
//==============================================================================

//      PlainSession::create()

//==============================================================================

PlainSession::SP PlainSession::create(Tango::DeviceImpl* deviceImpl_p,

Session::SP PlainSession::create(Tango::DeviceImpl* deviceImpl_p,

    boost::shared_ptr<boost::asio::io_service> ioService_sp)

{

    PlainSession::SP s_sp(new PlainSession(deviceImpl_p, ioService_sp),

    Session::SP s_sp(new PlainSession(deviceImpl_p, ioService_sp),

        PlainSession::Deleter());



    return s_sp;

src/PlainSession.h

+1 −7
Original line number Diff line number Diff line
@@ -13,12 +13,6 @@ namespace MetadataExporter_ns 
class PlainSession : public Session,

    public boost::enable_shared_from_this<PlainSession>

{

public:

//------------------------------------------------------------------------------

//  [Public] Shared pointer typedef

//------------------------------------------------------------------------------

    typedef boost::shared_ptr<PlainSession> SP;



protected:

//------------------------------------------------------------------------------

//	[Protected] Constructor destructor deleter
@@ -40,7 +34,7 @@ public: 
//------------------------------------------------------------------------------

//	[Public] Users methods

//------------------------------------------------------------------------------

    static PlainSession::SP create(Tango::DeviceImpl*,

    static Session::SP create(Tango::DeviceImpl*,

        boost::shared_ptr<boost::asio::io_service>);



    virtual boost::asio::ip::tcp::socket& getSocket();

src/SSLServer.cpp

+3 −3
Original line number Diff line number Diff line
@@ -96,12 +96,12 @@ void SSLServer::startAccept() 
{

    DEBUG_STREAM << "SSLServer::startAccept()" << endl;



    SSLSession::SP sSLSession_sp = SSLSession::create(m_deviceImpl_p,

    Session::SP session_sp = SSLSession::create(m_deviceImpl_p,

        m_ioService_sp, m_context_sp);



    m_acceptor_sp->async_accept(sSLSession_sp->getSocket(),

    m_acceptor_sp->async_accept(session_sp->getSocket(),

        boost::bind(&SSLServer::handleAccept, this,

        sSLSession_sp, boost::asio::placeholders::error));

        session_sp, boost::asio::placeholders::error));

}



//==============================================================================

src/SSLSession.cpp

+4 −4
Original line number Diff line number Diff line
@@ -27,11 +27,11 @@ SSLSession::~SSLSession() 
//==============================================================================

//      SSLSession::create()

//==============================================================================

SSLSession::SP SSLSession::create(Tango::DeviceImpl* deviceImpl_p,

Session::SP SSLSession::create(Tango::DeviceImpl* deviceImpl_p,

    boost::shared_ptr<boost::asio::io_service> ioService_sp,

    boost::shared_ptr<boost::asio::ssl::context> context_sp)

{

    SSLSession::SP s_sp(new SSLSession(deviceImpl_p, ioService_sp, context_sp),

    Session::SP s_sp(new SSLSession(deviceImpl_p, ioService_sp, context_sp),

        SSLSession::Deleter());



    return s_sp;
@@ -40,11 +40,11 @@ SSLSession::SP SSLSession::create(Tango::DeviceImpl* deviceImpl_p, 
//==============================================================================

//      SSLSession::getSocket()

//==============================================================================

boost::asio::ssl::stream<boost::asio::ip::tcp::socket>::lowest_layer_type& SSLSession::getSocket()

boost::asio::ip::tcp::socket& SSLSession::getSocket()

{

    DEBUG_STREAM << "SSLSession::getSocket()" << endl;



    return m_sslSocket.lowest_layer();

    return m_sslSocket.next_layer();

}



//==============================================================================