Changeset 7532 for source/ariba/AribaModule.h

Timestamp:

Feb 4, 2010, 5:29:37 PM (14 years ago)

Author:

Christoph Mayer

Message:

-von außen konfigurierbare bootstrap module, -periodicbroadcast crash fix

File:

• source/ariba/AribaModule.h (modified) (3 diffs)

source/ariba/AribaModule.h

@@ -44 +44 @@
 #include <ctime>
 #include <cstdlib>
-#include "ariba/utility/logging/Logging.h"
+#include <algorithm>
 
 using std::vector;
@@ -156 +156 @@
 
 private:
+
+        // bootstrap mechanisms
+        enum BootstrapMechanism {
+                BootstrapMechanismInvalid = 0,
+                BootstrapMechanismStatic = 1,
+                BootstrapMechanismBroadcast = 2,
+                BootstrapMechanismMulticastDNS = 3,
+                BootstrapMechanismSDP = 4,
+        };
+        static const string BootstrapMechanismNames[5];
+
         // bootstrap node
         class BootstrapNode {
         public:
                 inline BootstrapNode() :
-                        timestamp(0), desc(NULL) {
+                        timestamp(0), desc(NULL), mechanism(BootstrapMechanismInvalid), info("") {
 
                 }
                 inline BootstrapNode(const BootstrapNode& copy) :
-                        timestamp(copy.timestamp), desc(copy.desc) {
-                }
-                inline BootstrapNode(uint32_t timestamp,
-                                communication::EndpointDescriptor* desc) :
-                        timestamp(timestamp), desc(desc) {
+                        timestamp(copy.timestamp), desc(copy.desc), mechanism(copy.mechanism), info(copy.info) {
+                }
+                inline BootstrapNode(
+                                uint32_t timestamp,
+                                communication::EndpointDescriptor* desc,
+                                BootstrapMechanism mechanism, string info) :
+                        timestamp(timestamp), desc(desc), mechanism(mechanism), info(info) {
                 }
                 uint32_t timestamp;
                 communication::EndpointDescriptor* desc;
+                BootstrapMechanism mechanism;
+                string info;
         };
 
@@ -192 +207 @@
 protected:
         // members
-        string bootstrapFile; //< file with bootstrap information
-        string endpoints;
+        string endpoints; //< local endpoints the ariba module is bound to
         bool started; //< flag, if module has been started
 
         // bootstrap node management
-        void addBootstrapNode(const Name& spovnet,
-                        communication::EndpointDescriptor* desc);
+        void addBootstrapNode(
+                        const Name& spovnet,
+                        communication::EndpointDescriptor* desc,
+                        const string& info,
+                        const BootstrapMechanism& mechanism
+                        );
+        void addBootstrapNode(
+                        const Name& spovnet,
+                        const BootstrapNode& node
+                        );
+
+        vector<AribaModule::BootstrapMechanism> getBootstrapMechanisms(
+                        const Name& spovnet
+                        ) const;
+
         const communication::EndpointDescriptor* getBootstrapNode(
-                        const Name& spovnet) const;
+                        const Name& spovnet,
+                        const BootstrapMechanism mechanism
+                        ) const;
+
+        string getBootstrapInfo(
+                        const Name& spovnet,
+                        const BootstrapMechanism mechanism
+                        ) const;
 
         communication::BaseCommunication* base_comm;