Merge branch 'master' of github.com:ethcore/parity into jsonrpc2

install-deps.sh

@@ -570,7 +570,7 @@ function run_installer()
 		sudo apt-add-repository -y ppa:ethcore/ethcore
 		sudo apt-get -f -y install
 		sudo apt-get update -qq
-		sudo apt-get install -qq -y librocksdb-dev
+		sudo apt-get install -qq -y librocksdb-dev librocksdb
 	}
 
 	function linux_rocksdb_installer()
@@ -669,7 +669,7 @@ function run_installer()
 	function build_parity()
 	{
 		info "Downloading Parity..."
-		git clone git@github.com:ethcore/parity
+		git clone https://github.com/ethcore/parity
 		cd parity
 		git submodule init
 		git submodule update

parity/main.rs

@@ -64,6 +64,7 @@ Options:
   --listen-address URL     Specify the IP/port on which to listen for peers [default: 0.0.0.0:30304].
   --public-address URL     Specify the IP/port on which peers may connect [default: 0.0.0.0:30304].
   --address URL            Equivalent to --listen-address URL --public-address URL.
+  --upnp                   Use UPnP to try to figure out the correct network settings.
 
   --cache-pref-size BYTES  Specify the prefered size of the blockchain cache in bytes [default: 16384].
   --cache-max-size BYTES   Specify the maximum size of the blockchain cache in bytes [default: 262144].
@@ -89,7 +90,6 @@ fn setup_log(init: &str) {
 	builder.init().unwrap();
 }
 
-
 #[cfg(feature = "rpc")]
 fn setup_rpc_server(client: Arc<Client>, sync: Arc<EthSync>, url: &str) {
 	use rpc::v1::*;
@@ -106,17 +106,7 @@ fn setup_rpc_server(client: Arc<Client>, sync: Arc<EthSync>, url: &str) {
 fn setup_rpc_server(_client: Arc<Client>, _sync: Arc<EthSync>, _url: &str) {
 }
 
-struct Configuration {
-	args: Args
-}
-impl Configuration {
-	fn parse() -> Self {
-		Configuration {
-			args: Args::docopt().decode().unwrap_or_else(|e| e.exit())
-		}
-	}
-
-	fn print_version(&self) {
+fn print_version() {
 	println!("\
 Parity version {} ({}-{}-{})
 Copyright 2015, 2016 Ethcore (UK) Limited
@@ -128,6 +118,17 @@ By Wood/Paronyan/Kotewicz/Drwięga/Volf.\
 ", env!("CARGO_PKG_VERSION"), Target::arch(), Target::env(), Target::os());
 }
 
+struct Configuration {
+	args: Args
+}
+
+impl Configuration {
+	fn parse() -> Self {
+		Configuration {
+			args: Args::docopt().decode().unwrap_or_else(|e| e.exit())
+		}
+	}
+
 	fn get_spec(&self) -> Spec {
 		match self.args.flag_chain.as_ref() {
 			"frontier" | "mainnet" => ethereum::new_frontier(),
@@ -178,7 +179,7 @@ fn wait_for_exit(client_service: &ClientService) {
 fn main() {
 	let conf = Configuration::parse();
 	if conf.args.flag_version {
-		conf.print_version();
+		print_version();
 		return;
 	}
 
@@ -190,10 +191,10 @@ fn main() {
 	unsafe { ::fdlimit::raise_fd_limit(); }
 
 	// Configure network
-	let init_nodes = conf.get_init_nodes(&spec);
-	let (listen, public) = conf.get_net_addresses();
 	let mut net_settings = NetworkConfiguration::new();
-	net_settings.boot_nodes = init_nodes;
+	net_settings.nat_enabled = conf.args.flag_upnp;
+	net_settings.boot_nodes = conf.get_init_nodes(&spec);
+	let (listen, public) = conf.get_net_addresses();
 	net_settings.listen_address = listen;
 	net_settings.public_address = public;
 

util/Cargo.toml

@@ -29,3 +29,4 @@ serde = "0.6.7"
 clippy = "0.0.37"
 json-tests = { path = "json-tests" }
 target_info = "0.1.0"
+igd = "0.4.2"

util/src/lib.rs

@@ -100,6 +100,7 @@ extern crate crossbeam;
 extern crate serde;
 #[macro_use]
 extern crate log as rlog;
+extern crate igd;
 
 pub mod standard;
 #[macro_use]

util/src/network/host.rs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::net::{SocketAddr};
+use std::net::{SocketAddr, SocketAddrV4};
 use std::collections::{HashMap};
 use std::hash::{Hasher};
 use std::str::{FromStr};
@@ -36,6 +36,7 @@ use network::NetworkProtocolHandler;
 use network::node::*;
 use network::stats::NetworkStats;
 use network::error::DisconnectReason;
+use igd::{PortMappingProtocol,search_gateway};
 
 type Slab<T> = ::slab::Slab<T, usize>;
 
@@ -86,6 +87,42 @@ impl NetworkConfiguration {
 		config.public_address = SocketAddr::from_str(&format!("0.0.0.0:{}", port)).unwrap();
 		config
 	}
+
+	/// Conduct NAT if needed.
+	pub fn prepared(self) -> Self {
+		let mut listen = self.listen_address;
+		let mut public = self.public_address;
+
+		if self.nat_enabled {
+			info!("Enabling NAT...");
+			match search_gateway() {
+				Err(ref err) => info!("Error: {}", err),
+				Ok(gateway) => {
+					let int_addr = SocketAddrV4::from_str("127.0.0.1:30304").unwrap();
+					match gateway.get_any_address(PortMappingProtocol::TCP, int_addr, 0, "Parity Node/TCP") {
+						Err(ref err) => {
+							info!("There was an error! {}", err);
+						},
+						Ok(ext_addr) => {
+							info!("Local gateway: {}, External ip address: {}", gateway, ext_addr);
+							public = SocketAddr::V4(ext_addr);
+							listen = SocketAddr::V4(int_addr);
+						},
+					}
+				},
+			}
+		}
+
+		NetworkConfiguration {
+			listen_address: listen,
+			public_address: public,
+			nat_enabled: false,
+			discovery_enabled: self.discovery_enabled,
+			pin: self.pin,
+			boot_nodes: self.boot_nodes,
+			use_secret: self.use_secret,
+		}
+	}
 }
 
 // Tokens
@@ -296,6 +333,8 @@ pub struct Host<Message> where Message: Send + Sync + Clone {
 impl<Message> Host<Message> where Message: Send + Sync + Clone {
 	/// Create a new instance
 	pub fn new(config: NetworkConfiguration) -> Host<Message> {
+		let config = config.prepared();
+
 		let addr = config.listen_address;
 		// Setup the server socket
 		let tcp_listener = TcpListener::bind(&addr).unwrap();