5
0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2024-11-13 00:30:28 +00:00

add dht time since last ping to admin socket, some DHT code cleanup, bugfix to insertIfNew

This commit is contained in:
Arceliar 2018-05-17 19:32:29 -05:00
parent edf8f2e239
commit 8d9887294c
2 changed files with 39 additions and 46 deletions

View File

@ -10,6 +10,7 @@ import "net/url"
import "sort" import "sort"
import "strings" import "strings"
import "strconv" import "strconv"
import "time"
// TODO? Make all of this JSON // TODO? Make all of this JSON
// TODO: Add authentication // TODO: Add authentication
@ -339,27 +340,24 @@ func (a *admin) getData_getSwitchPeers() []admin_nodeInfo {
func (a *admin) getData_getDHT() []admin_nodeInfo { func (a *admin) getData_getDHT() []admin_nodeInfo {
var infos []admin_nodeInfo var infos []admin_nodeInfo
now := time.Now()
getDHT := func() { getDHT := func() {
for i := 0; i < a.core.dht.nBuckets(); i++ { for i := 0; i < a.core.dht.nBuckets(); i++ {
b := a.core.dht.getBucket(i) b := a.core.dht.getBucket(i)
for _, v := range b.other { getInfo := func(vs []*dhtInfo) {
addr := *address_addrForNodeID(v.getNodeID()) for _, v := range vs {
info := admin_nodeInfo{ addr := *address_addrForNodeID(v.getNodeID())
{"IP", net.IP(addr[:]).String()}, info := admin_nodeInfo{
{"coords", fmt.Sprint(v.coords)}, {"IP", net.IP(addr[:]).String()},
{"bucket", fmt.Sprint(i)}, {"coords", fmt.Sprint(v.coords)},
{"bucket", fmt.Sprint(i)},
{"lastSeen", fmt.Sprint(now.Sub(v.recv))},
}
infos = append(infos, info)
} }
infos = append(infos, info)
}
for _, v := range b.peers {
addr := *address_addrForNodeID(v.getNodeID())
info := admin_nodeInfo{
{"IP", net.IP(addr[:]).String()},
{"coords", fmt.Sprint(v.coords)},
{"bucket", fmt.Sprint(i)},
}
infos = append(infos, info)
} }
getInfo(b.other)
getInfo(b.peers)
} }
} }
a.core.router.doAdmin(getDHT) a.core.router.doAdmin(getDHT)

View File

@ -198,20 +198,12 @@ func (t *dht) nBuckets() int {
func (t *dht) insertIfNew(info *dhtInfo, isPeer bool) { func (t *dht) insertIfNew(info *dhtInfo, isPeer bool) {
//fmt.Println("DEBUG: dht insertIfNew:", info.getNodeID(), info.coords) //fmt.Println("DEBUG: dht insertIfNew:", info.getNodeID(), info.coords)
// Insert a peer if and only if the bucket doesn't already contain it // Insert a peer if and only if the bucket doesn't already contain it
nodeID := info.getNodeID() if !t.shouldInsert(info) {
bidx, isOK := t.getBucketIndex(nodeID)
if !isOK {
return return
} }
b := t.getBucket(bidx) info.send = time.Now()
if !b.contains(info) { info.recv = info.send
// We've never heard this node before t.insert(info, isPeer)
// TODO is there a better time than "now" to set send/recv to?
// (Is there another "natural" choice that bootstraps faster?)
info.send = time.Now()
info.recv = info.send
t.insert(info, isPeer)
}
} }
func (t *dht) insert(info *dhtInfo, isPeer bool) { func (t *dht) insert(info *dhtInfo, isPeer bool) {
@ -459,24 +451,7 @@ func (t *dht) doMaintenance() {
// Note that the above is a pointer comparison, and target can be nil // Note that the above is a pointer comparison, and target can be nil
// This is only for adding new nodes (learned from other lookups) // This is only for adding new nodes (learned from other lookups)
// It only makes sense to ping if the node isn't already in the table // It only makes sense to ping if the node isn't already in the table
bidx, isOK := t.getBucketIndex(rumor.info.getNodeID()) if !t.shouldInsert(rumor.info) {
if !isOK {
continue
}
b := t.getBucket(bidx)
if b.contains(rumor.info) {
// Already know about this node
continue
}
// This is a good spot to check if a node is worth pinging
doPing := len(b.other) < dht_bucket_size
for _, info := range b.other {
if dht_firstCloserThanThird(rumor.info.getNodeID(), &t.nodeID, info.getNodeID()) {
// Add the node if they are closer to us than someone in the same bucket
doPing = true
}
}
if !doPing {
continue continue
} }
} }
@ -485,6 +460,26 @@ func (t *dht) doMaintenance() {
} }
} }
func (t *dht) shouldInsert(info *dhtInfo) bool {
bidx, isOK := t.getBucketIndex(info.getNodeID())
if !isOK {
return false
}
b := t.getBucket(bidx)
if b.contains(info) {
return false
}
if len(b.other) < dht_bucket_size {
return true
}
for _, other := range b.other {
if dht_firstCloserThanThird(info.getNodeID(), &t.nodeID, other.getNodeID()) {
return true
}
}
return false
}
func dht_firstCloserThanThird(first *NodeID, func dht_firstCloserThanThird(first *NodeID,
second *NodeID, second *NodeID,
third *NodeID) bool { third *NodeID) bool {