Better handling of network communication errors

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

diff --git a/source/network/server.cpp b/source/network/server.cpp
index 73cee24a4f0c2f5d7676b98a507be2f25dcce6fd..c60eb70e109f296ccad3a820f10df62c958a6798 100644 (file)
--- a/source/network/server.cpp
+++ b/source/network/server.cpp
@@ -1,6 +1,7 @@
 #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"
@@ -34,6 +35,9 @@ Server::Server(Layout &l):
        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;
@@ -56,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;
@@ -71,13 +75,12 @@ void Server::train_added(Train &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)
@@ -107,14 +110,13 @@ void Server::train_ai_event(const Train &train, TrainAI &, const TrainAI::Messag
                        pkt.route = route->get_name();
                send(pkt);
        }
-}
-
-void Server::train_status_changed(const Train &train, const string &status)
-{
-       TrainStatusPacket pkt;
-       pkt.address = train.get_address();
-       pkt.status = status;
-       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>
@@ -122,16 +124,7 @@ void Server::send(const P &pkt)
 {
        for(vector<Connection *>::const_iterator i=connections.begin(); i!=connections.end(); ++i)
                if(!(*i)->stale && (*i)->comm.is_handshake_done())
-               {
-                       try
-                       {
-                               (*i)->comm.send(pkt);
-                       }
-                       catch(...)
-                       {
-                               (*i)->stale = true;
-                       }
-               }
+                       (*i)->comm.send(pkt);
 }
 
 
@@ -142,6 +135,7 @@ Server::Connection::Connection(Server &s, Net::StreamSocket *o):
 {
        socket->signal_end_of_file.connect(sigc::mem_fun(this, &Connection::end_of_file));
        comm.signal_handshake_done.connect(sigc::mem_fun(this, &Connection::handshake_done));
+       comm.signal_error.connect(sigc::mem_fun(this, &Connection::comm_error));
        comm.initiate_handshake();
 }
 
@@ -159,7 +153,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())
                {
@@ -168,6 +162,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)
        {
@@ -176,7 +171,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);
                }
@@ -198,14 +193,14 @@ 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(TrainRouter *router = dynamic_cast<TrainRouter *>(train.get_tagged_ai("router")))
+               if(TrainRouter *router = train.get_ai_of_type<TrainRouter>())
                {
                        TrainRoutePacket pkt;
                        pkt.address = train.get_address();
@@ -276,6 +271,11 @@ void Server::Connection::receive(const TrainRoutePacket &pkt)
        }
 }
 
+void Server::Connection::comm_error(const exception &)
+{
+       stale = true;
+}
+
 void Server::Connection::error(const string &msg)
 {
        ErrorPacket pkt;