From 5849725b97349e59066da67ba30edd408614e9ca Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Mon, 26 Feb 2018 18:22:07 +0100
Subject: [PATCH] posisibility to overwrite rx_udpmac even with receiver

---
 RELEASE.txt                                     | 4 ++++
 slsDetectorSoftware/slsDetector/slsDetector.cpp | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/RELEASE.txt b/RELEASE.txt
index 576d1207a..03499fffe 100644
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -209,6 +209,10 @@ Resolved Issues
 	3. 	More locking to handle main and processing threads using the threadpool.
 		Removing unlock twice, which is undefined behavior.
 		
+	4. 	Setting rx_udpmac should overwrite the receiver defined mac address. 
+		Should be after rx_hostname command and followed by 
+		"sls_detector_put configuremac 0"
+		
 
 	Detector Server
 	---------------
diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp
index 6e7890a89..617c2d06e 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp
@@ -6349,9 +6349,9 @@ string slsDetector::setReceiverUDPMAC(string udpmac){
 #else
       	  ;
 #endif
-      else  if(setUDPConnection()==FAIL){
+     /* else  if(setUDPConnection()==FAIL){ commented out to be replaced by user defined udpmac
     	  std::cout<< "Warning: UDP connection set up failed" << std::endl;
-      }
+      }*/
     }else{
       setErrorMask((getErrorMask())|(COULDNOT_SET_NETWORK_PARAMETER));
       std::cout << "Warning: receiver udp mac address should be in xx:xx:xx:xx:xx:xx format" << std::endl;