logos-messaging/go-multiaddr
1
0
Fork 0
mirror of https://github.com/logos-messaging/go-multiaddr.git synced 2026-01-03 21:43:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

disable utp for now (broken)

Browse Source
This commit is contained in:
Juan Batiz-Benet 2015-01-09 06:09:38 -08:00
parent 13314e3a21
commit 2b8f35303d
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
net.go
View File

@ -4,7 +4,7 @@ import (
"fmt"
"net"
utp "github.com/jbenet/go-multiaddr-net/Godeps/_workspace/src/github.com/h2so5/utp"
// utp "github.com/jbenet/go-multiaddr-net/Godeps/_workspace/src/github.com/h2so5/utp"
ma "github.com/jbenet/go-multiaddr-net/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
)
@ -112,16 +112,18 @@ func (d *Dialer) Dial(remote ma.Multiaddr) (Conn, error) {
return nil, err
}
case "utp":
// construct utp dialer, with options on our net.Dialer
utpd := utp.Dialer{
Timeout: d.Dialer.Timeout,
LocalAddr: d.Dialer.LocalAddr,
}
return nil, fmt.Errorf("utp is currently broken")
nconn, err = utpd.Dial(rnet, rnaddr)
if err != nil {
return nil, err
}
// // construct utp dialer, with options on our net.Dialer
// utpd := utp.Dialer{
// Timeout: d.Dialer.Timeout,
// LocalAddr: d.Dialer.LocalAddr,
// }
//
// nconn, err = utpd.Dial(rnet, rnaddr)
// if err != nil {
// return nil, err
// }
}
// get local address (pre-specified or assigned within net.Conn)
@ -225,7 +227,8 @@ func Listen(laddr ma.Multiaddr) (Listener, error) {
var nl net.Listener
switch lnet {
case "utp":
nl, err = utp.Listen(lnet, lnaddr)
// nl, err = utp.Listen(lnet, lnaddr)
return nil, fmt.Errorf("utp is currently broken")
default:
nl, err = net.Listen(lnet, lnaddr)
}

3
net_test.go
View File

@ -165,7 +165,7 @@ func TestListenAddrs(t *testing.T) {
test("/ip4/127.0.0.1/tcp/4324", true)
test("/ip4/127.0.0.1/udp/4325", false)
test("/ip4/127.0.0.1/udp/4326/udt", false)
test("/ip4/127.0.0.1/udp/4326/utp", true)
// test("/ip4/127.0.0.1/udp/4326/utp", true)
}
func TestListenAndDial(t *testing.T) {
@ -230,6 +230,7 @@ func TestListenAndDial(t *testing.T) {
}
func TestListenAndDialUTP(t *testing.T) {
t.Skip("utp is broken")
maddr := newMultiaddr(t, "/ip4/127.0.0.1/udp/4323/utp")
listener, err := Listen(maddr)