mirror of
https://github.com/v2fly/v2ray-core.git
synced 2024-09-28 14:56:33 -04:00
refactor: using callback instead of defer function
This commit is contained in:
parent
6593b88837
commit
edff5c8e2d
@ -56,9 +56,14 @@ func getControlFunc(ctx context.Context, sockopt *SocketConfig, controllers []co
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (dl *DefaultListener) Listen(ctx context.Context, addr net.Addr, sockopt *SocketConfig) (l net.Listener, err error) {
|
func (dl *DefaultListener) Listen(ctx context.Context, addr net.Addr, sockopt *SocketConfig) (net.Listener, error) {
|
||||||
var lc net.ListenConfig
|
var lc net.ListenConfig
|
||||||
var network, address string
|
var network, address string
|
||||||
|
// callback is called after the Listen function returns
|
||||||
|
// this is used to wrap the listener and do some post processing
|
||||||
|
callback := func(l net.Listener, err error) (net.Listener, error) {
|
||||||
|
return l, err
|
||||||
|
}
|
||||||
switch addr := addr.(type) {
|
switch addr := addr.(type) {
|
||||||
case *net.TCPAddr:
|
case *net.TCPAddr:
|
||||||
network = addr.Network()
|
network = addr.Network()
|
||||||
@ -81,6 +86,7 @@ func (dl *DefaultListener) Listen(ctx context.Context, addr net.Addr, sockopt *S
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// normal unix domain socket
|
// normal unix domain socket
|
||||||
|
var fileMode *os.FileMode
|
||||||
// parse file mode from address
|
// parse file mode from address
|
||||||
if s := strings.Split(address, ","); len(s) == 2 {
|
if s := strings.Split(address, ","); len(s) == 2 {
|
||||||
fMode, err := strconv.ParseUint(s[1], 8, 32)
|
fMode, err := strconv.ParseUint(s[1], 8, 32)
|
||||||
@ -88,18 +94,8 @@ func (dl *DefaultListener) Listen(ctx context.Context, addr net.Addr, sockopt *S
|
|||||||
return nil, newError("failed to parse file mode").Base(err)
|
return nil, newError("failed to parse file mode").Base(err)
|
||||||
}
|
}
|
||||||
address = s[0]
|
address = s[0]
|
||||||
// set file mode for unix domain socket when it is created
|
fm := os.FileMode(fMode)
|
||||||
defer func(name string, mode os.FileMode) {
|
fileMode = &fm
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if cerr := os.Chmod(name, mode); cerr != nil {
|
|
||||||
// failed to set file mode, close the listener
|
|
||||||
l.Close()
|
|
||||||
l = nil
|
|
||||||
err = newError("failed to set file mode for file: ", name).Base(cerr)
|
|
||||||
}
|
|
||||||
}(address, os.FileMode(fMode))
|
|
||||||
}
|
}
|
||||||
// normal unix domain socket needs lock
|
// normal unix domain socket needs lock
|
||||||
locker := &FileLocker{
|
locker := &FileLocker{
|
||||||
@ -108,20 +104,29 @@ func (dl *DefaultListener) Listen(ctx context.Context, addr net.Addr, sockopt *S
|
|||||||
if err := locker.Acquire(); err != nil {
|
if err := locker.Acquire(); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
defer func(locker *FileLocker) {
|
// set file mode for unix domain socket when it is created
|
||||||
// combine listener and locker
|
callback = func(l net.Listener, err error) (net.Listener, error) {
|
||||||
if err == nil {
|
if err != nil {
|
||||||
l = &combinedListener{Listener: l, locker: locker}
|
|
||||||
} else {
|
|
||||||
// failed to create listener, release the locker
|
|
||||||
locker.Release()
|
locker.Release()
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
l = &combinedListener{Listener: l, locker: locker}
|
||||||
|
if fileMode == nil {
|
||||||
|
return l, err
|
||||||
|
}
|
||||||
|
if cerr := os.Chmod(address, *fileMode); cerr != nil {
|
||||||
|
// failed to set file mode, close the listener
|
||||||
|
l.Close()
|
||||||
|
return nil, newError("failed to set file mode for file: ", address).Base(cerr)
|
||||||
|
}
|
||||||
|
return l, err
|
||||||
}
|
}
|
||||||
}(locker)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
l, err = lc.Listen(ctx, network, address)
|
l, err := lc.Listen(ctx, network, address)
|
||||||
if sockopt != nil && sockopt.AcceptProxyProtocol {
|
l, err = callback(l, err)
|
||||||
|
if err == nil && sockopt != nil && sockopt.AcceptProxyProtocol {
|
||||||
policyFunc := func(upstream net.Addr) (proxyproto.Policy, error) { return proxyproto.REQUIRE, nil }
|
policyFunc := func(upstream net.Addr) (proxyproto.Policy, error) { return proxyproto.REQUIRE, nil }
|
||||||
l = &proxyproto.Listener{Listener: l, Policy: policyFunc}
|
l = &proxyproto.Listener{Listener: l, Policy: policyFunc}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user