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

client specifies index of receiver returned error, skeleton of including clientinterface in receiver

Browse Source
This commit is contained in:
maliakal_d
2018-10-10 13:15:16 +02:00
parent 6d9530ee1d
commit e1d570e8ce
6 changed files with 156 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

143
slsSupportLib/include/ClientInterface.cpp
View File

@ -11,7 +11,10 @@
ClientInterface::ClientInterface(MySocketTCP *socket):dataSocket(socket){}
ClientInterface::ClientInterface(MySocketTCP *socket, int n, std::string t):
mySocket(socket),
index(n),
type(t){}
@ -24,173 +27,169 @@ int ClientInterface::SendString(int fnum, char retval[], char arg[]){
char mess[MAX_STR_LENGTH];
memset(mess, 0, MAX_STR_LENGTH);
dataSocket->SendDataOnly(&fnum,sizeof(fnum));
dataSocket->SendDataOnly(arg,MAX_STR_LENGTH);
dataSocket->ReceiveDataOnly(&ret,sizeof(ret));
mySocket->SendDataOnly(&fnum,sizeof(fnum));
mySocket->SendDataOnly(arg,MAX_STR_LENGTH);
mySocket->ReceiveDataOnly(&ret,sizeof(ret));
if (ret==slsDetectorDefs::FAIL){
dataSocket->ReceiveDataOnly(mess,sizeof(mess));
cprintf(RED, "Receiver returned error: %s", mess);
mySocket->ReceiveDataOnly(mess,sizeof(mess));
cprintf(RED, "%s %d returned error: %s", type.c_str(), index, mess);
}
if(strstr(mess,"Unrecognized Function")==NULL)
dataSocket->ReceiveDataOnly(retval,MAX_STR_LENGTH);
mySocket->ReceiveDataOnly(retval,MAX_STR_LENGTH);
return ret;
}
int ClientInterface::sendUDPDetails(int fnum, char retval[], char arg[3][MAX_STR_LENGTH]){
int ClientInterface::SendUDPDetails(int fnum, char retval[], char arg[3][MAX_STR_LENGTH]){
char args[3][MAX_STR_LENGTH];
int ret = slsDetectorDefs::FAIL;
char mess[MAX_STR_LENGTH];
memset(mess, 0, MAX_STR_LENGTH);
dataSocket->SendDataOnly(&fnum,sizeof(fnum));
dataSocket->SendDataOnly(arg,sizeof(args));
dataSocket->ReceiveDataOnly(&ret,sizeof(ret));
mySocket->SendDataOnly(&fnum,sizeof(fnum));
mySocket->SendDataOnly(arg,sizeof(args));
mySocket->ReceiveDataOnly(&ret,sizeof(ret));
if (ret==slsDetectorDefs::FAIL){
dataSocket->ReceiveDataOnly(mess,sizeof(mess));
cprintf(RED, "Receiver returned error: %s", mess);
mySocket->ReceiveDataOnly(mess,sizeof(mess));
cprintf(RED, "%s %d returned error: %s", type.c_str(), index, mess);
}
else
dataSocket->ReceiveDataOnly(retval,MAX_STR_LENGTH);
mySocket->ReceiveDataOnly(retval,MAX_STR_LENGTH);
return ret;
}
int ClientInterface::sendInt(int fnum, int &retval, int arg){
int ClientInterface::SendInt(int fnum, int &retval, int arg){
int ret = slsDetectorDefs::FAIL;
char mess[MAX_STR_LENGTH];
memset(mess, 0, MAX_STR_LENGTH);
dataSocket->SendDataOnly(&fnum,sizeof(fnum));
dataSocket->SendDataOnly(&arg,sizeof(arg));
dataSocket->ReceiveDataOnly(&ret,sizeof(ret));
mySocket->SendDataOnly(&fnum,sizeof(fnum));
mySocket->SendDataOnly(&arg,sizeof(arg));
mySocket->ReceiveDataOnly(&ret,sizeof(ret));
if (ret==slsDetectorDefs::FAIL){
dataSocket->ReceiveDataOnly(mess,sizeof(mess));
cprintf(RED, "Receiver returned error: %s", mess);
mySocket->ReceiveDataOnly(mess,sizeof(mess));
cprintf(RED, "%s %d returned error: %s", type.c_str(), index, mess);
}
if(strstr(mess,"Unrecognized Function")==NULL)
dataSocket->ReceiveDataOnly(&retval,sizeof(retval));
mySocket->ReceiveDataOnly(&retval,sizeof(retval));
return ret;
}
int ClientInterface::getInt(int fnum, int &retval){
int ClientInterface::GetInt(int fnum, int &retval){
int ret = slsDetectorDefs::FAIL;
char mess[MAX_STR_LENGTH];
memset(mess, 0, MAX_STR_LENGTH);
dataSocket->SendDataOnly(&fnum,sizeof(fnum));
dataSocket->ReceiveDataOnly(&ret,sizeof(ret));
mySocket->SendDataOnly(&fnum,sizeof(fnum));
mySocket->ReceiveDataOnly(&ret,sizeof(ret));
if (ret==slsDetectorDefs::FAIL){
dataSocket->ReceiveDataOnly(mess,sizeof(mess));
cprintf(RED, "Receiver returned error: %s", mess);
mySocket->ReceiveDataOnly(mess,sizeof(mess));
cprintf(RED, "%s %d returned error: %s", type.c_str(), index, mess);
}
if(strstr(mess,"Unrecognized Function")==NULL)
dataSocket->ReceiveDataOnly(&retval,sizeof(retval));
mySocket->ReceiveDataOnly(&retval,sizeof(retval));
return ret;
}
int ClientInterface::sendInt(int fnum, int64_t &retval, int64_t arg){
int ClientInterface::SendInt(int fnum, int64_t &retval, int64_t arg){
int ret = slsDetectorDefs::FAIL;
char mess[MAX_STR_LENGTH];
memset(mess, 0, MAX_STR_LENGTH);
dataSocket->SendDataOnly(&fnum,sizeof(fnum));
dataSocket->SendDataOnly(&arg,sizeof(arg));
dataSocket->ReceiveDataOnly(&ret,sizeof(ret));
mySocket->SendDataOnly(&fnum,sizeof(fnum));
mySocket->SendDataOnly(&arg,sizeof(arg));
mySocket->ReceiveDataOnly(&ret,sizeof(ret));
if (ret==slsDetectorDefs::FAIL){
dataSocket->ReceiveDataOnly(mess,sizeof(mess));
cprintf(RED, "Receiver returned error: %s", mess);
mySocket->ReceiveDataOnly(mess,sizeof(mess));
cprintf(RED, "%s %d returned error: %s", type.c_str(), index, mess);
}
if(strstr(mess,"Unrecognized Function")==NULL)
dataSocket->ReceiveDataOnly(&retval,sizeof(retval));
mySocket->ReceiveDataOnly(&retval,sizeof(retval));
return ret;
}
int ClientInterface::sendIntArray(int fnum, int64_t &retval, int64_t arg[2], char mess[]){
int ClientInterface::SendIntArray(int fnum, int64_t &retval, int64_t arg[2], char mess[]){
int64_t args[2];
int ret = slsDetectorDefs::FAIL;
memset(mess, 0, MAX_STR_LENGTH);
dataSocket->SendDataOnly(&fnum,sizeof(fnum));
dataSocket->SendDataOnly(arg,sizeof(args));
dataSocket->ReceiveDataOnly(&ret,sizeof(ret));
mySocket->SendDataOnly(&fnum,sizeof(fnum));
mySocket->SendDataOnly(arg,sizeof(args));
mySocket->ReceiveDataOnly(&ret,sizeof(ret));
if (ret==slsDetectorDefs::FAIL){
dataSocket->ReceiveDataOnly(mess,MAX_STR_LENGTH);
cprintf(RED, "Receiver returned error: %s", mess);
mySocket->ReceiveDataOnly(mess,MAX_STR_LENGTH);
cprintf(RED, "%s %d returned error: %s", type.c_str(), index, mess);
}
if(strstr(mess,"Unrecognized Function")==NULL)
dataSocket->ReceiveDataOnly(&retval,sizeof(retval));
mySocket->ReceiveDataOnly(&retval,sizeof(retval));
return ret;
}
int ClientInterface::sendIntArray(int fnum, int &retval, int arg[2]){
int ClientInterface::SendIntArray(int fnum, int &retval, int arg[2]){
int args[2];
int ret = slsDetectorDefs::FAIL;
char mess[MAX_STR_LENGTH];
memset(mess, 0, MAX_STR_LENGTH);
dataSocket->SendDataOnly(&fnum,sizeof(fnum));
dataSocket->SendDataOnly(arg,sizeof(args));
dataSocket->ReceiveDataOnly(&ret,sizeof(ret));
mySocket->SendDataOnly(&fnum,sizeof(fnum));
mySocket->SendDataOnly(arg,sizeof(args));
mySocket->ReceiveDataOnly(&ret,sizeof(ret));
if (ret==slsDetectorDefs::FAIL){
dataSocket->ReceiveDataOnly(mess,sizeof(mess));
cprintf(RED, "Receiver returned error: %s", mess);
mySocket->ReceiveDataOnly(mess,sizeof(mess));
cprintf(RED, "%s %d returned error: %s", type.c_str(), index, mess);
}
if(strstr(mess,"Unrecognized Function")==NULL)
dataSocket->ReceiveDataOnly(&retval,sizeof(retval));
mySocket->ReceiveDataOnly(&retval,sizeof(retval));
return ret;
}
int ClientInterface::getInt(int fnum, int64_t &retval){
int ClientInterface::GetInt(int fnum, int64_t &retval){
int ret = slsDetectorDefs::FAIL;
dataSocket->SendDataOnly(&fnum,sizeof(fnum));
dataSocket->ReceiveDataOnly(&ret,sizeof(ret));
dataSocket->ReceiveDataOnly(&retval,sizeof(retval));
mySocket->SendDataOnly(&fnum,sizeof(fnum));
mySocket->ReceiveDataOnly(&ret,sizeof(ret));
mySocket->ReceiveDataOnly(&retval,sizeof(retval));
return ret;
}
int ClientInterface::getLastClientIP(int fnum, char retval[]){
int ClientInterface::GetLastClientIP(int fnum, char retval[]){
int ret = slsDetectorDefs::FAIL;
dataSocket->SendDataOnly(&fnum,sizeof(fnum));
dataSocket->ReceiveDataOnly(&ret,sizeof(ret));
dataSocket->ReceiveDataOnly(retval,INET_ADDRSTRLEN);
mySocket->SendDataOnly(&fnum,sizeof(fnum));
mySocket->ReceiveDataOnly(&ret,sizeof(ret));
mySocket->ReceiveDataOnly(retval,INET_ADDRSTRLEN);
return ret;
}
int ClientInterface::executeFunction(int fnum,char mess[]){
int ClientInterface::ExecuteFunction(int fnum,char mess[]){
int ret = slsDetectorDefs::FAIL;
memset(mess, 0, MAX_STR_LENGTH);
dataSocket->SendDataOnly(&fnum,sizeof(fnum));
dataSocket->ReceiveDataOnly(&ret,sizeof(ret));
mySocket->SendDataOnly(&fnum,sizeof(fnum));
mySocket->ReceiveDataOnly(&ret,sizeof(ret));
if (ret==slsDetectorDefs::FAIL){
dataSocket->ReceiveDataOnly(mess,MAX_STR_LENGTH);
cprintf(RED, "Receiver returned error: %s", mess);
mySocket->ReceiveDataOnly(mess,MAX_STR_LENGTH);
cprintf(RED, "%s %d returned error: %s", type.c_str(), index, mess);
}
return ret;
@ -198,18 +197,18 @@ int ClientInterface::executeFunction(int fnum,char mess[]){
int ClientInterface::sendROI(int fnum, int n, slsReceiverDefs::ROI roiLimits[]) {
int ClientInterface::SendROI(int fnum, int n, slsReceiverDefs::ROI roiLimits[]) {
int ret = slsDetectorDefs::FAIL;
char mess[MAX_STR_LENGTH];
memset(mess, 0, MAX_STR_LENGTH);
dataSocket->SendDataOnly(&fnum,sizeof(fnum));
dataSocket->SendDataOnly(&n,sizeof(n));
dataSocket->SendDataOnly(roiLimits,n * sizeof(slsReceiverDefs::ROI));
dataSocket->ReceiveDataOnly(&ret,sizeof(ret));
mySocket->SendDataOnly(&fnum,sizeof(fnum));
mySocket->SendDataOnly(&n,sizeof(n));
mySocket->SendDataOnly(roiLimits,n * sizeof(slsReceiverDefs::ROI));
mySocket->ReceiveDataOnly(&ret,sizeof(ret));
if (ret==slsDetectorDefs::FAIL){
dataSocket->ReceiveDataOnly(mess,sizeof(mess));
cprintf(RED, "Receiver returned error: %s", mess);
mySocket->ReceiveDataOnly(mess,sizeof(mess));
cprintf(RED, "%s %d returned error: %s", type.c_str(), index, mess);
}
return ret;
}