mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-09 11:27:28 -03:00
init, doc: improve -onlynet help and tor/i2p documentation
and harmonize them as follows - s/outgoing/automatic outbound/ - s/Incoming/Inbound and manual/ (are not affected by this option.) - s/only through network/only to network/ - s/this option. This option/this option. It/ - s/network types/networks/ and also pick up a few nits in doc/p2p-bad-ports.md
This commit is contained in:
parent
30308cc380
commit
a1db99adea
4 changed files with 11 additions and 11 deletions
|
@ -65,9 +65,9 @@ logging` for more information.
|
||||||
-onlynet=i2p
|
-onlynet=i2p
|
||||||
```
|
```
|
||||||
|
|
||||||
Make outgoing connections only to I2P addresses. Incoming connections are not
|
Make automatic outbound connections only to I2P addresses. Inbound and manual
|
||||||
affected by this option. It can be specified multiple times to allow multiple
|
connections are not affected by this option. It can be specified multiple times
|
||||||
network types, e.g. onlynet=onion, onlynet=i2p.
|
to allow multiple networks, e.g. onlynet=onion, onlynet=i2p.
|
||||||
|
|
||||||
I2P support was added to Bitcoin Core in version 22.0 and there may be fewer I2P
|
I2P support was added to Bitcoin Core in version 22.0 and there may be fewer I2P
|
||||||
peers than Tor or IP ones. Therefore, using I2P alone without other networks may
|
peers than Tor or IP ones. Therefore, using I2P alone without other networks may
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
When Bitcoin Core automatically opens outgoing P2P connections it chooses
|
When Bitcoin Core automatically opens outgoing P2P connections, it chooses
|
||||||
a peer (address and port) from its list of potential peers. This list is
|
a peer (address and port) from its list of potential peers. This list is
|
||||||
populated with unchecked data, gossiped over the P2P network by other peers.
|
populated with unchecked data gossiped over the P2P network by other peers.
|
||||||
|
|
||||||
A malicious actor may gossip an address:port where no Bitcoin node is listening,
|
A malicious actor may gossip an address:port where no Bitcoin node is listening,
|
||||||
or one where a service is listening that is not related to the Bitcoin network.
|
or one where a service is listening that is not related to the Bitcoin network.
|
||||||
|
@ -17,7 +17,7 @@ authentication are unlikely to be considered a malicious action,
|
||||||
e.g. port 80 (http).
|
e.g. port 80 (http).
|
||||||
|
|
||||||
Below is a list of "bad" ports which Bitcoin Core avoids when choosing a peer to
|
Below is a list of "bad" ports which Bitcoin Core avoids when choosing a peer to
|
||||||
connect to. If a node is listening on such a port, it will likely receive less
|
connect to. If a node is listening on such a port, it will likely receive fewer
|
||||||
incoming connections.
|
incoming connections.
|
||||||
|
|
||||||
1: tcpmux
|
1: tcpmux
|
||||||
|
|
|
@ -55,10 +55,10 @@ outgoing connections, but more is possible.
|
||||||
-seednode=X SOCKS5. In Tor mode, such addresses can also be exchanged with
|
-seednode=X SOCKS5. In Tor mode, such addresses can also be exchanged with
|
||||||
other P2P nodes.
|
other P2P nodes.
|
||||||
|
|
||||||
-onlynet=onion Make outgoing connections only to .onion addresses. Incoming
|
-onlynet=onion Make automatic outbound connections only to .onion addresses.
|
||||||
connections are not affected by this option. This option can be
|
Inbound and manual connections are not affected by this option.
|
||||||
specified multiple times to allow multiple network types, e.g.
|
It can be specified multiple times to allow multiple networks,
|
||||||
onlynet=onion, onlynet=i2p.
|
e.g. onlynet=onion, onlynet=i2p.
|
||||||
|
|
||||||
In a typical situation, this suffices to run behind a Tor proxy:
|
In a typical situation, this suffices to run behind a Tor proxy:
|
||||||
|
|
||||||
|
|
|
@ -462,7 +462,7 @@ void SetupServerArgs(ArgsManager& argsman)
|
||||||
argsman.AddArg("-onion=<ip:port>", "Use separate SOCKS5 proxy to reach peers via Tor onion services, set -noonion to disable (default: -proxy)", ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
|
argsman.AddArg("-onion=<ip:port>", "Use separate SOCKS5 proxy to reach peers via Tor onion services, set -noonion to disable (default: -proxy)", ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
|
||||||
argsman.AddArg("-i2psam=<ip:port>", "I2P SAM proxy to reach I2P peers and accept I2P connections (default: none)", ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
|
argsman.AddArg("-i2psam=<ip:port>", "I2P SAM proxy to reach I2P peers and accept I2P connections (default: none)", ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
|
||||||
argsman.AddArg("-i2pacceptincoming", "If set and -i2psam is also set then incoming I2P connections are accepted via the SAM proxy. If this is not set but -i2psam is set then only outgoing connections will be made to the I2P network. Ignored if -i2psam is not set. Listening for incoming I2P connections is done through the SAM proxy, not by binding to a local address and port (default: 1)", ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
|
argsman.AddArg("-i2pacceptincoming", "If set and -i2psam is also set then incoming I2P connections are accepted via the SAM proxy. If this is not set but -i2psam is set then only outgoing connections will be made to the I2P network. Ignored if -i2psam is not set. Listening for incoming I2P connections is done through the SAM proxy, not by binding to a local address and port (default: 1)", ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
|
||||||
argsman.AddArg("-onlynet=<net>", "Make automatic outgoing connections only through network <net> (" + Join(GetNetworkNames(), ", ") + "). Incoming connections are not affected by this option. This option can be specified multiple times to allow multiple networks.", ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
|
argsman.AddArg("-onlynet=<net>", "Make automatic outbound connections only to network <net> (" + Join(GetNetworkNames(), ", ") + "). Inbound and manual connections are not affected by this option. It can be specified multiple times to allow multiple networks.", ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
|
||||||
argsman.AddArg("-peerbloomfilters", strprintf("Support filtering of blocks and transaction with bloom filters (default: %u)", DEFAULT_PEERBLOOMFILTERS), ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
|
argsman.AddArg("-peerbloomfilters", strprintf("Support filtering of blocks and transaction with bloom filters (default: %u)", DEFAULT_PEERBLOOMFILTERS), ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
|
||||||
argsman.AddArg("-peerblockfilters", strprintf("Serve compact block filters to peers per BIP 157 (default: %u)", DEFAULT_PEERBLOCKFILTERS), ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
|
argsman.AddArg("-peerblockfilters", strprintf("Serve compact block filters to peers per BIP 157 (default: %u)", DEFAULT_PEERBLOCKFILTERS), ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
|
||||||
argsman.AddArg("-permitbaremultisig", strprintf("Relay non-P2SH multisig (default: %u)", DEFAULT_PERMIT_BAREMULTISIG), ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
|
argsman.AddArg("-permitbaremultisig", strprintf("Relay non-P2SH multisig (default: %u)", DEFAULT_PERMIT_BAREMULTISIG), ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
|
||||||
|
|
Loading…
Reference in a new issue