From 1ba42445a5a97e1b09fc9671602594d3e3695063 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Fri, 30 Nov 2018 18:15:57 +0100 Subject: core: extract message constants --- src/control_interface.cpp | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'src/control_interface.cpp') diff --git a/src/control_interface.cpp b/src/control_interface.cpp index 92d5def..85d1dca 100644 --- a/src/control_interface.cpp +++ b/src/control_interface.cpp @@ -100,14 +100,20 @@ void control_interface::on_received(control_connection::pointer connection, mess return; } - switch (connection->current_state()) + if (message.source != message_source_controller) { - case control_connection::state::fresh: - if (message.command == "HELLO") - { - connection->send({"D", "HELLO", "1.0.0"}); - connection->update(control_connection::state::established); - } + // TODO: Handle illegal message source + return; + } + + if (auto state = connection->current_state(); message.command == message_command_hello && state == control_connection::state::fresh) + { + connection->send({message_source_daemon, message_command_hello, message_argument_hello}); + connection->update(control_connection::state::established); + } + else + { + // TODO: Handle unexpected message } } -- cgit v1.2.3