Changeset 5870 for source/ariba/overlay/modules/chord/messages

Timestamp:

Aug 11, 2009, 4:11:02 PM (15 years ago)

Author:

Christoph Mayer

Message:

merge noch nicht fertig

Location:

source/ariba/overlay/modules/chord/messages

Files:

• ChordMessage.cpp (deleted)
• ChordMessage.h (deleted)
• Discovery.cpp (modified) (1 diff)
• Discovery.h (modified) (4 diffs)

source/ariba/overlay/modules/chord/messages/Discovery.cpp

@@ -44 +44 @@
 vsznDefault(Discovery);
 
-Discovery::Discovery(){
-}
-
 Discovery::~Discovery(){
 }

source/ariba/overlay/modules/chord/messages/Discovery.h

@@ -41 +41 @@
 
 #include <vector>
+
 #include "ariba/utility/messages.h"
 #include "ariba/utility/serialization.h"
@@ -61 +62 @@
         VSERIALIZEABLE;
 public:
-        enum follow_type_ {
-                normal = 0,
-                successor = 1,
-                predecessor = 2
+        enum type_ {
+                invalid = 0,
+                normal = 1,
+                successor = 2,
+                predecessor = 3
         };
 
-        Discovery( const Discovery& msg ) {
-                this->follow_type = msg.follow_type;
-                this->ttl = msg.ttl;
-                this->source_relay = msg.source_relay;
-                this->source_endpoint = msg.source_endpoint;
+        Discovery( const Discovery& msg ) : type(msg.type), ttl(msg.ttl),
+                endpoint(msg.endpoint) {
         }
-        explicit Discovery();
+        Discovery( type_ type = invalid, uint8_t ttl = 4,
+                const EndpointDescriptor& endpoint = EndpointDescriptor::UNSPECIFIED() )
+        : type(type),  ttl(ttl), endpoint(endpoint) {
+        }
         virtual ~Discovery();
 
-        const EndpointDescriptor* getSourceEndpoint() const {
-                return &source_endpoint;
+        inline type_ getType() const {
+                return (type_)type;
         }
 
-        void setSourceEndpoint( const EndpointDescriptor* endpoint ) {
-                source_endpoint = *endpoint;
+        inline void setType( type_ type ) {
+                this->type = type;
         }
 
@@ -92 +94 @@
         }
 
-        inline follow_type_ getFollowType() const {
-                return (follow_type_)follow_type;
+        inline const EndpointDescriptor& getEndpoint() const {
+                return endpoint;
         }
 
-        inline void setFollowType( follow_type_ type ) {
-                follow_type = (uint8_t)type;
+        inline void setEndpoint( const EndpointDescriptor& endpoint ) {
+                this->endpoint = endpoint;
         }
 
-        inline void setSourceRelay( const NodeID& relay ) {
-                source_relay = relay;
-        }
-
-        inline const NodeID& getSourceRelay() const {
-                return source_relay;
-        }
 private:
-        uint8_t follow_type;
+        uint8_t type;
         uint8_t ttl;
-        EndpointDescriptor source_endpoint;
-        NodeID source_relay;
+        EndpointDescriptor endpoint;
 };
 
@@ -117 +111 @@
 
 sznBeginDefault( ariba::overlay::Discovery, X ) {
-        /// serialize follow-type and time-to-live
-        X && follow_type && ttl;
-
-        // serialize end-point
-        X && &source_relay && source_endpoint;
+        X && type && ttl && endpoint;
 } sznEnd();