X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnetwork%2Fserver.cpp;h=43dce66cfc7353022df95b4893fba47710df31d6;hb=66a30fdf63df6ae092fb3d335c30a37e4e6ef40d;hp=73cee24a4f0c2f5d7676b98a507be2f25dcce6fd;hpb=d0af7846e05691d65d8021e46c8f81e8ca05199a;p=r2c2.git diff --git a/source/network/server.cpp b/source/network/server.cpp index 73cee24..43dce66 100644 --- a/source/network/server.cpp +++ b/source/network/server.cpp @@ -1,6 +1,8 @@ #include #include #include +#include "libr2c2/aicontrol.h" +#include "libr2c2/catalogue.h" #include "libr2c2/driver.h" #include "libr2c2/route.h" #include "libr2c2/train.h" @@ -34,6 +36,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 +61,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 +76,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()) + new TrainStatus(train); } void Server::train_control_changed(const Train &train, const string &control, float value) @@ -97,7 +101,7 @@ void Server::train_function_changed(const Train &train, unsigned, bool) send(pkt); } -void Server::train_ai_event(const Train &train, TrainAI &, const TrainAI::Message &ev) +void Server::train_ai_event(const Train &train, TrainAI &ai, const TrainAI::Message &ev) { if(ev.type=="route-changed") { @@ -107,14 +111,25 @@ 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(); + send(pkt); + } + else if(ev.type=="target-speed-changed" || ev.type=="reverse-changed") + { + AIControl *control = dynamic_cast(&ai); + if(control) + { + TrainAIControlPacket pkt; + pkt.address = train.get_address(); + pkt.target_speed = control->get_target_speed(); + pkt.reverse = control->get_reverse(); + send(pkt); + } + } } template @@ -122,16 +137,7 @@ void Server::send(const P &pkt) { for(vector::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 +148,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 +166,7 @@ void Server::Connection::handshake_done() comm.send(pkt); } - const set &routes = server.layout.get_routes(); + const set &routes = server.layout.get_all(); for(set::const_iterator i=routes.begin(); i!=routes.end(); ++i) if(!(*i)->is_temporary()) { @@ -168,6 +175,7 @@ void Server::Connection::handshake_done() comm.send(pkt); } + const Catalogue &cat = server.layout.get_catalogue(); const map &trains = server.layout.get_trains(); for(map::const_iterator i=trains.begin(); i!=trains.end(); ++i) { @@ -176,10 +184,18 @@ 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); } + if(AIControl *control = train.get_ai_of_type()) + { + TrainAIControlPacket pkt; + pkt.address = train.get_address(); + pkt.target_speed = control->get_target_speed(); + pkt.reverse = control->get_reverse(); + comm.send(pkt); + } for(unsigned j=0;; ++j) { const char *name = train.get_controller().enumerate_controls(j); @@ -198,14 +214,14 @@ void Server::Connection::handshake_done() pkt.functions = train.get_functions(); comm.send(pkt); } - if(TrainStatus *status = dynamic_cast(train.get_tagged_ai("server:status"))) + if(TrainStatus *status = train.get_ai_of_type()) { TrainStatusPacket pkt; pkt.address = train.get_address(); pkt.status = status->get_status(); comm.send(pkt); } - if(TrainRouter *router = dynamic_cast(train.get_tagged_ai("router"))) + if(TrainRouter *router = train.get_ai_of_type()) { TrainRoutePacket pkt; pkt.address = train.get_address(); @@ -257,6 +273,20 @@ void Server::Connection::receive(const TrainFunctionPacket &pkt) } } +void Server::Connection::receive(const TrainAIControlPacket &pkt) +{ + try + { + Train &train = server.layout.get_train(pkt.address); + train.ai_message(TrainAI::Message("set-target-speed", pkt.target_speed)); + train.ai_message(TrainAI::Message("set-reverse", pkt.reverse)); + } + catch(const exception &e) + { + error(e.what()); + } +} + void Server::Connection::receive(const TrainRoutePacket &pkt) { try @@ -276,6 +306,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;