From e6dd92620d5c3a3fb5bd4345d41af56550d33358 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Thu, 22 Aug 2019 21:51:52 +0200 Subject: [PATCH] changed to two sockets --- FlippR-Driver/networking/FlippRServer.cpp | 4 ++-- FlippR-Driver/networking/FlippRServer.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/FlippR-Driver/networking/FlippRServer.cpp b/FlippR-Driver/networking/FlippRServer.cpp index 00140f4..d4b7888 100644 --- a/FlippR-Driver/networking/FlippRServer.cpp +++ b/FlippR-Driver/networking/FlippRServer.cpp @@ -180,7 +180,7 @@ HTTPServer* FlippRServer::build_output_server() std::string runtime_dir = this->get_runtime_dir(); - SocketAddress address(runtime_dir + SOCKET_NAME); + SocketAddress address(runtime_dir + OUTPUT_SOCKET_NAME); ServerSocket server_socket(address); return new HTTPServer(new OutputRequestHandlerFactory(this->output_driver), server_socket, new HTTPServerParams); @@ -191,7 +191,7 @@ TCPServer* FlippRServer::build_input_server() unsigned short port = (unsigned short) config().getInt("FlippRServer.port", this->output_port); std::string runtime_dir = this->get_runtime_dir(); - SocketAddress address(runtime_dir + SOCKET_NAME); + SocketAddress address(runtime_dir + INPUT_SOCKET_NAME); ServerSocket server_socket(address); return new TCPServer(new input::InputSocketHandlerFactory(this->input_driver), port); diff --git a/FlippR-Driver/networking/FlippRServer.h b/FlippR-Driver/networking/FlippRServer.h index fbc3641..a8c2ce4 100644 --- a/FlippR-Driver/networking/FlippRServer.h +++ b/FlippR-Driver/networking/FlippRServer.h @@ -42,7 +42,8 @@ private: private: const char * DEFAULT_RUNTIME_DIR = "/tmp/flippR_driver-runtime/"; - const char * SOCKET_NAME = "S.flippR_driver"; + const char * INPUT_SOCKET_NAME = "S.flippR_driver.in"; + const char * OUTPUT_SOCKET_NAME = "S.flippR_driver.out"; const std::vector REQUIRED_CONFIG_KEYS = {"display-config", "input-config", "lamp-config", "matrix-config", "solenoid-config", "sound-config"}; int input_port;