refactor: rename socks5_proxy to tor_socks5_proxy

bin/darkfid/darkfid_config.toml

@@ -99,8 +99,8 @@ hostlist = "~/.local/share/darkfi/darkfid/localnet/p2p_hostlist.tsv"
 # Allow transport mixing (e.g. Tor would be allowed to connect to `tcp://`)
 #transport_mixing = true
 
-# Socks5 proxy
-#socks5_proxy = "socks5://127.0.0.1:9050"
+# Tor Socks5 proxy
+#tor_socks5_proxy = "socks5://127.0.0.1:9050"
 
 # I2p Socks5 proxy
 #i2p_socks5_proxy = "socks5://127.0.0.1:4447"
@@ -235,8 +235,8 @@ allowed_transports = ["tcp+tls"]
 # Allow transport mixing (e.g. Tor would be allowed to connect to `tcp://`)
 #transport_mixing = true
 
-# Socks5 proxy
-#socks5_proxy = "socks5://127.0.0.1:9050"
+# Tor Socks5 proxy
+#tor_socks5_proxy = "socks5://127.0.0.1:9050"
 
 # I2p Socks5 proxy
 #i2p_socks5_proxy = "socks5://127.0.0.1:4447"
@@ -365,8 +365,8 @@ allowed_transports = ["tcp+tls"]
 # Allow transport mixing (e.g. Tor would be allowed to connect to `tcp://`)
 #transport_mixing = true
 
-# Socks5 proxy
-#socks5_proxy = "socks5://127.0.0.1:9050"
+# Tor Socks5 proxy
+#tor_socks5_proxy = "socks5://127.0.0.1:9050"
 
 # I2p Socks5 proxy
 #i2p_socks5_proxy = "socks5://127.0.0.1:4447"

bin/darkirc/darkirc_config.toml

@@ -99,8 +99,8 @@ allowed_transports = ["tcp+tls"]
 # By default this is not allowed.
 transport_mixing = false
 
-# Socks5 proxy
-#socks5_proxy = "socks5://127.0.0.1:9050"
+# Tor Socks5 proxy
+#tor_socks5_proxy = "socks5://127.0.0.1:9050"
 
 # I2p Socks5 proxy
 #i2p_socks5_proxy = "socks5://127.0.0.1:4447"

bin/fud/fud/fud_config.toml

@@ -71,8 +71,8 @@ allowed_transports = ["tcp", "tcp+tls"]
 # By default this is not allowed.
 transport_mixing = false
 
-# Socks5 proxy
-#socks5_proxy = "socks5://127.0.0.1:9050"
+# Tor Socks5 proxy
+#tor_socks5_proxy = "socks5://127.0.0.1:9050"
 
 # I2p Socks5 proxy
 #i2p_socks5_proxy = "socks5://127.0.0.1:4447"

bin/tau/taud/taud_config.toml

@@ -100,8 +100,8 @@ allowed_transports = ["tcp+tls"]
 # By default this is not allowed.
 transport_mixing = false
 
-# Socks5 proxy
-#socks5_proxy = "socks5://127.0.0.1:9050"
+# Tor Socks5 proxy
+#tor_socks5_proxy = "socks5://127.0.0.1:9050"
 
 # I2p Socks5 proxy
 #i2p_socks5_proxy = "socks5://127.0.0.1:4447"

doc/src/misc/nodes/tor-guide.md

@@ -64,11 +64,11 @@ transport_mixing = false
 ```
 
 #### Socks5 proxy node settings
-If we want to route all our connections through the SOCKS5 proxy provided by Tor, we can enable the Socks5 proxy 
+If we want to route all our connections through the `socks5` proxy provided by Tor, we can enable the Socks5 proxy 
 transport in our settings.
 
-When using Whonix, this configuration helps prevent the 'Tor over Tor' issue.
-Ensure that the socks5_proxy field is correctly set, if your Socks5 proxy is running on a different 
+When using `Whonix`, this configuration helps prevent the `Tor over Tor` issue.
+Ensure that the `tor_socks5_proxy` field is correctly set, if your tor socks5 proxy is running on a different 
 host or port.
 
 <u><b>Note</b></u>: With this setup, our node will connect to both Tor and clearnet nodes through the Socks5 proxy.
@@ -77,8 +77,8 @@ host or port.
 allowed_transports = ["socks5", "socks5+tls"]
 ## Enable transport mixing
 transport_mixing = true
-## Socks5 proxy
-socks5_proxy = "socks5://127.0.0.1:9050"
+## Tor socks5 proxy
+tor_socks5_proxy = "socks5://127.0.0.1:9050"
 ```
 
 ### Inbound node settings

src/net/connector.rs

@@ -68,7 +68,7 @@ impl Connector {
         let datastore = settings.p2p_datastore.clone();
         let outbound_connect_timeout = settings.outbound_connect_timeout;
         let i2p_socks5_proxy = settings.i2p_socks5_proxy.clone();
-        let socks5_proxy = settings.socks5_proxy.clone();
+        let tor_socks5_proxy = settings.tor_socks5_proxy.clone();
         drop(settings);
 
         let mut endpoint = url.clone();
@@ -91,10 +91,10 @@ impl Connector {
                     endpoint.host().unwrap(),
                     endpoint.port().unwrap()
                 ));
-                endpoint.set_host(socks5_proxy.host_str())?;
-                endpoint.set_port(socks5_proxy.port())?;
-                endpoint.set_username(socks5_proxy.username())?;
-                endpoint.set_password(socks5_proxy.password())?;
+                endpoint.set_host(tor_socks5_proxy.host_str())?;
+                endpoint.set_port(tor_socks5_proxy.port())?;
+                endpoint.set_username(tor_socks5_proxy.username())?;
+                endpoint.set_password(tor_socks5_proxy.password())?;
                 endpoint.set_scheme("socks5")?;
             } else if transports.contains(&"socks5+tls".to_string()) &&
                 (scheme == "tcp+tls" || scheme == "tor+tls")
@@ -104,10 +104,10 @@ impl Connector {
                     endpoint.host().unwrap(),
                     endpoint.port().unwrap()
                 ));
-                endpoint.set_host(socks5_proxy.host_str())?;
-                endpoint.set_port(socks5_proxy.port())?;
-                endpoint.set_username(socks5_proxy.username())?;
-                endpoint.set_password(socks5_proxy.password())?;
+                endpoint.set_host(tor_socks5_proxy.host_str())?;
+                endpoint.set_port(tor_socks5_proxy.port())?;
+                endpoint.set_username(tor_socks5_proxy.username())?;
+                endpoint.set_password(tor_socks5_proxy.password())?;
                 endpoint.set_scheme("socks5+tls")?;
             }
         }

src/net/hosts.rs

@@ -420,7 +420,7 @@ impl HostContainer {
         color: HostColor,
         transports: &[String],
         transport_mixing: bool,
-        socks5_proxy: Url,
+        tor_socks5_proxy: Url,
     ) -> Vec<(Url, u64)> {
         trace!(target: "net::hosts::fetch_addrs()", "[START] {:?}", color);
         let mut hosts = vec![];
@@ -451,10 +451,10 @@ impl HostContainer {
                             addr.host().unwrap(),
                             addr.port().unwrap()
                         ));
-                        addr.set_host(socks5_proxy.host_str()).unwrap();
-                        addr.set_port(socks5_proxy.port()).unwrap();
-                        addr.set_username(socks5_proxy.username()).unwrap();
-                        addr.set_password(socks5_proxy.password()).unwrap();
+                        addr.set_host(tor_socks5_proxy.host_str()).unwrap();
+                        addr.set_port(tor_socks5_proxy.port()).unwrap();
+                        addr.set_username(tor_socks5_proxy.username()).unwrap();
+                        addr.set_password(tor_socks5_proxy.password()).unwrap();
                         addr.set_scheme($a).unwrap();
                         hosts.push((addr.clone(), last_seen.clone()));
                     }

src/net/session/outbound_session.rs

@@ -218,7 +218,7 @@ impl Slot {
         let transports = settings.allowed_transports.clone();
         let transport_mixing = settings.transport_mixing;
         let preference_strict = settings.slot_preference_strict;
-        let socks5_proxy = settings.socks5_proxy.clone();
+        let tor_socks5_proxy = settings.tor_socks5_proxy.clone();
 
         // Drop Settings read lock
         drop(settings);
@@ -230,13 +230,13 @@ impl Slot {
         // If we only have grey entries, select from the greylist. Otherwise,
         // use the preference defined in settings.
         let addrs = if grey_only && !preference_strict {
-            container.fetch(HostColor::Grey, &transports, transport_mixing, socks5_proxy)
+            container.fetch(HostColor::Grey, &transports, transport_mixing, tor_socks5_proxy)
         } else if slot < gold_count {
-            container.fetch(HostColor::Gold, &transports, transport_mixing, socks5_proxy)
+            container.fetch(HostColor::Gold, &transports, transport_mixing, tor_socks5_proxy)
         } else if slot < white_count {
-            container.fetch(HostColor::White, &transports, transport_mixing, socks5_proxy)
+            container.fetch(HostColor::White, &transports, transport_mixing, tor_socks5_proxy)
         } else {
-            container.fetch(HostColor::Grey, &transports, transport_mixing, socks5_proxy)
+            container.fetch(HostColor::Grey, &transports, transport_mixing, tor_socks5_proxy)
         };
 
         hosts.check_addrs(addrs).await

src/net/settings.rs

@@ -64,9 +64,9 @@ pub struct Settings {
     pub allowed_transports: Vec<String>,
     /// Allow transport mixing (e.g. Tor would be allowed to connect to `tcp://`)
     pub transport_mixing: bool,
-    /// Socks5 proxy to connect to when socks5 or socks5+tls are added to allowed transports
+    /// Tor socks5 proxy to connect to when socks5 or socks5+tls are added to allowed transports
     /// and transport mixing is enabled
-    pub socks5_proxy: Url,
+    pub tor_socks5_proxy: Url,
     /// I2p Socks5 proxy to connect to i2p eepsite (hidden services)
     pub i2p_socks5_proxy: Url,
     /// Outbound connection slots number, this many connections will be
@@ -129,7 +129,7 @@ impl Default for Settings {
             app_version,
             allowed_transports: vec!["tcp+tls".to_string()],
             transport_mixing: true,
-            socks5_proxy: Url::parse("socks5://127.0.0.1:9050").unwrap(),
+            tor_socks5_proxy: Url::parse("socks5://127.0.0.1:9050").unwrap(),
             i2p_socks5_proxy: Url::parse("socks5://127.0.0.1:4447").unwrap(),
             outbound_connections: 8,
             inbound_connections: 8,
@@ -232,10 +232,10 @@ pub struct SettingsOpt {
     #[structopt(long)]
     pub transport_mixing: Option<bool>,
 
-    /// Socks5 proxy to connect to when socks5 or socks5+tls are added to allowed transports
+    /// Tor socks5 proxy to connect to when socks5 or socks5+tls are added to allowed transports
     /// and transport mixing is enabled
     #[structopt(long)]
-    pub socks5_proxy: Option<Url>,
+    pub tor_socks5_proxy: Option<Url>,
 
     /// I2p Socks5 proxy to connect to i2p eepsite (hidden services)
     #[structopt(long)]
@@ -317,7 +317,7 @@ impl From<SettingsOpt> for Settings {
             app_version: def.app_version,
             allowed_transports: opt.allowed_transports.unwrap_or(def.allowed_transports),
             transport_mixing: opt.transport_mixing.unwrap_or(def.transport_mixing),
-            socks5_proxy: opt.socks5_proxy.unwrap_or(def.socks5_proxy),
+            tor_socks5_proxy: opt.tor_socks5_proxy.unwrap_or(def.tor_socks5_proxy),
             i2p_socks5_proxy: opt.i2p_socks5_proxy.unwrap_or(def.i2p_socks5_proxy),
             outbound_connections: opt.outbound_connections.unwrap_or(def.outbound_connections),
             inbound_connections: opt.inbound_connections.unwrap_or(def.inbound_connections),