httpd: fix ignored port on --httpd=nnnn

also fix unconditional startup of the daemon

diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index 694ffd3e26a302d6084dab1d038bc84dc18551c4..9ec346493123b6622741edbfc217152f9cb0ab1f 100644 (file)
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -955,7 +955,7 @@ fgOptHttpd( const char * arg )
 {
     int port = atoi(arg);
     if( port > 0 ) {
-        fgSetInt( string(flightgear::http::PROPERTY_ROOT).append("/listening-port").c_str(), port );
+        fgSetInt( string(flightgear::http::PROPERTY_ROOT).append("/options/listening-port").c_str(), port );
     }
     return FG_OPTIONS_OK;
 }

diff --git a/src/Network/http/httpd.cxx b/src/Network/http/httpd.cxx
index 9fd2f31f1a27960670fc1f7c2efddd9837103088..ea0f37145743f9a49844070f5cc91031fccc812d 100644 (file)
--- a/src/Network/http/httpd.cxx
+++ b/src/Network/http/httpd.cxx
@@ -237,7 +237,11 @@ int MongooseHttpd::staticRequestHandler( struct mg_connection * connection )
 
 FGHttpd * FGHttpd::createInstance( SGPropertyNode_ptr configNode )
 {
-  return configNode.valid() ? new MongooseHttpd( configNode ) : NULL;
+  // only create a server if a port has been configured
+  if( false == configNode.valid() ) return NULL;
+  string port = configNode->getStringValue( "options/listening-port", "" );
+  if( port.empty() ) return NULL;
+  return new MongooseHttpd( configNode );
 }
 
 } // namespace http