Changeset 6919 for source/ariba/overlay

Timestamp:

Nov 13, 2009, 1:41:34 PM (15 years ago)

Author:

mies

Message:

Fixed tons of warnings when using CXXFLAGS="-Wall"!

Location:

source/ariba/overlay

Files:

• BaseOverlay.cpp (modified) (6 diffs)
• OverlayBootstrap.h (modified) (1 diff)
• messages/DHTMessage.cpp (modified) (3 diffs)
• messages/DHTMessage.h (modified) (1 diff)
• messages/OverlayMsg.h (modified) (1 diff)
• modules/OverlayInterface.h (modified) (2 diffs)
• modules/chord/Chord.cpp (modified) (5 diffs)
• modules/chord/detail/chord_routing_table.hpp (modified) (1 diff)
• modules/onehop/OneHop.cpp (modified) (1 diff)

source/ariba/overlay/BaseOverlay.cpp

@@ -148 +148 @@
         static bool equals( const Data& lhs, const Data& rhs ) {
                 if (rhs.getLength()!=lhs.getLength()) return false;
-                for (int i=0; i<lhs.getLength()/8; i++)
+                for (size_t i=0; i<lhs.getLength()/8; i++)
                         if (lhs.getBuffer()[i] != rhs.getBuffer()[i]) return false;
                 return true;
@@ -604 +604 @@
         message->setDestinationNode(remote);
         message->setService(service);
-        send( message, remote );
+        return send( message, remote );
 }
 
@@ -747 +747 @@
 
 BaseOverlay::BaseOverlay() :
-                        bc(NULL), overlayInterface(NULL), nodeId(NodeID::UNSPECIFIED),
-                        spovnetId(SpoVNetID::UNSPECIFIED), state(BaseOverlayStateInvalid),
-                        sideport(&SideportListener::DEFAULT), started(false), counter(0) {
+                        started(false),state(BaseOverlayStateInvalid),
+                        bc(NULL),
+                        nodeId(NodeID::UNSPECIFIED), spovnetId(SpoVNetID::UNSPECIFIED),
+                        sideport(&SideportListener::DEFAULT), overlayInterface(NULL),
+                        counter(0) {
         dht = new DHT();
         localDHT = new DHT();
@@ -1158 +1160 @@
         sideport = _sideport;
         _sideport->configure( this );
+        return true;
 }
 
 bool BaseOverlay::unregisterSidePort(SideportListener* _sideport) {
         sideport = &SideportListener::DEFAULT;
+        return true;
 }
 
@@ -1789 +1793 @@
         // erase the original descriptor
         eraseDescriptor(ld->overlayId);
+        return true;
 }
 
@@ -2182 +2187 @@
 void BaseOverlay::dhtPut( const Data& key, const Data& value, int ttl, bool replace, bool no_local_refresh ) {
 
-        logging_info("DHT: putting key=" <<  key
-                        << " value=" << value
-                        << " ttl=" << ttl
-                        << " replace=" << replace
+        logging_info("DHT: putting key=" << key << " value=" << value
+                << " ttl=" << ttl << " replace=" << replace
         );
 

source/ariba/overlay/OverlayBootstrap.h

@@ -106 +106 @@
                         nodeid = rhs.nodeid;
                         endpoint = rhs.endpoint;
+                        return *this;
                 }
 

source/ariba/overlay/messages/DHTMessage.cpp

@@ -10 +10 @@
 DHTMessage::DHTMessage() {
         this->key.setLength(0);
-        this->ttl =0 ;
+        this->ttl = 0;
         this->replace = false;
 }
@@ -18 +18 @@
         this->hash = NodeID::sha1( key.getBuffer(), key.getLength() / 8 );
         this->key = key.clone();
-        this->ttl =0 ;
+        this->ttl = 0;
         this->replace = false;
 }
@@ -26 +26 @@
         this->hash = NodeID::sha1( key.getBuffer(), key.getLength() / 8 );
         this->key = key.clone();
-        this->values.push_back(  value.clone() );
-        this->ttl =0 ;
+        this->values.push_back( value.clone() );
+        this->ttl = 0;
         this->replace = false;
 }
 
 DHTMessage::DHTMessage( const Data& key, const vector<Data>& values ) {
+        this->hash = NodeID::sha1( key.getBuffer(), key.getLength() / 8 );
         this->key = key.clone();
         BOOST_FOREACH(const Data value, values )
-                        this->values.push_back( value.clone() );
+                this->values.push_back( value.clone() );
+        this->ttl = 0;
         this->replace = false;
 }

source/ariba/overlay/messages/DHTMessage.h

@@ -33 +33 @@
 
         bool hasValues() const {
-                values.size() != 0;
+                return values.size() != 0;
         }
 

source/ariba/overlay/messages/OverlayMsg.h

@@ -213 +213 @@
         uint8_t increaseNumHops() {
                 hops++;
+                return hops;
         }
 

source/ariba/overlay/modules/OverlayInterface.h

@@ -179 +179 @@
         BaseOverlay& baseoverlay;
 
-        /// The parameters of the overlay structure
-        OverlayParameterSet parameters;
-
         /// The node identifier to use with this overlay
         const NodeID& nodeid;
@@ -187 +184 @@
         /// The listener used to inform about overlay structure changes
         OverlayStructureEvents* eventsReceiver;
+
+        /// The parameters of the overlay structure
+        OverlayParameterSet parameters;
 
         /// The service identifer of this overlay

source/ariba/overlay/modules/chord/Chord.cpp

@@ -79 +79 @@
 
         // check if we already have a connection
-        for (int i=0; i<table->size(); i++)
+        for (size_t i=0; i<table->size(); i++)
                 if ((*table)[i]->ref_count > 0 && (*table)[i]->id == remote && !((*table)[i]->info.isUnspecified()))
                         return LinkID::UNSPECIFIED;
@@ -291 +291 @@
 
         // handle messages
-        switch (m->getType()) {
+        switch ((signalMessageTypes)m->getType()) {
 
         // discovery request
@@ -317 +317 @@
                         setup( dmsg->getEndpoint(), m->getSourceNode() );
 
-                // delegate discovery message
+                // process discovery message -------------------------- switch start --
                 switch (dmsg->getType()) {
 
@@ -388 +388 @@
                         baseoverlay.send(&omsg, omsg.getDestinationNode());
                         break;
-                }}
+                }
+                case Discovery::invalid:
+                        break;
+
+                default:
+                        break;
+                }
+                // process discovery message ---------------------------- switch end --
+
                 delete dmsg;
                 break;
@@ -426 +434 @@
                 // updating neighbors
                 logging_debug("Discover new ring neighbors");
-                for (int i=0; i<table->size(); i++) {
+                for (size_t i=0; i<table->size(); i++) {
                         LinkID id = (*table)[i]->info;
                         if (!id.isUnspecified()) discover_neighbors(id);

source/ariba/overlay/modules/chord/detail/chord_routing_table.hpp

@@ -92 +92 @@
 private:
         // maximum number of fingers
-        static const int max_fingers = 32;
+        static const size_t max_fingers = 32;
 
         // the own node id

source/ariba/overlay/modules/onehop/OneHop.cpp

@@ -241 +241 @@
         if( onemsg->isType( OneHopMessage::OneHopMessageTypeListingRequest ) ){
 
-                NodeListingRequest* request = onemsg->decapsulate<NodeListingRequest>();
+                //NodeListingRequest* request = onemsg->decapsulate<NodeListingRequest>();
 
                 logging_info( "onehop received node listing request from node " << remote.toString() );