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

bugfix zmq ip was being overwritten

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-11-23 17:48:30 +01:00
commit ab5229bcbf
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -3734,13 +3734,9 @@ string multiSlsDetector::setNetworkParameter(networkParameter p, string s){
switch (p) { switch (p) {
case CLIENT_STREAMING_PORT: case CLIENT_STREAMING_PORT:
case CLIENT_STREAMING_SRC_IP: case CLIENT_STREAMING_SRC_IP:
prev_streaming = enableDataStreamingToClient();
if (enableDataStreamingFromReceiver(-1)) enableDataStreamingFromReceiver(0);
if (enableDataStreamingToClient(-1)) enableDataStreamingToClient(0);
break;
case RECEIVER_STREAMING_PORT: case RECEIVER_STREAMING_PORT:
case RECEIVER_STREAMING_SRC_IP: case RECEIVER_STREAMING_SRC_IP:
prev_streaming = enableDataStreamingFromReceiver(); prev_streaming = (enableDataStreamingFromReceiver() || enableDataStreamingToClient());
if (enableDataStreamingFromReceiver(-1)) enableDataStreamingFromReceiver(0); if (enableDataStreamingFromReceiver(-1)) enableDataStreamingFromReceiver(0);
if (enableDataStreamingToClient(-1)) enableDataStreamingToClient(0); if (enableDataStreamingToClient(-1)) enableDataStreamingToClient(0);
break; break;

1
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -6443,7 +6443,6 @@ string slsDetector::setReceiverStreamingIP(string sourceIP) {
} }
// on success put IP as string into arg // on success put IP as string into arg
else { else {
memset(thisDetector->zmqip, 0, MAX_STR_LENGTH);
dataSocket->ConvertInternetAddresstoIpString(result, arg, MAX_STR_LENGTH); dataSocket->ConvertInternetAddresstoIpString(result, arg, MAX_STR_LENGTH);
} }
} }