forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-18 09:53:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

p2p/sim: use ipv4

Browse source
This commit is contained in:
Anton Evangelatov 2018-03-05 10:43:09 +01:00
parent 8c05e9b252
commit 96e374efe5
2 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
p2p/simulations/adapters/exec.go
View file

@ -340,17 +340,27 @@ type execNodeConfig struct {
// ExternalIP gets an external IP address so that Enode URL is usable // ExternalIP gets an external IP address so that Enode URL is usable
func ExternalIP() net.IP { func ExternalIP() net.IP {
addrs, err := net.InterfaceAddrs() //addrs, err := net.InterfaceAddrs()
//if err != nil {
//log.Crit("error getting IP address", "err", err)
//}
//for _, addr := range addrs {
//if ip, ok := addr.(*net.IPNet); ok && !ip.IP.IsLoopback() {
//return ip.IP
//}
//}
//log.Crit("unable to determine explicit IP address")
//return net.IP{127, 0, 0, 1}
conn, err := net.Dial("udp", "8.8.8.8:80")
if err != nil { if err != nil {
log.Crit("error getting IP address", "err", err) panic(err)
} }
for _, addr := range addrs { defer conn.Close()
if ip, ok := addr.(*net.IPNet); ok && !ip.IP.IsLoopback() {
return ip.IP localAddr := conn.LocalAddr().(*net.UDPAddr)
}
} return localAddr.IP
log.Crit("unable to determine explicit IP address")
return net.IP{127, 0, 0, 1}
} }
// execP2PNode starts a devp2p node when the current binary is executed with // execP2PNode starts a devp2p node when the current binary is executed with

2
swarm/network/simulations/discovery/discovery_test.go
View file

@ -233,7 +233,7 @@ func discoverySimulation(nodes, conns int, adapter adapters.NodeAdapter) (*simul
// 64 nodes ~ 1min // 64 nodes ~ 1min
// 128 nodes ~ // 128 nodes ~
timeout := 60 * time.Second timeout := 300 * time.Second
ctx, cancel := context.WithTimeout(context.Background(), timeout) ctx, cancel := context.WithTimeout(context.Background(), timeout)
defer cancel() defer cancel()
result := simulations.NewSimulation(net).Run(ctx, &simulations.Step{ result := simulations.NewSimulation(net).Run(ctx, &simulations.Step{