Changeset 5493 for source

Timestamp:

Jul 30, 2009, 4:44:40 PM (15 years ago)

Author:

mies

Message:

 

Location:

source/ariba

Files:

• overlay/BaseOverlay.cpp (modified) (3 diffs)
• utility/transport/rfcomm/rfcomm.cpp (modified) (1 diff)

source/ariba/overlay/BaseOverlay.cpp

@@ -172 +172 @@
                         << " using relay " << ld->localRelay
                 );
-
+/*
                 // get local relay link descriptor and mark as used for relaying
                 LinkDescriptor* rld = getRelayDescriptor(ld->localRelay);
@@ -180 +180 @@
                         return -1;
                 }
-                rld->markAsRelay();
+                rld->markAsRelay();*/
 
                 // create a information relay message to inform the relay about
@@ -190 +190 @@
                 // route message to relay node in order to inform it!
                 logging_debug("sendMessage: Sending message over relayed link with" << ld );
-                overlayInterface->routeMessage(rld->remoteNode, rld->overlayId, &overlay_msg);
+                sendOverlay( &overlay_msg, ld->localRelay );
                 return 0;
         }

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

@@ -378 +378 @@
 
 void rfcomm::start_write( link_info* info ) {
-        boost::mutex::scoped_lock(info->mutex);
-
         // do not start writing if sending is in progress
         if (info->sending || !info->up || info->send_buffer.size()==0) return;