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

renamed ServerInterface

Browse Source
This commit is contained in:
Erik Frojdh
2020-02-04 08:57:35 +01:00
parent e6340456f6
commit ec66079f65
8 changed files with 88 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsSupportLib/CMakeLists.txt
View File

@ -4,7 +4,7 @@ set(SOURCES
src/ClientSocket.cpp
src/DataSocket.cpp
src/ServerSocket.cpp
src/ServerInterface2.cpp
src/ServerInterface.cpp
src/network_utils.cpp
)
@ -25,7 +25,7 @@ set(PUBLICHEADERS
include/ClientSocket.h
include/DataSocket.h
include/ServerSocket.h
include/ServerInterface2.h
include/ServerInterface.h
include/network_utils.h
include/FixedCapacityContainer.h
include/ToString.h

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; }

4
slsSupportLib/src/ServerInterface2.cpp → slsSupportLib/src/ServerInterface.cpp
View File

@ -1,10 +1,10 @@
#include "ServerInterface2.h"
#include "ServerInterface.h"
#include <cassert>
#include <cstring>
#include <sstream>
namespace sls {
int ServerInterface2::sendResult(int ret, void *retval, int retvalSize,
int ServerInterface::sendResult(int ret, void *retval, int retvalSize,
char *mess) {
write(&ret, sizeof(ret));

6
slsSupportLib/src/ServerSocket.cpp
View File

@ -1,4 +1,4 @@
#include "ServerInterface2.h"
#include "ServerInterface.h"
#include "ServerSocket.h"
#include "DataSocket.h"
@ -37,7 +37,7 @@ ServerSocket::ServerSocket(int port)
}
}
ServerInterface2 ServerSocket::accept() {
ServerInterface ServerSocket::accept() {
lastClient = thisClient; //update from previous connection
struct sockaddr_in clientAddr;
socklen_t addr_size = sizeof clientAddr;
@ -49,7 +49,7 @@ ServerInterface2 ServerSocket::accept() {
char tc[INET_ADDRSTRLEN]{};
inet_ntop(AF_INET, &(clientAddr.sin_addr), tc, INET_ADDRSTRLEN);
thisClient = IpAddr{tc};
return ServerInterface2(newSocket);
return ServerInterface(newSocket);
}
}; // namespace sls