From aa44c75b910e4e3cf2deb2fa301c2a97544ed3b8 Mon Sep 17 00:00:00 2001
From: Miek Gieben <miek@miek.nl>
Date: Sat, 12 Oct 2013 18:32:53 +0100
Subject: [PATCH] Merge net branch

---
 client.go | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/client.go b/client.go
index 2096928e..6b90610c 100644
--- a/client.go
+++ b/client.go
@@ -185,10 +185,8 @@ func (co *Conn) Read(p []byte) (n int, err error) {
 	if len(p) < 2 {
 		return 0, io.ErrShortBuffer
 	}
-	switch w.client.Net {
-	case "tcp", "tcp4", "tcp6":
-		setTimeouts(w)
-		n, err = w.conn.Read(p[0:2])
+	if t, ok := co.Conn.(*net.TCPConn); ok {
+		n, err = t.Read(p[0:2])
 		if err != nil || n != 2 {
 			return n, err
 		}
@@ -199,25 +197,25 @@ func (co *Conn) Read(p []byte) (n int, err error) {
 		if int(l) > len(p) {
 			return int(l), io.ErrShortBuffer
 		}
-		n, err = w.conn.Read(p[:l])
+		n, err = t.Read(p[:l])
 		if err != nil {
 			return n, err
 		}
 		i := n
 		for i < int(l) {
-			j, err := w.conn.Read(p[i:int(l)])
+			j, err := t.Read(p[i:int(l)])
 			if err != nil {
 				return i, err
 			}
 			i += j
 		}
 		n = i
-	case "", "udp", "udp4", "udp6":
-		setTimeouts(w)
-		n, err = w.conn.Read(p)
-		if err != nil {
-			return n, err
-		}
+		return n, err
+	}
+	// assume udp connection
+	n, _, err = co.Conn.(*net.UDPConn).ReadFromUDP(p)
+	if err != nil {
+		return n, err
 	}
 	return n, err
 }
@@ -270,16 +268,7 @@ func (co *Conn) Write(p []byte) (n int, err error) {
 			i += j
 		}
 		n = i
-<<<<<<< HEAD
-	case "", "udp", "udp4", "udp6":
-		setTimeouts(w)
-		n, err = w.conn.Write(p)
-		if err != nil {
-			return n, err
-		}
-=======
 		return n, err
->>>>>>> net
 	}
 	n, err = co.Conn.(*net.UDPConn).Write(p)
 	return n, err