Changeset 2393 for source

Timestamp:

Feb 10, 2009, 5:41:47 PM (16 years ago)

Author:

mies

Message:

added MessageData wrapper

Location:

source/ariba

Files:

• Makefile.am (modified) (2 diffs)
• tidy/DataMessage.cpp (added)
• tidy/DataMessage.h (added)
• tidy/Node.cpp (modified) (2 diffs)
• tidy/Node.h (modified) (4 diffs)
• tidy/TidyCommunicationListener.cpp (modified) (1 diff)
• tidy/TidyCommunicationListener.h (modified) (2 diffs)
• tidy/ariba.h (modified) (1 diff)

source/ariba/Makefile.am

@@ -53 +53 @@
   tidy/LinkProperties.h \
   tidy/TidyMessage.h \
+  tidy/DataMessage.h \
   tidy/Module.h \
   tidy/Name.h \
@@ -71 +72 @@
   tidy/TidyMessage.cpp \
   tidy/TidyMessage.h \
+  tidy/DataMessage.cpp \
+  tidy/DataMessage.h \
   tidy/Module.cpp \
   tidy/Module.h \

source/ariba/tidy/Node.cpp

@@ -178 +178 @@
 
 LinkID Node::establishLink(const NodeID& nid, const ServiceID& sid,
-                const LinkProperties& req, const Message* msg) {
+                const LinkProperties& req, const DataMessage& msg) {
         return context->getOverlay().establishLink(nid, sid);
 }
@@ -186 +186 @@
 }
 
-seqnum_t Node::sendMessage(Message* msg, const NodeID& nid,
+seqnum_t Node::sendMessage(const DataMessage& msg, const NodeID& nid,
                 const ServiceID& sid, const LinkProperties& req) {
-        return context->getOverlay().sendMessage(msg, nid, sid);
-}
-
-seqnum_t Node::sendMessage(Message* msg, const LinkID& lnk) {
-        return context->getOverlay().sendMessage(msg, lnk);
+        return context->getOverlay().sendMessage((Message*)msg, nid, sid);
+}
+
+seqnum_t Node::sendMessage(const DataMessage& msg, const LinkID& lnk) {
+        return context->getOverlay().sendMessage((Message*)msg, lnk);
 }
 

source/ariba/tidy/Node.h

@@ -53 +53 @@
 #include "AribaModule.h"
 #include "TidyCommunicationListener.h"
-#include "TidyMessage.h"
+#include "DataMessage.h"
 
 namespace ariba {
@@ -197 +197 @@
         LinkID establishLink(const NodeID& nid, const ServiceID& sid,
                         const LinkProperties& req = LinkProperties::DEFAULT,
-                        const Message* msg = NULL);
+                        const DataMessage& msg = DataMessage::UNSPECIFIED);
 
         /**
@@ -223 +223 @@
          * @return A sequence number
          */
-        seqnum_t sendMessage(Message* msg, const NodeID& nid, const ServiceID& sid,
+        seqnum_t sendMessage(const DataMessage& msg, const NodeID& nid, const ServiceID& sid,
                         const LinkProperties& req = LinkProperties::DEFAULT);
 
@@ -234 +234 @@
          * @param lnk The link to be used for sending the message
          */
-        seqnum_t sendMessage(Message* msg, const LinkID& lnk);
+        seqnum_t sendMessage(const DataMessage& msg, const LinkID& lnk);
 
         // --- communication listeners ---

source/ariba/tidy/TidyCommunicationListener.cpp

@@ -71 +71 @@
 
 // dummy
-bool CommunicationListener::onLinkRequest(const NodeID& remote, Message* msg) {
+bool CommunicationListener::onLinkRequest(const NodeID& remote,
+                const DataMessage& msg) {
         return false;
 }
 
 // dummy
-void CommunicationListener::onMessage(Message* msg, const NodeID& remote,
-                const LinkID& lnk) {
+void CommunicationListener::onMessage(const DataMessage& msg,
+                const NodeID& remote, const LinkID& lnk) {
 }
 
 // dummy
-void CommunicationListener::onMessageSent(seqnum_t seq_num, bool failed, Message* msg) {
+void CommunicationListener::onMessageSent(seqnum_t seq_num, bool failed,
+                const DataMessage& msg) {
 }
 

source/ariba/tidy/TidyCommunicationListener.h

@@ -49 +49 @@
 #include "Identifiers.h"
 #include "LinkProperties.h"
+#include "DataMessage.h"
 
 namespace ariba {
@@ -77 +78 @@
         // --- service specific events ---
 
-        virtual bool onLinkRequest(const NodeID& remote, Message* msg);
+        virtual bool onLinkRequest(const NodeID& remote, const DataMessage& msg);
 
         // --- general receive method ---
 
-        virtual void onMessage(Message* msg, const NodeID& remote,
+        virtual void onMessage(const DataMessage& msg, const NodeID& remote,
                         const LinkID& lnk = LinkID::UNSPECIFIED);
 
-        virtual void onMessageSent(seqnum_t seq_num, bool failed, Message* msg = NULL);
+        virtual void onMessageSent(seqnum_t seq_num, bool failed,
+                        const DataMessage& msg = DataMessage::UNSPECIFIED);
 
         // --- dht functionality ---

source/ariba/tidy/ariba.h

@@ -47 +47 @@
 #include "AribaModule.h"
 #include "LinkProperties.h"
-#include "TidyMessage.h"
+#include "DataMessage.h"
 #include "TidyCommunicationListener.h"
 #include "Name.h"