2007-05-23 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

	Change file mode to 666:
	* src/common.h (OPEN_MODE): New definition.
	* src/File.cc
	* src/Util.cc
	* src/Directry.cc
	* src/AbstractDiskWriter.cc

	Change the level of log message "download aborted" to debug:
	* src/PeerAbstractCommand.cc (execute)
	
	* src/RequestGroup.h (RequestGroup): Initialized 
_hintTotalLength to 0.

	* src/TrackerWatcherCommand.cc
	(createCommand): Sleep some seconds after request failed.
	If tracker request fails more than value of 
PREF_TRACKER_MAX_TRIES,
	then abort tracker request.

1 files changed, 4 insertions, 2 deletions

diff --git a/src/TrackerWatcherCommand.cc b/src/TrackerWatcherCommand.cc
index 4c5eec74..5b4b2b64 100644
--- a/src/TrackerWatcherCommand.cc
+++ b/src/TrackerWatcherCommand.cc
@@ -64,6 +64,7 @@ bool TrackerWatcherCommand::execute() {
 
 Command* TrackerWatcherCommand::createCommand() {
   Command* command = 0;
+
   if(btAnnounce->isAnnounceReady()) {
     command = createRequestCommand(btAnnounce->getAnnounceUrl());
     btAnnounce->announceStart(); // inside it, trackers++.
@@ -72,11 +73,13 @@ Command* TrackerWatcherCommand::createCommand() {
     e->_requestGroupMan->removeStoppedGroup();
     if(btAnnounce->isAllAnnounceFailed()) {
       btAnnounce->resetAnnounce();
-      // sleep a few seconds.
+      return 0;
+    } else if(btAnnounce->isAnnounceReady()) {
       command =
 	new SleepCommand(cuid, e,
 			 createRequestCommand(btAnnounce->getAnnounceUrl()),
 			 e->option->getAsInt(PREF_RETRY_WAIT));
+      btAnnounce->announceStart(); // inside it, tracker++.
     }
   }
   return command;
@@ -94,7 +97,6 @@ Command* TrackerWatcherCommand::createRequestCommand(const string& url)
     logger->error("CUID#%d - Cannot create tracker request.");
     return 0;
   }
-
   logger->info("CUID#%d - Creating new tracker request command #%d", cuid,
 	       commands.front()->getCuid());
   return commands.front();