merging refactor (replacing)

This commit is contained in:
2019-04-12 10:53:09 +02:00
parent 0bb800cc8a
commit 89a06f099c
1176 changed files with 82698 additions and 159058 deletions

23
slsReceiverSoftware/include/slsReceiver.h Normal file → Executable file
View File

@ -4,21 +4,17 @@
* @short creates the UDP and TCP class objects
***********************************************/
#include <memory>
#include "slsReceiverTCPIPInterface.h"
#include "UDPInterface.h"
#include "receiver_defs.h"
#include "MySocketTCP.h"
//#include "utilities.h"
#include "sls_detector_defs.h"
/**
*@short creates the UDP and TCP class objects
*/
class slsReceiver : private virtual slsReceiverDefs {
class slsReceiver : private virtual slsDetectorDefs {
public:
/**
@ -30,11 +26,15 @@ class slsReceiver : private virtual slsReceiverDefs {
* @param argv from command line
*/
slsReceiver(int argc, char *argv[]);
/**
* Destructor
* Constructor
* Starts up a Receiver server. Reads configuration file, options, and
* assembles a Receiver using TCP and UDP detector interfaces
* throws an exception in case of failure
* @param tcpip_port_no TCP/IP port number
*/
~slsReceiver();
slsReceiver(int tcpip_port_no = 1954);
/**
* starts listening on the TCP port for client comminication
@ -98,6 +98,5 @@ class slsReceiver : private virtual slsReceiverDefs {
private:
slsReceiverTCPIPInterface* tcpipInterface;
std::unique_ptr<slsReceiverTCPIPInterface> tcpipInterface;
};