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

localhost works as a receiver now

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@426 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-01-14 16:40:10 +00:00
parent 4cc8566311
commit 5d88f249a4
3 changed files with 61 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
View File

@ -755,9 +755,9 @@ int startReceiver(int start) {
bus_w(CONFIG_REG,reg&(~CPU_OR_RECEIVER_BIT)); bus_w(CONFIG_REG,reg&(~CPU_OR_RECEIVER_BIT));
reg=bus_r(addr); reg=bus_r(addr);
#ifdef VERBOSE //#ifdef VERBOSE
printf("Config Reg %x\n", reg); printf("Config Reg %x\n", reg);
#endif //#endif
int d =reg&CPU_OR_RECEIVER_BIT; int d =reg&CPU_OR_RECEIVER_BIT;
if(d!=0) d=1; if(d!=0) d=1;
if(d!=start) if(d!=start)

41
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -4610,6 +4610,12 @@ int slsDetector::setUDPConnection(){
//if no udp ip given, use hostname //if no udp ip given, use hostname
if(!strcmp(thisDetector->receiverUDPIP,"none")){ if(!strcmp(thisDetector->receiverUDPIP,"none")){
if(!strcmp(thisDetector->receiver_hostname,"localhost")){
string temp = genericSocket::ipToName("localhost");
strcpy(thisDetector->receiverUDPIP,temp.c_str());
temp = genericSocket::nameToMac(genericSocket::ipToName(temp));
strcpy(thisDetector->receiverUDPMAC,temp.c_str());
}else{
//hostname is an ip address //hostname is an ip address
if(strchr(thisDetector->receiver_hostname,'.')!=NULL) if(strchr(thisDetector->receiver_hostname,'.')!=NULL)
strcpy(thisDetector->receiverUDPIP,thisDetector->receiver_hostname); strcpy(thisDetector->receiverUDPIP,thisDetector->receiver_hostname);
@ -4623,6 +4629,7 @@ int slsDetector::setUDPConnection(){
strcpy(thisDetector->receiverUDPIP,inet_ntoa(*(struct in_addr*)he->h_addr)); strcpy(thisDetector->receiverUDPIP,inet_ntoa(*(struct in_addr*)he->h_addr));
} }
} }
}
//copy arguments to args[][] //copy arguments to args[][]
@ -4630,29 +4637,37 @@ int slsDetector::setUDPConnection(){
sprintf(args[1],"%d",thisDetector->receiverUDPPort); sprintf(args[1],"%d",thisDetector->receiverUDPPort);
//set up receiver for UDP Connection and get receivermac address //set up receiver for UDP Connection and get receivermac address
if(setReceiverOnline(ONLINE_FLAG)==ONLINE_FLAG){ if(setReceiverOnline(ONLINE_FLAG)==ONLINE_FLAG){
#ifdef VERBOSE #ifdef VERBOSE
std::cout << "Setting up UDP Connection for Receiver " << arg[0] << "\t" << arg[1] << std::endl; std::cout << "Setting up UDP Connection for Receiver " << args[0] << "\t" << args[1] << std::endl;
#endif #endif
ret=thisReceiver->sendUDPDetails(fnum,retval,args);
//already have mac address if localhost
if(!strcmp(thisDetector->receiver_hostname,"localhost"))
ret=OK;
//get mac address from receiver
else{
ret=thisReceiver->sendUDPDetails(fnum,retval,args);
if(ret!=FAIL){ if(ret!=FAIL){
#ifdef VERBOSE
std::cout << "Receiver mac address: " << retval << std::endl;
#endif
strcpy(thisDetector->receiverUDPMAC,retval); strcpy(thisDetector->receiverUDPMAC,retval);
}
if(ret==FORCE_UPDATE)
updateReceiver();
}
#ifdef VERBOSE
std::cout << "Receiver mac address: " << thisDetector->receiverUDPMAC << std::endl;
#endif
//configure detector with udp details //configure detector with udp details
if(ret!=FAIL){
if(configureMAC()!=OK){ if(configureMAC()!=OK){
setReceiverOnline(OFFLINE_FLAG); setReceiverOnline(OFFLINE_FLAG);
std::cout << "could not configure mac" << endl; std::cout << "could not configure mac" << endl;
} }
} }
if(ret==FORCE_UPDATE)
updateReceiver();
}else{ }else{
ret=FAIL; ret=FAIL;
std::cout << "cannot connect to receiver" << endl; std::cout << "cannot connect to receiver" << endl;
@ -4674,6 +4689,13 @@ int slsDetector::configureMAC(int adc){
//if udpip wasnt initialized in config file //if udpip wasnt initialized in config file
if(!(strcmp(thisDetector->receiverUDPIP,"none"))){ if(!(strcmp(thisDetector->receiverUDPIP,"none"))){
//if localhost
if(!strcmp(thisDetector->receiver_hostname,"localhost")){
string temp = genericSocket::ipToName("localhost");
strcpy(thisDetector->receiverUDPIP,temp.c_str());
temp = genericSocket::nameToMac(genericSocket::ipToName(temp));
strcpy(thisDetector->receiverUDPMAC,temp.c_str());
}else{
//hostname is an ip address //hostname is an ip address
if(strchr(thisDetector->receiver_hostname,'.')!=NULL) if(strchr(thisDetector->receiver_hostname,'.')!=NULL)
strcpy(thisDetector->receiverUDPIP,thisDetector->receiver_hostname); strcpy(thisDetector->receiverUDPIP,thisDetector->receiver_hostname);
@ -4688,6 +4710,7 @@ int slsDetector::configureMAC(int adc){
} }
} }
} }
}
strcpy(arg[0],thisDetector->receiverUDPIP); strcpy(arg[0],thisDetector->receiverUDPIP);
strcpy(arg[1],thisDetector->receiverUDPMAC); strcpy(arg[1],thisDetector->receiverUDPMAC);
sprintf(arg[2],"%x",thisDetector->receiverUDPPort); sprintf(arg[2],"%x",thisDetector->receiverUDPPort);

7
slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
View File

@ -233,10 +233,11 @@ int slsReceiverFunctionList::startListening(){
do { do {
if(!strlen(eth)){ if(!strlen(eth)){
cout<<"error:eth is empty:"<<eth<<endl; cout<<"warning:eth is empty.listening to all"<<endl;
break; udpSocket = new genericSocket(server_port,genericSocket::UDP);
} }else
udpSocket = new genericSocket(server_port,genericSocket::UDP,eth); udpSocket = new genericSocket(server_port,genericSocket::UDP,eth);
if (udpSocket->getErrorStatus()){ if (udpSocket->getErrorStatus()){
break; break;
} }