Separate train routing logic to a class derived from TrainAI

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

diff --git a/source/network/server.cpp b/source/network/server.cpp
index c9a56e39b243d7673d15c80259d4410658aabe8f..73cee24a4f0c2f5d7676b98a507be2f25dcce6fd 100644 (file)
--- a/source/network/server.cpp
+++ b/source/network/server.cpp
@@ -1,7 +1,11 @@
+#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/trainrouter.h"
+#include "libr2c2/trainstatus.h"
 #include "libr2c2/vehicletype.h"
 #include "server.h"
 
@@ -25,7 +29,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));
 }
 
@@ -62,8 +67,7 @@ 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();
@@ -93,13 +97,16 @@ void Server::train_function_changed(const Train &train, unsigned, bool)
        send(pkt);
 }
 
-void Server::train_route_changed(const Train &train, const Route *route)
+void Server::train_ai_event(const Train &train, TrainAI &, const TrainAI::Message &ev)
 {
-       TrainRoutePacket pkt;
-       pkt.address = train.get_address();
-       if(route)
-               pkt.route = route->get_name();
-       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);
+       }
 }
 
 void Server::train_status_changed(const Train &train, const string &status)
@@ -198,11 +205,11 @@ void Server::Connection::handshake_done()
                        pkt.status = status->get_status();
                        comm.send(pkt);
                }
-               if(train.get_route())
+               if(TrainRouter *router = dynamic_cast<TrainRouter *>(train.get_tagged_ai("router")))
                {
                        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 +217,6 @@ void Server::Connection::handshake_done()
 
 void Server::Connection::end_of_file()
 {
-       socket->close();
        stale = true;
 }
 
@@ -230,7 +236,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());
        }
@@ -245,7 +251,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());
        }
@@ -257,14 +263,14 @@ 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)
+       catch(const exception &e)
        {
                error(e.what());
        }