New upstream version 8.1.0

mon/source/net/message/NetMessageFactory.cpp

@@ -0,0 +1,49 @@
+#include <common/net/message/SimpleMsg.h>
+#include <common/net/message/NetMessageTypes.h>
+#include <common/net/message/mon/RequestMetaDataRespMsg.h>
+#include <common/net/message/mon/RequestStorageDataRespMsg.h>
+#include <common/net/message/control/DummyMsg.h>
+#include <common/net/message/control/GenericResponseMsg.h>
+#include <common/net/message/nodes/GetClientStatsRespMsg.h>
+#include <common/net/message/nodes/GetMirrorBuddyGroupsRespMsg.h>
+#include <common/net/message/nodes/GetNodesRespMsg.h>
+#include <common/net/message/nodes/GetTargetMappingsRespMsg.h>
+#include <common/net/message/storage/lookup/FindOwnerRespMsg.h>
+
+#include <net/message/nodes/HeartbeatMsgEx.h>
+
+#include "NetMessageFactory.h"
+
+/**
+ * @return NetMessage that must be deleted by the caller
+ * (msg->msgType is NETMSGTYPE_Invalid on error)
+ */
+std::unique_ptr<NetMessage> NetMessageFactory::createFromMsgType(unsigned short msgType) const
+{
+   NetMessage* msg;
+
+   switch(msgType)
+   {
+      // The following lines shoudle be grouped by "type of the message" and ordered alphabetically
+      // inside the groups. There should always be one message per line to keep a clear layout
+      // (although this might lead to lines that are longer than usual)
+
+      case NETMSGTYPE_FindOwnerResp: { msg = new FindOwnerRespMsg(); } break;
+      case NETMSGTYPE_GenericResponse: { msg = new GenericResponseMsg(); } break;
+      case NETMSGTYPE_GetClientStatsResp: { msg = new GetClientStatsRespMsg(); } break;
+      case NETMSGTYPE_GetMirrorBuddyGroupsResp: { msg = new GetMirrorBuddyGroupsRespMsg(); } break;
+      case NETMSGTYPE_GetNodesResp: { msg = new GetNodesRespMsg(); } break;
+      case NETMSGTYPE_GetTargetMappingsResp: { msg = new GetTargetMappingsRespMsg(); } break;
+      case NETMSGTYPE_Heartbeat: { msg = new HeartbeatMsgEx(); } break;
+      case NETMSGTYPE_RequestMetaDataResp: { msg = new RequestMetaDataRespMsg(); } break;
+      case NETMSGTYPE_RequestStorageDataResp: { msg = new RequestStorageDataRespMsg(); } break;
+
+      default:
+      {
+         msg = new SimpleMsg(NETMSGTYPE_Invalid);
+      } break;
+   }
+
+   return std::unique_ptr<NetMessage>(msg);
+}
+

mon/source/net/message/NetMessageFactory.h

@@ -0,0 +1,13 @@
+#ifndef NETMESSAGEFACTORY_H_
+#define NETMESSAGEFACTORY_H_
+
+#include <common/Common.h>
+#include <common/net/message/AbstractNetMessageFactory.h>
+
+class NetMessageFactory : public AbstractNetMessageFactory
+{
+   protected:
+      virtual std::unique_ptr<NetMessage> createFromMsgType(unsigned short msgType) const override;
+} ;
+
+#endif /*NETMESSAGEFACTORY_H_*/

mon/source/net/message/nodes/HeartbeatMsgEx.h

@@ -0,0 +1,11 @@
+#ifndef HEARTBEATMSGEX_H_
+#define HEARTBEATMSGEX_H_
+
+#include <common/net/message/nodes/HeartbeatMsg.h>
+
+// This is only a dummy so the mgmt download doesn't fail
+
+class HeartbeatMsgEx : public HeartbeatMsg
+{};
+
+#endif /*HEARTBEATMSGEX_H_*/