Commit 77a51e63 authored by Marco De Marco's avatar Marco De Marco
Browse files

SSL and plain server partially implemented

parent b8ed050e

Makefile

+2 −1
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ CXX_DEBUG_FLAGS=-g -DVERBOSE_DEBUG 
CXX_RELEASE_FLAGS=-O3

CXX_DEFAULT_FLAGS=-c -Wall -Wextra -std=c++11 -std=gnu++11

LDFLAGS=-Wall -lomniORB4 -lomniDynamic4 -lCOS4 -lomnithread -ltango -llog4tango \

	-lsoci_core -lsoci_mysql -lboost_system -lboost_thread

	-lsoci_core -lsoci_mysql -lboost_system -lboost_thread -lboost_filesystem \

	-lssl

INC_PARM=$(foreach d, $(INC_DIR), -I$d)

LIB_PARM=$(foreach d, $(LIB_DIR), -L$d)

#================================================================================

src/MetadataExporter.cpp

+51 −36
Original line number Diff line number Diff line
@@ -153,11 +153,26 @@ void MetadataExporter::init_device() 
        Configuration::SP configuration_sp = Configuration::create(address, port,

            workerNumber, enableSSL, certificateFile, privateKeyFile, dHTempFile);



        try

        {

            if(enableSSL)

                m_server_sp = SSLServer::create(this, configuration_sp);

            else

                m_server_sp = PlainServer::create(this, configuration_sp);

        }

        catch(std::exception& ex)

        {

            set_state(Tango::FAULT);

            std::stringstream error_stream;

            error_stream << "MetadataExporter::init_device() " << ex.what() << std::endl;

            set_status(error_stream.str());

        }

        catch(...)

        {

            set_state(Tango::FAULT);

            set_status("MetadataExporter::init_device() unknown error");

        }

    }



	/*----- PROTECTED REGION END -----*/	//	MetadataExporter::init_device

}

src/PlainServer.cpp

+14 −6
Original line number Diff line number Diff line
@@ -34,4 +34,12 @@ Server::SP PlainServer::create(Tango::DeviceImpl* deviceImpl_p, 
    return s_sp;

}



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

//      PlainServer::startAccept()

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

void PlainServer::startAccept()

{

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

}



}   //namespace

src/PlainServer.h

+5 −4
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ public: 
//------------------------------------------------------------------------------

    static Server::SP create(Tango::DeviceImpl*, Configuration::SP);



    virtual void startAccept();

};



}   //End of namespace

src/PlainSession.cpp

+9 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ PlainSession::~PlainSession() 
}



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

//      PlainSession::~PlainSession()

//      PlainSession::create()

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

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

{
@@ -30,4 +30,12 @@ Session::SP PlainSession::create(Tango::DeviceImpl* deviceImpl_p) 
    return s_sp;

}



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

//      PlainSession::start()

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

void PlainSession::start()

{

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

}



}   //namespace
 
 No newline at end of file