Unverified Commit d5339f72 authored by Giuseppe Carboni's avatar Giuseppe Carboni Committed by GitHub
Browse files

Fix #844, addresses of external clients are now logged (#846) 

Their ports are logged as well
parent 17f4a8a0

Common/Servers/ExternalClients/include/ExternalClientsSocketServer.h

+4 −0
Original line number Diff line number Diff line
@@ -125,6 +125,10 @@ private: 
    	/** This is the reference to the mount component */

    	Antenna::Mount_var m_mount;



    /** Address and port of the connected client **/

    CString m_peerAddress;

    WORD m_peerPort;



    	int receiveBuffer(BYTE *Msg,WORD Len);

    	void printBuffer(BYTE *Buff,WORD Len);

    	OperationResult sendBuffer(BYTE *Msg,WORD Len);

Common/Servers/ExternalClients/src/ExternalClientsSocketServer.cpp

+7 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ using namespace ComponentErrors; 
using namespace ManagementErrors;



CExternalClientsSocketServer::CExternalClientsSocketServer (ContainerServices * service):CSocket (),

m_services (service), m_logDike(_IRA_LOGDIKE_GETLOGGER)

m_services (service), m_logDike(_IRA_LOGDIKE_GETLOGGER), m_peerAddress(""), m_peerPort(0)

{

  AUTO_TRACE ("CExternalClientsSocketServer::CExternalClientsSocketServer()");

  setExternalClientSocketStatus (ExternalClientSocketStatus_NOTCNTD);
@@ -230,6 +230,9 @@ CExternalClientsSocketServer::cmdToScheduler () 
	}

      if (Res == WOULDBLOCK)

	setSockMode (m_Error, BLOCKING);



      newExternalClientsSocketServer.getPeerName(m_peerAddress, m_peerPort);

      ACS_LOG(LM_FULL_INFO, "CExternalClientsSocketServer::cmdToScheduler()", (LM_NOTICE, std::string("Got connection from " + std::string(m_peerAddress) + " " + std::to_string(m_peerPort)).c_str()));

    }

  m_accept = true;
@@ -602,7 +605,10 @@ CExternalClientsSocketServer::cmdToScheduler () 
    }

  else

    {

      ACS_LOG(LM_FULL_INFO, "CExternalClientsSocketServer::cmdToScheduler()", (LM_NOTICE, std::string("Closed connection from " + std::string(m_peerAddress) + " " + std::to_string(m_peerPort)).c_str()));

      newExternalClientsSocketServer.Close (m_Error);

      m_peerAddress = "";

      m_peerPort = 0;

      m_accept = false;

    }

}