X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnetwork%2Fserver.cpp;h=df40b3f11ea23d03bf9ca1cb2bb3cdb36b36d6f5;hb=a72309e64614bb1e230f9842d94dc261be1301e6;hp=2e3248f28878bf0a7000d874895c69d2675f3056;hpb=651698847d5293cfb15b6fb23a394701388c0151;p=r2c2.git diff --git a/source/network/server.cpp b/source/network/server.cpp index 2e3248f..df40b3f 100644 --- a/source/network/server.cpp +++ b/source/network/server.cpp @@ -1,26 +1,31 @@ /* $Id$ -This file is part of the MSP Märklin suite -Copyright © 2009-2010 Mikkosoft Productions, Mikko Rasa +This file is part of R²C² +Copyright © 2009-2011 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ #include -#include "libmarklin/locotype.h" -#include "libmarklin/route.h" -#include "libmarklin/train.h" +#include "libr2c2/driver.h" +#include "libr2c2/route.h" +#include "libr2c2/train.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(); @@ -45,36 +50,45 @@ 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(const string &msg) +{ + EmergencyPacket pkt; + pkt.message = msg; + send(pkt); +} + void Server::train_added(Train &train) { - train.signal_target_speed_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_speed_changed), sigc::ref(train))); - train.signal_reverse_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_reverse_changed), sigc::ref(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))); TrainInfoPacket pkt; pkt.address = train.get_address(); - pkt.loco_type = train.get_locomotive_type().get_article_number(); + pkt.loco_type = train.get_locomotive_type().get_article_number().str(); pkt.name = train.get_name(); send(pkt); -} -void Server::train_speed_changed(const Train &train, unsigned speed) -{ - TrainSpeedPacket pkt; - pkt.address = train.get_address(); - pkt.speed = speed; - pkt.reverse = train.get_reverse(); - 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_reverse_changed(const Train &train, bool reverse) +void Server::train_control_changed(const Train &train, const string &control, float value) { - TrainSpeedPacket pkt; + TrainControlPacket pkt; pkt.address = train.get_address(); - pkt.speed = train.get_target_speed(); - pkt.reverse = reverse; + pkt.control = control; + pkt.value = value; send(pkt); } @@ -107,8 +121,17 @@ template void Server::send(const P &pkt) { for(vector::const_iterator i=connections.begin(); i!=connections.end(); ++i) - if(!(*i)->stale) - (*i)->comm.send(pkt); + if(!(*i)->stale && (*i)->comm.is_handshake_done()) + { + try + { + (*i)->comm.send(pkt); + } + catch(...) + { + (*i)->stale = true; + } + } } @@ -129,14 +152,22 @@ 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_routes(); + 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 map &trains = server.layout.get_trains(); for(map::const_iterator i=trains.begin(); i!=trains.end(); ++i) { @@ -145,15 +176,20 @@ 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 = train.get_locomotive_type().get_article_number().str(); pkt.name = train.get_name(); comm.send(pkt); } + for(unsigned j=0;; ++j) { - TrainSpeedPacket pkt; + const char *name = train.get_controller().enumerate_controls(j); + if(!name) + break; + + TrainControlPacket pkt; pkt.address = train.get_address(); - pkt.speed = train.get_target_speed(); - pkt.reverse = train.get_reverse(); + pkt.control = name; + pkt.value = train.get_control(name); comm.send(pkt); } { @@ -162,10 +198,11 @@ void Server::Connection::handshake_done() pkt.functions = train.get_functions(); comm.send(pkt); } + if(TrainStatus *status = dynamic_cast(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()) @@ -184,15 +221,21 @@ void Server::Connection::end_of_file() stale = true; } -void Server::Connection::receive(const TrainSpeedPacket &pkt) +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 { Train &train = server.layout.get_train(pkt.address); - if(pkt.reverse!=train.get_reverse()) - train.set_reverse(pkt.reverse); - else - train.set_speed(pkt.speed); + train.set_control(pkt.control, pkt.value); } catch(const Exception &e) { @@ -241,4 +284,4 @@ void Server::Connection::error(const string &msg) comm.send(pkt); } -} // namespace Marklin +} // namespace R2C2