diff options
author | Felföldi Zsolt <zsfelfoldi@gmail.com> | 2018-01-22 20:38:34 +0800 |
---|---|---|
committer | Felix Lange <fjl@users.noreply.github.com> | 2018-01-22 20:38:34 +0800 |
commit | 92580d69d3156e5d2f0788eb5d48664cc3fb0ef3 (patch) | |
tree | fc9a52735b2857802a18bcdd0964d5e861024ddd /p2p/discover/udp_test.go | |
parent | 02aeb3d76652a4c0451e5c3734e6881aefe46249 (diff) | |
download | dexon-92580d69d3156e5d2f0788eb5d48664cc3fb0ef3.tar dexon-92580d69d3156e5d2f0788eb5d48664cc3fb0ef3.tar.gz dexon-92580d69d3156e5d2f0788eb5d48664cc3fb0ef3.tar.bz2 dexon-92580d69d3156e5d2f0788eb5d48664cc3fb0ef3.tar.lz dexon-92580d69d3156e5d2f0788eb5d48664cc3fb0ef3.tar.xz dexon-92580d69d3156e5d2f0788eb5d48664cc3fb0ef3.tar.zst dexon-92580d69d3156e5d2f0788eb5d48664cc3fb0ef3.zip |
p2p, p2p/discover, p2p/discv5: implement UDP port sharing (#15200)
This commit affects p2p/discv5 "topic discovery" by running it on
the same UDP port where the old discovery works. This is realized
by giving an "unhandled" packet channel to the old v4 discovery
packet handler where all invalid packets are sent. These packets
are then processed by v5. v5 packets are always invalid when
interpreted by v4 and vice versa. This is ensured by adding one
to the first byte of the packet hash in v5 packets.
DiscoveryV5Bootnodes is also changed to point to new bootnodes
that are implementing the changed packet format with modified
hash. Existing and new v5 bootnodes are both running on different
ports ATM.
Diffstat (limited to 'p2p/discover/udp_test.go')
-rw-r--r-- | p2p/discover/udp_test.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/p2p/discover/udp_test.go b/p2p/discover/udp_test.go index 21e8b561d..b81caf839 100644 --- a/p2p/discover/udp_test.go +++ b/p2p/discover/udp_test.go @@ -70,7 +70,8 @@ func newUDPTest(t *testing.T) *udpTest { remotekey: newkey(), remoteaddr: &net.UDPAddr{IP: net.IP{10, 0, 1, 99}, Port: 30303}, } - test.table, test.udp, _ = newUDP(test.localkey, test.pipe, nil, "", nil) + realaddr := test.pipe.LocalAddr().(*net.UDPAddr) + test.table, test.udp, _ = newUDP(test.localkey, test.pipe, realaddr, nil, "", nil) return test } |