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

Merge branch 'developer' into jungfrautomerge

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-11-02 14:33:03 +01:00
commit 9069e2eba4
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsReceiverSoftware/include/genericSocket.h
View File

@ -448,7 +448,7 @@ enum communicationProtocol{
close(file_des); close(file_des);
} }
else { else {
while(!shutdown(socketDescriptor, SHUT_RDWR)); //while(!shutdown(socketDescriptor, SHUT_RDWR));
close(socketDescriptor); close(socketDescriptor);
socketDescriptor=-1; socketDescriptor=-1;
} }

6
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -911,14 +911,15 @@ int slsReceiverTCPIPInterface::stop_receiver(){
int slsReceiverTCPIPInterface::get_status(){ int slsReceiverTCPIPInterface::get_status(){
ret=OK; ret=OK;
enum runStatus retval = ERROR; int retval=-1;
enum runStatus s=ERROR;
// execute action if the arguments correctly arrived // execute action if the arguments correctly arrived
#ifdef SLS_RECEIVER_UDP_FUNCTIONS #ifdef SLS_RECEIVER_UDP_FUNCTIONS
if (receiverBase == NULL){ if (receiverBase == NULL){
strcpy(mess,SET_RECEIVER_ERR_MESSAGE); strcpy(mess,SET_RECEIVER_ERR_MESSAGE);
ret=FAIL; ret=FAIL;
}else retval=receiverBase->getStatus(); }else s=receiverBase->getStatus();
#endif #endif
if(ret==OK && socket->differentClients){ if(ret==OK && socket->differentClients){
@ -932,6 +933,7 @@ int slsReceiverTCPIPInterface::get_status(){
cprintf(RED, "%s\n", mess); cprintf(RED, "%s\n", mess);
socket->SendDataOnly(mess,sizeof(mess)); socket->SendDataOnly(mess,sizeof(mess));
} }
retval = (runStatus(s));
socket->SendDataOnly(&retval,sizeof(retval)); socket->SendDataOnly(&retval,sizeof(retval));
//return ok/fail //return ok/fail
return ret; return ret;