Peernet-Archive/core
1
0
Fork 0
mirror of https://github.com/PeernetOfficial/core.git synced 2026-07-20 20:07:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

dht.Get return sender's nodeID

Browse Source
This commit is contained in:
Kleissner
2021-04-21 03:06:30 +02:00
parent 8a33f19986
commit e432696ad1
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dht/DHT Lite.go
View File

@@ -136,19 +136,20 @@ func (dht *DHT) Store(key []byte, dataSize uint64) (err error) {
} }
// Get retrieves data from the network using key // Get retrieves data from the network using key
func (dht *DHT) Get(key []byte) (value []byte, found bool, err error) { func (dht *DHT) Get(key []byte) (value []byte, senderID []byte, found bool, err error) {
if len(key)*8 != dht.ht.bBits { if len(key)*8 != dht.ht.bBits {
return nil, false, errors.New("invalid key size") return nil, nil, false, errors.New("invalid key size")
} }
// Keep a reference to closestNode. If after performing a search we do not find a closer node, we stop searching. // Keep a reference to closestNode. If after performing a search we do not find a closer node, we stop searching.
sl := dht.ht.getClosestContacts(dht.alpha, key, nil) sl := dht.ht.getClosestContacts(dht.alpha, key, nil)
if len(sl.Nodes) == 0 { if len(sl.Nodes) == 0 {
return nil, false, nil return nil, nil, false, nil
} }
closestNode := sl.Nodes[0] closestNode := sl.Nodes[0]
// TODO: Limit max amount of iterations to mitigate malicious responses.
for { for {
info := dht.NewInformationRequest(ActionFindValue, key, sl.GetUncontacted(dht.alpha, true)) info := dht.NewInformationRequest(ActionFindValue, key, sl.GetUncontacted(dht.alpha, true))
dht.SendRequestFindValue(info) dht.SendRequestFindValue(info)
@@ -160,7 +161,7 @@ func (dht *DHT) Get(key []byte) (value []byte, found bool, err error) {
continue continue
} }
if len(result.Data) > 0 { if len(result.Data) > 0 {
return result.Data, true, nil return result.Data, result.SenderID, true, nil
} }
sl.AppendUniqueNodes(result.Storing...) // TODO: Assign higher priority, skip closesNode check. sl.AppendUniqueNodes(result.Storing...) // TODO: Assign higher priority, skip closesNode check.
sl.AppendUniqueNodes(result.Closest...) sl.AppendUniqueNodes(result.Closest...)
@@ -170,7 +171,7 @@ func (dht *DHT) Get(key []byte) (value []byte, found bool, err error) {
// If closestNode is unchanged then we are done // If closestNode is unchanged then we are done
if bytes.Equal(sl.Nodes[0].ID, closestNode.ID) { if bytes.Equal(sl.Nodes[0].ID, closestNode.ID) {
return nil, false, nil return nil, nil, false, nil
} }
closestNode = sl.Nodes[0] closestNode = sl.Nodes[0]