Adjust subsystem order (instruments vs systems)

[flightgear.git] / src / Main / fg_io.cxx

diff --git a/src/Main/fg_io.cxx b/src/Main/fg_io.cxx
index c45b98f86d9318ee14d00104d4534b00874c86b7..96b2a4d6b27ad2477a5e5cccf5d6d34e3febc9a5 100644 (file)
--- a/src/Main/fg_io.cxx
+++ b/src/Main/fg_io.cxx
@@ -65,6 +65,7 @@
 #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>
@@ -87,7 +88,7 @@ FGIO::FGIO()
 
 FGIO::~FGIO()
 {
-    
+
 }
 
 
@@ -195,24 +196,16 @@ FGIO::parse_port_config( const string& config )
        } 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)" );
@@ -222,7 +215,7 @@ FGIO::parse_port_config( const string& config )
            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
@@ -283,7 +276,7 @@ FGIO::parse_port_config( const string& config )
 
        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.");
@@ -345,7 +338,7 @@ FGIO::init()
     //         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
@@ -361,13 +354,14 @@ FGIO::init()
       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
 }
@@ -381,6 +375,10 @@ FGIO::reinit()
 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
@@ -393,7 +391,7 @@ FGIO::update( double /* delta_time_sec */ )
       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 ) {
@@ -419,7 +417,7 @@ FGIO::shutdown()
       if ( p->is_enabled() ) {
           p->close();
       }
-      
+
       delete p;
     }