From 2b8f35303d2855c79f9f3f9b3584338a1ff7edbd Mon Sep 17 00:00:00 2001
From: Juan Batiz-Benet <juan@benet.ai>
Date: Fri, 9 Jan 2015 06:09:38 -0800
Subject: [PATCH] disable utp for now (broken)

---
 net.go      | 25 ++++++++++++++-----------
 net_test.go |  3 ++-
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/net.go b/net.go
index 316ea6a..907c68e 100644
--- a/net.go
+++ b/net.go
@@ -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)
 	}
diff --git a/net_test.go b/net_test.go
index 6aaa708..8261a35 100644
--- a/net_test.go
+++ b/net_test.go
@@ -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)