]> Sergey Matveev's repositories - btrtrc.git/commitdiff
utp package merged PacketConn with Socket
authorMatt Joiner <anacrolix@gmail.com>
Sat, 3 Oct 2015 14:02:14 +0000 (00:02 +1000)
committerMatt Joiner <anacrolix@gmail.com>
Sat, 3 Oct 2015 14:02:14 +0000 (00:02 +1000)
client.go
client_test.go

index d28357269ec8b4cdfaf8cca73a83dc882f35120c..5773627382ff5fb4596161a8f4e903f84532d651 100644 (file)
--- 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 {
index 49d0965fd77f827bdeba84fd23c30a712bd8adce..a0f0f2a19bedeaa3b9dd4e4dc9cf7d076213fc62 100644 (file)
@@ -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)
                        }