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

able to send data to eigerbe

Browse Source 
tweaks on logging

added configuration_map, to flexibly pass options to the different receivers

some more fixes to method overloads

still very preliminary
This commit is contained in:
sala
2014-09-17 15:56:27 +02:00
parent cfacc6ad6e
commit b427452f39
12 changed files with 352 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -69,14 +69,13 @@ slsReceiverTCPIPInterface::slsReceiverTCPIPInterface(int &success, UDPInterface*
//Catch signal SIGINT to close files properly
signal(SIGINT,staticCloseFile);
}
}
}
int slsReceiverTCPIPInterface::setPortNumber(int pn){
int p_number;
int p_number;
MySocketTCP *oldsocket=NULL;;
int sd=0;
@ -144,10 +143,12 @@ void slsReceiverTCPIPInterface::stop(){
cout<<"Shutting down TCP Socket and TCP thread"<<endl;
killTCPServerThread = 1;
socket->ShutDownSocket();
cout<<"Socket closed"<<endl;
void* status;
pthread_join(TCPServer_thread, &status);
killTCPServerThread = 0;
cout<<"Threads joined"<<endl;
}
@ -656,7 +657,7 @@ int slsReceiverTCPIPInterface::setup_udp(){
strcpy(eth,"");
ret = FAIL;
}
cout<<"eth:"<<eth<<endl;
FILE_LOG(logDEBUG) << __FILE__ << "::" << __func__ << " " << eth;
receiverBase->setEthernetInterface(eth);
//get mac address from ethernet interface