github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

Apply coding style

pull/238/head
Shelikhoo 2016-08-15 18:59:14 +08:00
parent a5ae6a0f4e
commit 4c093a2107
No known key found for this signature in database
GPG Key ID: 7791BDB0709ABD21
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
transport/internet/ws/wsconn.go
View File

@ -81,31 +81,33 @@ func (ws *wsconn) Write(b []byte) (n int, err error) {
ws.wlock.Lock() ws.wlock.Lock()
if ws.connClosing { if ws.connClosing {
return 0, io.EOF return 0, io.EOF
} }
writeWs := func(b []byte) (n int, err error) {
wr, err := ws.wsc.NextWriter(websocket.BinaryMessage) n, err = ws.write(b)
if err != nil {
log.Warning("WS transport: ws connection NewFrameReader return " + err.Error())
ws.connClosing = true
ws.Close()
return 0, err
}
n, err = wr.Write(b)
if err != nil {
return 0, err
}
err = wr.Close()
if err != nil {
return 0, err
}
return n, err
}
n, err = writeWs(b)
ws.wlock.Unlock() ws.wlock.Unlock()
return n, err return n, err
} }
func (ws *wsconn) write(b []byte) (n int, err error) {
wr, err := ws.wsc.NextWriter(websocket.BinaryMessage)
if err != nil {
log.Warning("WS transport: ws connection NewFrameReader return " + err.Error())
ws.connClosing = true
ws.Close()
return 0, err
}
n, err = wr.Write(b)
if err != nil {
return 0, err
}
err = wr.Close()
if err != nil {
return 0, err
}
return n, err
}
func (ws *wsconn) Close() error { func (ws *wsconn) Close() error {
ws.connClosing = true ws.connClosing = true
ws.wlock.Lock() ws.wlock.Lock()