From fdd19bc316b168424e199d4e8f765be5a9fa0a7e Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Tue, 1 May 2018 12:01:33 +0200
Subject: [PATCH] slsReceiver: udp socket buffer size, additional prints

---
 slsDetectorSoftware/slsDetector/slsDetector.cpp       | 4 ++--
 slsReceiverSoftware/include/genericSocket.h           | 1 -
 slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp
index fc0220810..5c2de0de3 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp
@@ -6750,7 +6750,7 @@ string slsDetector::setReceiverUDPSocketBufferSize(int udpsockbufsize) {
         }
         if(ret==FAIL) {
             setErrorMask((getErrorMask())|(COULDNOT_SET_NETWORK_PARAMETER));
-            std::cout << "Warning: Could not set udp socket buffer size" << std::endl;
+            printf("Warning: Could not set udp socket buffer size\n");
         }
         if(ret==FORCE_UPDATE)
             updateReceiver();
@@ -6779,7 +6779,7 @@ string slsDetector::getReceiverRealUDPSocketBufferSize() {
         }
         if(ret==FAIL) {
             setErrorMask((getErrorMask())|(COULDNOT_SET_NETWORK_PARAMETER));
-            std::cout << "Warning: Could not get real socket buffer size" << std::endl;
+            printf("Warning: Could not get real socket buffer size\n");
         }
         if(ret==FORCE_UPDATE)
             updateReceiver();
diff --git a/slsReceiverSoftware/include/genericSocket.h b/slsReceiverSoftware/include/genericSocket.h
index 633ed8068..c81ca5a09 100644
--- a/slsReceiverSoftware/include/genericSocket.h
+++ b/slsReceiverSoftware/include/genericSocket.h
@@ -257,7 +257,6 @@ enum communicationProtocol{
              // buffer size too large
              else {
                  actual_udp_socket_buffer_size = ret_size;
-                 cprintf(BLUE, "[Port %u] wanted : %u, actualsize: %u\n", port_number, real_size, ret_size);
                  // force a value larger than system limit (if run in a privileged context (capability CAP_NET_ADMIN set))
                  int ret = setsockopt(socketDescriptor, SOL_SOCKET, SO_RCVBUFFORCE, &desired_size, optlen);
                  getsockopt(socketDescriptor, SOL_SOCKET, SO_RCVBUF, &ret_size, &optlen);
diff --git a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
index 0df07bbe9..ababdf861 100644
--- a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
+++ b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
@@ -2651,7 +2651,7 @@ int slsReceiverTCPIPInterface::set_udp_socket_buffer_size() {
         retval=receiverBase->getUDPSocketBufferSize();
         if(index >= 0 && retval != index) {
             ret = FAIL;
-            strcpy(mess, "Could not set UDP Socket buffer size\n");
+            strcpy(mess, "Could not set UDP Socket buffer size (No CAP_NET_ADMIN privileges?)\n");
             FILE_LOG(logERROR) << mess;
         }
     }