don't return nil multiaddrs from dht messages

License: MIT
Signed-off-by: Jeromy <why@ipfs.io>
This commit is contained in:
Jeromy 2016-05-16 17:09:54 -07:00
parent c81d962885
commit fd6f4b6104
2 changed files with 21 additions and 5 deletions

View File

@ -107,14 +107,15 @@ func (m *Message_Peer) Addresses() []ma.Multiaddr {
return nil
}
var err error
maddrs := make([]ma.Multiaddr, len(m.Addrs))
for i, addr := range m.Addrs {
maddrs[i], err = ma.NewMultiaddrBytes(addr)
maddrs := make([]ma.Multiaddr, 0, len(m.Addrs))
for _, addr := range m.Addrs {
maddr, err := ma.NewMultiaddrBytes(addr)
if err != nil {
log.Debugf("error decoding Multiaddr for peer: %s", m.GetId())
log.Warningf("error decoding Multiaddr for peer: %s", m.GetId())
continue
}
maddrs = append(maddrs, maddr)
}
return maddrs
}

15
pb/message_test.go Normal file
View File

@ -0,0 +1,15 @@
package dht_pb
import (
"testing"
)
func TestBadAddrsDontReturnNil(t *testing.T) {
mp := new(Message_Peer)
mp.Addrs = [][]byte{[]byte("NOT A VALID MULTIADDR")}
addrs := mp.Addresses()
if len(addrs) > 0 {
t.Fatal("shouldnt have any multiaddrs")
}
}