mirror of
https://github.com/SagerNet/sing-box.git
synced 2025-09-02 15:28:49 +08:00
Compare commits
2 Commits
2dcb86941f
...
ef0004400d
Author | SHA1 | Date | |
---|---|---|---|
![]() |
ef0004400d | ||
![]() |
0a63049845 |
@ -112,6 +112,8 @@ func buildAndroid() {
|
|||||||
args = append(args, debugFlags...)
|
args = append(args, debugFlags...)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
args = append(args, "-ldflags", "-checklinkname=0")
|
||||||
|
|
||||||
tags := append(sharedTags, memcTags...)
|
tags := append(sharedTags, memcTags...)
|
||||||
if debugEnabled {
|
if debugEnabled {
|
||||||
tags = append(tags, debugTags...)
|
tags = append(tags, debugTags...)
|
||||||
|
@ -111,7 +111,7 @@ func NewWithOptions(options Options) (N.Dialer, error) {
|
|||||||
dnsQueryOptions.Transport = dnsTransport.Default()
|
dnsQueryOptions.Transport = dnsTransport.Default()
|
||||||
} else if options.NewDialer {
|
} else if options.NewDialer {
|
||||||
return nil, E.New("missing domain resolver for domain server address")
|
return nil, E.New("missing domain resolver for domain server address")
|
||||||
} else if !options.DirectOutbound {
|
} else {
|
||||||
deprecated.Report(options.Context, deprecated.OptionMissingDomainResolver)
|
deprecated.Report(options.Context, deprecated.OptionMissingDomainResolver)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
19
experimental/libbox/pidfd_android.go
Normal file
19
experimental/libbox/pidfd_android.go
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
package libbox
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
_ "unsafe"
|
||||||
|
)
|
||||||
|
|
||||||
|
// https://github.com/SagerNet/sing-box/issues/3233
|
||||||
|
// https://github.com/golang/go/issues/70508
|
||||||
|
// https://github.com/tailscale/tailscale/issues/13452
|
||||||
|
|
||||||
|
//go:linkname checkPidfdOnce os.checkPidfdOnce
|
||||||
|
var checkPidfdOnce func() error
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
checkPidfdOnce = func() error {
|
||||||
|
return os.ErrInvalid
|
||||||
|
}
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user