detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-19 08:17:13 +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

8
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -6,6 +6,7 @@
#include "slsReceiverTCPIPInterface.h"
#include "slsReceiverImplementation.h"
#include "MySocketTCP.h"
#include "ClientInterface.h"
#include "gitInfoReceiver.h"
#include "slsReceiverUsers.h"
#include "slsReceiver.h"
@ -28,6 +29,8 @@ slsReceiverTCPIPInterface::~slsReceiverTCPIPInterface() {
delete mySock;
mySock=NULL;
}
if (clientInterface)
delete clientInterface;
if(receiverBase)
delete receiverBase;
}
@ -41,7 +44,8 @@ slsReceiverTCPIPInterface::slsReceiverTCPIPInterface(int pn):
killTCPServerThread(0),
tcpThreadCreated(false),
portNumber(DEFAULT_PORTNO+2),
mySock(0)
mySock(0),
clientInterface(0)
{
//***callback parameters***
startAcquisitionCallBack = NULL;
@ -56,6 +60,7 @@ slsReceiverTCPIPInterface::slsReceiverTCPIPInterface(int pn):
portNumber = (pn > 0 ? pn : DEFAULT_PORTNO + 2);
MySocketTCP* m = new MySocketTCP(portNumber);
mySock = m;
clientInterface = new ClientInterface(mySock);
//initialize variables
strcpy(mySock->lastClientIP,"none");
@ -564,6 +569,7 @@ int slsReceiverTCPIPInterface::set_port() {
mySock->Disconnect();
delete mySock;
mySock = mySocket;
clientInterface->SetSocket(mySock);
}
}