Better handling of network communication errors

[r2c2.git] / source / network / server.h

diff --git a/source/network/server.h b/source/network/server.h
index febd567598e0e71def517c7a9743bfdc77706994..50c0f72fae98d6ac2a0f0ce00e7d49a9b194ad02 100644 (file)
--- a/source/network/server.h
+++ b/source/network/server.h
@@ -6,7 +6,7 @@
 #include <msp/net/streamsocket.h>
 #include <msp/net/streamserversocket.h>
 #include "libr2c2/layout.h"
-#include "libr2c2/trainstatus.h"
+#include "libr2c2/trainai.h"
 #include "packets.h"
 #include "protocol.h"
 
@@ -34,6 +34,7 @@ private:
                virtual void receive(const TrainControlPacket &);
                virtual void receive(const TrainFunctionPacket &);
                virtual void receive(const TrainRoutePacket &);
+               void comm_error(const std::exception &);
                void error(const std::string &);
        };
 
@@ -45,17 +46,18 @@ private:
 
 public:
        Server(Layout &);
+       ~Server();
+
        void use_event_dispatcher(Msp::IO::EventDispatcher &);
 private:
        void incoming_connection();
 
        void driver_state_changed();
-       void emergency(const std::string &);
+       void emergency(Block *, const std::string &);
        void train_added(Train &);
        void train_control_changed(const Train &, const std::string &, float);
        void train_function_changed(const Train &, unsigned, bool);
-       void train_route_changed(const Train &, const Route *);
-       void train_status_changed(const Train &, const std::string &);
+       void train_ai_event(const Train &, TrainAI &, const TrainAI::Message &);
 
        template<typename P>
        void send(const P &);