Update to the Mini FDM network protocal (mostly renaming class and file names)

[flightgear.git] / src / Network / httpd.cxx
diff --git a/src/Network/httpd.cxx b/src/Network/httpd.cxx

index 5cc4219262bb69ab99500da86d0c3cfe71e02550..162bf45ec6ec92816ce0b45f78d8f774205fba58 100644 (file)
--- a/src/Network/httpd.cxx
+++ b/src/Network/httpd.cxx
@@ -39,6 +39,7 @@
  #include <simgear/debug/logstream.hxx>
  #include <simgear/io/iochannel.hxx>
  #include <simgear/math/sg_types.hxx>
+#include <simgear/misc/commands.hxx>
  #include <simgear/misc/props.hxx>
  
  #include <Main/fg_props.hxx>
@@ -47,10 +48,8 @@
  #include "httpd.hxx"
  
  SG_USING_STD(string);
-#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
  SG_USING_STD(cout);
  SG_USING_STD(istrstream);
-#endif
  
  
  bool FGHttpd::open() {
@@ -62,7 +61,7 @@ bool FGHttpd::open() {
  
      server = new HttpdServer( port );
      
-    set_hz( 5 );                // default to processing requests @ 5Hz
+    set_hz( 15 );                // default to processing requests @ 15Hz
      set_enabled( true );
  
      return true;
@@ -97,7 +96,7 @@ void HttpdChannel::foundTerminator (void) {
          string request;
          string tmp;
  
-        unsigned int pos = rest.find( " " );
+        string::size_type pos = rest.find( " " );
          if ( pos != string::npos ) {
              request = rest.substr( 0, pos );
          } else {
@@ -127,21 +126,38 @@ void HttpdChannel::foundTerminator (void) {
                  }
  
                  printf("  arg = %s\n", arg.c_str() );
-                unsigned int apos = arg.find("=");
+                string::size_type apos = arg.find("=");
                  if ( apos != string::npos ) {
                      string a = arg.substr( 0, apos );
                      string b = arg.substr( apos + 1 );
                      printf("    a = %s  b = %s\n", a.c_str(), b.c_str() );
-                    if ( a == "value" ) {
-                        fgSetString( request, urlDecode(b) );
-                    } 
+                    if ( request == "/run.cgi" ) {
+                        // execute a command
+                        if ( a == "value" ) {
+                            SGPropertyNode args;
+                            if ( !globals->get_commands()
+                                 ->execute(urlDecode(b).c_str(), &args) )
+                            {
+                                SG_LOG( SG_GENERAL, SG_ALERT,
+                                        "Command " << urlDecode(b)
+                                        << " failed.");
+                            }
+
+                        }
+                    } else {
+                        if ( a == "value" ) {
+                            // update a property value
+                            fgSetString( request.c_str(),
+                                         urlDecode(b).c_str() );
+                        }
+                    }
                  }
              }
          } else {
              request = urlDecode(request);
         }
  
-        node = globals->get_props()->getNode(request);
+        node = globals->get_props()->getNode(request.c_str());
  
          string response = "";
          response += "<HTML LANG=\"en\">";
@@ -178,12 +194,7 @@ void HttpdChannel::foundTerminator (void) {
  
              for (int i = 0; i < node->nChildren(); i++) {
                  SGPropertyNode *child = node->getChild(i);
-                string name = child->getName();
-                if ( node->getChild(name, 1) ) {
-                    char buf[16];
-                    sprintf(buf, "[%d]", child->getIndex());
-                    name += buf;
-                }
+                string name = child->getDisplayName(true);
                  string line = "";
                  if ( child->nChildren() > 0 ) {
                      line += "<B><A HREF=\"";
@@ -197,7 +208,7 @@ void HttpdChannel::foundTerminator (void) {
                      line += "</A></B>";
                      line += "/<BR>";
                  } else {
-                    string value = node->getStringValue ( name, "" );
+                    string value = node->getStringValue ( name.c_str(), "" );
                      line += "<B>";
                      line += name;
                      line += "</B> <A HREF=\"";