mirrors/v2ray-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix lint warnings

Browse Source
This commit is contained in:
Darien Raymond
2018-05-31 11:55:11 +02:00
parent fe3ddb0ef5
commit adade2bffd
19 changed files with 159 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
transport/internet/websocket/connection.go
View File

@@ -9,6 +9,7 @@ import (
"v2ray.com/core/common/buf"
"v2ray.com/core/common/errors"
"v2ray.com/core/common/serial"
)
var (
@@ -70,7 +71,7 @@ func (c *connection) Write(b []byte) (int, error) {
func (c *connection) WriteMultiBuffer(mb buf.MultiBuffer) error {
if c.mergingWriter == nil {
c.mergingWriter = buf.NewBufferedWriter(buf.NewBufferToBytesWriter(c))
c.mergingWriter = buf.NewBufferedWriter(&buf.BufferToBytesWriter{Writer: c})
}
if err := c.mergingWriter.WriteMultiBuffer(mb); err != nil {
return err
@@ -79,8 +80,17 @@ func (c *connection) WriteMultiBuffer(mb buf.MultiBuffer) error {
}
func (c *connection) Close() error {
c.conn.WriteControl(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""), time.Now().Add(time.Second*5))
return c.conn.Close()
var errors []interface{}
if err := c.conn.WriteControl(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""), time.Now().Add(time.Second*5)); err != nil {
errors = append(errors, err)
}
if err := c.conn.Close(); err != nil {
errors = append(errors, err)
}
if len(errors) > 0 {
return newError("failed to close connection").Base(newError(serial.Concat(errors...)))
}
return nil
}
func (c *connection) LocalAddr() net.Addr {