From 2baa5c265526ae60776bf664405de9af185a48f8 Mon Sep 17 00:00:00 2001
From: ginuerzh <ginuerzh@gmail.com>
Date: Tue, 12 May 2015 22:52:40 +0800
Subject: [PATCH] fix websocket rw

---
 ws.go | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/ws.go b/ws.go
index 9437501..ffe1267 100644
--- a/ws.go
+++ b/ws.go
@@ -20,23 +20,16 @@ func NewWSConn(conn *websocket.Conn) *WSConn {
 }
 
 func (conn *WSConn) Read(b []byte) (n int, err error) {
-	_, r, err := conn.NextReader()
-	if err != nil {
-		return
-	}
-	n, err = r.Read(b)
+	_, p, err := conn.ReadMessage()
+	copy(b, p)
+	n = len(p)
 	log.Println("ws r:", n)
 	return
 }
 
 func (conn *WSConn) Write(b []byte) (n int, err error) {
-	w, err := conn.NextWriter(websocket.BinaryMessage)
-	if err != nil {
-		return
-	}
-	defer w.Close()
-
-	n, err = w.Write(b)
+	err = conn.WriteMessage(websocket.BinaryMessage, b)
+	n = len(b)
 	log.Println("ws w:", n)
 	return
 }