Merge branch 'maint' into next

[flightgear.git] / src / Network / generic.hxx

diff --git a/src/Network/generic.hxx b/src/Network/generic.hxx
index 13b6202941e4d48a2e91cc8fcd1b4e35144ce658..1d07b1265efefa034699a14767ab62e34208e060 100644 (file)
--- a/src/Network/generic.hxx
+++ b/src/Network/generic.hxx
@@ -27,11 +27,11 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include "protocol.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 
 class FGGeneric : public FGProtocol {
@@ -53,6 +53,8 @@ public:
     // close the channel
     bool close();
 
+    void setExitOnError(bool val) { exitOnError = val; }
+    bool getExitOnError() { return exitOnError; }
 protected:
 
     enum e_type { FG_BOOL=0, FG_INT, FG_DOUBLE, FG_STRING };
@@ -63,7 +65,7 @@ protected:
         e_type type;
         double offset;
         double factor;
-        SGPropertyNode *prop;
+        SGPropertyNode_ptr prop;
     } _serial_prot;
 
 private:
@@ -71,6 +73,8 @@ private:
     int length;
     char buf[ FG_MAX_MSG_SIZE ];
 
+    string preamble;
+    string postamble;
     string var_separator;
     string line_separator;
     string var_sep_string;
@@ -78,8 +82,12 @@ private:
     vector<_serial_prot> _out_message;
     vector<_serial_prot> _in_message;
 
-    void read_config(SGPropertyNode *root, vector<_serial_prot> &msg);
+    bool binary_mode;
+    enum {FOOTER_NONE, FOOTER_LENGTH, FOOTER_MAGIC} binary_footer_type;
+    int binary_footer_value;
 
+    void read_config(SGPropertyNode *root, vector<_serial_prot> &msg);
+    bool exitOnError;
 };