Fix for bug 1304 - crash loading XML route

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

diff --git a/src/Network/generic.hxx b/src/Network/generic.hxx
index 6df4681935808896c219f7c22e0d01bd685800d6..fbc146d5c2adfbec68b1cbb0bce1d6fe544c93ea 100644 (file)
--- a/src/Network/generic.hxx
+++ b/src/Network/generic.hxx
@@ -33,7 +33,6 @@
 
 using std::string;
 
-
 class FGGeneric : public FGProtocol {
 
 public:
@@ -42,7 +41,7 @@ public:
     ~FGGeneric();
 
     bool gen_message();
-    bool parse_message();
+    bool parse_message_len(int length);
 
     // open hailing frequencies
     bool open();
@@ -57,9 +56,10 @@ public:
 
     void setExitOnError(bool val) { exitOnError = val; }
     bool getExitOnError() { return exitOnError; }
+    bool getInitOk(void) { return initOk; }
 protected:
 
-    enum e_type { FG_BOOL=0, FG_INT, FG_FLOAT, FG_DOUBLE, FG_STRING, FG_FIXED };
+    enum e_type { FG_BOOL=0, FG_INT, FG_FLOAT, FG_DOUBLE, FG_STRING, FG_FIXED, FG_BYTE, FG_WORD };
 
     typedef struct {
      // string name;
@@ -67,6 +67,9 @@ protected:
         e_type type;
         double offset;
         double factor;
+        double min, max;
+        bool wrap;
+        bool rel;
         SGPropertyNode_ptr prop;
     } _serial_prot;
 
@@ -95,10 +98,34 @@ private:
 
     bool gen_message_ascii();
     bool gen_message_binary();
-    bool parse_message_ascii();
-    bool parse_message_binary();
-    void read_config(SGPropertyNode *root, vector<_serial_prot> &msg);
+    bool parse_message_ascii(int length);
+    bool parse_message_binary(int length);
+    bool read_config(SGPropertyNode *root, vector<_serial_prot> &msg);
     bool exitOnError;
+    bool initOk;
+
+    class FGProtocolWrapper * wrapper;
+    
+    template<class T>
+    static void updateValue(_serial_prot& prot, const T& val)
+    {
+      T new_val = (prot.rel ? getValue<T>(prot.prop) : 0)
+                + prot.offset
+                + prot.factor * val;
+                
+      if( prot.max > prot.min )
+      {
+        if( prot.wrap )
+          new_val = SGMisc<double>::normalizePeriodic(prot.min, prot.max, new_val);
+        else
+          new_val = SGMisc<T>::clip(new_val, prot.min, prot.max);
+      }
+
+      setValue(prot.prop, new_val);
+    }
+    
+    // Special handling for bool (relative change = toggle, no min/max, no wrap)
+    static void updateValue(_serial_prot& prot, bool val);
 };