Changeset 5:94fdd791268f in xplra

Timestamp:

01/03/13 18:27:08 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Extracted the protocol-related constants into their own class

Location:

src/xplra

Files:

• Makefile.am (modified) (1 diff)
• Protocol.h (added)
• ServerThread.cc (modified) (5 diffs)
• ServerThread.h (modified) (1 diff)

src/xplra/Makefile.am

@@ -37 +37 @@
         Request.h               \
         RequestQueue.h          \
+        Protocol.h              \
         ServerThread.h          \
         Task.h                  \

src/xplra/ServerThread.cc

@@ -32 +32 @@
 
 #include "RequestQueue.h"
+#include "Protocol.h"
 #include "GetDataRefTask.h"
 #include "TaskRequest.h"
@@ -109 +110 @@
         //             this, command);
 
-        if (command==CMD_GET_SINGLE) {
+        if (command==Protocol::CMD_GET_SINGLE) {
             string name = stream.readString();
             uint8_t type = stream.readU8();
@@ -115 +116 @@
             // Util::debug("hu.varadiistvan.xplra.ServerThread[%p]::run: name='%s', type=0x%02x\n",
             //             this, name.c_str(), type);
-            if (type==TYPE_BYTE_ARRAY) {
+            if (type==Protocol::TYPE_BYTE_ARRAY) {
                 int length = stream.readS32();
                 if (!stream) continue;
@@ -128 +129 @@
                 if (requestQueue.execute(&request)) {
                     // Util::debug("hu.varadiistvan.xplra.ServerThread[%p]::run: request executed\n");
-                    stream.writeU8(RESULT_OK);
+                    stream.writeU8(Protocol::RESULT_OK);
                     int length = task->getLength();
                     stream.writeS32(length);
@@ -138 +139 @@
                 }
             } else {
-                stream.writeU8(RESULT_OTHER_ERROR);
+                stream.writeU8(Protocol::RESULT_OTHER_ERROR);
             }
         } else {
-            stream.writeU8(RESULT_INVALID_COMMAND);
+            stream.writeU8(Protocol::RESULT_INVALID_COMMAND);
         }
         stream.flush();

src/xplra/ServerThread.h

@@ -57 +57 @@
 class ServerThread : public xplcommon::Thread
 {
-public:
-    /**
-     * Command: get the value of a single dataref.
-     */
-    static const uint8_t CMD_GET_SINGLE = 0x01;
-
-    /**
-     * Data type: int
-     */
-    static const uint8_t TYPE_INT = 0x01;
-
-    /**
-     * Data type: float
-     */
-    static const uint8_t TYPE_FLOAT = 0x02;
-
-    /**
-     * Data type: double
-     */
-    static const uint8_t TYPE_DOUBLE = 0x03;
-
-    /**
-     * Data type: float array
-     */
-    static const uint8_t TYPE_FLOAT_ARRAY = 0x11;
-
-    /**
-     * Data type: int array
-     */
-    static const uint8_t TYPE_INT_ARRAY = 0x12;
-
-    /**
-     * Data type: byte array
-     */
-    static const uint8_t TYPE_BYTE_ARRAY = 0x13;
-
-    /**
-     * Result code: no error, everything is OK.
-     */
-    static const uint8_t RESULT_OK = 0x00;
-
-    /**
-     * Result code: invalid command
-     */
-    static const uint8_t RESULT_INVALID_COMMAND = 0x01;
-
-    /**
-     * Result code: unknown dataref
-     */
-    static const uint8_t RESULT_UNKNOWN_DATAREF = 0x02;
-
-    /**
-     * Result code: invalid type
-     */
-    static const uint8_t RESULT_INVALID_TYPE = 0x03;
-
-    /**
-     * Result code: other error
-     */
-    static const uint8_t RESULT_OTHER_ERROR = 0xff;
-
 private:
     /**