Added httpd protocol so you can interface to a running copy of FlightGear

via a web browser, see README.IO for more details.

src/Main/Makefile.am

@@ -79,7 +79,7 @@ fgfs_LDADD = \
 	-lsgmath -lsgbucket -lsgdebug -lsgmagvar -lsgmisc -lsgxml \
 	$(SERIAL_LIBS) \
 	$(THREAD_LIBS) \
-	-lplibpu -lplibfnt -lplibssg -lplibsg \
+	-lplibpu -lplibfnt -lplibnet -lplibssg -lplibsg \
 	-lmk4 -lz \
 	$(opengl_LIBS) \
 	$(audio_LIBS)

src/Main/fg_io.cxx

@@ -23,6 +23,8 @@
 
 #include <simgear/compiler.h>
 
+#include <stdlib.h>             // atoi()
+
 #include STL_STRING
 
 #include <simgear/debug/logstream.hxx>
@@ -36,6 +38,7 @@
 #include <Network/protocol.hxx>
 #include <Network/atlas.hxx>
 #include <Network/garmin.hxx>
+#include <Network/httpd.hxx>
 #include <Network/joyclient.hxx>
 #include <Network/native.hxx>
 #include <Network/native_ctrls.hxx>
@@ -57,6 +60,8 @@ io_container global_io_list;
 // configure a port based on the config string
 static FGProtocol *parse_port_config( const string& config )
 {
+    bool short_circuit = false;
+
     string::size_type begin, end;
 
     begin = 0;
@@ -80,6 +85,12 @@ static FGProtocol *parse_port_config( const string& config )
     } else if ( protocol == "garmin" ) {
 	FGGarmin *garmin = new FGGarmin;
 	io = garmin;
+    } else if ( protocol == "httpd" ) {
+        // determine port
+        string port = config.substr(begin);
+	FGHttpd *httpd = new FGHttpd( atoi(port.c_str()) );
+	io = httpd;
+        short_circuit = true;
     } else if ( protocol == "joyclient" ) {
 	FGJoyClient *joyclient = new FGJoyClient;
 	io = joyclient;
@@ -108,6 +119,7 @@ static FGProtocol *parse_port_config( const string& config )
 	return NULL;
     }
 
+    if ( ! short_circuit ) {
         // determine medium
         end = config.find(",", begin);
         if ( end == string::npos ) {
@@ -193,6 +205,7 @@ static FGProtocol *parse_port_config( const string& config )
             SGSocket *ch = new SGSocket( hostname, port, style_str );
             io->set_io_channel( ch );
         }
+    }
 
     return io;
 }

src/Main/main.cxx

@@ -60,6 +60,7 @@
 // #  include <GL/glext.h>
 // #endif
 
+#include <plib/netChat.h>
 #include <plib/pu.h>
 #include <plib/ssg.h>
 
@@ -1518,6 +1519,9 @@ int mainLoop( int argc, char **argv ) {
  	exit(-1);
     }
 
+    // Initialize plib net interface
+    netInit( &argc, argv );
+
     // Initialize ssg (from plib).  Needs to come before we do any
     // other ssg stuff, but after opengl/glut has been initialized.
     ssgInit();

src/Main/options.cxx

@@ -456,7 +456,7 @@ parse_fov( const string& arg ) {
 //  filename = file system file name
 
 static bool 
-parse_channel( const string& type, const string& channel_str ) {
+add_channel( const string& type, const string& channel_str ) {
     // cout << "Channel string = " << channel_str << endl;
 
     globals->get_channel_options_list()->push_back( type + "," + channel_str );
@@ -789,25 +789,27 @@ parse_option (const string& arg)
     } else if ( arg == "--hud-culled" ) {
         fgSetString("/sim/hud/frame-stat-type", "culled");
     } else if ( arg.find( "--atlas=" ) == 0 ) {
-	parse_channel( "atlas", arg.substr(8) );
+	add_channel( "atlas", arg.substr(8) );
+    } else if ( arg.find( "--httpd=" ) == 0 ) {
+	add_channel( "httpd", arg.substr(8) );
     } else if ( arg.find( "--native=" ) == 0 ) {
-	parse_channel( "native", arg.substr(9) );
+	add_channel( "native", arg.substr(9) );
     } else if ( arg.find( "--native-ctrls=" ) == 0 ) {
-	parse_channel( "native_ctrls", arg.substr(15) );
+	add_channel( "native_ctrls", arg.substr(15) );
     } else if ( arg.find( "--garmin=" ) == 0 ) {
-	parse_channel( "garmin", arg.substr(9) );
+	add_channel( "garmin", arg.substr(9) );
     } else if ( arg.find( "--nmea=" ) == 0 ) {
-	parse_channel( "nmea", arg.substr(7) );
+	add_channel( "nmea", arg.substr(7) );
     } else if ( arg.find( "--props=" ) == 0 ) {
-	parse_channel( "props", arg.substr(8) );
+	add_channel( "props", arg.substr(8) );
     } else if ( arg.find( "--pve=" ) == 0 ) {
-	parse_channel( "pve", arg.substr(6) );
+	add_channel( "pve", arg.substr(6) );
     } else if ( arg.find( "--ray=" ) == 0 ) {
-	parse_channel( "ray", arg.substr(6) );
+	add_channel( "ray", arg.substr(6) );
     } else if ( arg.find( "--rul=" ) == 0 ) {
-	parse_channel( "rul", arg.substr(6) );
+	add_channel( "rul", arg.substr(6) );
     } else if ( arg.find( "--joyclient=" ) == 0 ) {
-	parse_channel( "joyclient", arg.substr(12) );
+	add_channel( "joyclient", arg.substr(12) );
 #ifdef FG_NETWORK_OLK
     } else if ( arg == "--disable-network-olk" ) {
         fgSetBool("/sim/networking/olk", false);

src/Network/Makefile.am

@@ -4,6 +4,7 @@ libNetwork_a_SOURCES = \
 	protocol.cxx protocol.hxx \
 	atlas.cxx atlas.hxx \
 	garmin.cxx garmin.hxx \
+        httpd.cxx httpd.hxx \
 	joyclient.cxx joyclient.hxx \
 	native.cxx native.hxx \
 	native_ctrls.cxx native_ctrls.hxx \