forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-11 14:33:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #135 from thinkAfCod/fix_ip

Browse source 
fix parse enr ip
This commit is contained in:
thinkAfCod 2024-08-19 23:54:53 +08:00 committed by GitHub
commit 923f0ba54e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
p2p/enode/node.go
View file

@ -172,8 +172,20 @@ func ParseForAddEnr(validSchemes enr.IdentityScheme, input string) (*Node, error
var ip6 netip.Addr var ip6 netip.Addr
n.Load((*enr.IPv4Addr)(&ip4)) n.Load((*enr.IPv4Addr)(&ip4))
n.Load((*enr.IPv6Addr)(&ip6)) n.Load((*enr.IPv6Addr)(&ip6))
n.setIP4(ip4) valid4 := ip4.IsValid()
n.setIP6(ip6) valid6 := ip6.IsValid()
switch {
case valid4 && valid6:
if localityScore(ip4) >= localityScore(ip6) {
n.setIP4(ip4)
} else {
n.setIP6(ip6)
}
case valid4:
n.setIP4(ip4)
case valid6:
n.setIP6(ip6)
}
return n, nil return n, nil
} }