Changeset 8433

Timestamp:

May 19, 2009, 6:38:26 PM (13 years ago)

Author:

charles

Message:

(trunk) #7: DHT support. This is a work in progress... no gui/rpc support yet

Location:

trunk

Files:

• AUTHORS (modified) (1 diff)
• cli/Makefile.am (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• daemon/Makefile.am (modified) (1 diff)
• gtk/Makefile.am (modified) (1 diff)
• gtk/details.c (modified) (2 diffs)
• libtransmission/Makefile.am (modified) (3 diffs)
• libtransmission/handshake.c (modified) (5 diffs)
• libtransmission/peer-io.c (modified) (1 diff)
• libtransmission/peer-io.h (modified) (2 diffs)
• libtransmission/peer-mgr.c (modified) (2 diffs)
• libtransmission/peer-msgs.c (modified) (3 diffs)
• libtransmission/session.c (modified) (7 diffs)
• libtransmission/session.h (modified) (1 diff)
• libtransmission/torrent.c (modified) (3 diffs)
• libtransmission/torrent.h (modified) (2 diffs)
• libtransmission/tr-dht.c (added)
• libtransmission/tr-dht.h (added)
• libtransmission/tracker.c (modified) (2 diffs)
• libtransmission/transmission.h (modified) (2 diffs)
• third-party/Makefile.am (modified) (1 diff)
• third-party/dht (added)
• third-party/dht/CHANGES (added)
• third-party/dht/LICENCE (added)
• third-party/dht/Makefile.am (added)
• third-party/dht/README (added)
• third-party/dht/dht-example.c (added)
• third-party/dht/dht.c (added)
• third-party/dht/dht.h (added)
• third-party/dht/makelog (added)

trunk/AUTHORS

@@ -8 +8 @@
 Project Contributors
   Tomas Carnecky  (Profiling, patches, and detection of sneaky bugs)
+  Juliusz Chroboczek  (DHT)
   John Clay  (Website maintenance and troubleshooting)
   Rashid Eissing  (Mac OS X Transfers preferences icon)

trunk/cli/Makefile.am

@@ -21 +21 @@
     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
+    $(top_builddir)/third-party/dht/libdht.a \
     $(INTLLIBS) \
     $(LIBCURL_LIBS) \

trunk/configure.ac

@@ -264 +264 @@
 if test "x$enable_nls" = "xyes" ; then
     use_nls=yes
-    IT_PROG_INTLTOOL([0.40.0],[no-xml])
+    IT_PROG_INTLTOOL([0.35],[no-xml])
     AC_CHECK_HEADERS([libintl.h])
     GETTEXT_PACKAGE=transmission
@@ -356 +356 @@
                  third-party/miniupnp/Makefile
                  third-party/libnatpmp/Makefile
+                 third-party/dht/Makefile
                  macosx/Makefile
                  gtk/Makefile

trunk/daemon/Makefile.am

@@ -23 +23 @@
     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
     $(top_builddir)/third-party/libevent/libevent.la \
+    $(top_builddir)/third-party/dht/libdht.a \
     $(INTLLIBS) \
     $(LIBCURL_LIBS) \

trunk/gtk/Makefile.am

@@ -104 +104 @@
     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
+    $(top_builddir)/third-party/dht/libdht.a \
     $(GTK_LIBS) \
     $(GIO_LIBS) \

trunk/gtk/details.c

@@ -942 +942 @@
             str = mixed;
         else if( baseline )
-            str = _( "Private to this tracker -- PEX disabled" );
+            str = _( "Private to this tracker -- DHT and PEX disabled" );
         else
             str = _( "Public torrent" );
@@ -1504 +1504 @@
                 case 'E': s = _( "Encrypted connection" ); break; 
                 case 'X': s = _( "Peer was discovered through Peer Exchange (PEX)" ); break;
+                case 'H': s = _( "Peer was discovered through DHT" ); break;
                 case 'I': s = _( "Peer is an incoming connection" ); break;
             }

trunk/libtransmission/Makefile.am

@@ -50 +50 @@
     tr-getopt.c \
     tracker.c \
+    tr-dht.c \
     trevent.c \
     upnp.c \
@@ -97 +98 @@
     tr-getopt.h \
     transmission.h \
+    tr-dht.h \
     trevent.h \
     upnp.h \
@@ -125 +127 @@
     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
     $(top_builddir)/third-party/libevent/libevent.la \
+    $(top_builddir)/third-party/dht/libdht.a \
     $(INTLLIBS) \
     $(LIBCURL_LIBS) \

trunk/libtransmission/handshake.c

@@ -29 +29 @@
 #include "peer-mgr.h"
 #include "torrent.h"
+#include "tr-dht.h"
 #include "trevent.h"
 #include "utils.h"
@@ -36 +37 @@
 /* fast extensions */
 #define ENABLE_FAST * /
+/* DHT */
+#define ENABLE_DHT * /
 
 /***
@@ -81 +84 @@
  #define HANDSHAKE_HAS_FASTEXT( bits ) ( 0 ) 
  #define HANDSHAKE_SET_FASTEXT( bits ) ( (void)0 ) 
+#endif 
+
+#ifdef ENABLE_DHT
+ #define HANDSHAKE_HAS_DHT( bits ) ( ( ( bits )[7] & 0x01 ) ? 1 : 0 )
+ #define HANDSHAKE_SET_DHT( bits ) ( ( bits )[7] |= 0x01 )
+#else
+ #define HANDSHAKE_HAS_DHT( bits ) ( 0 )
+ #define HANDSHAKE_SET_DHT( bits ) ( (void)0 )
 #endif 
 
@@ -220 +231 @@
     HANDSHAKE_SET_FASTEXT( walk );
 
+    /* Note that this doesn't depend on whether the torrent is private.  We
+       don't accept DHT peers for a private torrent, but we participate in
+       the DHT regardless. */
+    if(tr_dhtEnabled(handshake->session))
+        HANDSHAKE_SET_DHT( walk );
+
     walk += HANDSHAKE_FLAGS_LEN;
     memcpy( walk, torrentHash, SHA_DIGEST_LENGTH );
@@ -303 +320 @@
 
     tr_peerIoEnableFEXT( handshake->io, HANDSHAKE_HAS_FASTEXT( reserved ) );
+
+    /* This doesn't depend on whether the torrent is private. */
+    if( tor->session->isDHTEnabled )
+        tr_peerIoEnableDHT( handshake->io, HANDSHAKE_HAS_DHT( reserved ) );
 
     return HANDSHAKE_OK;

trunk/libtransmission/peer-io.c

@@ -618 +618 @@
 }
 
+void
+tr_peerIoEnableDHT( tr_peerIo * io, tr_bool flag )
+{
+    assert( tr_isPeerIo( io ) );
+    assert( tr_isBool( flag ) );
+
+    dbgmsg( io, "setting DHT support flag to %d", (flag!=0) );
+    io->dhtSupported = flag;
+}
+
 /**
 ***

trunk/libtransmission/peer-io.h

@@ -64 +64 @@
     tr_bool               extendedProtocolSupported;
     tr_bool               fastExtensionSupported;
+    tr_bool               dhtSupported;
 
     /* we create the socket in a nonblocking way, so this flag is initially
@@ -158 +159 @@
 
     return io->fastExtensionSupported;
+}
+
+void        tr_peerIoEnableDHT( tr_peerIo * io, tr_bool flag );
+
+static TR_INLINE tr_bool tr_peerIoSupportsDHT( const tr_peerIo * io )
+{
+    assert( tr_isPeerIo( io ) );
+
+    return io->dhtSupported;
 }
 

trunk/libtransmission/peer-mgr.c

@@ -1874 +1874 @@
         if( !stat->peerIsChoked && !stat->peerIsInterested ) *pch++ = '?';
         if( stat->isEncrypted ) *pch++ = 'E';
+        if( stat->from == TR_PEER_FROM_DHT ) *pch++ = 'H';
         if( stat->from == TR_PEER_FROM_PEX ) *pch++ = 'X';
         if( stat->isIncoming ) *pch++ = 'I';
@@ -2164 +2165 @@
         return a->time < b->time ? -1 : 1;
 
-    /* all other things being equal, prefer peers whose
-     * information comes from a more reliable source */
+    /* In order to avoid fragmenting the swarm, peers from trackers and
+     * from the DHT should be preferred to peers from PEX. */
     if( a->from != b->from )
         return a->from < b->from ? -1 : 1;

trunk/libtransmission/peer-msgs.c

@@ -37 +37 @@
 #include "stats.h"
 #include "torrent.h"
+#include "tr-dht.h"
 #include "trevent.h"
 #include "utils.h"
@@ -305 +306 @@
     dbgOutMessageLen( msgs );
     pokeBatchPeriod( msgs, IMMEDIATE_PRIORITY_INTERVAL_SECS );
+}
+
+static void
+protocolSendPort(tr_peermsgs *msgs, uint16_t port)
+{
+    tr_peerIo       * io  = msgs->peer->io;
+    struct evbuffer * out = msgs->outMessages;
+
+    dbgmsg( msgs, "sending Port %u", port);
+    tr_peerIoWriteUint32( io, out, 3 );
+    tr_peerIoWriteUint8 ( io, out, BT_PORT );
+    tr_peerIoWriteUint16( io, out, port);
 }
 
@@ -2124 +2137 @@
         sendLtepHandshake( m );
 
+    if(tr_peerIoSupportsDHT(peer->io))
+        protocolSendPort(m, tr_dhtPort(torrent->session));
+
     tellPeerWhatWeHave( m );
 

trunk/libtransmission/session.c

@@ -46 +46 @@
 #include "verify.h"
 #include "web.h"
+#include "tr-dht.h"
 
 #define dbgmsg( ... ) \
@@ -622 +623 @@
     assert( found );
     session->isPexEnabled = boolVal;
+    /* This really ought to be a separate preference. */
+    session->isDHTEnabled = boolVal;
 
     found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_ENCRYPTION, &i );
@@ -831 +834 @@
     session->isWaiting = FALSE;
     dbgmsg( "returning session %p; session->tracker is %p", session, session->tracker );
+
+    if( session->isDHTEnabled )
+        tr_dhtInit(session);
 }
 
@@ -1393 +1399 @@
 
 static void
-tr_closeAllConnections( void * vsession )
+sessionCloseImpl( void * vsession )
 {
     tr_session *  session = vsession;
@@ -1403 +1409 @@
 
     free_incoming_peer_port( session );
+
+    if( session->isDHTEnabled )
+        tr_dhtUninit( session );
 
     evtimer_del( session->altTimer );
@@ -1456 +1465 @@
 
     /* close the session */
-    tr_runInEventThread( session, tr_closeAllConnections, session );
+    tr_runInEventThread( session, sessionCloseImpl, session );
     while( !session->isClosed && !deadlineReached( deadline ) )
     {
@@ -1578 +1587 @@
 
     return session->isPexEnabled;
+}
+
+tr_bool
+tr_sessionIsDHTEnabled( const tr_session * session )
+{
+    assert( tr_isSession( session ) );
+
+    return session->isDHTEnabled;
 }
 

trunk/libtransmission/session.h

@@ -62 +62 @@
     tr_bool                      isPortRandom;
     tr_bool                      isPexEnabled;
+    tr_bool                      isDHTEnabled;
     tr_bool                      isBlocklistEnabled;
     tr_bool                      isProxyEnabled;

trunk/libtransmission/torrent.c

@@ -1272 +1272 @@
 checkAndStartImpl( void * vtor )
 {
+    time_t now;
     tr_torrent * tor = vtor;
 
@@ -1278 +1279 @@
     tr_globalLock( tor->session );
 
+    now = time( NULL );
     tor->isRunning = TRUE;
     tor->needsSeedRatioCheck = TRUE;
@@ -1284 +1286 @@
     tor->completeness = tr_cpGetStatus( &tor->completion );
     tr_torrentSaveResume( tor );
-    tor->startDate = tor->anyDate = time( NULL );
+    tor->startDate = tor->anyDate = now;
     tr_trackerStart( tor->tracker );
+    tor->dhtAnnounceAt = now + tr_cryptoWeakRandInt( 20 );
     tr_peerMgrStartTorrent( tor );
 

trunk/libtransmission/torrent.h

@@ -176 +176 @@
     struct tr_publisher_tag *  trackerSubscription;
 
+    time_t                     dhtAnnounceAt;
+    tr_bool                    dhtAnnounceInProgress;
+
     uint64_t                   downloadedCur;
     uint64_t                   downloadedPrev;
@@ -289 +292 @@
 }
 
+static TR_INLINE tr_bool tr_torrentAllowsDHT( const tr_torrent * tor )
+{
+    return ( tor != NULL  ) && tor->session->isDHTEnabled && !tr_torrentIsPrivate( tor );
+}
+
 static TR_INLINE tr_bool tr_torrentIsPieceChecked( const tr_torrent  * tor, tr_piece_index_t i )
 {

trunk/libtransmission/tracker.c

@@ -27 +27 @@
 #include "torrent.h"
 #include "tracker.h"
+#include "tr-dht.h"
 #include "trevent.h"
 #include "utils.h"
@@ -978 +979 @@
             enqueueRequest( session, t, TR_REQ_REANNOUNCE );
         }
+
+        if( tor->dhtAnnounceAt <= now ) {
+            int rc = 1;
+            if( tr_torrentAllowsDHT(tor) )
+                rc = tr_dhtAnnounce(tor, 1);
+            if(rc == 0)
+                /* The DHT is not ready yet.  Try again soon. */
+                tor->dhtAnnounceAt = now + 5 + tr_cryptoWeakRandInt( 5 );
+            else
+                /* We should announce at least once every 30 minutes. */
+                tor->dhtAnnounceAt = now + 25 * 60 + tr_cryptoWeakRandInt( 3 * 60 );
+        }
     }
 

trunk/libtransmission/transmission.h

@@ -531 +531 @@
 tr_bool            tr_sessionIsPexEnabled( const tr_session * session );
 
+tr_bool            tr_sessionIsDHTEnabled( const tr_session * session );
+
 void               tr_sessionSetLazyBitfieldEnabled( tr_session * session,
                                                      tr_bool       enabled );
@@ -1344 +1346 @@
     TR_PEER_FROM_INCOMING  = 0,  /* connections made to the listening port */
     TR_PEER_FROM_TRACKER   = 1,  /* peers received from a tracker */
-    TR_PEER_FROM_CACHE     = 2,  /* peers read from the peer cache */
-    TR_PEER_FROM_PEX       = 3,  /* peers discovered via PEX */
+    TR_PEER_FROM_DHT       = 2,  /* peers learnt from the DHT */
+    TR_PEER_FROM_CACHE     = 3,  /* peers read from the peer cache */
+    TR_PEER_FROM_PEX       = 4,  /* peers discovered via PEX */
     TR_PEER_FROM__MAX
 };

trunk/third-party/Makefile.am

@@ -2 +2 @@
     libevent \
     libnatpmp \
-    miniupnp
+    miniupnp \
+    dht
 
 EXTRA_DIST = \