#include <Network/ray.hxx>
#include <Network/rul.hxx>
#include <Network/generic.hxx>
+#include <Network/HTTPClient.hxx>
#ifdef FG_HAVE_HLA
#include <Network/HLA/hla.hxx>
FGIO::~FGIO()
{
-
+
}
} else if ( protocol == "rul" ) {
FGRUL *rul = new FGRUL;
io = rul;
- } else if ( protocol == "generic" ) {
- size_t configToken;
- if (tokens[1] == "socket") {
- configToken = 7;
- } else if (tokens[1] == "file") {
- configToken = 5;
- } else {
- configToken = 6;
- }
-
- if (configToken >= tokens.size()) {
- SG_LOG( SG_IO, SG_ALERT, "Not enough tokens passed for the generic protocol.");
- return NULL;
- }
-
- FGGeneric *generic = new FGGeneric( tokens );
- io = generic;
- } else if ( protocol == "multiplay" ) {
+ } else if ( protocol == "generic" ) {
+ FGGeneric *generic = new FGGeneric( tokens );
+ if (!generic->getInitOk())
+ {
+ // failed to initialize (i.e. invalid configuration)
+ delete generic;
+ return NULL;
+ }
+ io = generic;
+ } else if ( protocol == "multiplay" ) {
if ( tokens.size() != 5 ) {
SG_LOG( SG_IO, SG_ALERT, "Ignoring invalid --multiplay option "
"(4 arguments expected: --multiplay=dir,hz,hostname,port)" );
int rate = atoi(tokens[2].c_str());
string host = tokens[3];
- short port = atoi(tokens[4].c_str());
+ short port = atoi(tokens[4].c_str());
// multiplay used to be handled by an FGProtocol, but no longer. This code
// retains compatability with existing command-line syntax
SGSerial *ch = new SGSerial( device, baud );
io->set_io_channel( ch );
-
+
if ( protocol == "AV400WSimB" ) {
if ( tokens.size() < 7 ) {
SG_LOG( SG_IO, SG_ALERT, "Missing second hz for AV400WSimB.");
// globals->get_channel_options_list()->size() << " requests." );
_realDeltaTime = fgGetNode("/sim/time/delta-realtime-sec");
-
+
FGProtocol *p;
// we could almost do this in a single step except pushing a valid
if (!p) {
continue;
}
-
+
p->open();
if ( !p->is_enabled() ) {
SG_LOG( SG_IO, SG_ALERT, "I/O Channel config failed." );
delete p;
+ continue;
}
-
+
io_channels.push_back( p );
} // of channel options iteration
}
void
FGIO::update( double /* delta_time_sec */ )
{
+ if (FGHTTPClient::haveInstance()) {
+ FGHTTPClient::instance()->update();
+ }
+
// use wall-clock, not simulation, delta time, so that network
// protocols update when the simulation is paused
// see http://code.google.com/p/flightgear-bugs/issues/detail?id=125
if (!p->is_enabled()) {
continue;
}
-
+
p->dec_count_down( delta_time_sec );
double dt = 1 / p->get_hz();
if ( p->get_count_down() < 0.33 * dt ) {
if ( p->is_enabled() ) {
p->close();
}
-
+
delete p;
}