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

replaced udp socket

Browse Source
This commit is contained in:
Erik Frojdh
2020-02-17 17:43:14 +01:00
parent 3ea9b86bf5
commit f1bce15a57
46 changed files with 703 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsReceiverSoftware/src/Listener.cpp
View File

@ -12,6 +12,7 @@
#include "container_utils.h" // For sls::make_unique<>
#include "genericSocket.h"
#include "sls_detector_exceptions.h"
#include "UdpRxSocket.h"
#include <cerrno>
#include <cstring>
@ -147,7 +148,6 @@ void Listener::SetGeneralData(GeneralData* g) {
void Listener::CreateUDPSockets() {
if (!(*activated)) {
return;
}
@ -163,7 +163,7 @@ void Listener::CreateUDPSockets() {
ShutDownUDPSocket();
try{
udpSocket = sls::make_unique<genericSocket>(*udpPortNumber, genericSocket::UDP,
udpSocket = sls::make_unique<SELECTED_SOCKET>(*udpPortNumber, genericSocket::UDP,
generalData->packetSize, ((*eth).length() ? (*eth).c_str() : nullptr), generalData->headerPacketSize,
*udpSocketBufferSize);
FILE_LOG(logINFO) << index << ": UDP port opened at port " << *udpPortNumber;
@ -213,7 +213,7 @@ void Listener::CreateDummySocketForUDPSocketBufferSize(int64_t s) {
//create dummy socket
try {
genericSocket g(*udpPortNumber, genericSocket::UDP,
SELECTED_SOCKET g(*udpPortNumber, genericSocket::UDP,
generalData->packetSize, ((*eth).length() ? (*eth).c_str() : nullptr), generalData->headerPacketSize,
*udpSocketBufferSize);

9
slsReceiverSoftware/src/Listener.h
View File

@ -16,6 +16,13 @@
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 {
@ -187,7 +194,7 @@ class Listener : private virtual slsDetectorDefs, public ThreadObject {
std::atomic<runStatus>* status;
/** UDP Socket - Detector to Receiver */
std::unique_ptr<genericSocket> udpSocket;
std::unique_ptr<SELECTED_SOCKET> udpSocket;
/** UDP Port Number */
uint32_t* udpPortNumber;