detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-11 12:27:14 +02:00
Code Issues Actions Packages Releases Activity

removed genericSocket

Browse Source
This commit is contained in:
Erik Frojdh
2020-03-11 13:39:40 +01:00
parent 0de0d82a1a
commit 3dbd6a33f7
4 changed files with 15 additions and 842 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
slsReceiverSoftware/src/Listener.cpp
View File

@ -10,7 +10,6 @@
#include "Fifo.h"
#include "GeneralData.h"
#include "container_utils.h" // For sls::make_unique<>
#include "genericSocket.h"
#include "sls_detector_exceptions.h"
#include "UdpRxSocket.h"
@ -164,10 +163,10 @@ void Listener::CreateUDPSockets() {
}
ShutDownUDPSocket();
// InterfaceNameToIp(eth).str().c_str()
try{
udpSocket = sls::make_unique<SELECTED_SOCKET>(*udpPortNumber, genericSocket::UDP,
generalData->packetSize, ((*eth).length() ? (*eth).c_str() : nullptr), generalData->headerPacketSize,
udpSocket = sls::make_unique<sls::UdpRxSocket>(*udpPortNumber,
generalData->packetSize, ((*eth).length() ? sls::InterfaceNameToIp(*eth).str().c_str() : nullptr),
*udpSocketBufferSize);
LOG(logINFO) << index << ": UDP port opened at port " << *udpPortNumber;
} catch (...) {
@ -216,8 +215,8 @@ void Listener::CreateDummySocketForUDPSocketBufferSize(int64_t s) {
//create dummy socket
try {
SELECTED_SOCKET g(*udpPortNumber, genericSocket::UDP,
generalData->packetSize, ((*eth).length() ? (*eth).c_str() : nullptr), generalData->headerPacketSize,
sls::UdpRxSocket g(*udpPortNumber,
generalData->packetSize, ((*eth).length() ? sls::InterfaceNameToIp(*eth).str().c_str() : nullptr),
*udpSocketBufferSize);
// doubled due to kernel bookkeeping (could also be less due to permissions)

6
slsReceiverSoftware/src/Listener.h
View File

@ -15,15 +15,11 @@
class GeneralData;
class Fifo;
class genericSocket;
namespace sls{
class UdpRxSocket;
}
// #define SELECTED_SOCKET genericSocket
#define SELECTED_SOCKET sls::UdpRxSocket
class Listener : private virtual slsDetectorDefs, public ThreadObject {
public:
@ -194,7 +190,7 @@ class Listener : private virtual slsDetectorDefs, public ThreadObject {
std::atomic<runStatus>* status;
/** UDP Socket - Detector to Receiver */
std::unique_ptr<SELECTED_SOCKET> udpSocket;
std::unique_ptr<sls::UdpRxSocket> udpSocket;
/** UDP Port Number */
uint32_t* udpPortNumber;