Commit 9141de32 authored by Jeromy's avatar Jeromy

update to utp code from master of go-ipfs

parent cbc0086a
...@@ -18,8 +18,8 @@ var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/net/swarm/addr") ...@@ -18,8 +18,8 @@ var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/net/swarm/addr")
var SupportedTransportStrings = []string{ var SupportedTransportStrings = []string{
"/ip4/tcp", "/ip4/tcp",
"/ip6/tcp", "/ip6/tcp",
// "/ip4/udp/utp", disabled because the lib is broken "/ip4/udp/utp",
// "/ip6/udp/utp", disabled because the lib is broken "/ip6/udp/utp",
// "/ip4/udp/udt", disabled because the lib doesnt work on arm // "/ip4/udp/udt", disabled because the lib doesnt work on arm
// "/ip6/udp/udt", disabled because the lib doesnt work on arm // "/ip6/udp/udt", disabled because the lib doesnt work on arm
} }
......
...@@ -20,7 +20,6 @@ func TestFilterAddrs(t *testing.T) { ...@@ -20,7 +20,6 @@ func TestFilterAddrs(t *testing.T) {
bad := []ma.Multiaddr{ bad := []ma.Multiaddr{
newMultiaddr(t, "/ip4/1.2.3.4/udp/1234"), // unreliable newMultiaddr(t, "/ip4/1.2.3.4/udp/1234"), // unreliable
newMultiaddr(t, "/ip4/1.2.3.4/udp/1234/sctp/1234"), // not in manet newMultiaddr(t, "/ip4/1.2.3.4/udp/1234/sctp/1234"), // not in manet
newMultiaddr(t, "/ip4/1.2.3.4/udp/1234/utp"), // utp is broken
newMultiaddr(t, "/ip4/1.2.3.4/udp/1234/udt"), // udt is broken on arm newMultiaddr(t, "/ip4/1.2.3.4/udp/1234/udt"), // udt is broken on arm
newMultiaddr(t, "/ip6/fe80::1/tcp/1234"), // link local newMultiaddr(t, "/ip6/fe80::1/tcp/1234"), // link local
newMultiaddr(t, "/ip6/fe80::100/tcp/1234"), // link local newMultiaddr(t, "/ip6/fe80::100/tcp/1234"), // link local
...@@ -29,6 +28,7 @@ func TestFilterAddrs(t *testing.T) { ...@@ -29,6 +28,7 @@ func TestFilterAddrs(t *testing.T) {
good := []ma.Multiaddr{ good := []ma.Multiaddr{
newMultiaddr(t, "/ip4/127.0.0.1/tcp/1234"), newMultiaddr(t, "/ip4/127.0.0.1/tcp/1234"),
newMultiaddr(t, "/ip6/::1/tcp/1234"), newMultiaddr(t, "/ip6/::1/tcp/1234"),
newMultiaddr(t, "/ip4/1.2.3.4/udp/1234/utp"),
} }
goodAndBad := append(good, bad...) goodAndBad := append(good, bad...)
...@@ -39,18 +39,12 @@ func TestFilterAddrs(t *testing.T) { ...@@ -39,18 +39,12 @@ func TestFilterAddrs(t *testing.T) {
if AddrUsable(a, false) { if AddrUsable(a, false) {
t.Errorf("addr %s should be unusable", a) t.Errorf("addr %s should be unusable", a)
} }
if AddrUsable(a, true) {
t.Errorf("addr %s should be unusable", a)
}
} }
for _, a := range good { for _, a := range good {
if !AddrUsable(a, false) { if !AddrUsable(a, false) {
t.Errorf("addr %s should be usable", a) t.Errorf("addr %s should be usable", a)
} }
if !AddrUsable(a, true) {
t.Errorf("addr %s should be usable", a)
}
} }
subtestAddrsEqual(t, FilterUsableAddrs(bad), []ma.Multiaddr{}) subtestAddrsEqual(t, FilterUsableAddrs(bad), []ma.Multiaddr{})
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment