detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-10 12:00:43 +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));
reg=bus_r(addr);
#ifdef VERBOSE
//#ifdef VERBOSE
printf("Config Reg %x\n", reg);
#endif
//#endif
int d =reg&CPU_OR_RECEIVER_BIT;
if(d!=0) d=1;
if(d!=start)

85
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -4610,17 +4610,24 @@ int slsDetector::setUDPConnection(){
//if no udp ip given, use hostname
if(!strcmp(thisDetector->receiverUDPIP,"none")){
//hostname is an ip address
if(strchr(thisDetector->receiver_hostname,'.')!=NULL)
strcpy(thisDetector->receiverUDPIP,thisDetector->receiver_hostname);
//if hostname not ip, convert it to ip
else{
struct hostent *he = gethostbyname(thisDetector->receiver_hostname);
if (he == NULL){
std::cout << "no rx_udpip given and could not convert receiver hostname to ip" << endl;
return FAIL;
}else
strcpy(thisDetector->receiverUDPIP,inet_ntoa(*(struct in_addr*)he->h_addr));
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
if(strchr(thisDetector->receiver_hostname,'.')!=NULL)
strcpy(thisDetector->receiverUDPIP,thisDetector->receiver_hostname);
//if hostname not ip, convert it to ip
else{
struct hostent *he = gethostbyname(thisDetector->receiver_hostname);
if (he == NULL){
std::cout << "no rx_udpip given and could not convert receiver hostname to ip" << endl;
return FAIL;
}else
strcpy(thisDetector->receiverUDPIP,inet_ntoa(*(struct in_addr*)he->h_addr));
}
}
}
@ -4630,29 +4637,37 @@ int slsDetector::setUDPConnection(){
sprintf(args[1],"%d",thisDetector->receiverUDPPort);
//set up receiver for UDP Connection and get receivermac address
if(setReceiverOnline(ONLINE_FLAG)==ONLINE_FLAG){
#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
ret=thisReceiver->sendUDPDetails(fnum,retval,args);
if(ret!=FAIL){
//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){
strcpy(thisDetector->receiverUDPMAC,retval);
}
if(ret==FORCE_UPDATE)
updateReceiver();
}
#ifdef VERBOSE
std::cout << "Receiver mac address: " << retval << std::endl;
std::cout << "Receiver mac address: " << thisDetector->receiverUDPMAC << std::endl;
#endif
strcpy(thisDetector->receiverUDPMAC,retval);
//configure detector with udp details
//configure detector with udp details
if(ret!=FAIL){
if(configureMAC()!=OK){
setReceiverOnline(OFFLINE_FLAG);
std::cout << "could not configure mac" << endl;
}
}
if(ret==FORCE_UPDATE)
updateReceiver();
}else{
ret=FAIL;
std::cout << "cannot connect to receiver" << endl;
@ -4674,17 +4689,25 @@ int slsDetector::configureMAC(int adc){
//if udpip wasnt initialized in config file
if(!(strcmp(thisDetector->receiverUDPIP,"none"))){
//hostname is an ip address
if(strchr(thisDetector->receiver_hostname,'.')!=NULL)
strcpy(thisDetector->receiverUDPIP,thisDetector->receiver_hostname);
//if hostname not ip, convert it to ip
else{
struct hostent *he = gethostbyname(thisDetector->receiver_hostname);
if (he != NULL)
strcpy(thisDetector->receiverUDPIP,inet_ntoa(*(struct in_addr*)he->h_addr));
//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
if(strchr(thisDetector->receiver_hostname,'.')!=NULL)
strcpy(thisDetector->receiverUDPIP,thisDetector->receiver_hostname);
//if hostname not ip, convert it to ip
else{
std::cout << "no rx_udpip given and invalid receiver hostname" << endl;
return FAIL;
struct hostent *he = gethostbyname(thisDetector->receiver_hostname);
if (he != NULL)
strcpy(thisDetector->receiverUDPIP,inet_ntoa(*(struct in_addr*)he->h_addr));
else{
std::cout << "no rx_udpip given and invalid receiver hostname" << endl;
return FAIL;
}
}
}
}

9
slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
View File

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