One more std::string fixup.

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

diff --git a/src/Main/fg_io.cxx b/src/Main/fg_io.cxx
index 2ca273f1de2f10de551f747ed98fb5f1747ae028..36ca64433d3f6dc923acdfcdaa59374ea88856d7 100644 (file)
--- a/src/Main/fg_io.cxx
+++ b/src/Main/fg_io.cxx
@@ -44,6 +44,7 @@
 #include <Network/ATC-Main.hxx>
 #include <Network/atlas.hxx>
 #include <Network/AV400.hxx>
+#include <Network/AV400Sim.hxx>
 #include <Network/garmin.hxx>
 #include <Network/httpd.hxx>
 #ifdef FG_JPEG_SERVER
@@ -136,6 +137,9 @@ FGIO::parse_port_config( const string& config )
        } else if ( protocol == "AV400" ) {
            FGAV400 *av400 = new FGAV400;
            io = av400;
+       } else if ( protocol == "AV400Sim" ) {
+           FGAV400Sim *av400sim = new FGAV400Sim;
+           io = av400sim;
        } else if ( protocol == "garmin" ) {
            FGGarmin *garmin = new FGGarmin;
            io = garmin;
@@ -183,14 +187,21 @@ FGIO::parse_port_config( const string& config )
            FGRUL *rul = new FGRUL;
            io = rul;
         } else if ( protocol == "generic" ) {
-            int configToken;
-            if (tokens[1] == "socket")
+            size_t configToken;
+            if (tokens[1] == "socket") {
                 configToken = 7;
-            else if (tokens[1] == "file")
+            } else if (tokens[1] == "file") {
                 configToken = 5;
-            else
+            } else {
                 configToken = 6;
-            FGGeneric *generic = new FGGeneric( tokens[configToken] );
+            }
+
+            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" ) {
            if ( tokens.size() != 5 ) {
@@ -323,6 +334,11 @@ FGIO::init()
     }
 }
 
+void
+FGIO::reinit()
+{
+}
+
 
 // process any IO channel work
 void