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

diff --git a/source/network/server.cpp b/source/network/server.cpp
index b3f4662..d4e2049 100644
--- a/source/network/server.cpp
+++ b/source/network/server.cpp
@@ -1,11 +1,6 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2009-2011  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"
@@ -32,7 +27,8 @@ 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));
 }
 
@@ -77,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)
@@ -194,10 +194,11 @@ 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")))
 		{
 			TrainStatusPacket pkt;
 			pkt.address = train.get_address();
-			pkt.status = train.get_status();
+			pkt.status = status->get_status();
 			comm.send(pkt);
 		}
 		if(train.get_route())
@@ -212,7 +213,6 @@ void Server::Connection::handshake_done()
 
 void Server::Connection::end_of_file()
 {
-	socket->close();
 	stale = true;
 }
 
@@ -232,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());
 	}
@@ -247,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());
 	}
@@ -266,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());
 	}