Changeset 8880

Timestamp:

Aug 7, 2009, 2:38:09 PM (13 years ago)

Author:

charles

Message:

(trunk libT) #2281: add logging related to DHT (Patch from Juliusz)

Location:

trunk/libtransmission

Files:

• tr-dht.c (modified) (15 diffs)
• tr-dht.h (modified) (1 diff)

trunk/libtransmission/tr-dht.c

@@ -116 +116 @@
     tr_free( cl->nodes );
     tr_free( closure );
+    tr_ndbg( "DHT", "Finished bootstrapping" );
 }
 
@@ -134 +135 @@
         return -1;
 
-    dht_socket = socket(PF_INET, SOCK_DGRAM, 0);
-    if(dht_socket < 0)
-        return -1;
-
     dht_port = tr_sessionGetPeerPort(ss);
     if(dht_port <= 0)
         return -1;
+
+    tr_ndbg( "DHT", "Initialising DHT" );
+
+    dht_socket = socket(PF_INET, SOCK_DGRAM, 0);
+    if(dht_socket < 0)
+        goto fail;
 
     memset(&sin, 0, sizeof(sin));
@@ -158 +161 @@
         if(( have_id = tr_bencDictFindRaw( &benc, "id", &raw, &len ) && len==20 ))
             memcpy( myid, raw, len );
-        if( tr_bencDictFindRaw( &benc, "nodes", &raw, &len ) && !(len%6) )
+        if( tr_bencDictFindRaw( &benc, "nodes", &raw, &len ) && !(len%6) ) {
             nodes = tr_memdup( raw, len );
+            tr_ninf( "DHT", "Bootstrapping from %d old nodes", (int)(len/6) );
+        }
         tr_bencFree( &benc );
     }
 
-    if(!have_id) {
+    if( have_id )
+        tr_ninf( "DHT", "Reusing old id" );
+    else {
         /* Note that DHT ids need to be distributed uniformly,
          * so it should be something truly random. */
+        tr_ninf( "DHT", "Generating new id" );
         tr_cryptoRandBuf( myid, 20 );
     }
@@ -190 +198 @@
     tr_timerAdd( &dht_event, 0, tr_cryptoWeakRandInt( 1000000 ) );
 
+    tr_ndbg( "DHT", "DHT initialised" );
+
     return 1;
 
@@ -198 +208 @@
         dht_socket = -1;
         session = NULL;
+        tr_ndbg( "DHT", "DHT initialisation failed (errno = %d)", save );
         errno = save;
     }
@@ -210 +221 @@
         return;
 
+    tr_ndbg( "DHT", "Uninitialising DHT" );
+
     event_del(&dht_event);
 
     /* Since we only save known good nodes, avoid erasing older data if we
        don't know enough nodes. */
-    if(tr_dhtStatus(ss, NULL) >= TR_DHT_FIREWALLED) {
+    if(tr_dhtStatus(ss, NULL) < TR_DHT_FIREWALLED)
+        tr_ninf( "DHT", "Not saving nodes, DHT not ready" );
+    else {
         tr_benc benc;
         struct sockaddr_in sins[300];
@@ -222 +237 @@
         int n = dht_get_nodes(sins, 300);
         int j = 0;
+
+        tr_ninf( "DHT", "Saving %d nodes", n );
         for( i=0; i<n; ++i ) {
             memcpy( compact + j, &sins[i].sin_addr, 4 );
@@ -239 +256 @@
     EVUTIL_CLOSESOCKET( dht_socket );
 
+    tr_ndbg("DHT", "Done uninitialising DHT");
+
     session = NULL;
 }
@@ -299 +318 @@
 
 int
-tr_dhtAddNode(tr_session *ss, tr_address *address, tr_port port, tr_bool bootstrap)
+tr_dhtAddNode(tr_session *ss, tr_address *address, tr_port port,
+              tr_bool bootstrap)
 {
     struct sockaddr_in sin;
@@ -323 +343 @@
 
     return 1;
+}
+
+const char *
+tr_dhtPrintableStatus(int status)
+{
+    switch(status) {
+    case TR_DHT_STOPPED: return "stopped";
+    case TR_DHT_BROKEN: return "broken";
+    case TR_DHT_POOR: return "poor";
+    case TR_DHT_FIREWALLED: return "firewalled";
+    case TR_DHT_GOOD: return "good";
+    default: return "???";
+    }
 }
 
@@ -341 +374 @@
                 tr_peerMgrAddPex( tor, TR_PEER_FROM_DHT, pex+i );
             tr_free(pex);
+            tr_torinf(tor, "Learned %d peers from DHT", (int)n);
         }
         tr_globalUnlock( session );
@@ -347 +381 @@
     {
         tr_torrent * tor = tr_torrentFindFromHash( session, info_hash );
-        if( tor )
+        if( tor ) {
+            tr_torinf(tor, "DHT announce done");
             tor->dhtAnnounceInProgress = 0;
+        }
     }
 }
@@ -355 +391 @@
 tr_dhtAnnounce(tr_torrent *tor, tr_bool announce)
 {
-    int rc;
+    int rc, status, numnodes;
 
     if( !tr_torrentAllowsDHT( tor ) )
         return -1;
 
-    if( tr_dhtStatus( tor->session, NULL ) < TR_DHT_POOR )
+    status = tr_dhtStatus( tor->session, &numnodes );
+    if(status < TR_DHT_POOR ) {
+        tr_tordbg(tor, "DHT not ready (%s, %d nodes)",
+                  tr_dhtPrintableStatus(status), numnodes);
         return 0;
+    }
 
     rc = dht_search( dht_socket, tor->info.hash,
@@ -367 +407 @@
                      callback, NULL);
 
-    if( rc >= 1 )
+    if( rc >= 1 ) {
+        tr_torinf(tor, "Starting DHT announce (%s, %d nodes)",
+                  tr_dhtPrintableStatus(status), numnodes);
         tor->dhtAnnounceInProgress = TRUE;
+    } else {
+        tr_torerr(tor, "DHT announce failed, errno = %d (%s, %d nodes)",
+                  errno, tr_dhtPrintableStatus(status), numnodes);
+    }
 
     return 1;
@@ -382 +428 @@
             tosleep = 0;
         } else {
-            perror("dht_periodic");
+            tr_nerr("DHT", "dht_periodic failed (errno = %d)", errno);
             if(errno == EINVAL || errno == EFAULT)
                     abort();

trunk/libtransmission/tr-dht.h

@@ -32 +32 @@
 tr_port tr_dhtPort ( const tr_session * );
 int tr_dhtStatus( tr_session *, int * setme_nodeCount );
+const char *tr_dhtPrintableStatus(int status);
 int tr_dhtAddNode( tr_session *, tr_address *, tr_port, tr_bool bootstrap );
 int tr_dhtAnnounce( tr_torrent *, tr_bool announce );