detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 21:37:13 +02:00
Code Issues Actions Packages Releases Activity

changed the start and stop receiver error messages to be displayed to the client and not jsus recever

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@640 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-07-30 14:49:53 +00:00
parent 500f83f0b4
commit 05f54e996c
8 changed files with 212 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp
View File

@ -30,12 +30,12 @@ slsReceiverFuncs::~slsReceiverFuncs() {
slsReceiverFuncs::slsReceiverFuncs(int argc, char *argv[], int &success):
myDetectorType(GOTTHARD),
socket(NULL),
ret(OK),
lockStatus(0),
shortFrame(-1),
packetsPerFrame(GOTTHARD_PACKETS_PER_FRAME),
withGotthard(0){
withGotthard(0),
socket(NULL){
int port_no = DEFAULT_PORTNO+2;
ifstream infile;
@ -348,7 +348,7 @@ int slsReceiverFuncs::M_nofunc(){
void slsReceiverFuncs::closeFile(int p){
if(slsReceiverFunctionList::listening_thread_running)
if(slsReceiverFunctionList::receiver_threads_running)
fclose(slsReceiverFunctionList::sfilefd);
@ -670,7 +670,6 @@ int slsReceiverFuncs::setup_udp(){
int slsReceiverFuncs::start_receiver(){
ret=OK;
strcpy(mess,"Could not start receiver\n");
// execute action if the arguments correctly arrived
@ -686,7 +685,7 @@ int slsReceiverFuncs::start_receiver(){
}
*/
else if(slsReceiverList->getStatus()!=RUNNING)
ret=slsReceiverList->startReceiver();
ret=slsReceiverList->startReceiver(mess);
#endif
if(ret==OK && socket->differentClients){