mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

Reword debugging messages for the IPv4 DHT. 

The IPv6 DHT is no longer expermiental, no need for the asymmetry.
This commit is contained in:
Juliusz Chroboczek 2011-07-25 19:53:39 +00:00
parent 8018973257
commit 17d1210b95
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libtransmission/tr-dht.c
View File

@ -150,7 +150,7 @@ dht_bootstrap(void *closure)
return; return;
if(cl->len > 0) if(cl->len > 0)
tr_ninf( "DHT", "Bootstrapping from %d nodes", num ); tr_ninf( "DHT", "Bootstrapping from %d IPv4 nodes", num );
if(cl->len6 > 0) if(cl->len6 > 0)
tr_ninf( "DHT", "Bootstrapping from %d IPv6 nodes", num6 ); tr_ninf( "DHT", "Bootstrapping from %d IPv6 nodes", num6 );
@ -529,9 +529,9 @@ callback( void *ignore UNUSED, int event,
for( i=0; i<n; ++i ) for( i=0; i<n; ++i )
tr_peerMgrAddPex( tor, TR_PEER_FROM_DHT, pex+i, -1 ); tr_peerMgrAddPex( tor, TR_PEER_FROM_DHT, pex+i, -1 );
tr_free(pex); tr_free(pex);
tr_tordbg(tor, "Learned %d%s peers from DHT", tr_tordbg(tor, "Learned %d %s peers from DHT",
(int)n, (int)n,
event == DHT_EVENT_VALUES6 ? " IPv6" : ""); event == DHT_EVENT_VALUES6 ? "IPv6" : "IPv4");
} }
tr_sessionUnlock( session ); tr_sessionUnlock( session );
} else if( event == DHT_EVENT_SEARCH_DONE || } else if( event == DHT_EVENT_SEARCH_DONE ||
@ -539,7 +539,7 @@ callback( void *ignore UNUSED, int event,
tr_torrent * tor = tr_torrentFindFromHash( session, info_hash ); tr_torrent * tor = tr_torrentFindFromHash( session, info_hash );
if( tor ) { if( tor ) {
if( event == DHT_EVENT_SEARCH_DONE ) { if( event == DHT_EVENT_SEARCH_DONE ) {
tr_torinf(tor, "DHT announce done"); tr_torinf(tor, "IPv4 DHT announce done");
tor->dhtAnnounceInProgress = 0; tor->dhtAnnounceInProgress = 0;
} else { } else {
tr_torinf(tor, "IPv6 DHT announce done"); tr_torinf(tor, "IPv6 DHT announce done");
@ -569,8 +569,8 @@ tr_dhtAnnounce(tr_torrent *tor, int af, bool announce)
announce ? tr_sessionGetPeerPort(session) : 0, announce ? tr_sessionGetPeerPort(session) : 0,
af, callback, NULL); af, callback, NULL);
if( rc >= 1 ) { if( rc >= 1 ) {
tr_torinf(tor, "Starting%s DHT announce (%s, %d nodes)", tr_torinf(tor, "Starting %s DHT announce (%s, %d nodes)",
af == AF_INET6 ? " IPv6" : "", af == AF_INET6 ? "IPv6" : "IPv4",
tr_dhtPrintableStatus(status), numnodes); tr_dhtPrintableStatus(status), numnodes);
if(af == AF_INET) if(af == AF_INET)
tor->dhtAnnounceInProgress = true; tor->dhtAnnounceInProgress = true;
@ -578,14 +578,14 @@ tr_dhtAnnounce(tr_torrent *tor, int af, bool announce)
tor->dhtAnnounce6InProgress = true; tor->dhtAnnounce6InProgress = true;
ret = 1; ret = 1;
} else { } else {
tr_torerr(tor, "%sDHT announce failed (%s, %d nodes): %s", tr_torerr(tor, "%s DHT announce failed (%s, %d nodes): %s",
af == AF_INET6 ? "IPv6 " : "", af == AF_INET6 ? "IPv6" : "IPv4",
tr_dhtPrintableStatus(status), numnodes, tr_dhtPrintableStatus(status), numnodes,
tr_strerror( errno ) ); tr_strerror( errno ) );
} }
} else { } else {
tr_tordbg(tor, "%sDHT not ready (%s, %d nodes)", tr_tordbg(tor, "%s DHT not ready (%s, %d nodes)",
af == AF_INET6 ? "IPv6 " : "", af == AF_INET6 ? "IPv6" : "IPv4",
tr_dhtPrintableStatus(status), numnodes); tr_dhtPrintableStatus(status), numnodes);
} }