lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-04-10 07:45:54 -04:00
Code Issues Releases Wiki Activity

relocated browser forwarder interface

Browse Source
This commit is contained in:
Shelikhoo
2021-05-01 00:06:10 +01:00
parent ffc8887d79
commit 7a6f887fe3
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,13 +6,12 @@ import (
"bytes"
"context"
"encoding/base64"
"github.com/v2fly/v2ray-core/v4/features/extension"
"io"
"time"
core "github.com/v2fly/v2ray-core/v4"
"github.com/v2fly/v2ray-core/v4/features/ext"
"github.com/gorilla/websocket"
core "github.com/v2fly/v2ray-core/v4"
"github.com/v2fly/v2ray-core/v4/common"
"github.com/v2fly/v2ray-core/v4/common/net"
@@ -62,8 +61,8 @@ func dialWebsocket(ctx context.Context, dest net.Destination, streamSettings *in
uri := protocol + "://" + host + wsSettings.GetNormalizedPath()
if wsSettings.UseBrowserForwarding {
var forwarder ext.BrowserForwarder
err := core.RequireFeatures(ctx, func(Forwarder ext.BrowserForwarder) {
var forwarder extension.BrowserForwarder
err := core.RequireFeatures(ctx, func(Forwarder extension.BrowserForwarder) {
forwarder = Forwarder
})
if err != nil {
@@ -141,7 +140,7 @@ func (d dialerWithEarlyData) Dial(earlyData []byte) (*websocket.Conn, error) {
}
type dialerWithEarlyDataRelayed struct {
forwarder ext.BrowserForwarder
forwarder extension.BrowserForwarder
uriBase string
config *Config
}