- Moved osiSockAddr comparators to 'inetAddressUtil.h'

- moved serve response handler implementation(s) to '/server' and fixed #includes and Makefile
2011-01-05 10:29:46 +01:00
parent 544fc6bd73
commit 5f6652af0b
8 changed files with 157 additions and 96 deletions
--- a/pvAccessApp/server/responseHandlers.cpp
+++ b/pvAccessApp/server/responseHandlers.cpp
@@ -0,0 +1,123 @@
+/*
+ * responseHandlers.cpp
+ *
+ *  Created on: Jan 4, 2011
+ *      Author: Miha Vitorovic
+ */
+
+#include "responseHandlers.h"
+#include "remote.h"
+#include "hexDump.h"
+
+#include <byteBuffer.h>
+
+#include <osiSock.h>
+#include <errlog.h>
+
+#include <sstream>
+
+using std::ostringstream;
+using std::hex;
+
+using namespace epics::pvData;
+
+namespace epics {
+    namespace pvAccess {
+
+        void AbstractResponseHandler::handleResponse(osiSockAddr* responseFrom,
+                Transport* transport, int8 version, int8 command,
+                int payloadSize, ByteBuffer* payloadBuffer) {
+            if(_debug) {
+                char ipAddrStr[48];
+                ipAddrToA(&responseFrom->ia, ipAddrStr, sizeof(ipAddrStr));
+
+                ostringstream prologue;
+                prologue<<"Message ["<<command<<", v"<<hex<<version;
+                prologue<<"] received from "<<ipAddrStr;
+
+                hexDump(prologue.str(), _description,
+                        (const int8*)payloadBuffer->getArray(),
+                        payloadBuffer->getPosition(), payloadSize);
+            }
+        }
+
+        void BadResponse::handleResponse(osiSockAddr* responseFrom,
+                Transport* transport, int8 version, int8 command,
+                int payloadSize, ByteBuffer* payloadBuffer) {
+            AbstractServerResponseHandler::handleResponse(responseFrom,
+                    transport, version, command, payloadSize, payloadBuffer);
+
+            char ipAddrStr[48];
+            ipAddrToA(&responseFrom->ia, ipAddrStr, sizeof(ipAddrStr));
+
+            errlogSevPrintf(errlogInfo,
+                    "Undecipherable message (bad response type %d) from %s.",
+                    command, ipAddrStr);
+
+        }
+
+        ServerResponseHandler::ServerResponseHandler(ServerContextImpl* context) :
+            _context(context) {
+
+            BadResponse* badResponse = new BadResponse(context);
+
+            _handlerTable = new ResponseHandler*[HANDLER_TABLE_LENGTH];
+            // TODO add real handlers, as they are developed
+            _handlerTable[0] = badResponse;
+            _handlerTable[1] = badResponse;
+            _handlerTable[2] = badResponse;
+            _handlerTable[3] = badResponse;
+            _handlerTable[4] = badResponse;
+            _handlerTable[5] = badResponse;
+            _handlerTable[6] = badResponse;
+            _handlerTable[7] = badResponse;
+            _handlerTable[8] = badResponse;
+            _handlerTable[9] = badResponse;
+            _handlerTable[10] = badResponse;
+            _handlerTable[11] = badResponse;
+            _handlerTable[12] = badResponse;
+            _handlerTable[13] = badResponse;
+            _handlerTable[14] = badResponse;
+            _handlerTable[15] = badResponse;
+            _handlerTable[16] = badResponse;
+            _handlerTable[17] = badResponse;
+            _handlerTable[18] = badResponse;
+            _handlerTable[19] = badResponse;
+            _handlerTable[20] = badResponse;
+            _handlerTable[21] = badResponse;
+            _handlerTable[22] = badResponse;
+            _handlerTable[23] = badResponse;
+            _handlerTable[24] = badResponse;
+            _handlerTable[25] = badResponse;
+            _handlerTable[26] = badResponse;
+            _handlerTable[27] = badResponse;
+        }
+
+        ServerResponseHandler::~ServerResponseHandler() {
+            delete _handlerTable[0];
+            delete[] _handlerTable;
+        }
+
+        void ServerResponseHandler::handleResponse(osiSockAddr* responseFrom,
+                Transport* transport, int8 version, int8 command,
+                int payloadSize, ByteBuffer* payloadBuffer) {
+            if(command<0||command>=HANDLER_TABLE_LENGTH) {
+                errlogSevPrintf(errlogMinor,
+                        "Invalid (or unsupported) command: %d.", command);
+                // TODO remove debug output
+                ostringstream name;
+                name<<"Invalid CA header "<<command;
+                name<<" + , its payload buffer";
+
+                hexDump(name.str(), (const int8*)payloadBuffer->getArray(),
+                        payloadBuffer->getPosition(), payloadSize);
+                return;
+            }
+
+            // delegate
+            _handlerTable[command]->handleResponse(responseFrom, transport,
+                    version, command, payloadSize, payloadBuffer);
+        }
+
+    }
+}