logging + tweaks

This commit is contained in:
Juan Batiz-Benet 2014-10-13 01:31:51 -07:00
parent 5fe1399bab
commit 4429ee65e3
2 changed files with 11 additions and 4 deletions

3
dht.go
View File

@ -472,7 +472,7 @@ func (dht *IpfsDHT) peerFromInfo(pbp *Message_Peer) (*peer.Peer, error) {
}
if p == nil {
maddr, err := ma.NewMultiaddr(pbp.GetAddr())
maddr, err := pbp.Address()
if err != nil {
return nil, err
}
@ -481,6 +481,7 @@ func (dht *IpfsDHT) peerFromInfo(pbp *Message_Peer) (*peer.Peer, error) {
p = &peer.Peer{ID: id}
p.AddAddress(maddr)
dht.peerstore.Put(p)
log.Info("dht found new peer: %s %s", p, maddr)
}
return p, nil
}

View File

@ -176,19 +176,25 @@ func (dht *IpfsDHT) handleAddProvider(p *peer.Peer, pmes *Message) (*Message, er
log.Debug("%s adding %s as a provider for '%s'\n", dht.self, p, peer.ID(key))
// add provider should use the address given in the message
for _, pb := range pmes.GetCloserPeers() {
if peer.ID(pb.GetId()).Equal(p.ID) {
for _, pb := range pmes.GetProviderPeers() {
pid := peer.ID(pb.GetId())
if pid.Equal(p.ID) {
addr, err := pb.Address()
if err != nil {
log.Error("provider %s error with address %s", p, *pb.Addr)
continue
}
log.Info("received provider %s %s for %s", p, addr, key)
p.AddAddress(addr)
dht.providers.AddProvider(key, p)
} else {
log.Error("handleAddProvider received provider %s from %s", pid, p)
}
}
dht.providers.AddProvider(key, p)
return pmes, nil // send back same msg as confirmation.
}