mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-04 00:50:42 +02:00
renamed ServerInterface
This commit is contained in:
Erik Frojdh
parent
e6340456f6
commit
ec66079f65
@ -18,7 +18,7 @@
|
||||
|
||||
using sls::RuntimeError;
|
||||
using sls::SocketError;
|
||||
using Interface = sls::ServerInterface2;
|
||||
using Interface = sls::ServerInterface;
|
||||
|
||||
ClientInterface::~ClientInterface() {
|
||||
killTcpThread = true;
|
||||
|
||||
@ -41,85 +41,85 @@ class ClientInterface : private virtual slsDetectorDefs {
|
||||
private:
|
||||
void startTCPServer();
|
||||
int functionTable();
|
||||
int decodeFunction(sls::ServerInterface2 &socket);
|
||||
int decodeFunction(sls::ServerInterface &socket);
|
||||
void functionNotImplemented();
|
||||
void modeNotImplemented(const std::string& modename, int mode);
|
||||
template <typename T>
|
||||
void validate(T arg, T retval, std::string modename, numberMode hex);
|
||||
void verifyLock();
|
||||
void verifyIdle(sls::ServerInterface2 &socket);
|
||||
void verifyIdle(sls::ServerInterface &socket);
|
||||
|
||||
|
||||
int exec_command(sls::ServerInterface2 &socket);
|
||||
int exit_server(sls::ServerInterface2 &socket);
|
||||
int lock_receiver(sls::ServerInterface2 &socket);
|
||||
int get_last_client_ip(sls::ServerInterface2 &socket);
|
||||
int set_port(sls::ServerInterface2 &socket);
|
||||
int update_client(sls::ServerInterface2 &socket);
|
||||
int send_update(sls::ServerInterface2 &socket);
|
||||
int get_version(sls::ServerInterface2 &socket);
|
||||
int set_detector_type(sls::ServerInterface2 &socket);
|
||||
int set_detector_hostname(sls::ServerInterface2 &socket);
|
||||
int set_roi(sls::ServerInterface2 &socket);
|
||||
int set_num_frames(sls::ServerInterface2 &socket);
|
||||
int set_num_analog_samples(sls::ServerInterface2 &socket);
|
||||
int set_num_digital_samples(sls::ServerInterface2 &socket);
|
||||
int set_exptime(sls::ServerInterface2 &socket);
|
||||
int set_period(sls::ServerInterface2 &socket);
|
||||
int set_subexptime(sls::ServerInterface2 &socket);
|
||||
int set_subdeadtime(sls::ServerInterface2 &socket);
|
||||
int set_dynamic_range(sls::ServerInterface2 &socket);
|
||||
int set_streaming_frequency(sls::ServerInterface2 &socket);
|
||||
int get_status(sls::ServerInterface2 &socket);
|
||||
int start_receiver(sls::ServerInterface2 &socket);
|
||||
int stop_receiver(sls::ServerInterface2 &socket);
|
||||
int set_file_dir(sls::ServerInterface2 &socket);
|
||||
int set_file_name(sls::ServerInterface2 &socket);
|
||||
int set_file_index(sls::ServerInterface2 &socket);
|
||||
int get_frame_index(sls::ServerInterface2 &socket);
|
||||
int get_missing_packets(sls::ServerInterface2 &socket);
|
||||
int get_frames_caught(sls::ServerInterface2 &socket);
|
||||
int enable_file_write(sls::ServerInterface2 &socket);
|
||||
int enable_master_file_write(sls::ServerInterface2 &socket);
|
||||
int enable_compression(sls::ServerInterface2 &socket);
|
||||
int enable_overwrite(sls::ServerInterface2 &socket);
|
||||
int enable_tengiga(sls::ServerInterface2 &socket);
|
||||
int set_fifo_depth(sls::ServerInterface2 &socket);
|
||||
int set_activate(sls::ServerInterface2 &socket);
|
||||
int set_data_stream_enable(sls::ServerInterface2 &socket);
|
||||
int set_streaming_timer(sls::ServerInterface2 &socket);
|
||||
int set_flipped_data(sls::ServerInterface2 &socket);
|
||||
int set_file_format(sls::ServerInterface2 &socket);
|
||||
int set_detector_posid(sls::ServerInterface2 &socket);
|
||||
int set_multi_detector_size(sls::ServerInterface2 &socket);
|
||||
int set_streaming_port(sls::ServerInterface2 &socket);
|
||||
int set_streaming_source_ip(sls::ServerInterface2 &socket);
|
||||
int set_silent_mode(sls::ServerInterface2 &socket);
|
||||
int enable_gap_pixels(sls::ServerInterface2 &socket);
|
||||
int restream_stop(sls::ServerInterface2 &socket);
|
||||
int set_additional_json_header(sls::ServerInterface2 &socket);
|
||||
int get_additional_json_header(sls::ServerInterface2 &socket);
|
||||
int set_udp_socket_buffer_size(sls::ServerInterface2 &socket);
|
||||
int get_real_udp_socket_buffer_size(sls::ServerInterface2 &socket);
|
||||
int set_frames_per_file(sls::ServerInterface2 &socket);
|
||||
int check_version_compatibility(sls::ServerInterface2 &socket);
|
||||
int set_discard_policy(sls::ServerInterface2 &socket);
|
||||
int set_padding_enable(sls::ServerInterface2 &socket);
|
||||
int set_deactivated_padding_enable(sls::ServerInterface2 &socket);
|
||||
int set_readout_mode(sls::ServerInterface2 &socket);
|
||||
int set_adc_mask(sls::ServerInterface2 &socket);
|
||||
int set_dbit_list(sls::ServerInterface2 &socket);
|
||||
int get_dbit_list(sls::ServerInterface2 &socket);
|
||||
int set_dbit_offset(sls::ServerInterface2 &socket);
|
||||
int set_quad_type(sls::ServerInterface2 &socket);
|
||||
int set_read_n_lines(sls::ServerInterface2 &socket);
|
||||
int set_udp_ip(sls::ServerInterface2 &socket);
|
||||
int set_udp_ip2(sls::ServerInterface2 &socket);
|
||||
int set_udp_port(sls::ServerInterface2 &socket);
|
||||
int set_udp_port2(sls::ServerInterface2 &socket);
|
||||
int set_num_interfaces(sls::ServerInterface2 &socket);
|
||||
int set_adc_mask_10g(sls::ServerInterface2 &socket);
|
||||
int set_num_counters(sls::ServerInterface2 &socket);
|
||||
int exec_command(sls::ServerInterface &socket);
|
||||
int exit_server(sls::ServerInterface &socket);
|
||||
int lock_receiver(sls::ServerInterface &socket);
|
||||
int get_last_client_ip(sls::ServerInterface &socket);
|
||||
int set_port(sls::ServerInterface &socket);
|
||||
int update_client(sls::ServerInterface &socket);
|
||||
int send_update(sls::ServerInterface &socket);
|
||||
int get_version(sls::ServerInterface &socket);
|
||||
int set_detector_type(sls::ServerInterface &socket);
|
||||
int set_detector_hostname(sls::ServerInterface &socket);
|
||||
int set_roi(sls::ServerInterface &socket);
|
||||
int set_num_frames(sls::ServerInterface &socket);
|
||||
int set_num_analog_samples(sls::ServerInterface &socket);
|
||||
int set_num_digital_samples(sls::ServerInterface &socket);
|
||||
int set_exptime(sls::ServerInterface &socket);
|
||||
int set_period(sls::ServerInterface &socket);
|
||||
int set_subexptime(sls::ServerInterface &socket);
|
||||
int set_subdeadtime(sls::ServerInterface &socket);
|
||||
int set_dynamic_range(sls::ServerInterface &socket);
|
||||
int set_streaming_frequency(sls::ServerInterface &socket);
|
||||
int get_status(sls::ServerInterface &socket);
|
||||
int start_receiver(sls::ServerInterface &socket);
|
||||
int stop_receiver(sls::ServerInterface &socket);
|
||||
int set_file_dir(sls::ServerInterface &socket);
|
||||
int set_file_name(sls::ServerInterface &socket);
|
||||
int set_file_index(sls::ServerInterface &socket);
|
||||
int get_frame_index(sls::ServerInterface &socket);
|
||||
int get_missing_packets(sls::ServerInterface &socket);
|
||||
int get_frames_caught(sls::ServerInterface &socket);
|
||||
int enable_file_write(sls::ServerInterface &socket);
|
||||
int enable_master_file_write(sls::ServerInterface &socket);
|
||||
int enable_compression(sls::ServerInterface &socket);
|
||||
int enable_overwrite(sls::ServerInterface &socket);
|
||||
int enable_tengiga(sls::ServerInterface &socket);
|
||||
int set_fifo_depth(sls::ServerInterface &socket);
|
||||
int set_activate(sls::ServerInterface &socket);
|
||||
int set_data_stream_enable(sls::ServerInterface &socket);
|
||||
int set_streaming_timer(sls::ServerInterface &socket);
|
||||
int set_flipped_data(sls::ServerInterface &socket);
|
||||
int set_file_format(sls::ServerInterface &socket);
|
||||
int set_detector_posid(sls::ServerInterface &socket);
|
||||
int set_multi_detector_size(sls::ServerInterface &socket);
|
||||
int set_streaming_port(sls::ServerInterface &socket);
|
||||
int set_streaming_source_ip(sls::ServerInterface &socket);
|
||||
int set_silent_mode(sls::ServerInterface &socket);
|
||||
int enable_gap_pixels(sls::ServerInterface &socket);
|
||||
int restream_stop(sls::ServerInterface &socket);
|
||||
int set_additional_json_header(sls::ServerInterface &socket);
|
||||
int get_additional_json_header(sls::ServerInterface &socket);
|
||||
int set_udp_socket_buffer_size(sls::ServerInterface &socket);
|
||||
int get_real_udp_socket_buffer_size(sls::ServerInterface &socket);
|
||||
int set_frames_per_file(sls::ServerInterface &socket);
|
||||
int check_version_compatibility(sls::ServerInterface &socket);
|
||||
int set_discard_policy(sls::ServerInterface &socket);
|
||||
int set_padding_enable(sls::ServerInterface &socket);
|
||||
int set_deactivated_padding_enable(sls::ServerInterface &socket);
|
||||
int set_readout_mode(sls::ServerInterface &socket);
|
||||
int set_adc_mask(sls::ServerInterface &socket);
|
||||
int set_dbit_list(sls::ServerInterface &socket);
|
||||
int get_dbit_list(sls::ServerInterface &socket);
|
||||
int set_dbit_offset(sls::ServerInterface &socket);
|
||||
int set_quad_type(sls::ServerInterface &socket);
|
||||
int set_read_n_lines(sls::ServerInterface &socket);
|
||||
int set_udp_ip(sls::ServerInterface &socket);
|
||||
int set_udp_ip2(sls::ServerInterface &socket);
|
||||
int set_udp_port(sls::ServerInterface &socket);
|
||||
int set_udp_port2(sls::ServerInterface &socket);
|
||||
int set_num_interfaces(sls::ServerInterface &socket);
|
||||
int set_adc_mask_10g(sls::ServerInterface &socket);
|
||||
int set_num_counters(sls::ServerInterface &socket);
|
||||
|
||||
Implementation *impl() {
|
||||
if (receiver != nullptr) {
|
||||
@ -133,7 +133,7 @@ class ClientInterface : private virtual slsDetectorDefs {
|
||||
detectorType myDetectorType;
|
||||
std::unique_ptr<Implementation> receiver{nullptr};
|
||||
int (ClientInterface::*flist[NUM_REC_FUNCTIONS])(
|
||||
sls::ServerInterface2 &socket);
|
||||
sls::ServerInterface &socket);
|
||||
int ret{OK};
|
||||
int fnum{-1};
|
||||
int lockedByClient{0};
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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; }
|
||||
|
||||
@ -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));
|
||||
@ -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
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
#include "tests/testenum.h"
|
||||
|
||||
#include "ServerInterface2.h"
|
||||
#include "ServerInterface.h"
|
||||
#include "container_utils.h"
|
||||
#include <iostream>
|
||||
#include <unordered_map>
|
||||
@ -15,7 +15,7 @@ struct EnumClassHash {
|
||||
}
|
||||
};
|
||||
|
||||
using Interface = sls::ServerInterface2;
|
||||
using Interface = sls::ServerInterface;
|
||||
using func_ptr = void (*)(Interface &);
|
||||
|
||||
/********************************************
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user