autopilot: Introduce virtual dtor.

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

diff --git a/src/Main/fg_io.cxx b/src/Main/fg_io.cxx
index 7c5f6965245aa59ce693b35472769ec25dc16e38..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>
@@ -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)" );
@@ -382,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