From: Matt Joiner <anacrolix@gmail.com>
Date: Sat, 3 Oct 2015 14:02:14 +0000 (+1000)
Subject: utp package merged PacketConn with Socket
X-Git-Tag: v1.0.0~1024
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=efe294ac35631e0d84ed6032fcc12d8a929d8c9c;p=btrtrc.git

utp package merged PacketConn with Socket
---

diff --git a/client.go b/client.go
index d2835726..57736273 100644
--- a/client.go
+++ b/client.go
@@ -536,7 +536,7 @@ func NewClient(cfg *Config) (cl *Client, err error) {
 			dhtCfg.Addr = listenAddr()
 		}
 		if dhtCfg.Conn == nil && cl.utpSock != nil {
-			dhtCfg.Conn = cl.utpSock.PacketConn()
+			dhtCfg.Conn = cl.utpSock
 		}
 		cl.dHT, err = dht.NewServer(dhtCfg)
 		if err != nil {
diff --git a/client_test.go b/client_test.go
index 49d0965f..a0f0f2a1 100644
--- a/client_test.go
+++ b/client_test.go
@@ -186,7 +186,7 @@ func TestUTPRawConn(t *testing.T) {
 		defer close(readerStopped)
 		b := make([]byte, 500)
 		for i := 0; i < N; i++ {
-			n, _, err := l.PacketConn().ReadFrom(b)
+			n, _, err := l.ReadFrom(b)
 			if err != nil {
 				t.Fatalf("error reading from raw conn: %s", err)
 			}