Changeset 7441 for trunk/libtransmission/handshake.c

Timestamp:

Dec 20, 2008, 10:19:34 PM (12 years ago)

Author:

charles

Message:

try to rework the bandwidth code yet again s.t. it satisfies all three: (1) fairly distributes bandwidth across all peers, (2) scales well in high-bandwidth situations, (3) is good at hitting and staying at bandwidth limits/goals

File:

• trunk/libtransmission/handshake.c (modified) (3 diffs)

trunk/libtransmission/handshake.c

@@ -1091 +1091 @@
 }
 
+void
+tr_handshakeFree( tr_handshake * handshake )
+{
+    if( handshake->io )
+        tr_peerIoFree( handshake->io );
+
+    tr_free( handshake );
+}
+
 static int
 tr_handshakeDone( tr_handshake * handshake,
                   int            isOK )
 {
-    int success;
+    tr_bool success;
 
     dbgmsg( handshake, "handshakeDone: %s", isOK ? "connected" : "aborting" );
@@ -1101 +1110 @@
 
     success = fireDoneFunc( handshake, isOK );
-
-    tr_free( handshake );
 
     return success ? READ_LATER : READ_ERR;
@@ -1193 +1200 @@
 }
 
+struct tr_peerIo*
+tr_handshakeStealIO( tr_handshake * handshake )
+{
+    struct tr_peerIo * io;
+
+    assert( handshake );
+    assert( handshake->io );
+
+    io = handshake->io;
+    handshake->io = NULL;
+    return io;
+}
+
 const tr_address *
 tr_handshakeGetAddr( const struct tr_handshake * handshake,