renamed ServerInterface

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

View File

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