LBRYCommunity/lbry.go
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 46 Packages Wiki Activity

Revert "add tcp port mapping to data store"

Browse source 
This reverts commit 76b0e156366163ad9caae988253f66680a4c5bec.
This commit is contained in:
Alex Grintsvayg 2018-07-13 12:49:41 -04:00
parent c2d0c0a2d9
commit 283ec46bd5
3 changed files with 9 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dht/dht.go
View file

@ -318,7 +318,7 @@ func (dht *DHT) startReannouncer() {
func (dht *DHT) storeOnNode(hash bits.Bitmap, c Contact) {
// self-store
if dht.contact.ID == c.ID {
dht.node.Store(hash, c, dht.conf.PeerProtocolPort)
dht.node.Store(hash, c)
return
}

15
dht/node.go
View file

@ -236,11 +236,8 @@ func (n *Node) handleRequest(addr *net.UDPAddr, request Request) {
// TODO: we should be sending the IP in the request, not just using the sender's IP
// TODO: should we be using StoreArgs.NodeID or StoreArgs.Value.LbryID ???
if n.tokens.Verify(request.StoreArgs.Value.Token, request.NodeID, addr) {
n.Store(
request.StoreArgs.BlobHash,
Contact{ID: request.StoreArgs.NodeID, IP: addr.IP, Port: addr.Port},
request.StoreArgs.Value.Port,
)
n.Store(request.StoreArgs.BlobHash, Contact{ID: request.StoreArgs.NodeID, IP: addr.IP, Port: request.StoreArgs.Value.Port})
err := n.sendMessage(addr, Response{ID: request.ID, NodeID: n.id, Data: storeSuccessResponse})
if err != nil {
log.Error("error sending 'storemethod' response message - ", err)
@ -279,9 +276,9 @@ func (n *Node) handleRequest(addr *net.UDPAddr, request Request) {
if contacts := n.store.Get(*request.Arg); len(contacts) > 0 {
res.FindValueKey = request.Arg.RawString()
res.Contacts = contacts // we are returning stored contacts with tcp ports for file transfer
res.Contacts = contacts
} else {
res.Contacts = n.rt.GetClosest(*request.Arg, bucketSize) // these are normal dht contacts with udp ports
res.Contacts = n.rt.GetClosest(*request.Arg, bucketSize)
}
err := n.sendMessage(addr, res)
@ -467,6 +464,6 @@ func (n *Node) startRoutingTableGrooming() {
}
// Store stores a node contact in the node's contact store.
func (n *Node) Store(hash bits.Bitmap, c Contact, tcpPort int) {
n.store.Upsert(hash, c, tcpPort)
func (n *Node) Store(hash bits.Bitmap, c Contact) {
n.store.Upsert(hash, c)
}

16
dht/store.go
View file

@ -4,7 +4,6 @@ import (
"sync"
"github.com/lbryio/reflector.go/dht/bits"
"net"
)
// TODO: expire stored data after tExpire time
@ -12,8 +11,6 @@ import (
type contactStore struct {
// map of blob hashes to (map of node IDs to bools)
hashes map[bits.Bitmap]map[bits.Bitmap]bool
// map of blob hashes to (map of node ids to tcp ports)
ports map[bits.Bitmap]map[bits.Bitmap]int
// stores the peers themselves, so they can be updated in one place
contacts map[bits.Bitmap]Contact
lock sync.RWMutex
@ -22,23 +19,18 @@ type contactStore struct {
func newStore() *contactStore {
return &contactStore{
hashes: make(map[bits.Bitmap]map[bits.Bitmap]bool),
ports: make(map[bits.Bitmap]map[bits.Bitmap]int),
contacts: make(map[bits.Bitmap]Contact),
}
}
func (s *contactStore) Upsert(blobHash bits.Bitmap, contact Contact, tcpPort int) {
func (s *contactStore) Upsert(blobHash bits.Bitmap, contact Contact) {
s.lock.Lock()
defer s.lock.Unlock()
if _, ok := s.hashes[blobHash]; !ok {
s.hashes[blobHash] = make(map[bits.Bitmap]bool)
}
if _, ok := s.ports[blobHash]; !ok {
s.ports[blobHash] = make(map[bits.Bitmap]int)
}
s.hashes[blobHash][contact.ID] = true
s.ports[blobHash][contact.ID] = tcpPort
s.contacts[contact.ID] = contact
}
@ -53,11 +45,7 @@ func (s *contactStore) Get(blobHash bits.Bitmap) []Contact {
if !ok {
panic("node id in IDs list, but not in nodeInfo")
}
peerPort, ok := s.ports[blobHash][id]
if !ok {
panic("node id in IDs list, but missing peer port")
}
contacts = append(contacts, Contact{ID: contact.ID, IP: contact.IP, Port: peerPort})
contacts = append(contacts, contact)
}
}
return contacts