yanistyle/sing-box-extended
1
0
Fork 0
mirror of https://github.com/shtorm-7/sing-box-extended.git synced 2026-06-06 03:07:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Improve system proxy API

Browse Source
This commit is contained in:
世界
2023-09-03 14:29:37 +08:00
parent 013e29e4b6
commit e5a704d4b7
7 changed files with 295 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
inbound/default.go
View File

@@ -33,8 +33,8 @@ type myInboundAdapter struct {
// http mixed
setSystemProxy bool
clearSystemProxy func() error
setSystemProxy bool
systemProxy settings.SystemProxy
// internal
@@ -91,7 +91,19 @@ func (a *myInboundAdapter) Start() error {
}
}
if a.setSystemProxy {
a.clearSystemProxy, err = settings.SetSystemProxy(a.router, M.SocksaddrFromNet(a.tcpListener.Addr()).Port, a.protocol == C.TypeMixed)
listenPort := M.SocksaddrFromNet(a.tcpListener.Addr()).Port
var listenAddrString string
listenAddr := a.listenOptions.Listen.Build()
if listenAddr.IsUnspecified() {
listenAddrString = "127.0.0.1"
} else {
listenAddrString = listenAddr.String()
}
a.systemProxy, err = settings.NewSystemProxy(a.ctx, M.ParseSocksaddrHostPort(listenAddrString, listenPort), a.protocol == C.TypeMixed)
if err != nil {
return E.Cause(err, "initialize system proxy")
}
err = a.systemProxy.Enable()
if err != nil {
return E.Cause(err, "set system proxy")
}
@@ -102,8 +114,8 @@ func (a *myInboundAdapter) Start() error {
func (a *myInboundAdapter) Close() error {
a.inShutdown.Store(true)
var err error
if a.clearSystemProxy != nil {
err = a.clearSystemProxy()
if a.systemProxy != nil && a.systemProxy.IsEnabled() {
err = a.systemProxy.Disable()
}
return E.Errors(err, common.Close(
a.tcpListener,