Add workaround for golang/go#68760

This commit is contained in:
世界 2024-12-10 09:58:55 +08:00
parent 3032317918
commit f0b6818b4c
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
7 changed files with 79 additions and 16 deletions

View File

@ -201,9 +201,15 @@ test_stdio:
lib_android: lib_android:
go run ./cmd/internal/build_libbox -target android go run ./cmd/internal/build_libbox -target android
lib_android_debug:
go run ./cmd/internal/build_libbox -target android -debug
lib_ios: lib_ios:
go run ./cmd/internal/build_libbox -target ios go run ./cmd/internal/build_libbox -target ios
lib_ios_debug:
go run ./cmd/internal/build_libbox -target ios -debug
lib: lib:
go run ./cmd/internal/build_libbox -target android go run ./cmd/internal/build_libbox -target android
go run ./cmd/internal/build_libbox -target ios go run ./cmd/internal/build_libbox -target ios

View File

@ -80,9 +80,17 @@ func buildAndroid() {
log.Fatal("java version should be openjdk 17") log.Fatal("java version should be openjdk 17")
} }
var bindTarget string
if debugEnabled {
bindTarget = "android/arm64"
} else {
bindTarget = "android"
}
args := []string{ args := []string{
"bind", "bind",
"-v", "-v",
"-target", bindTarget,
"-androidapi", "21", "-androidapi", "21",
"-javapkg=io.nekohasekai", "-javapkg=io.nekohasekai",
"-libname=box", "-libname=box",

View File

@ -0,0 +1,8 @@
//go:build android && debug
package constant
// TODO: remove after fixed
// https://github.com/golang/go/issues/68760
const FixAndroidStack = true

View File

@ -0,0 +1,5 @@
//go:build !(android && debug)
package constant
const FixAndroidStack = false

View File

@ -7,6 +7,7 @@ import (
"path/filepath" "path/filepath"
"time" "time"
C "github.com/sagernet/sing-box/constant"
"github.com/sagernet/sing/common" "github.com/sagernet/sing/common"
E "github.com/sagernet/sing/common/exceptions" E "github.com/sagernet/sing/common/exceptions"
) )
@ -113,11 +114,24 @@ func (c *CommandClient) Connect() error {
if err != nil { if err != nil {
return err return err
} }
if C.FixAndroidStack {
go func() {
c.handler.Connected() c.handler.Connected()
c.handler.InitializeClashMode(newIterator(modeList), currentMode) c.handler.InitializeClashMode(newIterator(modeList), currentMode)
if len(modeList) == 0 { if len(modeList) == 0 {
conn.Close() conn.Close()
c.handler.Disconnected(os.ErrInvalid.Error()) c.handler.Disconnected(os.ErrInvalid.Error())
}
}()
} else {
c.handler.Connected()
c.handler.InitializeClashMode(newIterator(modeList), currentMode)
if len(modeList) == 0 {
conn.Close()
c.handler.Disconnected(os.ErrInvalid.Error())
}
}
if len(modeList) == 0 {
return nil return nil
} }
go c.handleModeConn(conn) go c.handleModeConn(conn)

View File

@ -5,6 +5,7 @@ import (
"net/netip" "net/netip"
"sync" "sync"
C "github.com/sagernet/sing-box/constant"
"github.com/sagernet/sing-tun" "github.com/sagernet/sing-tun"
"github.com/sagernet/sing/common" "github.com/sagernet/sing/common"
E "github.com/sagernet/sing/common/exceptions" E "github.com/sagernet/sing/common/exceptions"
@ -97,6 +98,14 @@ func (m *platformDefaultInterfaceMonitor) UnregisterCallback(element *list.Eleme
} }
func (m *platformDefaultInterfaceMonitor) UpdateDefaultInterface(interfaceName string, interfaceIndex32 int32) { func (m *platformDefaultInterfaceMonitor) UpdateDefaultInterface(interfaceName string, interfaceIndex32 int32) {
if C.FixAndroidStack {
go m.updateDefaultInterface(interfaceName, interfaceIndex32)
} else {
m.updateDefaultInterface(interfaceName, interfaceIndex32)
}
}
func (m *platformDefaultInterfaceMonitor) updateDefaultInterface(interfaceName string, interfaceIndex32 int32) {
if interfaceName == "" || interfaceIndex32 == -1 { if interfaceName == "" || interfaceIndex32 == -1 {
m.defaultInterfaceName = "" m.defaultInterfaceName = ""
m.defaultInterfaceIndex = -1 m.defaultInterfaceIndex = -1

View File

@ -73,23 +73,36 @@ func NewService(configContent string, platformInterface PlatformInterface) (*Box
} }
func (s *BoxService) Start() error { func (s *BoxService) Start() error {
if C.FixAndroidStack {
var err error
done := make(chan struct{})
go func() {
err = s.instance.Start()
close(done)
}()
<-done
return err
} else {
return s.instance.Start() return s.instance.Start()
}
} }
func (s *BoxService) Close() error { func (s *BoxService) Close() error {
done := make(chan struct{})
defer close(done)
go func() {
select {
case <-done:
return
case <-time.After(C.FatalStopTimeout):
os.Exit(1)
}
}()
s.cancel() s.cancel()
s.urlTestHistoryStorage.Close() s.urlTestHistoryStorage.Close()
return s.instance.Close() var err error
done := make(chan struct{})
go func() {
err = s.instance.Close()
close(done)
}()
select {
case <-done:
return err
case <-time.After(C.FatalStopTimeout):
os.Exit(1)
return nil
}
} }
func (s *BoxService) NeedWIFIState() bool { func (s *BoxService) NeedWIFIState() bool {