#346 related: missing status message for property server

[flightgear.git] / src / Network / protocol.cxx

diff --git a/src/Network/protocol.cxx b/src/Network/protocol.cxx
index 1e5b7ca0d3d2a2c6a34384d1770607427053183b..69bda35f4e7d3e4736a45fb849bd6bbcff342df6 100644 (file)
--- a/src/Network/protocol.cxx
+++ b/src/Network/protocol.cxx
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started November 1999.
 //
-// Copyright (C) 1999  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 1999  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,20 +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$
 
 
-#include <Debug/logstream.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/io/iochannel.hxx>
 
-#include "iochannel.hxx"
 #include "protocol.hxx"
 
 
 FGProtocol::FGProtocol() :
     hz(0.0),
-    count_down(0),
+    count_down(0.0),
+    count(0),
     enabled(false)
 {
 }
@@ -42,15 +43,15 @@ FGProtocol::~FGProtocol() {
 // standard I/O channel open routine
 bool FGProtocol::open() {
     if ( is_enabled() ) {
-       FG_LOG( FG_IO, FG_ALERT, "This shouldn't happen, but the channel " 
+       SG_LOG( SG_IO, SG_ALERT, "This shouldn't happen, but the channel " 
                << "is already in use, ignoring" );
        return false;
     }
 
-    FGIOChannel *io = get_io_channel();
+    SGIOChannel *io = get_io_channel();
 
     if ( ! io->open( get_direction() ) ) {
-       FG_LOG( FG_IO, FG_ALERT, "Error opening channel communication layer." );
+       SG_LOG( SG_IO, SG_ALERT, "Error opening channel communication layer." );
        return false;
     }
 
@@ -62,21 +63,21 @@ bool FGProtocol::open() {
 
 // dummy process routine
 bool FGProtocol::process() {
-    FG_LOG( FG_IO, FG_INFO, "dummy FGProtocol::process()" );
+    SG_LOG( SG_IO, SG_INFO, "dummy FGProtocol::process()" );
     return false;
 }
 
 
 // dummy close routine
 bool FGProtocol::close() {
-    FG_LOG( FG_IO, FG_INFO, "dummy FGProtocol::close()" );
+    SG_LOG( SG_IO, SG_INFO, "dummy FGProtocol::close()" );
     return false;
 }
 
 
 // standard I/O channel close routine
 bool FGProtocol::gen_message() {
-    FGIOChannel *io = get_io_channel();
+    SGIOChannel *io = get_io_channel();
 
     set_enabled( false );
 
@@ -90,8 +91,19 @@ bool FGProtocol::gen_message() {
 
 // dummy close routine
 bool FGProtocol::parse_message() {
-    FG_LOG( FG_IO, FG_INFO, "dummy FGProtocol::close()" );
+    SG_LOG( SG_IO, SG_INFO, "dummy FGProtocol::close()" );
     return false;
 }
 
 
+void FGProtocol::set_direction( const string& d ) {
+    if ( d == "in" ) {
+       dir = SG_IO_IN;
+    } else if ( d == "out" ) {
+       dir = SG_IO_OUT;
+    } else if ( d == "bi" ) {
+       dir = SG_IO_BI;
+    } else {
+       dir = SG_IO_NONE;
+    }
+}