Do not run the HoldDown code until after the aircraft is trimmed to prevent a devide...

[flightgear.git] / src / FDM / ExternalNet / ExternalNet.hxx

diff --git a/src/FDM/ExternalNet/ExternalNet.hxx b/src/FDM/ExternalNet/ExternalNet.hxx
index d314cfaa0b5b5084c485090181a250ff94ce7a38..899650b414771f597bf42728e8fa679c18cffe32 100644 (file)
--- a/src/FDM/ExternalNet/ExternalNet.hxx
+++ b/src/FDM/ExternalNet/ExternalNet.hxx
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started November 2001.
 //
-// Copyright (C) 2001  Curtis L. Olson  - curt@flightgear.org
+// Copyright (C) 2001  Curtis L. Olson  - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -16,55 +16,21 @@
 //
 // 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$
 
 #ifndef _EXTERNAL_NET_HXX
 #define _EXTERNAL_NET_HXX
 
-#include <plib/netBuffer.h>
-#include <plib/netSocket.h>
+#include <simgear/timing/timestamp.hxx> // fine grained timing measurements
+#include <simgear/io/raw_socket.hxx>
 
-#include <Network/raw_ctrls.hxx>
+#include <Network/net_ctrls.hxx>
 #include <Network/net_fdm.hxx>
-
 #include <FDM/flight.hxx>
 
 
-class HTTPClient : public netBufferChannel
-{
-
-    bool done;
-
-public:
-
-    HTTPClient ( cchar* host, int port, cchar* path ) :
-        done( false )
-    {
-       open ();
-       connect (host, port);
-
-       cchar* s = netFormat ( "GET %s HTTP/1.0\r\n\r\n", path );
-       bufferSend( s, strlen(s) ) ;
-    }
-
-    virtual void handleBufferRead (netBuffer& buffer)
-    {
-       const char* s = buffer.getData();
-       while (*s)
-           fputc(*s++,stdout);
-
-       printf("done\n");
-       buffer.remove();
-       printf("after buffer.remove()\n");
-        done = true;
-    }
-
-    bool isDone() const { return done; }
-};
-
-
 class FGExternalNet: public FGInterface {
 
 private:
@@ -72,20 +38,20 @@ private:
     int data_in_port;
     int data_out_port;
     int cmd_port;
-    string fdm_host;
+    std::string fdm_host;
 
-    netSocket data_client;
-    netSocket data_server;
+    simgear::Socket data_client;
+    simgear::Socket data_server;
 
     bool valid;
 
-    FGRawCtrls ctrls;
+    FGNetCtrls ctrls;
     FGNetFDM fdm;
 
 public:
 
     // Constructor
-    FGExternalNet( double dt, string host, int dop, int dip, int cp );
+    FGExternalNet( double dt, std::string host, int dop, int dip, int cp );
 
     // Destructor
     ~FGExternalNet();