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

bugfix:receiverip checked for dots in the exact place, also updated receiver using multislsdetector reference

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@294 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2012-10-16 12:41:24 +00:00
parent 5d9d26506f
commit aa10120574
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -4452,13 +4452,13 @@ char* slsDetector::setReceiverIP(string receiverIP){
struct sockaddr_in sa; struct sockaddr_in sa;
if(receiverIP.length()<16){ if(receiverIP.length()<16){
if((receiverIP[3]=='.')&&(receiverIP[7]=='.')&&(receiverIP[11]=='.')){ // if((receiverIP[3]=='.')&&(receiverIP[7]=='.')&&(receiverIP[11]=='.')){
int result = inet_pton(AF_INET, receiverIP.c_str(), &(sa.sin_addr)); int result = inet_pton(AF_INET, receiverIP.c_str(), &(sa.sin_addr));
if(result!=0){ if(result!=0){
sprintf(thisDetector->receiverIP,receiverIP.c_str()); sprintf(thisDetector->receiverIP,receiverIP.c_str());
wrongFormat=0; wrongFormat=0;
} }
} // }
} }
if(wrongFormat) if(wrongFormat)
@ -5764,16 +5764,16 @@ int slsDetector::updateReceiverNoWait() {
char lastClientIP[INET_ADDRSTRLEN]; char lastClientIP[INET_ADDRSTRLEN];
n = dataSocket->ReceiveDataOnly(lastClientIP,sizeof(lastClientIP)); n = dataSocket->ReceiveDataOnly(lastClientIP,sizeof(lastClientIP));
//#ifdef VERBOSE #ifdef VERBOSE
cout << "Updating receiver last modified by " << lastClientIP << std::endl; cout << "Updating receiver last modified by " << lastClientIP << std::endl;
//#endif #endif
n = dataSocket->ReceiveDataOnly(&ind,sizeof(ind)); cout<<"index:"<<ind<<endl; n = dataSocket->ReceiveDataOnly(&ind,sizeof(ind));
//thisDetector->xx=xx;update file index how? parentDet->setFileIndex(ind);
n = dataSocket->ReceiveDataOnly(path,MAX_STR_LENGTH); cout<<"path:"<<path<<endl; n = dataSocket->ReceiveDataOnly(path,MAX_STR_LENGTH);
//thisDetector->xx=xx;update file index how? parentDet->setFilePath(path);
n = dataSocket->ReceiveDataOnly(path,MAX_STR_LENGTH); cout<<"name:"<<path<<endl; n = dataSocket->ReceiveDataOnly(path,MAX_STR_LENGTH);
//thisDetector->xx=xx;update file index how? parentDet->setFileName(path);
return OK; return OK;
} }

1
slsDetectorSoftware/slsDetector/slsDetectorBase.h
View File

@ -444,7 +444,6 @@ class slsDetectorBase : public virtual slsDetectorDefs {
/** /**
Sets up the receiver file directory Sets up the receiver file directory
@param fileName fileDir file directory
\returns file dir \returns file dir
*/ */
virtual string setReceiverFileDir(string fileDir="")=0; virtual string setReceiverFileDir(string fileDir="")=0;