Changeset 7:bafe58db1509 in xplra for src

Timestamp:

01/04/13 12:50:45 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Added support for setting values

Location:

src/xplra

Files:

• GetDataRefTask.cc (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• Protocol.h (modified) (2 diffs)
• ServerThread.cc (modified) (4 diffs)
• ServerThread.h (modified) (1 diff)
• SetDataRefTask.cc (added)
• SetDataRefTask.h (added)

src/xplra/GetDataRefTask.cc

@@ -69 +69 @@
         if (!stream) return 0;
 
+        if (length>Protocol::MAX_LENGTH) {
+            result = Protocol::RESULT_INVALID_LENGTH;
+            return 0;
+        }
+        if (offset<0) {
+            result = Protocol::RESULT_INVALID_OFFSET;
+            return 0;
+        }
+
         if (type==Protocol::TYPE_FLOAT_ARRAY) {
             return new GetFloatArrayDataRefTask(name, length, offset);

src/xplra/Makefile.am

@@ -30 +30 @@
         TaskRequest.cc          \
         DataRefTask.cc          \
-        GetDataRefTask.cc
+        GetDataRefTask.cc       \
+        SetDataRefTask.cc
 
 libxplra_la_LIBADD=$(LIBXPLCOMMON_LIBS)
@@ -43 +44 @@
         TaskRequest.h           \
         DataRefTask.h           \
-        GetDataRefTask.h
+        GetDataRefTask.h        \
+        SetDataRefTask.h

src/xplra/Protocol.h

@@ -45 +45 @@
      */
     static const uint8_t COMMAND_GET_SINGLE = 0x01;
+
+    /**
+     * Command: set the value of a single dataref.
+     */
+    static const uint8_t COMMAND_SET_SINGLE = 0x02;
 
     /**
@@ -97 +102 @@
 
     /**
+     * Result code: invalid length
+     */
+    static const uint8_t RESULT_INVALID_LENGTH = 0x04;
+
+    /**
+     * Result code: invalid offset
+     */
+    static const uint8_t RESULT_INVALID_OFFSET = 0x05;
+
+    /**
      * Result code: other error
      */
     static const uint8_t RESULT_OTHER_ERROR = 0xff;
+
+    /**
+     * The maximal length we accept (in order to protect ourselves).
+     */
+    static const int MAX_LENGTH = 2048;
 };
 

src/xplra/ServerThread.cc

@@ -34 +34 @@
 #include "Protocol.h"
 #include "GetDataRefTask.h"
+#include "SetDataRefTask.h"
 #include "TaskRequest.h"
 
@@ -111 +112 @@
 
         if (command==Protocol::COMMAND_GET_SINGLE) {
-            if (!handleGetSingle(stream)) break;
+            if (!handleGetSingle()) break;
+        } else if (command==Protocol::COMMAND_SET_SINGLE) {
+            if (!handleSetSingle()) break;
         } else {
             stream.writeU8(Protocol::RESULT_INVALID_COMMAND);
@@ -123 +126 @@
 //------------------------------------------------------------------------------
 
-bool ServerThread::handleGetSingle(xplcommon::DataStream& stream)
+bool ServerThread::handleGetSingle()
 {
     uint8_t result = Protocol::RESULT_OK;
-
     GetDataRefTask* task = GetDataRefTask::create(result, stream);
 
     if (!stream) return false;
     else if (task==0) {
-        stream.writeU8(Protocol::RESULT_INVALID_TYPE);
+        stream.writeU8(result);
         return true;
     }
@@ -150 +152 @@
 //------------------------------------------------------------------------------
 
+bool ServerThread::handleSetSingle()
+{
+    uint8_t result = Protocol::RESULT_OK;
+    SetDataRefTask* task = SetDataRefTask::create(result, stream);
+
+    if (!stream) return false;
+    else if (task==0) {
+        stream.writeU8(result);
+        return true;
+    }
+
+    TaskRequest request(task);
+    if (!requestQueue.execute(&request)) return false;
+
+    stream.writeU8(task->isValid() ? Protocol::RESULT_OK :
+                   Protocol::RESULT_UNKNOWN_DATAREF);
+    return true;
+}
+
+//------------------------------------------------------------------------------
+
 // Local Variables:
 // mode: C++

src/xplra/ServerThread.h

@@ -129 +129 @@
      * @return true, if we can continue, false if the thread should quit
      */
-    bool handleGetSingle(xplcommon::DataStream& stream);
+    bool handleGetSingle();
+
+    /**
+     * Handle the COMMAND_SET_SINGLE command
+     *
+     * @return true, if we can continue, false if the thread should quit
+     */
+    bool handleSetSingle();
 };