From 8727a93e3e16be06182d267d6bf5a5ec15b516f8 Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Thu, 21 Nov 2019 12:35:07 +0100
Subject: [PATCH] WIP

---
 slsReceiverSoftware/include/Implementation.h | 3 +--
 slsReceiverSoftware/include/receiver_defs.h  | 2 ++
 slsReceiverSoftware/src/Implementation.cpp   | 7 +++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/slsReceiverSoftware/include/Implementation.h b/slsReceiverSoftware/include/Implementation.h
index 62cff970e..634a5461d 100755
--- a/slsReceiverSoftware/include/Implementation.h
+++ b/slsReceiverSoftware/include/Implementation.h
@@ -228,7 +228,6 @@ class Implementation : private virtual slsDetectorDefs {
  
     // config parameters
     int numThreads;
-    const static int MAX_NUMBER_OF_LISTENING_THREADS = 2;
     detectorType myDetectorType;
     int numDet[MAX_DIMENSIONS];
     int detID;
@@ -255,7 +254,7 @@ class Implementation : private virtual slsDetectorDefs {
     // network configuration (UDP)
     int numUDPInterfaces;
     std::vector <std::string> eth;
-    uint32_t udpPortNum[MAX_NUMBER_OF_LISTENING_THREADS];
+    std::vector <uint32_t> udpPortNum;
     int64_t udpSocketBufferSize;
     int64_t actualUDPSocketBufferSize;
 
diff --git a/slsReceiverSoftware/include/receiver_defs.h b/slsReceiverSoftware/include/receiver_defs.h
index 668d38ba7..7e591c374 100755
--- a/slsReceiverSoftware/include/receiver_defs.h
+++ b/slsReceiverSoftware/include/receiver_defs.h
@@ -4,6 +4,8 @@
 #include <stdint.h> 
 
 #define MAX_DIMENSIONS					(2)
+#define MAX_NUMBER_OF_LISTENING_THREADS (2)
+
 //socket
 #define GOODBYE 						(-200)
 #define RECEIVE_SOCKET_BUFFER_SIZE 		(100*1024*1024)
diff --git a/slsReceiverSoftware/src/Implementation.cpp b/slsReceiverSoftware/src/Implementation.cpp
index 670ece330..9599ae08a 100755
--- a/slsReceiverSoftware/src/Implementation.cpp
+++ b/slsReceiverSoftware/src/Implementation.cpp
@@ -39,6 +39,8 @@ void Implementation::DeleteMembers() {
     dataProcessor.clear();
     dataStreamer.clear();
     fifo.clear();
+    eth.clear();
+    udpPortNum.clear();
     ctbDbitList.clear();
 }
 
@@ -74,9 +76,10 @@ void Implementation::InitializeMembers() {
     // network configuration (UDP)
     numUDPInterfaces = 1;
     eth.resize(MAX_NUMBER_OF_LISTENING_THREADS);
-    for (int i = 0; i < MAX_NUMBER_OF_LISTENING_THREADS; i++) {
+    udpPortNum.resize(MAX_NUMBER_OF_LISTENING_THREADS);
+    for (int i = 0; i < MAX_NUMBER_OF_LISTENING_THREADS; ++i) {
         eth[i] = "";
-        udpPortNum[i] = DEFAULT_UDP_PORTNO + i;
+        udpPortNum[i] =  DEFAULT_UDP_PORTNO + i;
     }
     udpSocketBufferSize = 0;
     actualUDPSocketBufferSize = 0;