From e9c854d1b0ea566cc96777a2358736137f7d7647 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Sat, 19 Oct 2019 13:58:43 -0400
Subject: use separate configuration items for listen and connect addresses

---
 src/cmd/server.rs | 10 +++++-----
 src/cmd/stream.rs | 11 ++++++-----
 src/cmd/watch.rs  | 11 ++++++-----
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/cmd/server.rs b/src/cmd/server.rs
index f6fabfa..858c6b8 100644
--- a/src/cmd/server.rs
+++ b/src/cmd/server.rs
@@ -8,7 +8,7 @@ pub struct Config {
         deserialize_with = "crate::config::listen_address",
         default = "crate::config::default_listen_address"
     )]
-    address: std::net::SocketAddr,
+    listen_address: std::net::SocketAddr,
 
     #[serde(default = "crate::config::default_connection_buffer_size")]
     buffer_size: usize,
@@ -35,7 +35,7 @@ impl crate::config::Config for Config {
         matches: &clap::ArgMatches<'a>,
     ) -> Result<()> {
         if matches.is_present("address") {
-            self.address = matches
+            self.listen_address = matches
                 .value_of("address")
                 .unwrap()
                 .parse()
@@ -75,7 +75,7 @@ impl crate::config::Config for Config {
         let (acceptor, server) =
             if let Some(tls_identity_file) = &self.tls_identity_file {
                 create_server_tls(
-                    self.address,
+                    self.listen_address,
                     self.buffer_size,
                     self.read_timeout,
                     tls_identity_file,
@@ -83,7 +83,7 @@ impl crate::config::Config for Config {
                 )?
             } else {
                 create_server(
-                    self.address,
+                    self.listen_address,
                     self.buffer_size,
                     self.read_timeout,
                     self.allowed_login_methods.clone(),
@@ -105,7 +105,7 @@ impl crate::config::Config for Config {
 impl Default for Config {
     fn default() -> Self {
         Self {
-            address: crate::config::default_listen_address(),
+            listen_address: crate::config::default_listen_address(),
             buffer_size: crate::config::default_connection_buffer_size(),
             read_timeout: crate::config::default_read_timeout(),
             tls_identity_file: None,
diff --git a/src/cmd/stream.rs b/src/cmd/stream.rs
index 5915004..809e480 100644
--- a/src/cmd/stream.rs
+++ b/src/cmd/stream.rs
@@ -13,7 +13,7 @@ pub struct Config {
         deserialize_with = "crate::config::connect_address",
         default = "crate::config::default_connect_address"
     )]
-    address: (String, std::net::SocketAddr),
+    connect_address: (String, std::net::SocketAddr),
 
     #[serde(default = "crate::config::default_tls")]
     tls: bool,
@@ -30,11 +30,11 @@ pub struct Config {
 
 impl Config {
     fn host(&self) -> &str {
-        &self.address.0
+        &self.connect_address.0
     }
 
     fn addr(&self) -> &std::net::SocketAddr {
-        &self.address.1
+        &self.connect_address.1
     }
 }
 
@@ -58,7 +58,8 @@ impl crate::config::Config for Config {
         }
         if matches.is_present("address") {
             let address = matches.value_of("address").unwrap();
-            self.address = crate::config::to_connect_address(address)?;
+            self.connect_address =
+                crate::config::to_connect_address(address)?;
         }
         if matches.is_present("tls") {
             self.tls = true;
@@ -138,7 +139,7 @@ impl Default for Config {
     fn default() -> Self {
         Self {
             auth: crate::config::default_auth(),
-            address: crate::config::default_connect_address(),
+            connect_address: crate::config::default_connect_address(),
             tls: crate::config::default_tls(),
             buffer_size: crate::config::default_connection_buffer_size(),
             command: crate::config::default_command(),
diff --git a/src/cmd/watch.rs b/src/cmd/watch.rs
index 31cd505..66a6881 100644
--- a/src/cmd/watch.rs
+++ b/src/cmd/watch.rs
@@ -13,7 +13,7 @@ pub struct Config {
         deserialize_with = "crate::config::connect_address",
         default = "crate::config::default_connect_address"
     )]
-    address: (String, std::net::SocketAddr),
+    connect_address: (String, std::net::SocketAddr),
 
     #[serde(default = "crate::config::default_tls")]
     tls: bool,
@@ -21,11 +21,11 @@ pub struct Config {
 
 impl Config {
     fn host(&self) -> &str {
-        &self.address.0
+        &self.connect_address.0
     }
 
     fn addr(&self) -> &std::net::SocketAddr {
-        &self.address.1
+        &self.connect_address.1
     }
 }
 
@@ -49,7 +49,8 @@ impl crate::config::Config for Config {
         }
         if matches.is_present("address") {
             let address = matches.value_of("address").unwrap();
-            self.address = crate::config::to_connect_address(address)?;
+            self.connect_address =
+                crate::config::to_connect_address(address)?;
         }
         if matches.is_present("tls") {
             self.tls = true;
@@ -113,7 +114,7 @@ impl Default for Config {
     fn default() -> Self {
         Self {
             auth: crate::config::default_auth(),
-            address: crate::config::default_connect_address(),
+            connect_address: crate::config::default_connect_address(),
             tls: crate::config::default_tls(),
         }
     }
-- 
cgit v1.2.3-54-g00ecf