zmqip fix to restart reciever streaming form command line, fix to not have sls_receiver_defs in zmqSocket.h incldue

This commit is contained in:
Dhanya Maliakal
2017-11-28 16:31:43 +01:00
parent 6a41b5ce3a
commit 7c1423d654
2 changed files with 5 additions and 2 deletions

View File

@ -3977,13 +3977,16 @@ string slsDetectorCommand::cmdNetworkParameter(int narg, char *args[], int actio
t=CLIENT_STREAMING_SRC_IP;
}else if (cmd=="rx_zmqip") {
t=RECEIVER_STREAMING_SRC_IP;
// if streaming, switch it off
prev_streaming = myDet->enableDataStreamingFromReceiver();
if (prev_streaming) myDet->enableDataStreamingFromReceiver(0);
}
else return ("unknown network parameter")+cmd;
if (action==PUT_ACTION) {
myDet->setNetworkParameter(t, args[1]);
// switch it back on, if it had been switched on
if (prev_streaming && t == RECEIVER_STREAMING_PORT)
if (prev_streaming && (t == RECEIVER_STREAMING_PORT || t == RECEIVER_STREAMING_SRC_IP))
myDet->enableDataStreamingFromReceiver(1);
}