mirror of https://github.com/v2ray/v2ray-core
fix #1462
parent
21b3f66b8b
commit
f49f85b5bd
|
@ -10,7 +10,7 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
effectiveSystemDialer SystemDialer = DefaultSystemDialer{}
|
effectiveSystemDialer SystemDialer = &DefaultSystemDialer{}
|
||||||
)
|
)
|
||||||
|
|
||||||
type SystemDialer interface {
|
type SystemDialer interface {
|
||||||
|
@ -18,17 +18,19 @@ type SystemDialer interface {
|
||||||
}
|
}
|
||||||
|
|
||||||
type DefaultSystemDialer struct {
|
type DefaultSystemDialer struct {
|
||||||
|
controllers []controller
|
||||||
}
|
}
|
||||||
|
|
||||||
func (DefaultSystemDialer) Dial(ctx context.Context, src net.Address, dest net.Destination, sockopt *SocketConfig) (net.Conn, error) {
|
func (d *DefaultSystemDialer) Dial(ctx context.Context, src net.Address, dest net.Destination, sockopt *SocketConfig) (net.Conn, error) {
|
||||||
dialer := &net.Dialer{
|
dialer := &net.Dialer{
|
||||||
Timeout: time.Second * 60,
|
Timeout: time.Second * 60,
|
||||||
DualStack: true,
|
DualStack: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
if sockopt != nil {
|
if sockopt != nil || len(d.controllers) > 0 {
|
||||||
dialer.Control = func(network, address string, c syscall.RawConn) error {
|
dialer.Control = func(network, address string, c syscall.RawConn) error {
|
||||||
return c.Control(func(fd uintptr) {
|
return c.Control(func(fd uintptr) {
|
||||||
|
if sockopt != nil {
|
||||||
if err := applyOutboundSocketOptions(network, address, fd, sockopt); err != nil {
|
if err := applyOutboundSocketOptions(network, address, fd, sockopt); err != nil {
|
||||||
newError("failed to apply socket options").Base(err).WriteToLog(session.ExportIDToError(ctx))
|
newError("failed to apply socket options").Base(err).WriteToLog(session.ExportIDToError(ctx))
|
||||||
}
|
}
|
||||||
|
@ -37,6 +39,13 @@ func (DefaultSystemDialer) Dial(ctx context.Context, src net.Address, dest net.D
|
||||||
newError("failed to bind source address to ", sockopt.BindAddress).Base(err).WriteToLog(session.ExportIDToError(ctx))
|
newError("failed to bind source address to ", sockopt.BindAddress).Base(err).WriteToLog(session.ExportIDToError(ctx))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, ctl := range d.controllers {
|
||||||
|
if err := ctl(network, address, fd); err != nil {
|
||||||
|
newError("failed to apply external controller").Base(err).WriteToLog(session.ExportIDToError(ctx))
|
||||||
|
}
|
||||||
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -83,7 +92,26 @@ func (v *SimpleSystemDialer) Dial(ctx context.Context, src net.Address, dest net
|
||||||
// v2ray:api:stable
|
// v2ray:api:stable
|
||||||
func UseAlternativeSystemDialer(dialer SystemDialer) {
|
func UseAlternativeSystemDialer(dialer SystemDialer) {
|
||||||
if dialer == nil {
|
if dialer == nil {
|
||||||
effectiveSystemDialer = DefaultSystemDialer{}
|
effectiveSystemDialer = &DefaultSystemDialer{}
|
||||||
}
|
}
|
||||||
effectiveSystemDialer = dialer
|
effectiveSystemDialer = dialer
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// RegisterDialerController adds a controller to the effective system dialer.
|
||||||
|
// The controller can be used to operate on file descriptors before they are put into use.
|
||||||
|
// It only works when effective dialer is the default dialer.
|
||||||
|
//
|
||||||
|
// v2ray:api:beta
|
||||||
|
func RegisterDialerController(ctl func(network, address string, fd uintptr) error) error {
|
||||||
|
if ctl == nil {
|
||||||
|
return newError("nil listener controller")
|
||||||
|
}
|
||||||
|
|
||||||
|
dialer, ok := effectiveSystemDialer.(*DefaultSystemDialer)
|
||||||
|
if !ok {
|
||||||
|
return newError("RegisterListenerController not supported in custom dialer")
|
||||||
|
}
|
||||||
|
|
||||||
|
dialer.controllers = append(dialer.controllers, ctl)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue