From f8fd518229f7c63291ab2fa8b6cb7caa3958ad60 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sat, 4 Jul 2009 15:20:18 +0000
Subject: [PATCH] 2009-07-05  Tatsuhiro Tsujikawa 
 <t-tujikawa@users.sourceforge.net>

	Generate peer ID after SimpleRandomizer is initialized.
	* src/main.cc
	* src/option_processing.cc
---
 ChangeLog                | 6 ++++++
 src/main.cc              | 4 ++++
 src/option_processing.cc | 4 ----
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 844a76a5..46d81b5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-05  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Generate peer ID after SimpleRandomizer is initialized.
+	* src/main.cc
+	* src/option_processing.cc
+
 2009-07-04  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Removed unused method argument.
diff --git a/src/main.cc b/src/main.cc
index 2cfd78be..a69ba8d4 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -173,6 +173,10 @@ downloadresultcode::RESULT main(int argc, char* argv[])
 
   SimpleRandomizer::init();
   BitfieldManFactory::setDefaultRandomizer(SimpleRandomizer::getInstance());
+#ifdef ENABLE_BITTORRENT
+  bittorrent::generateStaticPeerId(op->get(PREF_PEER_ID_PREFIX),
+				   SimpleRandomizer::getInstance());
+#endif // ENABLE_BITTORRENT
   if(op->get(PREF_LOG) == "-") {
     LogFactory::setLogFile(DEV_STDOUT);
   } else if(!op->get(PREF_LOG).empty()) {
diff --git a/src/option_processing.cc b/src/option_processing.cc
index 9741e4ff..965a55a8 100644
--- a/src/option_processing.cc
+++ b/src/option_processing.cc
@@ -204,10 +204,6 @@ void option_processing(Option& op, std::deque<std::string>& uris,
     }
   }
 #endif // HAVE_DAEMON
-#ifdef ENABLE_BITTORRENT
-  bittorrent::generateStaticPeerId(op.get(PREF_PEER_ID_PREFIX),
-				   SimpleRandomizer::getInstance());
-#endif // ENABLE_BITTORRENT
 }
 
 } // namespace aria2