Преглед изворни кода

docs: standardized ports based on the node-configurations.html

All port references in the documentation are updated to use the new ports specified in the node config. doc.

Changes:
- Tor/i2p/Nym ports were updated in sequence +1 (9601, 9602, 9603)
- Removed all legacy port references (f.e. 25551, 26661, 5262)

Many things were correct already. I want to note, that there might be still some issues, even though this is a commit, I am waiting for a PR until things are clear.
eliedinner561 пре 6 месеци
родитељ
комит
ec44922bc4

+ 24 - 24
doc/src/dep/0007.md

@@ -31,15 +31,15 @@ allowed_transports = ["tcp+tls"]
 
 
 mixed_transports = []
 mixed_transports = []
 
 
-inbound = ["tcp+tls://0.0.0.0:26661", "tcp+tls://[::]:26661"]
+inbound = ["tcp+tls://0.0.0.0:9600", "tcp+tls://[::]:9600"]
 
 
-external_addrs = ["tcp+tls://my.resolveable.address:26661"]
+external_addrs = ["tcp+tls://my.resolveable.address:9600"]
 
 
 seeds = [
 seeds = [
-    "tcp+tls://lilith0.dark.fi:25551",
-    "tcp+tls://lilith1.dark.fi:25551",
-    #"tor://g7fxelebievvpr27w7gt24lflptpw3jeeuvafovgliq5utdst6xyruyd.onion:25552",
-    #"tor://yvklzjnfmwxhyodhrkpomawjcdvcaushsj6torjz2gyd7e25f3gfunyd.onion:25552",
+    "tcp+tls://lilith0.dark.fi:9600",
+    "tcp+tls://lilith1.dark.fi:9600",
+    #"tor://g7fxelebievvpr27w7gt24lflptpw3jeeuvafovgliq5utdst6xyruyd.onion:9601",
+    #"tor://yvklzjnfmwxhyodhrkpomawjcdvcaushsj6torjz2gyd7e25f3gfunyd.onion:9601",
 ]
 ]
 
 
 peers = []
 peers = []
@@ -58,23 +58,23 @@ active_profiles = ["tor"]
 mixed_profiles = []
 mixed_profiles = []
 
 
 [net.profiles."tcp+tls"]
 [net.profiles."tcp+tls"]
-seeds = ["tcp+tls://lilith0.dark.fi:25551", "tcp+tls://lilith1.dark.fi:25551"]
+seeds = ["tcp+tls://lilith0.dark.fi:9600", "tcp+tls://lilith1.dark.fi:9600"]
 
 
 peers = []
 peers = []
 
 
-inbound = ["tcp+tls://0.0.0.0:26661", "tcp+tls://[::]:26661"]
+inbound = ["tcp+tls://0.0.0.0:9600", "tcp+tls://[::]:9600"]
 
 
-external_addrs = ["tcp+tls://my.resolveable.address:26661"]
+external_addrs = ["tcp+tls://my.resolveable.address:9600"]
 
 
 [net.profiles."tor"]
 [net.profiles."tor"]
 seeds = [
 seeds = [
-    "tor://g7fxelebievvpr27w7gt24lflptpw3jeeuvafovgliq5utdst6xyruyd.onion:25552",
-    "tor://yvklzjnfmwxhyodhrkpomawjcdvcaushsj6torjz2gyd7e25f3gfunyd.onion:25552",
+    "tor://g7fxelebievvpr27w7gt24lflptpw3jeeuvafovgliq5utdst6xyruyd.onion:9601",
+    "tor://yvklzjnfmwxhyodhrkpomawjcdvcaushsj6torjz2gyd7e25f3gfunyd.onion:9601",
 ]
 ]
 
 
 peers = []
 peers = []
 
 
-inbound = ["tor://127.0.0.1:26661"]
+inbound = ["tor://127.0.0.1:9601"]
 
 
 outbound_connect_timeout = 60
 outbound_connect_timeout = 60
 channel_handshake_timeout = 55
 channel_handshake_timeout = 55
@@ -82,14 +82,14 @@ channel_heartbeat_interval = 90
 
 
 [net.profiles."i2p"]
 [net.profiles."i2p"]
 seeds = [
 seeds = [
-    "i2p://6l2rdfriixo2nh5pr5bt555lyz56qox2ikzia4kuzm4okje7gtmq.b32.i2p:5262"
+    "i2p://6l2rdfriixo2nh5pr5bt555lyz56qox2ikzia4kuzm4okje7gtmq.b32.i2p:9602"
 ]
 ]
 
 
 peers = []
 peers = []
 
 
-inbound = ["tcp://127.0.0.1:25551"]
+inbound = ["tcp://127.0.0.1:9602"]
 
 
-external_addrs = ["i2p://youraddress.b32.i2p:25551"]
+external_addrs = ["i2p://youraddress.b32.i2p:9602"]
 
 
 outbound_connect_timeout = 60
 outbound_connect_timeout = 60
 channel_handshake_timeout = 55
 channel_handshake_timeout = 55
@@ -97,8 +97,8 @@ channel_heartbeat_interval = 90
 
 
 [net.profiles."socks5"]
 [net.profiles."socks5"]
 seeds = [
 seeds = [
-    "socks5://127.0.0.1:9050/g7fxelebievvpr27w7gt24lflptpw3jeeuvafovgliq5utdst6xyruyd.onion:25552",
-    "socks5://127.0.0.1:9050/yvklzjnfmwxhyodhrkpomawjcdvcaushsj6torjz2gyd7e25f3gfunyd.onion:25552",
+    "socks5://127.0.0.1:9050/g7fxelebievvpr27w7gt24lflptpw3jeeuvafovgliq5utdst6xyruyd.onion:9601",
+    "socks5://127.0.0.1:9050/yvklzjnfmwxhyodhrkpomawjcdvcaushsj6torjz2gyd7e25f3gfunyd.onion:9601",
 ]
 ]
 
 
 peers = []
 peers = []
@@ -109,8 +109,8 @@ channel_heartbeat_interval = 90
 
 
 [net.profiles."socks5+tls"]
 [net.profiles."socks5+tls"]
 seeds = [
 seeds = [
-    #"socks5+tls://127.0.0.1:9050/lilith0.dark.fi:25551",
-    #"socks5+tls://127.0.0.1:1080/lilith1.dark.fi:25551"
+    #"socks5+tls://127.0.0.1:9050/lilith0.dark.fi:9601",
+    #"socks5+tls://127.0.0.1:1080/lilith1.dark.fi:9601"
 ]
 ]
 
 
 peers = []
 peers = []
@@ -121,8 +121,8 @@ channel_heartbeat_interval = 90
 
 
 [net.profiles."tor+tls"]
 [net.profiles."tor+tls"]
 seeds = [
 seeds = [
-    "tor+tls://lilith0.dark.fi:25551",
-    "tor+tls://lilith1.dark.fi:25551"
+    "tor+tls://lilith0.dark.fi:9600",
+    "tor+tls://lilith1.dark.fi:9600"
 ]
 ]
 
 
 peers = []
 peers = []
@@ -132,13 +132,13 @@ channel_handshake_timeout = 55
 channel_heartbeat_interval = 90
 channel_heartbeat_interval = 90
 
 
 [net.profiles."tcp"]
 [net.profiles."tcp"]
-seeds = ["tcp://127.0.0.1:25551"]
+seeds = ["tcp://127.0.0.1:9600"]
 
 
 peers = []
 peers = []
 
 
-inbound = ["tcp://127.0.0.1:26661"]
+inbound = ["tcp://127.0.0.1:9600"]
 
 
-external_addrs = ["tcp://127.0.0.1:26661"]
+external_addrs = ["tcp://127.0.0.1:9600"]
 ```
 ```
 
 
 Each profile will have the following fields `seeds`, `peers`,
 Each profile will have the following fields `seeds`, `peers`,

+ 10 - 10
doc/src/misc/network-troubleshooting.md

@@ -37,22 +37,22 @@ If the seed node is down, you will see this message in the debug output:
 
 
 ```
 ```
 ERROR] [P2P] Network reseed failed!
 ERROR] [P2P] Network reseed failed!
-[WARN] [P2P] Unable to connect to seed [tcp+tls://lilith1.dark.fi:5262/]: IO error: connection refused
+[WARN] [P2P] Unable to connect to seed [tcp+tls://lilith1.dark.fi:9600/]: IO error: connection refused
 ```
 ```
 
 
 If it's a problem related to nodes, you will typically see a successful
 If it's a problem related to nodes, you will typically see a successful
 seed connection like so:
 seed connection like so:
 
 
 ```
 ```
-[INFO] [P2P] Connected seed [tcp+tls://lilith1.dark.fi:5262/]
-[INFO] [P2P] Disconnecting from seed [tcp+tls://lilith1.dark.fi:5262/]
+[INFO] [P2P] Connected seed [tcp+tls://lilith1.dark.fi:9600/]
+[INFO] [P2P] Disconnecting from seed [tcp+tls://lilith1.dark.fi:9600/]
 ```
 ```
 
 
 Followed by multiple connection failed messages, like so:
 Followed by multiple connection failed messages, like so:
 
 
 ```
 ```
-[INFO] [P2P] Unable to connect outbound slot #5 [tcp+tls://example_peer:26661/]: IO error: connection refused
-[INFO] [P2P] Unable to connect outbound slot #6 [tcp+tls://example_peer2:26661/]: IO error: host unreachable
+[INFO] [P2P] Unable to connect outbound slot #5 [tcp+tls://example_peer:9600/]: IO error: connection refused
+[INFO] [P2P] Unable to connect outbound slot #6 [tcp+tls://example_peer2:9600/]: IO error: host unreachable
 ```
 ```
 
 
 ### Seed node is down
 ### Seed node is down
@@ -60,7 +60,7 @@ Followed by multiple connection failed messages, like so:
 If you get an error like this:
 If you get an error like this:
 
 
 ```
 ```
-[WARN] [P2P] Unable to connect to seed [tcp+tls://lilith1.dark.fi:5262/]: IO error: connection refused
+[WARN] [P2P] Unable to connect to seed [tcp+tls://lilith1.dark.fi:9600/]: IO error: connection refused
 ```
 ```
 
 
 This means you are failing to establish a connection to the seed node.
 This means you are failing to establish a connection to the seed node.
@@ -80,14 +80,14 @@ is down. Please do the following:
 1. Take careful note of the `IO error` that is written after `Unable to
 1. Take careful note of the `IO error` that is written after `Unable to
 connect to seed`.
 connect to seed`.
 2. Refer to [Error reporting](#error-reporting) section below.
 2. Refer to [Error reporting](#error-reporting) section below.
-3. You can set a peer such as `tcp+tls://example_peer:26661` in your
+3. You can set a peer such as `tcp+tls://example_peer:9600` in your
 config file. Ask in the telegram community channel for an active peer
 config file. Ask in the telegram community channel for an active peer
 (here we are using a fake peer called `example_peer`. Then open the
 (here we are using a fake peer called `example_peer`. Then open the
 config file at `~/.config/darkfi/darkirc_config.toml` and modify the `peers`
 config file at `~/.config/darkfi/darkirc_config.toml` and modify the `peers`
 field with the provided peer as follows:
 field with the provided peer as follows:
 
 
 ```
 ```
-peers = ["tcp+tls://example_peer:26661"]
+peers = ["tcp+tls://example_peer:9600"]
 ```
 ```
 
 
 #### It's not my first time connecting to the network
 #### It's not my first time connecting to the network
@@ -154,7 +154,7 @@ we'll delete the directory:
 If you see something in the logs like this:
 If you see something in the logs like this:
 
 
 ```
 ```
-[INFO] [P2P] Outbound slot #1 connected [tcp-tls://example_peer:25551/] 
+[INFO] [P2P] Outbound slot #1 connected [tcp-tls://example_peer:9600/] 
 ```
 ```
 
 
 That means you are connected. You can verify that by writing `test` in
 That means you are connected. You can verify that by writing `test` in
@@ -202,7 +202,7 @@ your hostlist file. You can now use the `ping` tool by
 running this command:
 running this command:
 
 
 ```
 ```
-$ cargo run -- tcp+tls://example_peer:26661
+$ cargo run -- tcp+tls://example_peer:9600
 ```
 ```
 
 
 If the peers are reachable, you'll receive a `Connected!` output.
 If the peers are reachable, you'll receive a `Connected!` output.

+ 5 - 5
doc/src/misc/nodes/i2p-guide.md

@@ -58,7 +58,7 @@ i2p_socks5_proxy = "socks5://127.0.0.1:4447"
 [net.profiles."i2p"]
 [net.profiles."i2p"]
 ## Seed nodes to connect to
 ## Seed nodes to connect to
 seeds = [
 seeds = [
-    "i2p://6l2rdfriixo2nh5pr5bt555lyz56qox2ikzia4kuzm4okje7gtmq.b32.i2p:5262"
+    "i2p://6l2rdfriixo2nh5pr5bt555lyz56qox2ikzia4kuzm4okje7gtmq.b32.i2p:9602"
 ]
 ]
 ```
 ```
 
 
@@ -78,7 +78,7 @@ and create a file `darkirc.conf` with the following contents:
 [darkirc]
 [darkirc]
 type = server
 type = server
 host = 127.0.0.1
 host = 127.0.0.1
-port = 25551
+port = 9602
 keys = darkirc.dat
 keys = darkirc.dat
 ```
 ```
 
 
@@ -91,7 +91,7 @@ Then restart i2pd:
 Find the hostname of your hidden service by running the following command:
 Find the hostname of your hidden service by running the following command:
 
 
 ```
 ```
-% curl -s http://127.0.0.1:7070/?page=i2p_tunnels | grep -Eo "[a-zA-Z0-9./?=_%:-]*" | grep "25551"
+% curl -s http://127.0.0.1:7070/?page=i2p_tunnels | grep -Eo "[a-zA-Z0-9./?=_%:-]*" | grep "9602"
 ```
 ```
 
 
 The above configuration saves the `i2p` hidden service key in `/var/lib/i2pd/darkirc.dat`,
 The above configuration saves the `i2p` hidden service key in `/var/lib/i2pd/darkirc.dat`,
@@ -106,10 +106,10 @@ inbound_connections = 64
 
 
 [net.profiles."i2p"]
 [net.profiles."i2p"]
 ## Addresses we want to advertise to peers
 ## Addresses we want to advertise to peers
-external_addrs = ["i2p://youraddress.b32.i2p:25551"]
+external_addrs = ["i2p://youraddress.b32.i2p:9602"]
 
 
 ## P2P accept addresses
 ## P2P accept addresses
-inbound = ["tcp://127.0.0.1:25551"]
+inbound = ["tcp://127.0.0.1:9602"]
 ```
 ```
 
 
 ## Connect and test your node
 ## Connect and test your node

+ 1 - 1
doc/src/misc/nodes/nym-guide.md

@@ -72,7 +72,7 @@ nym_socks5_proxy = "socks5://127.0.0.1:1080"
 [net.profiles."socks5+tls"]
 [net.profiles."socks5+tls"]
 ## Seed nodes to connect to
 ## Seed nodes to connect to
 seeds = [
 seeds = [
-    "socks5+tls://127.0.0.1:1080/lilith1.dark.fi:25551"
+    "socks5+tls://127.0.0.1:1080/lilith1.dark.fi:9603"
 ]
 ]
 ```
 ```
 
 

+ 26 - 26
doc/src/misc/nodes/public-guide.md

@@ -76,13 +76,13 @@ mixed_profiles = []
 
 
 [net.profiles."tcp+tls"]
 [net.profiles."tcp+tls"]
 ## Seed nodes to connect to
 ## Seed nodes to connect to
-seeds = ["tcp+tls://lilith1.dark.fi:25551"]
+seeds = ["tcp+tls://lilith1.dark.fi:9600"]
 
 
 ## Addresses we want to advertise to peers
 ## 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"]
+external_addrs = ["tcp+tls://MY_IP_V4:9600", "tcp+tls://MY_IP_V6:9600", "tcp+tls://my.resolveable.address:9600"]
 
 
 ## P2P accept addresses
 ## P2P accept addresses
-inbound = ["tcp+tls://0.0.0.0:26661", "tcp+tls://[::]:26661"]
+inbound = ["tcp+tls://0.0.0.0:9600", "tcp+tls://[::]:9600"]
 
 
 ## Connection settings with default values applicable for each profile separately
 ## Connection settings with default values applicable for each profile separately
 #outbound_connect_timeout = 15
 #outbound_connect_timeout = 15
@@ -121,15 +121,15 @@ mixed_profiles = []
 [net.profiles."tor"]
 [net.profiles."tor"]
 ## Seed nodes to connect to
 ## Seed nodes to connect to
 seeds = [
 seeds = [
-    "tor://g7fxelebievvpr27w7gt24lflptpw3jeeuvafovgliq5utdst6xyruyd.onion:25552",
-    "tor://yvklzjnfmwxhyodhrkpomawjcdvcaushsj6torjz2gyd7e25f3gfunyd.onion:25552",
+    "tor://g7fxelebievvpr27w7gt24lflptpw3jeeuvafovgliq5utdst6xyruyd.onion:9601",
+    "tor://yvklzjnfmwxhyodhrkpomawjcdvcaushsj6torjz2gyd7e25f3gfunyd.onion:9601",
 ]
 ]
 
 
 ## Addresses we want to advertise to peers
 ## Addresses we want to advertise to peers
-external_addrs = ["tor://youraddress.onion:26661"]
+external_addrs = ["tor://youraddress.onion:9601"]
 
 
 ## P2P accept addresses
 ## P2P accept addresses
-inbound = ["tcp://127.0.0.1:26661"]
+inbound = ["tcp://127.0.0.1:9601"]
 
 
 ## Connection settings with default values applicable for each profile separately
 ## Connection settings with default values applicable for each profile separately
 #outbound_connect_timeout = 60
 #outbound_connect_timeout = 60
@@ -168,14 +168,14 @@ i2p_socks5_proxy = "socks5://127.0.0.1:4447"
 [net.profiles."i2p"]
 [net.profiles."i2p"]
 ## Seed nodes to connect to
 ## Seed nodes to connect to
 seeds = [
 seeds = [
-    "i2p://6l2rdfriixo2nh5pr5bt555lyz56qox2ikzia4kuzm4okje7gtmq.b32.i2p:5262"
+    "i2p://6l2rdfriixo2nh5pr5bt555lyz56qox2ikzia4kuzm4okje7gtmq.b32.i2p:9602"
 ]
 ]
 
 
 ## Addresses we want to advertise to peers
 ## Addresses we want to advertise to peers
-external_addrs = ["i2p://youraddress.b32.i2p:26661"]
+external_addrs = ["i2p://youraddress.b32.i2p:9602"]
 
 
 ## P2P accept addresses
 ## P2P accept addresses
-inbound = ["tcp://127.0.0.1:26661"]
+inbound = ["tcp://127.0.0.1:9602"]
 
 
 ## Connection settings with default values applicable for each profile separately
 ## Connection settings with default values applicable for each profile separately
 #outbound_connect_timeout = 60
 #outbound_connect_timeout = 60
@@ -215,42 +215,42 @@ mixed_profiles = []
 
 
 [net.profiles."tcp+tls"]
 [net.profiles."tcp+tls"]
 ## Seed nodes to connect to
 ## Seed nodes to connect to
-seeds = ["tcp+tls://lilith0.dark.fi:25551", "tcp+tls://lilith1.dark.fi:25551"]
+seeds = ["tcp+tls://lilith0.dark.fi:9600", "tcp+tls://lilith1.dark.fi:9600"]
 
 
 ## P2P accept addresses
 ## P2P accept addresses
-inbound = ["tcp+tls://0.0.0.0:26661", "tcp+tls://[::]:26661"]
+inbound = ["tcp+tls://0.0.0.0:9600", "tcp+tls://[::]:9600"]
 
 
 ## Addresses we want to advertise to peers
 ## 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"]
+external_addrs = ["tcp+tls://MY_IP_V4:9600", "tcp+tls://MY_IP_V6:9600", "tcp+tls://my.resolveable.address:9600"]
 
 
 [net.profiles."tor"]
 [net.profiles."tor"]
 ## Seed nodes to connect to
 ## Seed nodes to connect to
 seeds = [
 seeds = [
-    "tor://g7fxelebievvpr27w7gt24lflptpw3jeeuvafovgliq5utdst6xyruyd.onion:25552",
-    "tor://yvklzjnfmwxhyodhrkpomawjcdvcaushsj6torjz2gyd7e25f3gfunyd.onion:25552",
+    "tor://g7fxelebievvpr27w7gt24lflptpw3jeeuvafovgliq5utdst6xyruyd.onion:9601",
+    "tor://yvklzjnfmwxhyodhrkpomawjcdvcaushsj6torjz2gyd7e25f3gfunyd.onion:9601",
 ]
 ]
 
 
 ## P2P accept addresses
 ## P2P accept addresses
-inbound = ["tcp://127.0.0.1:26662"]
+inbound = ["tcp://127.0.0.1:9601"]
 
 
 ## Addresses we want to advertise to peers
 ## Addresses we want to advertise to peers
-external_addrs = ["tor://youraddress.onion:26662"]
+external_addrs = ["tor://youraddress.onion:9601"]
 
 
 [net.profiles."i2p"]
 [net.profiles."i2p"]
 ## Seed nodes to connect to
 ## Seed nodes to connect to
 seeds = [
 seeds = [
     ##TODO: replace with an official seed address
     ##TODO: replace with an official seed address
-    "i2p://6l2rdfriixo2nh5pr5bt555lyz56qox2ikzia4kuzm4okje7gtmq.b32.i2p:5262"
+    "i2p://6l2rdfriixo2nh5pr5bt555lyz56qox2ikzia4kuzm4okje7gtmq.b32.i2p:9602"
 ]
 ]
 
 
 ## Manual peers to connect to
 ## Manual peers to connect to
 #peers = []
 #peers = []
 
 
 ## P2P accept addresses
 ## P2P accept addresses
-inbound = ["tcp://127.0.0.1:26663"]
+inbound = ["tcp://127.0.0.1:9602"]
 
 
 ## Addresses we want to advertise to peers
 ## Addresses we want to advertise to peers
-external_addrs = ["i2p://youraddress.b32.i2p:26663"]
+external_addrs = ["i2p://youraddress.b32.i2p:9602"]
 ```
 ```
 
 
 ### Autohost
 ### Autohost
@@ -264,13 +264,13 @@ in the `tcp+tls` profile as shown below.
 ```toml
 ```toml
 [net.profiles."tcp+tls"]
 [net.profiles."tcp+tls"]
 ## P2P accept addresses
 ## P2P accept addresses
-inbound = ["tcp+tls://[::]:26661"]
+inbound = ["tcp+tls://[::]:9600"]
 
 
 ## Addresses we want to advertise to peers
 ## Addresses we want to advertise to peers
-external_addrs = ["tcp+tls://[::]:26661"]
+external_addrs = ["tcp+tls://[::]:9600"]
 
 
 ## Seed nodes to connect to
 ## Seed nodes to connect to
-seeds = ["tcp+tls://lilith0.dark.fi:25551", "tcp+tls://lilith1.dark.fi:25551"]
+seeds = ["tcp+tls://lilith0.dark.fi:9600", "tcp+tls://lilith1.dark.fi:9600"]
 ```
 ```
 
 
 #### Tor
 #### Tor
@@ -282,14 +282,14 @@ edit the `inbound` field in the `tor` as shown below.
 ```toml
 ```toml
 [net.profiles."tor"]
 [net.profiles."tor"]
 ## P2P accept addresses
 ## P2P accept addresses
-inbound = ["tor://127.0.0.1:26661"]
+inbound = ["tor://127.0.0.1:9601"]
 
 
 ## Addresses we want to advertise to peers
 ## Addresses we want to advertise to peers
 external_addrs = []
 external_addrs = []
 
 
 ## Seed nodes to connect to
 ## Seed nodes to connect to
 seeds = [
 seeds = [
-    "tor://g7fxelebievvpr27w7gt24lflptpw3jeeuvafovgliq5utdst6xyruyd.onion:25552",
-    "tor://yvklzjnfmwxhyodhrkpomawjcdvcaushsj6torjz2gyd7e25f3gfunyd.onion:25552",
+    "tor://g7fxelebievvpr27w7gt24lflptpw3jeeuvafovgliq5utdst6xyruyd.onion:9601",
+    "tor://yvklzjnfmwxhyodhrkpomawjcdvcaushsj6torjz2gyd7e25f3gfunyd.onion:9601",
 ]
 ]
 ```
 ```