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

remove lock in websocket connection

pull/432/head
Darien Raymond 2017-02-10 16:41:54 +01:00
parent cc58f5cb8f
commit 2ba59428c9
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
transport/internet/websocket/wsconn.go
View File

@ -3,7 +3,6 @@ package websocket
import ( import (
"io" "io"
"net" "net"
"sync"
"time" "time"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
@ -13,14 +12,9 @@ import (
type wsconn struct { type wsconn struct {
wsc *websocket.Conn wsc *websocket.Conn
reader io.Reader reader io.Reader
rlock sync.Mutex
wlock sync.Mutex
} }
func (c *wsconn) Read(b []byte) (int, error) { func (c *wsconn) Read(b []byte) (int, error) {
c.rlock.Lock()
defer c.rlock.Unlock()
for { for {
reader, err := c.getReader() reader, err := c.getReader()
if err != nil { if err != nil {
@ -50,9 +44,6 @@ func (c *wsconn) getReader() (io.Reader, error) {
} }
func (c *wsconn) Write(b []byte) (int, error) { func (c *wsconn) Write(b []byte) (int, error) {
c.wlock.Lock()
defer c.wlock.Unlock()
if err := c.wsc.WriteMessage(websocket.BinaryMessage, b); err != nil { if err := c.wsc.WriteMessage(websocket.BinaryMessage, b); err != nil {
return 0, err return 0, err
} }