diff --git a/slsReceiverSoftware/include/genericSocket.h b/slsReceiverSoftware/include/genericSocket.h index 7c45765f3..2f75a985b 100644 --- a/slsReceiverSoftware/include/genericSocket.h +++ b/slsReceiverSoftware/include/genericSocket.h @@ -448,7 +448,7 @@ enum communicationProtocol{ close(file_des); } else { - while(!shutdown(socketDescriptor, SHUT_RDWR)); + //while(!shutdown(socketDescriptor, SHUT_RDWR)); close(socketDescriptor); socketDescriptor=-1; } diff --git a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp index 29806a82a..d06e08758 100644 --- a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp +++ b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp @@ -911,14 +911,15 @@ int slsReceiverTCPIPInterface::stop_receiver(){ int slsReceiverTCPIPInterface::get_status(){ ret=OK; - enum runStatus retval = ERROR; + int retval=-1; + enum runStatus s=ERROR; // execute action if the arguments correctly arrived #ifdef SLS_RECEIVER_UDP_FUNCTIONS if (receiverBase == NULL){ strcpy(mess,SET_RECEIVER_ERR_MESSAGE); ret=FAIL; - }else retval=receiverBase->getStatus(); + }else s=receiverBase->getStatus(); #endif if(ret==OK && socket->differentClients){ @@ -932,6 +933,7 @@ int slsReceiverTCPIPInterface::get_status(){ cprintf(RED, "%s\n", mess); socket->SendDataOnly(mess,sizeof(mess)); } + retval = (runStatus(s)); socket->SendDataOnly(&retval,sizeof(retval)); //return ok/fail return ret;