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

Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer

Browse Source
This commit is contained in:
maliakal_d
2020-02-04 10:50:14 +01:00
parent 36bd91daa3 40bfca588b
commit 64214f22f9
15 changed files with 188 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsSupportLib/include/ServerInterface2.h → slsSupportLib/include/ServerInterface.h
View File

@ -2,18 +2,18 @@
#include "DataSocket.h"
namespace sls {
class ServerInterface2;
class ServerInterface;
}
#include "ServerSocket.h"
#include "sls_detector_defs.h"
namespace sls {
class ServerInterface2 : public DataSocket {
class ServerInterface : public DataSocket {
using defs = slsDetectorDefs;
public:
ServerInterface2(int socketId) : DataSocket(socketId) {}
ServerInterface(int socketId) : DataSocket(socketId) {}
int sendResult(int ret, void *retval, int retvalSize, char *mess = nullptr);

4
slsSupportLib/include/ServerSocket.h
View File

@ -1,7 +1,7 @@
#pragma once
#include "DataSocket.h"
#include "ServerInterface2.h"
#include "ServerInterface.h"
#include "network_utils.h"
#include <cstdint>
#include <netdb.h>
@ -14,7 +14,7 @@ namespace sls {
class ServerSocket : public DataSocket {
public:
ServerSocket(int port);
ServerInterface2 accept();
ServerInterface accept();
IpAddr getLastClient() const noexcept { return lastClient; }
IpAddr getThisClient() const noexcept { return thisClient; }
IpAddr getLockedBy() const noexcept { return lockedBy; }