Use /dns/ instead of /dns4/ (#6369)

This commit is contained in:
Pierre Krieger
2020-06-16 22:49:44 +02:00
committed by GitHub
parent b4221cc135
commit 0787b189fa
4 changed files with 11 additions and 10 deletions
@@ -47,9 +47,9 @@ services:
- "--validator" - "--validator"
- "--alice" - "--alice"
- "--sentry-nodes" - "--sentry-nodes"
- "/dns4/sentry-a/tcp/30333/p2p/QmV7EhW6J6KgmNdr558RH1mPx2xGGznW7At4BhXzntRFsi" - "/dns/sentry-a/tcp/30333/p2p/QmV7EhW6J6KgmNdr558RH1mPx2xGGznW7At4BhXzntRFsi"
- "--reserved-nodes" - "--reserved-nodes"
- "/dns4/sentry-a/tcp/30333/p2p/QmV7EhW6J6KgmNdr558RH1mPx2xGGznW7At4BhXzntRFsi" - "/dns/sentry-a/tcp/30333/p2p/QmV7EhW6J6KgmNdr558RH1mPx2xGGznW7At4BhXzntRFsi"
# Not only bind to localhost. # Not only bind to localhost.
- "--unsafe-ws-external" - "--unsafe-ws-external"
- "--unsafe-rpc-external" - "--unsafe-rpc-external"
@@ -83,11 +83,11 @@ services:
- "--port" - "--port"
- "30333" - "30333"
- "--sentry" - "--sentry"
- "/dns4/validator-a/tcp/30333/p2p/QmRpheLN4JWdAnY7HGJfWFNbfkQCb6tFf4vvA6hgjMZKrR" - "/dns/validator-a/tcp/30333/p2p/QmRpheLN4JWdAnY7HGJfWFNbfkQCb6tFf4vvA6hgjMZKrR"
- "--reserved-nodes" - "--reserved-nodes"
- "/dns4/validator-a/tcp/30333/p2p/QmRpheLN4JWdAnY7HGJfWFNbfkQCb6tFf4vvA6hgjMZKrR" - "/dns/validator-a/tcp/30333/p2p/QmRpheLN4JWdAnY7HGJfWFNbfkQCb6tFf4vvA6hgjMZKrR"
- "--bootnodes" - "--bootnodes"
- "/dns4/validator-b/tcp/30333/p2p/QmSVnNf9HwVMT1Y4cK1P6aoJcEZjmoTXpjKBmAABLMnZEk" - "/dns/validator-b/tcp/30333/p2p/QmSVnNf9HwVMT1Y4cK1P6aoJcEZjmoTXpjKBmAABLMnZEk"
- "--no-telemetry" - "--no-telemetry"
- "--rpc-cors" - "--rpc-cors"
- "all" - "all"
@@ -118,9 +118,9 @@ services:
- "--validator" - "--validator"
- "--bob" - "--bob"
- "--bootnodes" - "--bootnodes"
- "/dns4/validator-a/tcp/30333/p2p/QmRpheLN4JWdAnY7HGJfWFNbfkQCb6tFf4vvA6hgjMZKrR" - "/dns/validator-a/tcp/30333/p2p/QmRpheLN4JWdAnY7HGJfWFNbfkQCb6tFf4vvA6hgjMZKrR"
- "--bootnodes" - "--bootnodes"
- "/dns4/sentry-a/tcp/30333/p2p/QmV7EhW6J6KgmNdr558RH1mPx2xGGznW7At4BhXzntRFsi" - "/dns/sentry-a/tcp/30333/p2p/QmV7EhW6J6KgmNdr558RH1mPx2xGGznW7At4BhXzntRFsi"
- "--no-telemetry" - "--no-telemetry"
- "--rpc-cors" - "--rpc-cors"
- "all" - "all"
+1 -1
View File
@@ -14,7 +14,7 @@
], ],
"telemetryEndpoints": [ "telemetryEndpoints": [
[ [
"/dns4/telemetry.polkadot.io/tcp/443/x-parity-wss/%2Fsubmit%2F", "/dns/telemetry.polkadot.io/tcp/443/x-parity-wss/%2Fsubmit%2F",
0 0
] ]
], ],
+2 -1
View File
@@ -324,7 +324,8 @@ impl DiscoveryBehaviour {
let ip = match addr.iter().next() { let ip = match addr.iter().next() {
Some(Protocol::Ip4(ip)) => IpNetwork::from(ip), Some(Protocol::Ip4(ip)) => IpNetwork::from(ip),
Some(Protocol::Ip6(ip)) => IpNetwork::from(ip), Some(Protocol::Ip6(ip)) => IpNetwork::from(ip),
Some(Protocol::Dns4(_)) | Some(Protocol::Dns6(_)) => return true, Some(Protocol::Dns(_)) | Some(Protocol::Dns4(_)) | Some(Protocol::Dns6(_))
=> return true,
_ => return false _ => return false
}; };
ip.is_global() ip.is_global()
+1 -1
View File
@@ -77,7 +77,7 @@
//! - WebSockets for addresses of the form `/ip4/1.2.3.4/tcp/5/ws`. A TCP/IP connection is open and //! - WebSockets for addresses of the form `/ip4/1.2.3.4/tcp/5/ws`. A TCP/IP connection is open and
//! the WebSockets protocol is negotiated on top. Communications then happen inside WebSockets data //! the WebSockets protocol is negotiated on top. Communications then happen inside WebSockets data
//! frames. Encryption and multiplexing are additionally negotiated again inside this channel. //! frames. Encryption and multiplexing are additionally negotiated again inside this channel.
//! - DNS for addresses of the form `/dns4/example.com/tcp/5` or `/dns4/example.com/tcp/5/ws`. A //! - DNS for addresses of the form `/dns/example.com/tcp/5` or `/dns/example.com/tcp/5/ws`. A
//! node's address can contain a domain name. //! node's address can contain a domain name.
//! - (All of the above using IPv6 instead of IPv4.) //! - (All of the above using IPv6 instead of IPv4.)
//! //!