Changeset 5481 for source/ariba

Timestamp:

Jul 30, 2009, 1:06:58 PM (15 years ago)

Author:

mies

Message:

 

Location:

source/ariba

Files:

• overlay/BaseOverlay.cpp (modified) (5 diffs)
• overlay/BaseOverlay.h (modified) (1 diff)
• utility/messages/Message.h (modified) (1 diff)
• utility/system/StartupWrapper.cpp (modified) (1 diff)
• utility/transport/rfcomm/rfcomm.cpp (modified) (3 diffs)

source/ariba/overlay/BaseOverlay.cpp

@@ -114 +114 @@
 
 /// find a proper relay node
-const NodeID BaseOverlay::findRelayNode( const NodeID& id ) {
+const NodeID BaseOverlay::findRelayNode( const NodeID id ) {
         LinkDescriptor* rld = NULL;
         NodeID relayNode = NodeID::UNSPECIFIED;
@@ -133 +133 @@
                 else relayNode = rld->remoteNode;
         }
-        logging_force( "Potential relay node " << relayNode.toString() );
+
+        // if first relay is unknown choose a arbitrary direct node as relay
+        if ( relayNode.isUnspecified() ) {
+                for (size_t i=0; i<links.size(); i++)
+                        if (links[i]->up &&
+                                links[i]->communicationUp &&
+                                !links[i]->relay &&
+                                links[i]->keepAliveMissed <= 1 &&
+                                links[i]->service == OverlayInterface::OVERLAY_SERVICE_ID) {
+                                relayNode = links[i]->remoteNode;
+                                break;
+                        }
+        }
+
         // do not return myself or use the node as relay node
         if (relayNode == nodeId)
@@ -189 +202 @@
 }
 
+/// routes a message over the overlay or directly sends it when a link is open
+seqnum_t BaseOverlay::sendOverlay( Message* message, const NodeID& nodeid ) {
+        for (size_t i=0; i<links.size(); i++)
+                if ( links[i]->up &&
+                links[i]->communicationUp &&
+                !links[i]->relay &&
+                links[i]->keepAliveMissed <= 1 &&
+                links[i]->remoteNode == nodeid &&
+                links[i]->service == OverlayInterface::OVERLAY_SERVICE_ID) {
+                        return sendMessage( message, links[i] );
+                        break;
+                }
+        overlayInterface->routeMessage(nodeid, message);
+        return 0;
+}
+
 /// creates a link descriptor, apply relay semantics if possible
 LinkDescriptor* BaseOverlay::createLinkDescriptor(
-        const NodeID& remoteNode, const ServiceID& service, const LinkID& link_id ) {
+        const NodeID remoteNode, const ServiceID service, const LinkID link_id ) {
 
         // find listener
@@ -1321 +1350 @@
                                         if (relayMsg->getRelayNode() == nodeId || relayMsg->getRelayNode().isUnspecified()) {
                                                 logging_info("Routing relay message to " << relayMsg->getDestNode().toString() );
-                                                overlayInterface->routeMessage(relayMsg->getDestNode(), &_overMsg );
+                                                sendOverlay( &_overMsg, relayMsg->getDestNode() );
                                         } else {
                                                 logging_info("Routing relay message to " << relayMsg->getRelayNode().toString() );
-                                                overlayInterface->routeMessage(relayMsg->getRelayNode(), &_overMsg );
+                                                sendOverlay( &_overMsg, relayMsg->getRelayNode() );
                                         }
                                         return true;
@@ -1354 +1383 @@
 
                                                 /// this must be handled by using relay link!
-                                                overlayInterface->routeMessage(relayMsg->getDestNode(), &_overMsg );
+                                                sendOverlay(&_overMsg, relayMsg->getDestNode());
                                                 return true;
                                         }

source/ariba/overlay/BaseOverlay.h

@@ -415 +415 @@
 
         /// find a proper relay node that is directly connected to this node
-        const NodeID findRelayNode( const NodeID& id );
+        const NodeID findRelayNode( const NodeID id );
 
         /// forwards a message over relays/overlay/directly using link descriptor
         seqnum_t sendMessage( Message* message, const LinkDescriptor* ld );
 
+        /// routes a message over the overlay or directly sends it when a link is open
+        seqnum_t sendOverlay( Message* message, const NodeID& nodeid );
+
         /// creates a link descriptor, applys relay semantics if possible
         LinkDescriptor* createLinkDescriptor(
-                const NodeID& remoteNode, const ServiceID& service, const LinkID& link_id );
+                const NodeID remoteNode, const ServiceID service, const LinkID link_id );
 
         // map of a link request map a nonce to a LinkID

source/ariba/utility/messages/Message.h

@@ -209 +209 @@
                         T* payloadMsg = new T();
                         data_deserialize( payloadMsg, payload );
+                        dropPayload();
                         return payloadMsg;
                 }

source/ariba/utility/system/StartupWrapper.cpp

@@ -126 +126 @@
                         log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger("rfcomm"));
                         logger->setLevel(log4cxx::Level::getAll());
-        }
+        }*/
          */
 

source/ariba/utility/transport/rfcomm/rfcomm.cpp

@@ -354 +354 @@
         // check error
         if (error) {
-                logging_error("Failed to receive message payload. Error code: "
-                        << error.message() );
+                logging_error("Failed to receive message payload. Error: " << error.message() );
                 shutdown(info);
                 return;
@@ -384 +383 @@
         if (info->sending || !info->up || info->send_buffer.size()==0) return;
 
+        // set sending flag
         info->sending = true;
-        logging_debug("Sending messages ...");
 
         // safely remove data from deque
@@ -415 +414 @@
         // handle error
         if (error) {
-                logging_error( "Message sent error. Error code: "<< error.message() );
+                logging_error( "Message sent error. Error: " << error.message() );
                 info->sending = false;
                 shutdown(info);