diff options
| author | Jesse Luehrs <doy@tozt.net> | 2019-10-16 01:01:10 -0400 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2019-10-16 01:01:10 -0400 |
| commit | 56cf6f34c7737aae4170d996f0c8027c4b363ff1 (patch) | |
| tree | 1bf20bbe8252ddc3ee55ffa25d4faf3e82688dbb | |
| parent | 64a56de257f7c40c683b941030e1c5e8afa8c7b6 (diff) | |
| download | teleterm-56cf6f34c7737aae4170d996f0c8027c4b363ff1.tar.gz teleterm-56cf6f34c7737aae4170d996f0c8027c4b363ff1.zip | |
move address default out of the util function
| -rw-r--r-- | src/cmd/stream.rs | 4 | ||||
| -rw-r--r-- | src/cmd/watch.rs | 4 | ||||
| -rw-r--r-- | src/util.rs | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/cmd/stream.rs b/src/cmd/stream.rs index 4a68fb9..66ed68b 100644 --- a/src/cmd/stream.rs +++ b/src/cmd/stream.rs @@ -39,8 +39,8 @@ pub fn run<'a>(matches: &clap::ArgMatches<'a>) -> super::Result<()> { .context(crate::error::CouldntFindUsername)?; crate::protocol::Auth::Plain { username } }; - let (host, address) = - crate::util::resolve_address(matches.value_of("address"))?; + let address = matches.value_of("address").unwrap_or("127.0.0.1:4144"); + let (host, address) = crate::util::resolve_address(address)?; let tls = matches.is_present("tls"); let buffer_size = matches diff --git a/src/cmd/watch.rs b/src/cmd/watch.rs index ae8d31b..a4e5efa 100644 --- a/src/cmd/watch.rs +++ b/src/cmd/watch.rs @@ -32,8 +32,8 @@ pub fn run<'a>(matches: &clap::ArgMatches<'a>) -> super::Result<()> { .context(crate::error::CouldntFindUsername)?; crate::protocol::Auth::Plain { username } }; - let (host, address) = - crate::util::resolve_address(matches.value_of("address"))?; + let address = matches.value_of("address").unwrap_or("127.0.0.1:4144"); + let (host, address) = crate::util::resolve_address(address)?; let tls = matches.is_present("tls"); run_impl(&auth, &host, address, tls) } diff --git a/src/util.rs b/src/util.rs index 15cd7d0..6e814ab 100644 --- a/src/util.rs +++ b/src/util.rs @@ -16,9 +16,8 @@ pub fn program_name() -> Result<String> { // XXX this does a blocking dns lookup - should try to find an async version pub fn resolve_address( - address: Option<&str>, + address: &str, ) -> Result<(String, std::net::SocketAddr)> { - let address = address.unwrap_or("0.0.0.0:4144"); let mut address_parts = address.split(':'); let host = address_parts.next().context(crate::error::ParseAddress)?; let port = address_parts.next().context(crate::error::ParseAddress)?; |