From 0a0d36382b8e1d5fdfccfeac6b997571a8833603 Mon Sep 17 00:00:00 2001
From: subtly <subtly@users.noreply.github.com>
Date: Sun, 14 Jun 2015 04:50:18 -0400
Subject: [PATCH] Fix bool.

---
 eth/main.cpp         | 8 +-------
 libp2p/Network.h     | 2 +-
 libp2p/NodeTable.cpp | 4 ++--
 libp2p/NodeTable.h   | 2 +-
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/eth/main.cpp b/eth/main.cpp
index bc143154e..e914bfc31 100644
--- a/eth/main.cpp
+++ b/eth/main.cpp
@@ -598,13 +598,7 @@ int main(int argc, char** argv)
 		else if (arg == "-b" || arg == "--bootstrap")
 			bootstrap = true;
 		else if (arg == "--no-discovery")
-			if (bootstrap)
-			{
-				cerr << "-b/--bootstrap cannot be used with --no-discovery." << endl;
-				return -1;
-			}
-			else
-				disableDiscovery = true;
+			disableDiscovery = true;
 		else if (arg == "--pin")
 			pinning = true;
 		else if (arg == "-f" || arg == "--force-mining")
diff --git a/libp2p/Network.h b/libp2p/Network.h
index 97c631a7c..e70dd89ea 100644
--- a/libp2p/Network.h
+++ b/libp2p/Network.h
@@ -51,9 +51,9 @@ struct NetworkPreferences
 	std::string publicIPAddress;
 	std::string listenIPAddress;
 	unsigned short listenPort = 30303;
+	bool traverseNAT = true;
 	bool discovery = true;		// Discovery is activated with network.
 	bool pin = false;			// Only connect to trusted ("required") peers.
-	bool traverseNAT = true;
 };
 
 /**
diff --git a/libp2p/NodeTable.cpp b/libp2p/NodeTable.cpp
index 491795274..1a0b11734 100644
--- a/libp2p/NodeTable.cpp
+++ b/libp2p/NodeTable.cpp
@@ -40,7 +40,7 @@ const char* NodeTableIngress::name() { return "<<P"; }
 
 NodeEntry::NodeEntry(NodeId const& _src, Public const& _pubk, NodeIPEndpoint const& _gw): Node(_pubk, _gw), distance(NodeTable::distance(_src, _pubk)) {}
 
-NodeTable::NodeTable(ba::io_service& _io, KeyPair const& _alias, NodeIPEndpoint const& _endpoint, bool _disabled):
+NodeTable::NodeTable(ba::io_service& _io, KeyPair const& _alias, NodeIPEndpoint const& _endpoint, bool _enabled):
 	m_node(Node(_alias.pub(), _endpoint)),
 	m_secret(_alias.sec()),
 	m_io(_io),
@@ -48,7 +48,7 @@ NodeTable::NodeTable(ba::io_service& _io, KeyPair const& _alias, NodeIPEndpoint
 	m_socketPointer(m_socket.get()),
 	m_bucketRefreshTimer(m_io),
 	m_evictionCheckTimer(m_io),
-	m_disabled(_disabled)
+	m_disabled(!_enabled)
 {
 	for (unsigned i = 0; i < s_bins; i++)
 	{
diff --git a/libp2p/NodeTable.h b/libp2p/NodeTable.h
index bca14e5d4..d31a356ef 100644
--- a/libp2p/NodeTable.h
+++ b/libp2p/NodeTable.h
@@ -130,7 +130,7 @@ public:
 	enum NodeRelation { Unknown = 0, Known };
 	
 	/// Constructor requiring host for I/O, credentials, and IP Address and port to listen on.
-	NodeTable(ba::io_service& _io, KeyPair const& _alias, NodeIPEndpoint const& _endpoint, bool _disabled = false);
+	NodeTable(ba::io_service& _io, KeyPair const& _alias, NodeIPEndpoint const& _endpoint, bool _enabled = true);
 	~NodeTable();
 
 	/// Returns distance based on xor metric two node ids. Used by NodeEntry and NodeTable.