keep track of direction in OverlayEndpoint

CSEMike · Sep 13, 2011 · 3919797 · 3919797
1 parent a646361
commit 3919797
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 12 deletions.
diff --git a/javatests/edu/washington/cs/oneswarm/test/integration/ServiceSharingThreeProcessTest.java b/javatests/edu/washington/cs/oneswarm/test/integration/ServiceSharingThreeProcessTest.java
@@ -62,11 +62,14 @@ public void testServiceSharing() throws InterruptedException {
             // Register the client service
             ServiceSharingManager.getInstance().registerClientService("echoclient", CLIENT_PORT,
                     searchKey);
+            SetupPacketTraceRoute tracerouteListener = new SetupPacketTraceRoute();
             OSF2FMain.getSingelton().getOverlayManager()
-                    .setSetupPacketListener(new SetupPacketTraceRoute());
+                    .setSetupPacketListener(tracerouteListener);
 
             Thread.sleep(5000);
             ServiceSharingSingleProcessTest.doEchoTest();
+
+            tracerouteListener.printAllTraceRoutes();
         } catch (Exception e) {
             e.printStackTrace();
             logger.severe(e.toString());

diff --git a/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/messaging/OSF2FChannelDataMsg.java b/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/messaging/OSF2FChannelDataMsg.java
@@ -143,6 +143,6 @@ public void updatePayload(DirectByteBuffer newPayload) {
             buffer[1].returnToPool();
         }
         buffer[1] = newPayload;
-        updateMessageLength();
+        // updateMessageLength();
     }
 }
diff --git a/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/OverlayEndpoint.java b/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/OverlayEndpoint.java
@@ -58,9 +58,10 @@ public abstract class OverlayEndpoint {
     protected Average uploadRateAverage = Average.getInstance(1000, 10);
     private final OSF2FHashSearch search;
     private final OSF2FHashSearchResp response;
+    protected final boolean outgoing;
 
     public OverlayEndpoint(FriendConnection friendConnection, int pathID, long overlayDelayMs,
-            OSF2FHashSearch search, OSF2FHashSearchResp response) {
+            OSF2FHashSearch search, OSF2FHashSearchResp response, boolean outgoing) {
         this.friendConnection = friendConnection;
         this.channelId = response.getChannelID();
         this.pathID = pathID;
@@ -71,10 +72,15 @@ public OverlayEndpoint(FriendConnection friendConnection, int pathID, long overl
                 overlayDelayMs);
         this.search = search;
         this.response = response;
+        this.outgoing = outgoing;
     }
 
     protected abstract void cleanup();
 
+    public boolean isOutgoing() {
+        return outgoing;
+    }
+
     private void deregister() {
         // remove it from the friend connection
         friendConnection.deregisterOverlayTransport(this);
@@ -207,7 +213,7 @@ public void run() {
                                 .getSetupPacketListener();
                         if (setupPacketListener != null && msg.getByteInChannel() == 0) {
                             setupPacketListener.packetArrivedAtFinalDestination(friendConnection,
-                                    search, response, msg);
+                                    search, response, msg, outgoing);
                         }
                         handleDelayedOverlayMessage(msg);
                     }

diff --git a/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/OverlayTransport.java b/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/OverlayTransport.java
@@ -68,7 +68,6 @@ public class OverlayTransport extends OverlayEndpoint implements Transport {
 
     private final byte[] infoHash;
 
-    private volatile boolean outgoing;
     private int posInHandshake = 0;
 
     private List<EventWaiter> readWaiter = new LinkedList<EventWaiter>();
@@ -84,12 +83,11 @@ public class OverlayTransport extends OverlayEndpoint implements Transport {
     public OverlayTransport(FriendConnection connection, byte[] infohash, int pathID,
             boolean outgoing, long overlayDelayMs, OSF2FHashSearch search,
             OSF2FHashSearchResp response) {
-        super(connection, pathID, overlayDelayMs, search, response);
+        super(connection, pathID, overlayDelayMs, search, response, outgoing);
         this.infoHash = infohash;
         this.bufferedMessages = new LinkedList<OSF2FChannelDataMsg>();
         logger.fine(getDescription() + ": Creating overlay transport");
         this.channelPeerId = generatePeerId();
-        this.outgoing = outgoing;
     }
 
     @Override

diff --git a/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/SetupPacketListener.java b/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/SetupPacketListener.java
@@ -18,6 +18,6 @@ public void packetAddedToTransportQueue(FriendConnection destination,
             OSF2FSearch sourceMessage, OSF2FSearchResp setupMessage, OSF2FChannelMsg message);
 
     public void packetArrivedAtFinalDestination(FriendConnection source, OSF2FHashSearch search,
-            OSF2FHashSearchResp response, OSF2FChannelDataMsg msg);
+            OSF2FHashSearchResp response, OSF2FChannelDataMsg msg, boolean outgoing);
 
 }
diff --git a/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/servicesharing/ClientServiceConnection.java b/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/servicesharing/ClientServiceConnection.java
@@ -17,7 +17,7 @@ public class ClientServiceConnection extends ServiceConnection {
 
     public ClientServiceConnection(ClientService service, NetworkConnection incomingConnetion,
             FriendConnection connection, OSF2FHashSearch search, OSF2FHashSearchResp response) {
-        super(connection, search, response);
+        super(connection, search, response, true);
         this.clientService = service;
         this.serverConnection = incomingConnetion;
     }

diff --git a/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/servicesharing/ServerServiceConnection.java b/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/servicesharing/ServerServiceConnection.java
@@ -15,7 +15,7 @@ public class ServerServiceConnection extends ServiceConnection {
 
     public ServerServiceConnection(SharedService service, FriendConnection connection,
             OSF2FHashSearch search, OSF2FHashSearchResp response) {
-        super(connection, search, response);
+        super(connection, search, response, false);
         this.serverService = service;
     }
 

diff --git a/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/servicesharing/ServiceConnection.java b/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/servicesharing/ServiceConnection.java
@@ -55,8 +55,8 @@ public abstract class ServiceConnection extends OverlayEndpoint {
     protected NetworkConnection serverConnection;
 
     public ServiceConnection(FriendConnection connection, OSF2FHashSearch search,
-            OSF2FHashSearchResp response) {
-        super(connection, response.getPathID(), 0, search, response);
+            OSF2FHashSearchResp response, boolean outgoing) {
+        super(connection, response.getPathID(), 0, search, response, outgoing);
         this.bufferedMessages = new LinkedList<OSF2FChannelDataMsg>();
     }