X-Git-Url: http://git.tdb.fi/?p=r2c2.git;a=blobdiff_plain;f=source%2Fnetwork%2Fserver.cpp;h=c60eb70e109f296ccad3a820f10df62c958a6798;hp=8db68717ddf27743b903d85c94976df10a605f83;hb=d13d841852d1fc5f97c40f93221745a63fae5e11;hpb=378f04522aa762729c0d5651fb60ad7e4d8ba9f3 diff --git a/source/network/server.cpp b/source/network/server.cpp index 8db6871..c60eb70 100644 --- a/source/network/server.cpp +++ b/source/network/server.cpp @@ -1,36 +1,43 @@ -/* $Id$ - -This file is part of the MSP Märklin suite -Copyright © 2009-2010 Mikkosoft Productions, Mikko Rasa -Distributed under the GPL -*/ - +#include #include -#include "libmarklin/route.h" -#include "libmarklin/train.h" -#include "libmarklin/vehicletype.h" +#include +#include "libr2c2/catalogue.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" using namespace std; using namespace Msp; -namespace Marklin { +namespace R2C2 { Server::Server(Layout &l): 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 &trains = layout.get_trains(); for(map::const_iterator i=trains.begin(); i!=trains.end(); ++i) train_added(*i->second); - listen_sock.listen(Net::InetAddr(0, 8315), 4); + RefPtr addr = Net::resolve("*", "8315", Net::INET); + listen_sock.listen(*addr, 4); 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; @@ -45,18 +52,35 @@ 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(Block *, 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))); 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(); - pkt.loco_type = train.get_locomotive_type().get_article_number(); + pkt.loco_type = layout.get_catalogue().get_name(&train.get_locomotive_type()); pkt.name = train.get_name(); send(pkt); + + if(!train.get_ai_of_type()) + new TrainStatus(train); } void Server::train_control_changed(const Train &train, const string &control, float value) @@ -76,28 +100,30 @@ void Server::train_function_changed(const Train &train, unsigned, bool) send(pkt); } -void Server::train_route_changed(const Train &train, const Route *route) -{ - TrainRoutePacket pkt; - pkt.address = train.get_address(); - if(route) - pkt.route = route->get_name(); - send(pkt); -} - -void Server::train_status_changed(const Train &train, const string &status) +void Server::train_ai_event(const Train &train, TrainAI &, const TrainAI::Message &ev) { - TrainStatusPacket pkt; - pkt.address = train.get_address(); - pkt.status = status; - send(pkt); + if(ev.type=="route-changed") + { + TrainRoutePacket pkt; + pkt.address = train.get_address(); + if(const Route *route = ev.value.value()) + pkt.route = route->get_name(); + send(pkt); + } + else if(ev.type=="status-changed") + { + TrainStatusPacket pkt; + pkt.address = train.get_address(); + pkt.status = ev.value.value(); + send(pkt); + } } template void Server::send(const P &pkt) { for(vector::const_iterator i=connections.begin(); i!=connections.end(); ++i) - if(!(*i)->stale) + if(!(*i)->stale && (*i)->comm.is_handshake_done()) (*i)->comm.send(pkt); } @@ -109,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(); } @@ -119,14 +146,23 @@ Server::Connection::~Connection() void Server::Connection::handshake_done() { - const map &routes = server.layout.get_routes(); - for(map::const_iterator i=routes.begin(); i!=routes.end(); ++i) { - RouteInfoPacket pkt; - pkt.name = i->first; + DriverStatePacket pkt; + pkt.power = server.layout.get_driver().get_power(); + pkt.halt = server.layout.get_driver().is_halted(); comm.send(pkt); } + const set &routes = server.layout.get_all(); + for(set::const_iterator i=routes.begin(); i!=routes.end(); ++i) + if(!(*i)->is_temporary()) + { + RouteInfoPacket pkt; + pkt.name = (*i)->get_name(); + 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) { @@ -135,28 +171,40 @@ void Server::Connection::handshake_done() { TrainInfoPacket pkt; pkt.address = train.get_address(); - pkt.loco_type = train.get_locomotive_type().get_article_number(); + pkt.loco_type = cat.get_name(&train.get_locomotive_type()); 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 = train.get_ai_of_type()) { TrainStatusPacket pkt; pkt.address = train.get_address(); - pkt.status = train.get_status(); + pkt.status = status->get_status(); comm.send(pkt); } - if(train.get_route()) + if(TrainRouter *router = train.get_ai_of_type()) { TrainRoutePacket pkt; pkt.address = train.get_address(); - pkt.route = train.get_route()->get_name(); + pkt.route = router->get_route()->get_name(); comm.send(pkt); } } @@ -164,10 +212,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 +231,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 +246,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()); } @@ -202,19 +258,24 @@ 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()); } } +void Server::Connection::comm_error(const exception &) +{ + stale = true; +} + void Server::Connection::error(const string &msg) { ErrorPacket pkt; @@ -222,4 +283,4 @@ void Server::Connection::error(const string &msg) comm.send(pkt); } -} // namespace Marklin +} // namespace R2C2