darkirc, darkfid, taud, damd configs: change boolean transport_mixing field to mixed_transport list

bin/darkfid/darkfid_config.toml

@@ -106,8 +106,9 @@ seeds = ["tcp+tls://lilith0.dark.fi:8342", "tcp+tls://lilith1.dark.fi:8342"]
 # Whitelisted network transports for outbound connections
 allowed_transports = ["tcp+tls"]
 
-# Allow transport mixing (e.g. Tor would be allowed to connect to `tcp://`)
-#transport_mixing = false
+# Transports you want to be mixed (e.g. Tor would be allowed to connect to `tcp://`
+# if tcp is added to mixed_transports and tor is added to allowed_transports)
+#mixed_transports = []
 
 # Tor Socks5 proxy
 #tor_socks5_proxy = "socks5://127.0.0.1:9050"
@@ -237,8 +238,9 @@ seeds = ["tcp+tls://lilith0.dark.fi:8442", "tcp+tls://lilith1.dark.fi:8442"]
 # Whitelisted network transports for outbound connections
 allowed_transports = ["tcp+tls"]
 
-# Allow transport mixing (e.g. Tor would be allowed to connect to `tcp://`)
-#transport_mixing = false
+# Transports you want to be mixed (e.g. Tor would be allowed to connect to `tcp://`
+# if tcp is added to mixed_transports and tor is added to allowed_transports)
+#mixed_transports = []
 
 # Tor Socks5 proxy
 #tor_socks5_proxy = "socks5://127.0.0.1:9050"
@@ -369,8 +371,9 @@ hostlist = "~/.local/share/darkfi/darkfid/localnet/p2p_hostlist.tsv"
 # Whitelisted network transports for outbound connections
 #allowed_transports = ["tcp+tls"]
 
-# Allow transport mixing (e.g. Tor would be allowed to connect to `tcp://`)
-#transport_mixing = false
+# Transports you want to be mixed (e.g. Tor would be allowed to connect to `tcp://`
+# if tcp is added to mixed_transports and tor is added to allowed_transports)
+#mixed_transports = []
 
 # Tor Socks5 proxy
 #tor_socks5_proxy = "socks5://127.0.0.1:9050"

bin/darkirc/config/darkirc-clearnet.toml

@@ -35,5 +35,5 @@ outbound_connections = 8
 ## Inbound connection slots
 inbound_connections = 64
 
-## Enable transport mixing
-transport_mixing = false
+## Transports to be mixed
+mixed_transports = []

bin/darkirc/config/darkirc-mixed.toml

@@ -24,7 +24,7 @@ channel_heartbeat_interval = 90
 outbound_peer_discovery_cooloff_time = 60
 
 ## Whitelisted transports for outbound connections
-allowed_transports = ["tcp+tls", "tor"]
+allowed_transports = ["tcp+tls", "tor", "tor+tls"]
 
 ## Addresses we want to advertise to peers
 external_addrs = ["tcp+tls://MY_IP_V4:26661", "tcp+tls://MY_IP_V6:26661", "tcp+tls://my.resolveable.address:26661", "tor://youraddress.onion:25551"]
@@ -45,5 +45,5 @@ outbound_connections = 8
 ## Inbound connection slots
 inbound_connections = 64
 
-## Enable transport mixing
-transport_mixing = true
+## Transports to be mixed
+mixed_transports = ["tcp", "tcp+tls"]

bin/darkirc/config/darkirc-tor.toml

@@ -44,5 +44,5 @@ outbound_connections = 8
 ## Inbound connection slots
 inbound_connections = 64
 
-## Enable transport mixing
-transport_mixing = false
+## Transports to be mixed
+mixed_transports = []

bin/darkirc/darkirc_config.toml

@@ -94,10 +94,9 @@ allowed_transports = ["tcp+tls"]
 #allowed_transports = ["tor"]
 #allowed_transports = ["tor", "tor+tls"]
 
-# Enable transport mixing
-# Allows mixing transports, e.g. tor+tls:// connecting to tcp+tls://
-# By default this is not allowed.
-transport_mixing = false
+# Transports you want to be mixed (e.g. Tor would be allowed to connect to `tcp://`
+# if tcp is added to mixed_transports and tor is added to allowed_transports)
+mixed_transports = []
 
 # Tor Socks5 proxy
 #tor_socks5_proxy = "socks5://127.0.0.1:9050"

bin/tau/taud/taud_config.toml

@@ -95,10 +95,9 @@ allowed_transports = ["tcp+tls"]
 #allowed_transports = ["tor"]
 #allowed_transports = ["tor", "tor+tls"]
 
-# Enable transport mixing
-# Allows mixing transports, e.g. tor+tls:// connecting to tcp+tls://
-# By default this is not allowed.
-transport_mixing = false
+# Transports you want to be mixed (e.g. Tor would be allowed to connect to `tcp://`
+# if tcp is added to mixed_transports and tor is added to allowed_transports)
+mixed_transports = []
 
 # Tor Socks5 proxy
 #tor_socks5_proxy = "socks5://127.0.0.1:9050"

contrib/localnet/taud-four-nodes/seed.toml

@@ -90,10 +90,9 @@ inbound_connections = 8
 allowed_transports = ["tcp"]
 #allowed_transports = ["tor"]
 
-# Enable transport mixing
-# Allows mixing transports, e.g. tor+tls:// connecting to tcp+tls://
-# By default this is not allowed.
-transport_mixing = false
+# Transports you want to be mixed (e.g. Tor would be allowed to connect to `tcp://`
+# if tcp is added to mixed_transports and tor is added to allowed_transports)
+mixed_transports = []
 
 localnet = true
 

contrib/localnet/taud-four-nodes/taud_full_node1.toml

@@ -85,10 +85,9 @@ seeds = ["tcp://127.0.0.1:23331"]
 allowed_transports = ["tcp"]
 #allowed_transports = ["tor"]
 
-# Enable transport mixing
-# Allows mixing transports, e.g. tor+tls:// connecting to tcp+tls://
-# By default this is not allowed.
-transport_mixing = false
+# Transports you want to be mixed (e.g. Tor would be allowed to connect to `tcp://`
+# if tcp is added to mixed_transports and tor is added to allowed_transports)
+mixed_transports = []
 
 localnet = true
 

contrib/localnet/taud-four-nodes/taud_full_node2.toml

@@ -85,10 +85,9 @@ seeds = ["tcp://127.0.0.1:23331"]
 allowed_transports = ["tcp"]
 #allowed_transports = ["tor"]
 
-# Enable transport mixing
-# Allows mixing transports, e.g. tor+tls:// connecting to tcp+tls://
-# By default this is not allowed.
-transport_mixing = false
+# Transports you want to be mixed (e.g. Tor would be allowed to connect to `tcp://`
+# if tcp is added to mixed_transports and tor is added to allowed_transports)
+mixed_transports = []
 
 localnet = true
 

contrib/localnet/taud-four-nodes/taud_full_node3.toml

@@ -85,10 +85,9 @@ seeds = ["tcp://127.0.0.1:23331"]
 allowed_transports = ["tcp"]
 #allowed_transports = ["tor"]
 
-# Enable transport mixing
-# Allows mixing transports, e.g. tor+tls:// connecting to tcp+tls://
-# By default this is not allowed.
-transport_mixing = false
+# Transports you want to be mixed (e.g. Tor would be allowed to connect to `tcp://`
+# if tcp is added to mixed_transports and tor is added to allowed_transports)
+mixed_transports = []
 
 localnet = true
 

contrib/localnet/taud-four-nodes/taud_full_node4.toml

@@ -85,10 +85,9 @@ seeds = ["tcp://127.0.0.1:23331"]
 allowed_transports = ["tcp"]
 #allowed_transports = ["tor"]
 
-# Enable transport mixing
-# Allows mixing transports, e.g. tor+tls:// connecting to tcp+tls://
-# By default this is not allowed.
-transport_mixing = false
+# Transports you want to be mixed (e.g. Tor would be allowed to connect to `tcp://`
+# if tcp is added to mixed_transports and tor is added to allowed_transports)
+mixed_transports = []
 
 localnet = true
 

script/research/dam/damd/damd_config.toml

@@ -39,8 +39,9 @@ hostlist = "~/.local/share/darkfi/damd/p2p_hostlist.tsv"
 # Whitelisted network transports for outbound connections
 #allowed_transports = ["tcp+tls"]
 
-# Allow transport mixing (e.g. Tor would be allowed to connect to `tcp://`)
-#transport_mixing = true
+# Transports you want to be mixed (e.g. Tor would be allowed to connect to `tcp://`
+# if tcp is added to mixed_transports and tor is added to allowed_transports)
+#mixed_transports = []
 
 # Outbound connection slots number, this many connections will be
 # attempted. (This does not include manual connections)

script/research/generic-node/generic_node_config.toml

@@ -25,8 +25,9 @@ inbound = ["tcp+tls://0.0.0.0:38967"]
 # Whitelisted network transports for outbound connections
 #allowed_transports = ["tcp+tls"]
 
-# Allow transport mixing (e.g. Tor would be allowed to connect to `tcp://`)
-#transport_mixing = true
+# Transports you want to be mixed (e.g. Tor would be allowed to connect to `tcp://`
+# if tcp is added to mixed_transports and tor is added to allowed_transports)
+#mixed_transports = []
 
 # Outbound connection slots number, this many connections will be
 # attempted. (This does not include manual connections)