Commit 523493c3 authored by Marco De Marco's avatar Marco De Marco
Browse files

File transfer draft implemented

parent e6d44997

src/PlainSession.cpp

+55 −0
Original line number Diff line number Diff line
@@ -164,6 +164,61 @@ void PlainSession::startWriteResponse() 
void PlainSession::startWriteData()

{

    DEBUG_STREAM << "PlainSession::startWriteData()" << endl;



    try

    {

        if(!m_inputStream.bad())

        {

            if(m_inputStream.tellg()<m_inputStreamSize)

            {

                int leftToRead = m_inputStreamSize - m_inputStream.tellg();



                DEBUG_STREAM << "PlainSession::startWriteData() left to read " << leftToRead << endl;



                int bufferSize = 0;



                if(leftToRead < BUFFER_SIZE)

                        bufferSize = leftToRead;

                else

                        bufferSize = BUFFER_SIZE;



                DEBUG_STREAM << "PlainSession::startWriteData() buffer size " << bufferSize << endl;



                std::vector<char> writeBuff;

                writeBuff.resize(bufferSize);



                m_inputStream.read(&writeBuff[0], bufferSize);



                boost::asio::async_write(m_plainSocket, boost::asio::buffer(writeBuff),

                    m_strand.wrap(boost::bind(&PlainSession::handleWriteData,

                    shared_from_this(), boost::asio::placeholders::error)));

            }

            else

            {

                INFO_STREAM << "SSLSession::startWriteData() "

                    << " transfer completed " << endl;



                m_inputStream.close();



                startReadRequestHeader();

            }

        }

        else

        {

            ERROR_STREAM << "SSLSession::startWriteData() error on file I/O "

                << "from " << m_remoteEndpoint << endl;

        }

    }

    catch(std::exception& ec)

    {

        ERROR_STREAM << "PlainSession::startWriteData() "

            << ec.what() << " from " << m_remoteEndpoint << endl;

    }

    catch(...)

    {

        ERROR_STREAM << "PlainSession::startWriteData() unknown error from "

            << m_remoteEndpoint <<  endl;

    }

}



}   //namespace
 
 No newline at end of file

src/ProtocolManager.cpp

+38 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ ProtocolManager::ProtocolManager(Tango::DeviceImpl* deviceImpl_p, 
    DEBUG_STREAM << "ProtocolManager::ProtocolManager()" << endl;



    m_isAuthorised = false;

    m_isValidated = false;

    m_isTransferRequest = false;

}



//==============================================================================
@@ -94,6 +96,36 @@ ResponseSP ProtocolManager::prepareResponse(RequestSP request_sp) 
    return response_sp;

}



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

//      ProtocolManager::isTransferRequest()

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

bool ProtocolManager::isTransferRequest()

{

    DEBUG_STREAM << "ProtocolManager::isTransferRequest()" << endl;



    return m_isTransferRequest;

}



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

//      ProtocolManager::getFilePath()

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

std::string ProtocolManager::getFilePath()

{

    DEBUG_STREAM << "ProtocolManager::getFilePath()" << endl;



    return m_filePath;

}



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

//      ProtocolManager::getFileSize()

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

int ProtocolManager::getFileSize()

{

    DEBUG_STREAM << "ProtocolManager::getFileSize()" << endl;



    return m_fileSize;

}



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

//      ProtocolManager::prepareAuthroisation()

//==============================================================================
@@ -233,6 +265,8 @@ ResponseSP ProtocolManager::prepareTransfer(RequestSP request_sp) 


            try

            {

                m_isTransferRequest = false;



                DBManager::FileTuple fileTuple =

                    m_dBManager_sp->retrieveFileInfo(m_validatedSchema,

                    m_validatedTable, fileVersion, fileName);
@@ -276,6 +310,10 @@ ResponseSP ProtocolManager::prepareTransfer(RequestSP request_sp) 


                transferRes->set_state(Response::Transfer::ACCEPTED);

                transferRes->set_status("File found");



                m_isTransferRequest = true;

                m_filePath = absPath.string();

                m_fileSize = boost::filesystem::file_size(absPath);

            }

            catch(std::exception& ex)

            {

src/ProtocolManager.h

+15 −0
Original line number Diff line number Diff line
@@ -59,6 +59,15 @@ public: 
    virtual ResponseSP prepareResponse(RequestSP)

        throw(std::runtime_error);



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

//	[Public] File transfer methods

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

    virtual bool isTransferRequest();



    virtual std::string getFilePath();



    virtual int getFileSize();



protected:

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

//  [Protected] Request specific methods
@@ -94,6 +103,12 @@ protected: 


    //Address and port of remote endpoint

    std::string m_remoteEndpoint;



    bool m_isTransferRequest;



    std::string m_filePath;



    int m_fileSize;

};



}   //End of namespace

src/SSLSession.cpp

+55 −0
Original line number Diff line number Diff line
@@ -199,6 +199,61 @@ void SSLSession::startWriteResponse() 
void SSLSession::startWriteData()

{

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



    try

    {

        if(!m_inputStream.bad())

        {

            if(m_inputStream.tellg()<m_inputStreamSize)

            {

                int leftToRead = m_inputStreamSize - m_inputStream.tellg();



                DEBUG_STREAM << "SSLSession::startWriteData() left to read " << leftToRead << endl;



                int bufferSize = 0;



                if(leftToRead < BUFFER_SIZE)

                        bufferSize = leftToRead;

                else

                        bufferSize = BUFFER_SIZE;



                DEBUG_STREAM << "SSLSession::startWriteData() buffer size " << bufferSize << endl;



                std::vector<char> writeBuff;

                writeBuff.resize(bufferSize);



                m_inputStream.read(&writeBuff[0], bufferSize);



                boost::asio::async_write(m_sslSocket, boost::asio::buffer(writeBuff),

                    m_strand.wrap(boost::bind(&SSLSession::handleWriteData,

                    shared_from_this(), boost::asio::placeholders::error)));

            }

            else

            {

                INFO_STREAM << "SSLSession::startWriteData() "

                    << " transfer completed " << endl;



                m_inputStream.close();



                startReadRequestHeader();

            }

        }

        else

        {

            ERROR_STREAM << "SSLSession::startWriteData() error on file I/O "

                << "from " << m_remoteEndpoint << endl;

        }

    }

    catch(std::exception& ec)

    {

        ERROR_STREAM << "SSLSession::startWriteData() "

            << ec.what() << " from " << m_remoteEndpoint << endl;

    }

    catch(...)

    {

        ERROR_STREAM << "SSLSession::startWriteData() unknown error from "

            << m_remoteEndpoint <<  endl;

    }

}



}   //namespace

src/Session.cpp

+46 −2
Original line number Diff line number Diff line
@@ -81,9 +81,38 @@ void Session::handleWriteResponse(const boost::system::error_code& errorCode) 
    DEBUG_STREAM << "Session::handleWriteResponse()" << endl;



    if(!errorCode)

    {

        if(m_protocolManager_sp->isTransferRequest())

        {

            std::string filePath = m_protocolManager_sp->getFilePath();

            int fileSize = m_protocolManager_sp->getFileSize();



            INFO_STREAM << "Session::handleWriteResponse() transfer request "

                << filePath << " size " << fileSize << " from "

                << m_remoteEndpoint << endl;



            m_inputStreamSize = fileSize;



            if(m_inputStream.is_open())

                m_inputStream.close();



            m_inputStream.open(filePath.c_str(), std::ios::binary);



            if(m_inputStream)

            {

                startWriteData();

            }

            else

            {

                ERROR_STREAM << "Session::handleWriteResponse() Cannot open "

                    << filePath << endl;

            }

        }

        else

        {

            startReadRequestHeader();

        }

    }

    else if(errorCode == boost::asio::error::eof)

    {

        DEBUG_STREAM << "Session::handleWriteResponse() end of file from "
@@ -99,9 +128,24 @@ void Session::handleWriteResponse(const boost::system::error_code& errorCode) 
//==============================================================================

//      Session::handleWriteData()

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

void Session::handleWriteData(const boost::system::error_code&)

void Session::handleWriteData(const boost::system::error_code& errorCode)

{

    DEBUG_STREAM << "Session::handleWriteData()" << endl;



    if(!errorCode)

    {

        startWriteData();

    }

    else if(errorCode == boost::asio::error::eof)

    {

        DEBUG_STREAM << "Session::handleWriteResponse() end of file from "

            << m_remoteEndpoint << endl;

    }

    else

    {

        ERROR_STREAM << "Session::handleWriteResponse() "

            << errorCode.message() << " from " << m_remoteEndpoint << endl;

    }

}



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