-// httpd.hxx -- FGFS http property manager interface / external script
+// httpd.cxx -- FGFS http property manager interface / external script
// and control class
//
// Written by Curtis Olson, started June 2001.
//
-// Copyright (C) 2001 Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 2001 Curtis L. Olson - http://www.flightgear.org/~curt
//
// Jpeg Image Support added August 2001
// by Norman Vine - nhv@cape.com
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
// $Id$
#include <stdlib.h> // atoi() atof()
#include STL_STRING
-#include STL_STRSTREAM
#include <simgear/debug/logstream.hxx>
#include <simgear/io/iochannel.hxx>
#include <simgear/math/sg_types.hxx>
-#include <simgear/misc/props.hxx>
+#include <simgear/structure/commands.hxx>
+#include <simgear/props/props.hxx>
#include <Main/fg_props.hxx>
#include <Main/globals.hxx>
#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() {
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;
bool FGHttpd::close() {
- delete server;
+ SG_LOG( SG_IO, SG_INFO, "closing FGHttpd" );
+
+ // the following delete causes a seg fault, gdb is not helpful.
+ // delete server;
+
+ set_enabled( false );
return true;
}
string request;
string tmp;
- unsigned int pos = rest.find( " " );
+ string::size_type pos = rest.find( " " );
if ( pos != string::npos ) {
request = rest.substr( 0, pos );
- request = urlDecode(request);
} else {
request = "/";
}
string args = request.substr( pos + 1 );
request = request.substr( 0, pos );
printf("'%s' '%s'\n", request.c_str(), args.c_str());
+ request = urlDecode(request);
// parse args looking for "value="
bool done = false;
}
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, 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\">";
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=\"";
line += request;
- if ( request.substr(request.length() - 1, 1) != (string)"/" ) {
+ if ( request.substr(request.length() - 1, 1) != "/" ) {
line += "/";
}
line += urlEncode(name);
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=\"";
line += request;
- if ( request.substr(request.length() - 1, 1) != (string)"/" ) {
+ if ( request.substr(request.length() - 1, 1) != "/" ) {
line += "/";
}
line += urlEncode(name);
response += value;
response += "\" maxlength=2047>";
response += "<input type=submit value=\"update\" name=\"submit\">";
- response += "<FORM>";
- response += "<BR>";
+ response += "</FORM>";
}
response += "</BODY>";
response += getTerminator();
}
-// encode everything but "a-zA-Z0-9_.-/"
+// encode everything but "a-zA-Z0-9_.-/" (see RFC2396)
string HttpdChannel::urlEncode(string s) {
string r = "";