From e1a1aef990849ae654a350c6c1a496204bb48412 Mon Sep 17 00:00:00 2001
From: hagen <hagen@mail.i2p>
Date: Thu, 21 Jan 2016 07:37:38 +0000
Subject: [PATCH] * I2PControl : use password option from main config

---
 I2PControl.cpp | 6 ++++--
 I2PControl.h   | 6 ------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/I2PControl.cpp b/I2PControl.cpp
index a706cd79..534a85d7 100644
--- a/I2PControl.cpp
+++ b/I2PControl.cpp
@@ -12,6 +12,7 @@
 #include <boost/property_tree/json_parser.hpp>
 #endif
 #include "Log.h"
+#include "Config.h"
 #include "NetDb.h"
 #include "RouterContext.h"
 #include "Daemon.h"
@@ -26,11 +27,12 @@ namespace i2p
 namespace client
 {
 	I2PControlService::I2PControlService (const std::string& address, int port):
-		m_Password (I2P_CONTROL_DEFAULT_PASSWORD), m_IsRunning (false), m_Thread (nullptr),
+		m_IsRunning (false), m_Thread (nullptr),
 		m_Acceptor (m_Service, boost::asio::ip::tcp::endpoint(boost::asio::ip::address::from_string(address), port)),
 		m_SSLContext (m_Service, boost::asio::ssl::context::sslv23),
 		m_ShutdownTimer (m_Service)
 	{
+		GetOption("i2pcontrol.password", m_Password);
 		LoadConfig ();
 		// certificate				
 		auto path = GetPath ();
@@ -385,7 +387,7 @@ namespace client
 
 	void I2PControlService::PasswordHandler (const std::string& value)
 	{
-		LogPrint (eLogDebug, "I2PControl new password=", value);
+		LogPrint (eLogDebug, "I2PControl: new password=", value, ", to make it persistent you should update your config!");
 		m_Password = value;
 		m_Tokens.clear ();
 		SaveConfig ();
diff --git a/I2PControl.h b/I2PControl.h
index 10b6b651..bed84666 100644
--- a/I2PControl.h
+++ b/I2PControl.h
@@ -26,7 +26,6 @@ namespace client
 	const char I2P_CONTROL_KEY_FILE[] = "key.pem";
 	const char I2P_CONTROL_CERT_FILE[] = "cert.pem";
 	const char I2P_CONTROL_CONFIG_FILE[] = "i2pcontrol.conf";
-	const char I2P_CONTROL_DEFAULT_PASSWORD[] = "itoopie";	
 
 	const char I2P_CONTROL_PROPERTY_ID[] = "id";
 	const char I2P_CONTROL_PROPERTY_METHOD[] = "method";
@@ -48,11 +47,6 @@ namespace client
 	const char I2P_CONTROL_PARAM_ECHO[] = "Echo";	
 	const char I2P_CONTROL_PARAM_RESULT[] = "Result";	
 
-	// I2PControl
-	const char I2P_CONTROL_I2PCONTROL_ADDRESS[] = "i2pcontrol.address";		
-	const char I2P_CONTROL_I2PCONTROL_PASSWORD[] = "i2pcontrol.password";
-	const char I2P_CONTROL_I2PCONTROL_PORT[] = "i2pcontrol.port";		
-
 	// RouterInfo requests
 	const char I2P_CONTROL_ROUTER_INFO_UPTIME[] = "i2p.router.uptime";
 	const char I2P_CONTROL_ROUTER_INFO_VERSION[] = "i2p.router.version";