grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add 'interface' option to cli (#8699)

Browse Source 
Additionally as to the port, the new  command line option
now allows the user to specify the network interface the P2P-Parity
listens, too. With support for 'all' and 'local' like in all other
versions of this flag. Default is 'all' (aka ).
This commit is contained in:
Benjamin Kampmann 2018-05-31 13:36:47 +02:00 committed by Afri Schoedon
parent 686bf443e6
commit 6b9314eaa9
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
parity/cli/mod.rs
View File

@ -438,6 +438,10 @@ usage! {
"--port=[PORT]", "--port=[PORT]",
"Override the port on which the node should listen.", "Override the port on which the node should listen.",
ARG arg_interface: (String) = "all", or |c: &Config| c.network.as_ref()?.interface.clone(),
"--interface=[IP]",
"Network interfaces. Valid values are 'all', 'local' or the ip of the interface you want parity to listen to.",
ARG arg_min_peers: (Option<u16>) = None, or |c: &Config| c.network.as_ref()?.min_peers.clone(), ARG arg_min_peers: (Option<u16>) = None, or |c: &Config| c.network.as_ref()?.min_peers.clone(),
"--min-peers=[NUM]", "--min-peers=[NUM]",
"Try to maintain at least NUM peers.", "Try to maintain at least NUM peers.",
@ -1119,6 +1123,7 @@ struct Network {
warp: Option<bool>, warp: Option<bool>,
warp_barrier: Option<u64>, warp_barrier: Option<u64>,
port: Option<u16>, port: Option<u16>,
interface: Option<String>,
min_peers: Option<u16>, min_peers: Option<u16>,
max_peers: Option<u16>, max_peers: Option<u16>,
snapshot_peers: Option<u16>, snapshot_peers: Option<u16>,
@ -1567,6 +1572,7 @@ mod tests {
// -- Networking Options // -- Networking Options
flag_no_warp: false, flag_no_warp: false,
arg_port: 30303u16, arg_port: 30303u16,
arg_interface: "all".into(),
arg_min_peers: Some(25u16), arg_min_peers: Some(25u16),
arg_max_peers: Some(50u16), arg_max_peers: Some(50u16),
arg_max_pending_peers: 64u16, arg_max_pending_peers: 64u16,
@ -1823,6 +1829,7 @@ mod tests {
warp: Some(false), warp: Some(false),
warp_barrier: None, warp_barrier: None,
port: None, port: None,
interface: None,
min_peers: Some(10), min_peers: Some(10),
max_peers: Some(20), max_peers: Some(20),
max_pending_peers: Some(30), max_pending_peers: Some(30),

2
parity/configuration.rs
View File

@ -767,7 +767,7 @@ impl Configuration {
fn net_addresses(&self) -> Result<(SocketAddr, Option<SocketAddr>), String> { fn net_addresses(&self) -> Result<(SocketAddr, Option<SocketAddr>), String> {
let port = self.args.arg_ports_shift + self.args.arg_port; let port = self.args.arg_ports_shift + self.args.arg_port;
let listen_address = SocketAddr::new("0.0.0.0".parse().unwrap(), port); let listen_address = SocketAddr::new(self.interface(&self.args.arg_interface).parse().unwrap(), port);
let public_address = if self.args.arg_nat.starts_with("extip:") { let public_address = if self.args.arg_nat.starts_with("extip:") {
let host = &self.args.arg_nat[6..]; let host = &self.args.arg_nat[6..];
let host = host.parse().map_err(|_| format!("Invalid host given with `--nat extip:{}`", host))?; let host = host.parse().map_err(|_| format!("Invalid host given with `--nat extip:{}`", host))?;