detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-20 02:40:03 +02:00
Code Issues Actions Packages Releases Activity

slsReceiver: udp socket buffer size, additional prints

Browse Source
This commit is contained in:
maliakal_d 2018-05-01 12:01:33 +02:00
parent 1152555663
commit fdd19bc316
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -6750,7 +6750,7 @@ string slsDetector::setReceiverUDPSocketBufferSize(int udpsockbufsize) {
} }
if(ret==FAIL) { if(ret==FAIL) {
setErrorMask((getErrorMask())|(COULDNOT_SET_NETWORK_PARAMETER)); 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) if(ret==FORCE_UPDATE)
updateReceiver(); updateReceiver();
@ -6779,7 +6779,7 @@ string slsDetector::getReceiverRealUDPSocketBufferSize() {
} }
if(ret==FAIL) { if(ret==FAIL) {
setErrorMask((getErrorMask())|(COULDNOT_SET_NETWORK_PARAMETER)); 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) if(ret==FORCE_UPDATE)
updateReceiver(); updateReceiver();

1
slsReceiverSoftware/include/genericSocket.h
View File

@ -257,7 +257,6 @@ enum communicationProtocol{
// buffer size too large // buffer size too large
else { else {
actual_udp_socket_buffer_size = ret_size; 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)) // 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); int ret = setsockopt(socketDescriptor, SOL_SOCKET, SO_RCVBUFFORCE, &desired_size, optlen);
getsockopt(socketDescriptor, SOL_SOCKET, SO_RCVBUF, &ret_size, &optlen); getsockopt(socketDescriptor, SOL_SOCKET, SO_RCVBUF, &ret_size, &optlen);

2
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -2651,7 +2651,7 @@ int slsReceiverTCPIPInterface::set_udp_socket_buffer_size() {
retval=receiverBase->getUDPSocketBufferSize(); retval=receiverBase->getUDPSocketBufferSize();
if(index >= 0 && retval != index) { if(index >= 0 && retval != index) {
ret = FAIL; 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; FILE_LOG(logERROR) << mess;
} }
} }