mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-26 09:37:56 +00:00
Code Issues Releases Wiki Activity

(trunk libT) r11448 seems to have been a red herring, so undo that commit.

Browse source
This commit is contained in:
Charles Kerr 2010-12-03 23:10:24 +00:00
parent cef4c4da88
commit e957353a85
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
libtransmission/announcer.c
View file

@ -604,6 +604,14 @@ publishErrorClear( tr_tier * tier )
publishMessage( tier, NULL, TR_TRACKER_ERROR_CLEAR ); publishMessage( tier, NULL, TR_TRACKER_ERROR_CLEAR );
} }
static void
publishErrorMessageAndStop( tr_tier * tier, const char * msg )
{
tier->isRunning = FALSE;
publishMessage( tier, msg, TR_TRACKER_ERROR );
}
static void static void
publishWarning( tr_tier * tier, const char * msg ) publishWarning( tr_tier * tier, const char * msg )
{ {
@ -1445,7 +1453,7 @@ onAnnounceDone( tr_session * session,
tierAddAnnounce( tier, announceEvent, now + interval ); tierAddAnnounce( tier, announceEvent, now + interval );
tier->manualAnnounceAllowedAt = now + tier->announceMinIntervalSec; tier->manualAnnounceAllowedAt = now + tier->announceMinIntervalSec;
} }
else if( 400 <= responseCode && responseCode <= 599 ) else if( ( responseCode == 404 ) || ( 500 <= responseCode && responseCode <= 599 ) )
{ {
/* 404: The requested resource could not be found but may be /* 404: The requested resource could not be found but may be
* available again in the future. Subsequent requests by * available again in the future. Subsequent requests by
@ -1455,16 +1463,20 @@ onAnnounceDone( tr_session * session,
* has erred or is incapable of performing the request. * has erred or is incapable of performing the request.
* So we pause a bit and try again. */ * So we pause a bit and try again. */
/* 4xx: The request could not be understood by the server due to
* malformed syntax. The client SHOULD NOT repeat the
* request without modifications... however, some trackers spit
* out 4xx messages too freely, so we can't disable reannounces
* altogether. Use the same sliding scale that 404 and 5xx use. */
const int interval = getRetryInterval( tier->currentTracker->host ); const int interval = getRetryInterval( tier->currentTracker->host );
tier->manualAnnounceAllowedAt = ~(time_t)0; tier->manualAnnounceAllowedAt = ~(time_t)0;
tierAddAnnounce( tier, announceEvent, now + interval ); tierAddAnnounce( tier, announceEvent, now + interval );
} }
else if( 400 <= responseCode && responseCode <= 499 )
{
/* The request could not be understood by the server due to
* malformed syntax. The client SHOULD NOT repeat the
* request without modifications. */
if( tr_torrentIsPrivate( tier->tor ) || ( tier->tor->info.trackerCount < 2 ) )
publishErrorMessageAndStop( tier, _( "Tracker returned a 4xx message" ) );
tier->announceAt = 0;
tier->manualAnnounceAllowedAt = ~(time_t)0;
}
else else
{ {
/* WTF did we get?? */ /* WTF did we get?? */