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

refactor websocket

pull/432/head
Darien Raymond 2017-02-16 17:13:20 +01:00
parent 935620104d
commit 38014efdee
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
transport/internet/websocket/wsconn.go → transport/internet/websocket/connection.go
View File

7
transport/internet/websocket/dialer.go
View File

@ -30,10 +30,9 @@ func Dial(ctx context.Context, dest v2net.Destination) (internet.Connection, err
} }
if conn == nil { if conn == nil {
var err error var err error
conn, err = wsDial(ctx, dest) conn, err = dialWebsocket(ctx, dest)
if err != nil { if err != nil {
log.Warning("WebSocket|Dialer: Dial failed: ", err) return nil, errors.Base(err).Message("WebSocket|Dialer: Dial failed.")
return nil, err
} }
} }
return internal.NewConnection(id, conn, globalCache, internal.ReuseConnection(wsSettings.IsConnectionReuse())), nil return internal.NewConnection(id, conn, globalCache, internal.ReuseConnection(wsSettings.IsConnectionReuse())), nil
@ -43,7 +42,7 @@ func init() {
common.Must(internet.RegisterTransportDialer(internet.TransportProtocol_WebSocket, Dial)) common.Must(internet.RegisterTransportDialer(internet.TransportProtocol_WebSocket, Dial))
} }
func wsDial(ctx context.Context, dest v2net.Destination) (net.Conn, error) { func dialWebsocket(ctx context.Context, dest v2net.Destination) (net.Conn, error) {
src := internet.DialerSourceFromContext(ctx) src := internet.DialerSourceFromContext(ctx)
wsSettings := internet.TransportSettingsFromContext(ctx).(*Config) wsSettings := internet.TransportSettingsFromContext(ctx).(*Config)