X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnetwork%2Fserver.h;h=402e55cd6ec1bf62507218f025fb61fbccbc45f7;hb=3ffe8b384fabeee1c3e636b83dd0006f3f5acfe1;hp=badced0dbd7d8dd612cf690319e8515c9f5ed63a;hpb=34f8bf04e4bdffefeceea59b186386b51c542b9d;p=r2c2.git

diff --git a/source/network/server.h b/source/network/server.h
index badced0..402e55c 100644
--- a/source/network/server.h
+++ b/source/network/server.h
@@ -1,19 +1,12 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2009-2011  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #ifndef R2C2_NET_SERVER_H_
 #define R2C2_NET_SERVER_H_
 
 #include <msp/io/eventdispatcher.h>
 #include <msp/net/communicator.h>
 #include <msp/net/streamsocket.h>
-#include <msp/net/streamlistensocket.h>
+#include <msp/net/streamserversocket.h>
 #include "libr2c2/layout.h"
-#include "libr2c2/trainstatus.h"
+#include "libr2c2/trainai.h"
 #include "packets.h"
 #include "protocol.h"
 
@@ -25,6 +18,7 @@ private:
 	struct Connection: Msp::Net::PacketReceiver<DriverStatePacket>,
 		Msp::Net::PacketReceiver<TrainControlPacket>,
 		Msp::Net::PacketReceiver<TrainFunctionPacket>,
+		Msp::Net::PacketReceiver<TrainAIControlPacket>,
 		Msp::Net::PacketReceiver<TrainRoutePacket>
 	{
 		Server &server;
@@ -40,29 +34,32 @@ private:
 		virtual void receive(const DriverStatePacket &);
 		virtual void receive(const TrainControlPacket &);
 		virtual void receive(const TrainFunctionPacket &);
+		virtual void receive(const TrainAIControlPacket &);
 		virtual void receive(const TrainRoutePacket &);
+		void comm_error(const std::exception &);
 		void error(const std::string &);
 	};
 
 	Protocol proto;
 	Layout &layout;
-	Msp::Net::StreamListenSocket listen_sock;
+	Msp::Net::StreamServerSocket listen_sock;
 	Msp::IO::EventDispatcher *event_disp;
 	std::vector<Connection *> connections;
 
 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 &);