Merge pull request #791 from fjl/discover-sha3-distance

p2p/discover: sha3-based node distance
2015-05-06 13:48:57 -07:00
parent 323216ed85 2adcc31bb4
commit 24d44f35f2
14 changed files with 651 additions and 292 deletions
--- a/eth/backend.go
+++ b/eth/backend.go
@ -277,8 +277,8 @@ func (s *Ethereum) NodeInfo() *NodeInfo {
 		NodeUrl:    node.String(),
 		NodeID:     node.ID.String(),
 		IP:         node.IP.String(),
-		DiscPort:   node.DiscPort,
-		TCPPort:    node.TCPPort,
+		DiscPort:   int(node.UDP),
+		TCPPort:    int(node.TCP),
 		ListenAddr: s.net.ListenAddr,
 		Td:         s.ChainManager().Td().String(),
 	}