Changeset 5284 for source/ariba/overlay

Timestamp:

Jul 24, 2009, 3:23:11 PM (15 years ago)

Author:

mies

Message:

+ added new transport modules and adapted ariba to them
+ exchange endpoint descriptors an link establishment
+ clean up of base communication
+ link establishment with in the presence of multiple endpoints
+ local discovery for ipv6, ipv4 and bluetooth mac addresses

Location:

source/ariba/overlay

Files:

• BaseOverlay.cpp (modified) (9 diffs)
• BaseOverlay.h (modified) (5 diffs)
• LinkDescriptor.h (modified) (1 diff)

source/ariba/overlay/BaseOverlay.cpp

@@ -185 +185 @@
         // route message using overlay
         else {
-                logging_error("Could not send message");
+                logging_error("Could not send message descriptor=" << ld );
                 logging_debug( "sendMessage: Routing message to node " << ld->remoteNode.toString() );
                 overlayInterface->routeMessage( ld->remoteNode, message );
@@ -689 +689 @@
 
 void BaseOverlay::onLinkUp(const LinkID& id,
-        const NetworkLocator* local, const NetworkLocator* remote) {
+        const address_v* local, const address_v* remote) {
         logging_debug( "Link up with base communication link id=" << id );
 
@@ -740 +740 @@
                 // if link is a relayed link ->convert to direct link
                 if (ld->relay) {
+                        logging_force( "Converting to direct link: " << ld );
                         ld->up = true;
                         ld->relay = false;
@@ -756 +757 @@
 
 void BaseOverlay::onLinkDown(const LinkID& id,
-        const NetworkLocator* local, const NetworkLocator* remote) {
+        const address_v* local, const address_v* remote) {
 
         // get descriptor for link
@@ -780 +781 @@
 
 void BaseOverlay::onLinkChanged(const LinkID& id,
-        const NetworkLocator* oldlocal, const NetworkLocator* newlocal,
-        const NetworkLocator* oldremote, const NetworkLocator* newremote) {
+        const address_v* oldlocal, const address_v* newlocal,
+        const address_v* oldremote, const address_v* newremote) {
 
         // get descriptor for link
@@ -797 +798 @@
 
 void BaseOverlay::onLinkFail(const LinkID& id,
-        const NetworkLocator* local, const NetworkLocator* remote) {
+        const address_v* local, const address_v* remote) {
         logging_debug( "Link fail with base communication link id=" << id );
 
@@ -813 +814 @@
 }
 
-void BaseOverlay::onLinkQoSChanged(const LinkID& id, const NetworkLocator* local,
-        const NetworkLocator* remote, const QoSParameterSet& qos) {
+void BaseOverlay::onLinkQoSChanged(const LinkID& id, const address_v* local,
+        const address_v* remote, const QoSParameterSet& qos) {
         logging_debug( "Link quality changed with base communication link id=" << id );
 
@@ -826 +827 @@
 }
 
-bool BaseOverlay::onLinkRequest( const LinkID& id, const NetworkLocator* local,
-        const NetworkLocator* remote ) {
-        logging_debug("Accepting link request from " << remote->toString() );
+bool BaseOverlay::onLinkRequest( const LinkID& id, const address_v* local,
+        const address_v* remote ) {
+        logging_debug("Accepting link request from " << remote->to_string() );
         return true;
 }
@@ -1358 +1359 @@
                 case OverlayMsg::typeDirectLink: {
                         LinkDescriptor* rld = getDescriptor( overlayMsg->getRelayLink() );
+                        logging_force( "Received direct link convert notification for " << rld );
                         rld->communicationId = ld->communicationId;
                         rld->communicationUp = true;

source/ariba/overlay/BaseOverlay.h

@@ -118 +118 @@
 namespace overlay {
 
+using namespace ariba::addressing;
+
 class LinkDescriptor;
 
@@ -285 +287 @@
          * @see ariba::communication::CommunicationEvents.h
          */
-        virtual void onLinkUp(const LinkID& id, const NetworkLocator* local,
-                const NetworkLocator* remote);
-
-        /**
-         * @see ariba::communication::CommunicationEvents.h
-         */
-        virtual void onLinkDown(const LinkID& id, const NetworkLocator* local,
-                const NetworkLocator* remote);
+        virtual void onLinkUp(const LinkID& id, const address_v* local,
+                const address_v* remote);
+
+        /**
+         * @see ariba::communication::CommunicationEvents.h
+         */
+        virtual void onLinkDown(const LinkID& id, const address_v* local,
+                const address_v* remote);
 
         /**
@@ -298 +300 @@
          */
         virtual void onLinkChanged(const LinkID& id,
-                const NetworkLocator* oldlocal, const NetworkLocator* newlocal,
-                const NetworkLocator* oldremote, const NetworkLocator* newremote);
-
-        /**
-         * @see ariba::communication::CommunicationEvents.h
-         */
-        virtual void onLinkFail(const LinkID& id, const NetworkLocator* local,
-                const NetworkLocator* remote);
+                const address_v* oldlocal, const address_v* newlocal,
+                const address_v* oldremote, const address_v* newremote);
+
+        /**
+         * @see ariba::communication::CommunicationEvents.h
+         */
+        virtual void onLinkFail(const LinkID& id, const address_v* local,
+                const address_v* remote);
 
         /**
@@ -311 +313 @@
          */
         virtual void onLinkQoSChanged(const LinkID& id,
-                const NetworkLocator* local, const NetworkLocator* remote,
+                const address_v* local, const address_v* remote,
                 const QoSParameterSet& qos);
 
@@ -317 +319 @@
          * @see ariba::communication::CommunicationEvents.h
          */
-        virtual bool onLinkRequest(const LinkID& id, const NetworkLocator* local,
-                const NetworkLocator* remote);
+        virtual bool onLinkRequest(const LinkID& id, const address_v* local,
+                const address_v* remote);
 
         /**

source/ariba/overlay/LinkDescriptor.h

@@ -128 +128 @@
                 s << "serv=" << service.toString() << " ";
                 s << "overId=" << overlayId.toString().substr(0,6) << " ";
+                s << "commUp=" << communicationUp << " ";
                 s << "commId=" << communicationId.toString().substr(0,6) << " ";
                 s << "usedAsRel=" << usedAsRelay << " ";