X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnetwork%2Fserver.cpp;h=a892dedd25a85c79e9ba8edd1f3c60db767855a6;hb=81ee4fbd16b472892b67b35ea85956423a2247ed;hp=c0a69463622d17d5f8b65fb55fd886692994ee36;hpb=621c5c938d70ba0d155e0eda91a708db0a52c0dc;p=r2c2.git

diff --git a/source/network/server.cpp b/source/network/server.cpp
index c0a6946..a892ded 100644
--- a/source/network/server.cpp
+++ b/source/network/server.cpp
@@ -1,7 +1,12 @@
+#include <msp/core/refptr.h>
 #include <msp/net/inet.h>
+#include <msp/net/resolve.h>
+#include "libr2c2/catalogue.h"
 #include "libr2c2/driver.h"
 #include "libr2c2/route.h"
 #include "libr2c2/train.h"
+#include "libr2c2/trainrouter.h"
+#include "libr2c2/trainstatus.h"
 #include "libr2c2/vehicletype.h"
 #include "server.h"
 
@@ -25,10 +30,14 @@ Server::Server(Layout &l):
 	for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
 		train_added(*i->second);
 
-	listen_sock.listen(Net::InetAddr(0, 8315), 4);
+	RefPtr<Net::SockAddr> addr = Net::resolve("*", "8315", Net::INET);
+	listen_sock.listen(*addr, 4);
 	listen_sock.signal_data_available.connect(sigc::mem_fun(this, &Server::incoming_connection));
 }
 
+Server::~Server()
+{ }
+
 void Server::use_event_dispatcher(IO::EventDispatcher &ed)
 {
 	event_disp = &ed;
@@ -51,7 +60,7 @@ void Server::driver_state_changed()
 	send(pkt);
 }
 
-void Server::emergency(const string &msg)
+void Server::emergency(Block *, const string &msg)
 {
 	EmergencyPacket pkt;
 	pkt.message = msg;
@@ -62,18 +71,16 @@ void Server::train_added(Train &train)
 {
 	train.signal_control_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_control_changed), sigc::ref(train)));
 	train.signal_function_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_function_changed), sigc::ref(train)));
-	train.signal_route_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_route_changed), sigc::ref(train)));
-	train.signal_status_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_status_changed), sigc::ref(train)));
+	train.signal_ai_event.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_ai_event), sigc::ref(train)));
 
 	TrainInfoPacket pkt;
 	pkt.address = train.get_address();
-	pkt.loco_type = train.get_locomotive_type().get_article_number().str();
+	pkt.loco_type = layout.get_catalogue().get_name(&train.get_locomotive_type());
 	pkt.name = train.get_name();
 	send(pkt);
 
-	TrainStatus *status = new TrainStatus(train);
-	status->set_tag("server:status");
-	status->signal_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_status_changed), sigc::ref(train)));
+	if(!train.get_ai_of_type<TrainStatus>())
+		new TrainStatus(train);
 }
 
 void Server::train_control_changed(const Train &train, const string &control, float value)
@@ -93,21 +100,23 @@ void Server::train_function_changed(const Train &train, unsigned, bool)
 	send(pkt);
 }
 
-void Server::train_route_changed(const Train &train, const Route *route)
-{
-	TrainRoutePacket pkt;
-	pkt.address = train.get_address();
-	if(route)
-		pkt.route = route->get_name();
-	send(pkt);
-}
-
-void Server::train_status_changed(const Train &train, const string &status)
+void Server::train_ai_event(const Train &train, TrainAI &, const TrainAI::Message &ev)
 {
-	TrainStatusPacket pkt;
-	pkt.address = train.get_address();
-	pkt.status = status;
-	send(pkt);
+	if(ev.type=="route-changed")
+	{
+		TrainRoutePacket pkt;
+		pkt.address = train.get_address();
+		if(const Route *route = ev.value.value<const Route *>())
+			pkt.route = route->get_name();
+		send(pkt);
+	}
+	else if(ev.type=="status-changed")
+	{
+		TrainStatusPacket pkt;
+		pkt.address = train.get_address();
+		pkt.status = ev.value.value<std::string>();
+		send(pkt);
+	}
 }
 
 template<typename P>
@@ -152,7 +161,7 @@ void Server::Connection::handshake_done()
 		comm.send(pkt);
 	}
 
-	const set<Route *> &routes = server.layout.get_routes();
+	const set<Route *> &routes = server.layout.get_all<Route>();
 	for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
 		if(!(*i)->is_temporary())
 		{
@@ -161,6 +170,7 @@ void Server::Connection::handshake_done()
 			comm.send(pkt);
 		}
 
+	const Catalogue &cat = server.layout.get_catalogue();
 	const map<unsigned, Train *> &trains = server.layout.get_trains();
 	for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
 	{
@@ -169,7 +179,7 @@ void Server::Connection::handshake_done()
 		{
 			TrainInfoPacket pkt;
 			pkt.address = train.get_address();
-			pkt.loco_type = train.get_locomotive_type().get_article_number().str();
+			pkt.loco_type = cat.get_name(&train.get_locomotive_type());
 			pkt.name = train.get_name();
 			comm.send(pkt);
 		}
@@ -191,18 +201,18 @@ void Server::Connection::handshake_done()
 			pkt.functions = train.get_functions();
 			comm.send(pkt);
 		}
-		if(TrainStatus *status = dynamic_cast<TrainStatus *>(train.get_tagged_ai("server:status")))
+		if(TrainStatus *status = train.get_ai_of_type<TrainStatus>())
 		{
 			TrainStatusPacket pkt;
 			pkt.address = train.get_address();
 			pkt.status = status->get_status();
 			comm.send(pkt);
 		}
-		if(train.get_route())
+		if(TrainRouter *router = train.get_ai_of_type<TrainRouter>())
 		{
 			TrainRoutePacket pkt;
 			pkt.address = train.get_address();
-			pkt.route = train.get_route()->get_name();
+			pkt.route = router->get_route()->get_name();
 			comm.send(pkt);
 		}
 	}
@@ -210,7 +220,6 @@ void Server::Connection::handshake_done()
 
 void Server::Connection::end_of_file()
 {
-	socket->close();
 	stale = true;
 }
 
@@ -257,11 +266,11 @@ void Server::Connection::receive(const TrainRoutePacket &pkt)
 	{
 		Train &train = server.layout.get_train(pkt.address);
 		if(pkt.route.empty())
-			train.set_route(0);
+			train.ai_message(TrainAI::Message("clear-route"));
 		else
 		{
 			Route &route = server.layout.get_route(pkt.route);
-			train.set_route(&route);
+			train.ai_message(TrainAI::Message("set-route", &route));
 		}
 	}
 	catch(const exception &e)