X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnetwork%2Fserver.cpp;h=d4e2049472c94caf42da31f7ac2042ecc0246e8d;hb=64feb0c70888bfc7c11b05dcc71be495f255c039;hp=404faa94a6fa83826f46403fd7ff08110d1d231d;hpb=1ff06c5bc46a677fa389ef86c6b26664368f1653;p=r2c2.git

diff --git a/source/network/server.cpp b/source/network/server.cpp
index 404faa9..d4e2049 100644
--- a/source/network/server.cpp
+++ b/source/network/server.cpp
@@ -1,11 +1,7 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2009-2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
+#include <msp/core/refptr.h>
 #include <msp/net/inet.h>
+#include <msp/net/resolve.h>
+#include "libr2c2/driver.h"
 #include "libr2c2/route.h"
 #include "libr2c2/train.h"
 #include "libr2c2/vehicletype.h"
@@ -21,13 +17,18 @@ Server::Server(Layout &l):
 	listen_sock(Net::INET),
 	event_disp(0)
 {
+	layout.get_driver().signal_power.connect(sigc::hide(sigc::mem_fun(this, &Server::driver_state_changed)));
+	layout.get_driver().signal_halt.connect(sigc::hide(sigc::mem_fun(this, &Server::driver_state_changed)));
+	layout.signal_emergency.connect(sigc::mem_fun(this, &Server::emergency));
+
 	layout.signal_train_added.connect(sigc::mem_fun(this, &Server::train_added));
 
 	const map<unsigned, Train *> &trains = layout.get_trains();
 	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));
 }
 
@@ -45,6 +46,21 @@ void Server::incoming_connection()
 	connections.push_back(new Connection(*this, sock));
 }
 
+void Server::driver_state_changed()
+{
+	DriverStatePacket pkt;
+	pkt.power = layout.get_driver().get_power();
+	pkt.halt = layout.get_driver().is_halted();
+	send(pkt);
+}
+
+void Server::emergency(const string &msg)
+{
+	EmergencyPacket pkt;
+	pkt.message = msg;
+	send(pkt);
+}
+
 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)));
@@ -57,6 +73,10 @@ void Server::train_added(Train &train)
 	pkt.loco_type = train.get_locomotive_type().get_article_number().str();
 	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)));
 }
 
 void Server::train_control_changed(const Train &train, const string &control, float value)
@@ -97,8 +117,17 @@ template<typename P>
 void Server::send(const P &pkt)
 {
 	for(vector<Connection *>::const_iterator i=connections.begin(); i!=connections.end(); ++i)
-		if(!(*i)->stale)
-			(*i)->comm.send(pkt);
+		if(!(*i)->stale && (*i)->comm.is_handshake_done())
+		{
+			try
+			{
+				(*i)->comm.send(pkt);
+			}
+			catch(...)
+			{
+				(*i)->stale = true;
+			}
+		}
 }
 
 
@@ -119,14 +148,22 @@ Server::Connection::~Connection()
 
 void Server::Connection::handshake_done()
 {
-	const set<Route *> &routes = server.layout.get_routes();
-	for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
 	{
-		RouteInfoPacket pkt;
-		pkt.name = (*i)->get_name();
+		DriverStatePacket pkt;
+		pkt.power = server.layout.get_driver().get_power();
+		pkt.halt = server.layout.get_driver().is_halted();
 		comm.send(pkt);
 	}
 
+	const set<Route *> &routes = server.layout.get_routes();
+	for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
+		if(!(*i)->is_temporary())
+		{
+			RouteInfoPacket pkt;
+			pkt.name = (*i)->get_name();
+			comm.send(pkt);
+		}
+
 	const map<unsigned, Train *> &trains = server.layout.get_trains();
 	for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
 	{
@@ -139,17 +176,29 @@ void Server::Connection::handshake_done()
 			pkt.name = train.get_name();
 			comm.send(pkt);
 		}
-		// XXX Need control enumeration to send control packets
+		for(unsigned j=0;; ++j)
+		{
+			const char *name = train.get_controller().enumerate_controls(j);
+			if(!name)
+				break;
+
+			TrainControlPacket pkt;
+			pkt.address = train.get_address();
+			pkt.control = name;
+			pkt.value = train.get_control(name);
+			comm.send(pkt);
+		}
 		{
 			TrainFunctionPacket pkt;
 			pkt.address = train.get_address();
 			pkt.functions = train.get_functions();
 			comm.send(pkt);
 		}
+		if(TrainStatus *status = dynamic_cast<TrainStatus *>(train.get_tagged_ai("server:status")))
 		{
 			TrainStatusPacket pkt;
 			pkt.address = train.get_address();
-			pkt.status = train.get_status();
+			pkt.status = status->get_status();
 			comm.send(pkt);
 		}
 		if(train.get_route())
@@ -164,10 +213,18 @@ void Server::Connection::handshake_done()
 
 void Server::Connection::end_of_file()
 {
-	socket->close();
 	stale = true;
 }
 
+void Server::Connection::receive(const DriverStatePacket &pkt)
+{
+	Driver &driver = server.layout.get_driver();
+	if(pkt.power!=driver.get_power())
+		driver.set_power(pkt.power);
+	if(pkt.halt!=driver.is_halted())
+		driver.halt(pkt.halt);
+}
+
 void Server::Connection::receive(const TrainControlPacket &pkt)
 {
 	try
@@ -175,7 +232,7 @@ void Server::Connection::receive(const TrainControlPacket &pkt)
 		Train &train = server.layout.get_train(pkt.address);
 		train.set_control(pkt.control, pkt.value);
 	}
-	catch(const Exception &e)
+	catch(const exception &e)
 	{
 		error(e.what());
 	}
@@ -190,7 +247,7 @@ void Server::Connection::receive(const TrainFunctionPacket &pkt)
 			if(((pkt.functions^train.get_functions())>>i)&1)
 				train.set_function(i, (pkt.functions>>i)&1);
 	}
-	catch(const Exception &e)
+	catch(const exception &e)
 	{
 		error(e.what());
 	}
@@ -209,7 +266,7 @@ void Server::Connection::receive(const TrainRoutePacket &pkt)
 			train.set_route(&route);
 		}
 	}
-	catch(const Exception &e)
+	catch(const exception &e)
 	{
 		error(e.what());
 	}