rhetenor/flippr-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

changed to two sockets

Browse Source
This commit is contained in:
Jonas Zeunert
2019-08-22 21:51:52 +02:00
parent c8bd4666fc
commit e6dd92620d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
FlippR-Driver/networking/FlippRServer.cpp
View File

@@ -180,7 +180,7 @@ HTTPServer* FlippRServer::build_output_server()
std::string runtime_dir = this->get_runtime_dir(); 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); ServerSocket server_socket(address);
return new HTTPServer(new OutputRequestHandlerFactory(this->output_driver), server_socket, new HTTPServerParams); 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); unsigned short port = (unsigned short) config().getInt("FlippRServer.port", this->output_port);
std::string runtime_dir = this->get_runtime_dir(); 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); ServerSocket server_socket(address);
return new TCPServer(new input::InputSocketHandlerFactory(this->input_driver), port); return new TCPServer(new input::InputSocketHandlerFactory(this->input_driver), port);

3
FlippR-Driver/networking/FlippRServer.h
View File

@@ -42,7 +42,8 @@ private:
private: private:
const char * DEFAULT_RUNTIME_DIR = "/tmp/flippR_driver-runtime/"; 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<std::string> REQUIRED_CONFIG_KEYS = {"display-config", "input-config", "lamp-config", const std::vector<std::string> REQUIRED_CONFIG_KEYS = {"display-config", "input-config", "lamp-config",
"matrix-config", "solenoid-config", "sound-config"}; "matrix-config", "solenoid-config", "sound-config"};
int input_port; int input_port;