Changeset 3501

Timestamp:

Oct 22, 2007, 11:27:47 PM (15 years ago)

Author:

charles

Message:

dead code removal.

Location:

trunk/libtransmission

Files:

• peer-io.c (modified) (3 diffs)
• peer-io.h (modified) (1 diff)
• peer-msgs.c (modified) (2 diffs)

trunk/libtransmission/peer-io.c

@@ -33 +33 @@
 struct tr_extensions
 {
-    unsigned int azureusProtocolSupported : 1;
     unsigned int extendedProtocolSupported : 1;
     unsigned int fastPeersSupported : 1;
@@ -355 +354 @@
 
 void
-tr_peerIoEnableAZMP( tr_peerIo * io, int flag )
-{
-    assert( io != NULL );
-    assert( flag==0 || flag==1 );
-    
-    io->extensions.azureusProtocolSupported = flag;
-}
-
-void
 tr_peerIoEnableLTEP( tr_peerIo * io, int flag )
 {
@@ -379 +369 @@
     
     io->extensions.fastPeersSupported = flag;
-}
-
-int
-tr_peerIoSupportsAZMP( const tr_peerIo * io )
-{
-    assert( io != NULL );
-    
-    return io->extensions.azureusProtocolSupported;
 }
 

trunk/libtransmission/peer-io.h

@@ -50 +50 @@
 **/
 
-void  tr_peerIoEnableAZMP( tr_peerIo * io, int flag );
 void  tr_peerIoEnableLTEP( tr_peerIo * io, int flag );
 void  tr_peerIoEnableFEXT( tr_peerIo * io, int flag );
 
-int   tr_peerIoSupportsAZMP( const tr_peerIo * io );
 int   tr_peerIoSupportsLTEP( const tr_peerIo * io );
 int   tr_peerIoSupportsFEXT( const tr_peerIo * io );

trunk/libtransmission/peer-msgs.c

@@ -1669 +1669 @@
     ratePulse( m );
 
-    /**
-    ***  If we initiated this connection,
-    ***  we may need to send LTEP/AZMP handshakes.
-    ***  Otherwise we'll wait for the peer to send theirs first.
-    **/
-    if( !tr_peerIoIsIncoming( m->io ) )
-    {
-        if ( tr_peerIoSupportsLTEP( m->io ) ) {
-            sendLtepHandshake( m );
-            
-        } else if ( tr_peerIoSupportsAZMP( m->io ) ) {
-            dbgmsg( m, "FIXME: need to send AZMP handshake" );
-            
-        } else {
-            /* no-op */
-        }
-    }
-    
-    if ( tr_peerIoSupportsFEXT( m->io ) )
-    {
+    if ( tr_peerIoSupportsLTEP( m->io ) )
+        sendLtepHandshake( m );
+
+    if ( !tr_peerIoSupportsFEXT( m->io ) )
+        sendBitfield( m );
+    else {
         /* This peer is fastpeer-enabled, send it have-all or have-none if appropriate */
         float completion = tr_cpPercentComplete( m->torrent->completion );
@@ -1702 +1688 @@
         if ( peerProgress < MAX_ALLOWED_SET_COUNT )
             sendFastAllowedSet( m );
-    } else {
-        sendBitfield( m );
-    }
+    }
+
     return m;
 }