root/gost_software
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix websocket rw

Browse Source
This commit is contained in:
ginuerzh 2015-05-12 22:52:40 +08:00
parent 0eabf75988
commit 2baa5c2655
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ws.go
View File

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