github/v2ray-core
4
0
Fork 0
mirror of https://github.com/v2ray/v2ray-core.git synced 2026-10-30 00:11:23 +00:00
Code Issues Releases Wiki Activity

move proxy.Dialer to internet.Dialer

Browse Source
This commit is contained in:
Darien Raymond
2018-10-22 22:12:50 +02:00
parent 07a7597ee8
commit 17e51b277b
10 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/proxyman/mux/mux.go
+4 -3
View File
@@ -21,6 +21,7 @@ import (
"v2ray.com/core/common/vio"
"v2ray.com/core/features/routing"
"v2ray.com/core/proxy"
"v2ray.com/core/transport/internet"
"v2ray.com/core/transport/pipe"
)
@@ -32,11 +33,11 @@ type ClientManager struct {
access sync.Mutex
clients []*Client
proxy proxy.Outbound
dialer proxy.Dialer
dialer internet.Dialer
config *proxyman.MultiplexingConfig
}
func NewClientManager(p proxy.Outbound, d proxy.Dialer, c *proxyman.MultiplexingConfig) *ClientManager {
func NewClientManager(p proxy.Outbound, d internet.Dialer, c *proxyman.MultiplexingConfig) *ClientManager {
return &ClientManager{
proxy: p,
dialer: d,
@@ -89,7 +90,7 @@ var muxCoolAddress = net.DomainAddress("v1.mux.cool")
var muxCoolPort = net.Port(9527)
// NewClient creates a new mux.Client.
func NewClient(pctx context.Context, p proxy.Outbound, dialer proxy.Dialer, m *ClientManager) (*Client, error) {
func NewClient(pctx context.Context, p proxy.Outbound, dialer internet.Dialer, m *ClientManager) (*Client, error) {
ctx := session.ContextWithOutbound(context.Background(), &session.Outbound{
Target: net.TCPDestination(muxCoolAddress, muxCoolPort),
})
app/proxyman/outbound/handler.go
+1 -1
View File
@@ -103,7 +103,7 @@ func (h *Handler) Dispatch(ctx context.Context, link *vio.Link) {
}
}
// Dial implements proxy.Dialer.Dial().
// Dial implements internet.Dialer.
func (h *Handler) Dial(ctx context.Context, dest net.Destination) (internet.Connection, error) {
if h.senderSettings != nil {
if h.senderSettings.ProxySettings.HasTag() {