Changeset 10606

Timestamp:

May 1, 2010, 4:04:00 PM (8 years ago)

Author:

charles

Message:

(trunk) #3060 -- Local Peer Discovery patch from Eszet

Location:

trunk

Files:

• daemon/daemon.c (modified) (2 diffs)
• libtransmission/Makefile.am (modified) (2 diffs)
• libtransmission/announcer.c (modified) (6 diffs)
• libtransmission/peer-mgr.c (modified) (1 diff)
• libtransmission/rpcimpl.c (modified) (2 diffs)
• libtransmission/session.c (modified) (7 diffs)
• libtransmission/session.h (modified) (2 diffs)
• libtransmission/torrent.c (modified) (2 diffs)
• libtransmission/torrent.h (modified) (3 diffs)
• libtransmission/tr-lds.c (added)
• libtransmission/tr-lds.h (added)
• libtransmission/transmission.h (modified) (3 diffs)

trunk/daemon/daemon.c

@@ -86 +86 @@
     { 'o', "dht", "Enable distributed hash tables (DHT)", "o", 0, NULL },
     { 'O', "no-dht", "Disable distributed hash tables (DHT)", "O", 0, NULL },
+    { 'z', "lds", "Enable local peer discovery (LDS)", "z", 0, NULL },
+    { 'Z', "no-lds", "Disable local peer discovery (LDS)", "Z", 0, NULL },
     { 'P', "peerport", "Port for incoming peers (Default: " TR_DEFAULT_PEER_PORT_STR ")", "P", 1, "<port>" },
     { 'm', "portmap", "Enable portmapping via NAT-PMP or UPnP", "m", 0, NULL },
@@ -407 +409 @@
                       tr_bencDictAddBool( &settings, TR_PREFS_KEY_RATIO_ENABLED, FALSE );
                       break;
+            case 'z': tr_bencDictAddBool( &settings, TR_PREFS_KEY_LDS_ENABLED, TRUE );
+                      break;
+            case 'Z': tr_bencDictAddBool( &settings, TR_PREFS_KEY_LDS_ENABLED, FALSE );
+                      break;
             default:  showUsage( );
                       break;

trunk/libtransmission/Makefile.am

@@ -56 +56 @@
     torrent-magnet.c \
     tr-dht.c \
+    tr-lds.c \
     tr-getopt.c \
     trevent.c \
@@ -108 +109 @@
     transmission.h \
     tr-dht.h \
+    tr-lds.h \
     trevent.h \
     upnp.h \

trunk/libtransmission/announcer.c

@@ -25 +25 @@
 #include "session.h"
 #include "tr-dht.h"
+#include "tr-lds.h"
 #include "torrent.h"
 #include "utils.h"
@@ -66 +67 @@
     SLOW_HOST_PENALTY_SECS = ( 60 * 10 ),
 
-    UPKEEP_INTERVAL_SECS = 1
+    UPKEEP_INTERVAL_SECS = 1,
+
+    /* this is an upper limit for the frequency of LDS announces */
+    LDS_HOUSEKEEPING_INTERVAL_SECS = 30
 
 };
@@ -203 +207 @@
     struct event * upkeepTimer;
     int slotsAvailable;
+    time_t ldsHouseKeepingAt;
 }
 tr_announcer;
@@ -232 +237 @@
 onUpkeepTimer( int foo UNUSED, short bar UNUSED, void * vannouncer );
 
+static inline time_t
+calcRescheduleWithJitter( const int minPeriod )
+{
+    const double jitterFac = 0.1;
+
+    assert( minPeriod > 0 );
+
+    return tr_time()
+        + minPeriod
+        + tr_cryptoWeakRandInt( (int) ( minPeriod * jitterFac ) + 1 );
+}
+
 void
 tr_announcerInit( tr_session * session )
 {
     tr_announcer * a;
+
+    const time_t relaxUntil =
+        calcRescheduleWithJitter( LDS_HOUSEKEEPING_INTERVAL_SECS / 3 );
 
     assert( tr_isSession( session ) );
@@ -244 +264 @@
     a->session = session;
     a->slotsAvailable = MAX_CONCURRENT_TASKS;
+    a->ldsHouseKeepingAt = relaxUntil;
     a->upkeepTimer = tr_new0( struct event, 1 );
     evtimer_set( a->upkeepTimer, onUpkeepTimer, a );
@@ -1885 +1906 @@
         }
     }
+
+    /* Local Peer Discovery */
+    if( announcer->ldsHouseKeepingAt <= now )
+    {
+        tr_ldsAnnounceMore( now, LDS_HOUSEKEEPING_INTERVAL_SECS );
+
+        /* reschedule more LDS announces for ( the future + jitter ) */
+        announcer->ldsHouseKeepingAt =
+            calcRescheduleWithJitter( LDS_HOUSEKEEPING_INTERVAL_SECS );
+    }
 }
 

trunk/libtransmission/peer-mgr.c

@@ -1509 +1509 @@
         case TR_PEER_FROM_PEX      : return 60 * 60 * 2;
         case TR_PEER_FROM_RESUME   : return 60 * 60;
+        case TR_PEER_FROM_LDS      : return 10 * 60;
         default                    : return 60 * 60;
     }

trunk/libtransmission/rpcimpl.c

@@ -1215 +1215 @@
     if( tr_bencDictFindBool( args_in, TR_PREFS_KEY_DHT_ENABLED, &boolVal ) )
         tr_sessionSetDHTEnabled( session, boolVal );
+    if( tr_bencDictFindBool( args_in, TR_PREFS_KEY_LDS_ENABLED, &boolVal ) )
+        tr_sessionSetLDSEnabled( session, boolVal );
     if( tr_bencDictFindBool( args_in, TR_PREFS_KEY_PEER_PORT_RANDOM_ON_START, &boolVal ) )
         tr_sessionSetPeerPortRandomOnStart( session, boolVal );
@@ -1327 +1329 @@
     tr_bencDictAddBool( d, TR_PREFS_KEY_PEX_ENABLED, tr_sessionIsPexEnabled( s ) );
     tr_bencDictAddBool( d, TR_PREFS_KEY_DHT_ENABLED, tr_sessionIsDHTEnabled( s ) );
+    tr_bencDictAddBool( d, TR_PREFS_KEY_LDS_ENABLED, tr_sessionIsLDSEnabled( s ) );
     tr_bencDictAddInt ( d, TR_PREFS_KEY_PEER_PORT, tr_sessionGetPeerPort( s ) );
     tr_bencDictAddInt ( d, TR_PREFS_KEY_PEER_PORT_RANDOM_ON_START, tr_sessionGetPeerPortRandomOnStart( s ) );

trunk/libtransmission/session.c

@@ -43 +43 @@
 #include "torrent.h"
 #include "tr-dht.h"
+#include "tr-lds.h"
 #include "trevent.h"
 #include "utils.h"
@@ -245 +246 @@
     tr_bencDictAddBool( d, TR_PREFS_KEY_BLOCKLIST_ENABLED,        FALSE );
     tr_bencDictAddBool( d, TR_PREFS_KEY_DHT_ENABLED,              TRUE );
+    tr_bencDictAddBool( d, TR_PREFS_KEY_LDS_ENABLED,              FALSE );
     tr_bencDictAddStr ( d, TR_PREFS_KEY_DOWNLOAD_DIR,             tr_getDefaultDownloadDir( ) );
     tr_bencDictAddInt ( d, TR_PREFS_KEY_DSPEED,                   100 );
@@ -307 +309 @@
     tr_bencDictAddBool( d, TR_PREFS_KEY_BLOCKLIST_ENABLED,        tr_blocklistIsEnabled( s ) );
     tr_bencDictAddBool( d, TR_PREFS_KEY_DHT_ENABLED,              s->isDHTEnabled );
+    tr_bencDictAddBool( d, TR_PREFS_KEY_LDS_ENABLED,              s->isLDSEnabled );
     tr_bencDictAddStr ( d, TR_PREFS_KEY_DOWNLOAD_DIR,             s->downloadDir );
     tr_bencDictAddInt ( d, TR_PREFS_KEY_DSPEED,                   tr_sessionGetSpeedLimit( s, TR_DOWN ) );
@@ -626 +629 @@
     }
 
+    if( session->isLDSEnabled )
+    {
+        if( tr_ldsInit( session, &session->public_ipv4->addr ) )
+            tr_ninf( "LDS", "Local Peer Discovery active" );
+    }
+    else
+        tr_ndbg( "LDS", "Local Peer Discovery disabled" );
+
     /* cleanup */
     tr_bencFree( &settings );
@@ -668 +679 @@
     if( tr_bencDictFindBool( settings, TR_PREFS_KEY_DHT_ENABLED, &boolVal ) )
         tr_sessionSetDHTEnabled( session, boolVal );
+    if( tr_bencDictFindBool( settings, TR_PREFS_KEY_LDS_ENABLED, &boolVal ) )
+        tr_sessionSetLDSEnabled( session, boolVal );
     if( tr_bencDictFindInt( settings, TR_PREFS_KEY_ENCRYPTION, &i ) )
         tr_sessionSetEncryption( session, i );
@@ -1551 +1564 @@
 
     free_incoming_peer_port( session );
+
+    if( session->isLDSEnabled )
+        tr_ldsUninit( session );
 
     if( session->isDHTEnabled )
@@ -1784 +1800 @@
     if( ( enabled != 0 ) != ( session->isDHTEnabled != 0 ) )
         tr_runInEventThread( session, toggleDHTImpl, session );
+}
+
+void
+tr_sessionSetLDSEnabled( tr_session * session,
+                         tr_bool      enabled )
+{
+    assert( tr_isSession( session ) );
+
+    session->isLDSEnabled = ( enabled != 0 );
+}
+
+tr_bool
+tr_sessionIsLDSEnabled( const tr_session * session )
+{
+    assert( tr_isSession( session ) );
+
+    return session->isLDSEnabled;
+}
+
+tr_bool
+tr_sessionAllowsLDS( const tr_session * session )
+{
+    return tr_sessionIsLDSEnabled( session );
 }
 

trunk/libtransmission/session.h

@@ -85 +85 @@
     tr_bool                      isPexEnabled;
     tr_bool                      isDHTEnabled;
+    tr_bool                      isLDSEnabled;
     tr_bool                      isBlocklistEnabled;
     tr_bool                      isProxyEnabled;
@@ -180 +181 @@
 tr_bool      tr_sessionAllowsDHT( const tr_session * session );
 
+tr_bool      tr_sessionAllowsLDS( const tr_session * session );
+
 const char * tr_sessionFindTorrentFile( const tr_session * session,
                                         const char *       hashString );

trunk/libtransmission/torrent.c

@@ -941 +941 @@
 }
 
-static tr_torrent_activity
+tr_torrent_activity
 tr_torrentGetActivity( tr_torrent * tor )
 {
@@ -1401 +1401 @@
         tor->dhtAnnounceAt = now + tr_cryptoWeakRandInt( 20 );
         tor->dhtAnnounce6At = now + tr_cryptoWeakRandInt( 20 );
+        tor->ldsAnnounceAt = now;
         tr_peerMgrStartTorrent( tor );
     }

trunk/libtransmission/torrent.h

@@ -131 +131 @@
                                            tr_verify_state   state );
 
+tr_torrent_activity tr_torrentGetActivity( tr_torrent * tor );
+
 struct tr_incomplete_metadata;
 
@@ -198 +200 @@
     tr_bool                    dhtAnnounceInProgress;
     tr_bool                    dhtAnnounce6InProgress;
+    
+    time_t                     ldsAnnounceAt;
 
     uint64_t                   downloadedCur;
@@ -328 +332 @@
     return ( tor != NULL )
         && ( tr_sessionAllowsDHT( tor->session ) )
+        && ( !tr_torrentIsPrivate( tor ) );
+}
+
+static inline tr_bool tr_torrentAllowsLDS( const tr_torrent * tor )
+{
+    return ( tor != NULL )
+        && ( tr_sessionAllowsLDS( tor->session ) )
         && ( !tr_torrentIsPrivate( tor ) );
 }

trunk/libtransmission/transmission.h

@@ -165 +165 @@
 #define TR_PREFS_KEY_BLOCKLIST_ENABLED          "blocklist-enabled"
 #define TR_PREFS_KEY_DHT_ENABLED                "dht-enabled"
+#define TR_PREFS_KEY_LDS_ENABLED                "lds-enabled"
 #define TR_PREFS_KEY_DOWNLOAD_DIR               "download-dir"
 #define TR_PREFS_KEY_ENCRYPTION                 "encryption"
@@ -592 +593 @@
 void               tr_sessionSetDHTEnabled( tr_session * session, tr_bool );
 
+tr_bool            tr_sessionIsLDSEnabled( const tr_session * session );
+
+void               tr_sessionSetLDSEnabled( tr_session * session, tr_bool enabled );
+
 void               tr_sessionSetLazyBitfieldEnabled( tr_session * session,
                                                      tr_bool       enabled );
@@ -1650 +1655 @@
     TR_PEER_FROM_INCOMING  = 0,  /* connections made to the listening port */
     TR_PEER_FROM_TRACKER   = 1,  /* peers received from a tracker */
-    TR_PEER_FROM_DHT       = 2,  /* peers learnt from the DHT */
-    TR_PEER_FROM_RESUME    = 3,  /* peers read from the .resume file */
-    TR_PEER_FROM_PEX       = 4,  /* peers discovered via PEX */
-    TR_PEER_FROM_LTEP      = 5,  /* peer address provided in an LTEP handshake */
+    TR_PEER_FROM_LDS       = 2,  /* peers discovered by local announcements */
+    TR_PEER_FROM_DHT       = 3,  /* peers learnt from the DHT */
+    TR_PEER_FROM_RESUME    = 4,  /* peers read from the .resume file */
+    TR_PEER_FROM_PEX       = 5,  /* peers discovered via PEX */
+    TR_PEER_FROM_LTEP      = 6,  /* peer address provided in an LTEP handshake */
     TR_PEER_FROM__MAX
 };