Northern_Lights/NekoBoxForAndroid
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/NekoBoxForAndroid.git synced 2025-12-19 06:30:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update box

Browse Source
This commit is contained in:
arm64v8a 2023-04-10 12:08:06 +09:00
parent 62739646dc
commit 4b0886e9fb
5 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libcore/dns.go
View File

@ -1,3 +1,5 @@
//go:build android
package libcore
import (
@ -16,24 +18,30 @@ import (
)
func init() {
D.RegisterTransport([]string{"underlying"}, CreateUnderlyingTransport)
D.RegisterTransport([]string{"underlying"}, createUnderlyingTransport)
}
// CreateUnderlyingTransport for Android
func CreateUnderlyingTransport(ctx context.Context, logger logger.ContextLogger, dialer N.Dialer, link string) (D.Transport, error) {
return underlyingResolver, nil
func createUnderlyingTransport(name string, ctx context.Context, logger logger.ContextLogger, dialer N.Dialer, link string) (D.Transport, error) {
return &androidUnderlyingTransportSing{name, underlyingResolver}, nil
}
//
type androidUnderlyingTransportSing struct {
name string
*androidUnderlyingTransport
}
func (t *androidUnderlyingTransportSing) Name() string { return t.name }
//
var systemResolver = &net.Resolver{PreferGo: false} // Using System API, lookup from current network.
var underlyingResolver = &androidUnderlyingTransport{systemResolver: systemResolver} // Using System API, lookup from non-VPN network.
type LocalResolver interface {
LookupIP(network string, domain string) (string, error)
}
type androidUnderlyingTransport struct {
systemResolver *net.Resolver
localResolver LocalResolver // Android: passed from java (only when VPNService)
}
func (t *androidUnderlyingTransport) Start() error { return nil }
@ -44,7 +52,7 @@ func (t *androidUnderlyingTransport) Exchange(ctx context.Context, message *dns.
}
func (t *androidUnderlyingTransport) Lookup(ctx context.Context, domain string, strategy D.DomainStrategy) (ips []netip.Addr, err error) {
isSekai := t.localResolver != nil
isSekai := localResolver != nil
var cancel context.CancelFunc
ctx, cancel = context.WithTimeout(ctx, time.Second*5)
@ -71,7 +79,7 @@ func (t *androidUnderlyingTransport) Lookup(ctx context.Context, domain string,
}
if isSekai {
str, err = t.localResolver.LookupIP(network, domain)
str, err = localResolver.LookupIP(network, domain)
// java -> go
if err != nil {
rcode, err2 := strconv.Atoi(err.Error())

8
libcore/go.mod
View File

@ -5,11 +5,11 @@ go 1.18
require (
github.com/codeclysm/extract v2.2.0+incompatible
github.com/matsuridayo/libneko v0.0.0-20230315005352-9d7e3f3a79d1
github.com/matsuridayo/sing-box-extra v0.0.0-20230407151528-afb3401544d4
github.com/matsuridayo/sing-box-extra v0.0.0-20230410030710-72e14149e230
github.com/miekg/dns v1.1.53
github.com/sagernet/sing v0.2.2-0.20230407053809-308e421e33c2
github.com/sagernet/sing-box v1.2.3
github.com/sagernet/sing-dns v0.1.5-0.20230407055526-2a27418e7855
github.com/sagernet/sing-box v1.2.4-0.20230408011350-68439705360e
github.com/sagernet/sing-dns v0.1.5-0.20230408004833-5adaf486d440
github.com/sagernet/sing-tun v0.1.4-0.20230326080954-8848c0e4cbab
github.com/ulikunitz/xz v0.5.10
golang.org/x/mobile v0.0.0-20220722155234-aaac322e2105
@ -96,4 +96,4 @@ require (
// replace github.com/matsuridayo/sing-box-extra => ../../sing-box-extra
replace github.com/sagernet/sing-dns => github.com/matsuridayo/sing-dns v0.0.0-20230407150154-fb87a0e6d1ec
replace github.com/sagernet/sing-dns => github.com/matsuridayo/sing-dns v0.0.0-20230410025504-c609bffff165

12
libcore/go.sum
View File

@ -76,10 +76,10 @@ github.com/logrusorgru/aurora v2.0.3+incompatible h1:tOpm7WcpBTn4fjmVfgpQq0EfczG
github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
github.com/matsuridayo/libneko v0.0.0-20230315005352-9d7e3f3a79d1 h1:+FflyEuq2hn++MENFuT1/qFHz0KITKK/F6ZHxs23mrg=
github.com/matsuridayo/libneko v0.0.0-20230315005352-9d7e3f3a79d1/go.mod h1:IRO07Queptz/rGFvEW+3Hmwpx7MCup6WiDs4p5jMt4g=
github.com/matsuridayo/sing-box-extra v0.0.0-20230407151528-afb3401544d4 h1:LNf3lmw1xbtWGa8jc2J6AnUeRVwZpc06cgwwhSejpMY=
github.com/matsuridayo/sing-box-extra v0.0.0-20230407151528-afb3401544d4/go.mod h1:9Iniw+DA0E4jitoGqQY6ZFIh7BPaAPL9VwR2EZsUyVM=
github.com/matsuridayo/sing-dns v0.0.0-20230407150154-fb87a0e6d1ec h1:1dY6PeEunsFJHGXAorHvB3GotaIt2aeXwn+J5SzGNfI=
github.com/matsuridayo/sing-dns v0.0.0-20230407150154-fb87a0e6d1ec/go.mod h1:69PNSHyEmXdjf6C+bXBOdr2GQnPeEyWjIzo/MV8gmz8=
github.com/matsuridayo/sing-box-extra v0.0.0-20230410030710-72e14149e230 h1:LWpfN8By7KS3mDqwTvipdlxdfy8NoeAh1TyJA8XK64Y=
github.com/matsuridayo/sing-box-extra v0.0.0-20230410030710-72e14149e230/go.mod h1:DkREqPDo+V81BJ9pjQ35ztx63f6oqCYvuwLHLpmtyVc=
github.com/matsuridayo/sing-dns v0.0.0-20230410025504-c609bffff165 h1:19PQEuBatWsTdQaoB60wdxQFHr3DOBhdTCpHzbkPDNw=
github.com/matsuridayo/sing-dns v0.0.0-20230410025504-c609bffff165/go.mod h1:69PNSHyEmXdjf6C+bXBOdr2GQnPeEyWjIzo/MV8gmz8=
github.com/mholt/acmez v1.1.0 h1:IQ9CGHKOHokorxnffsqDvmmE30mDenO1lptYZ1AYkHY=
github.com/mholt/acmez v1.1.0/go.mod h1:zwo5+fbLLTowAX8o8ETfQzbDtwGEXnPhkmGdKIP+bgs=
github.com/miekg/dns v1.1.53 h1:ZBkuHr5dxHtB1caEOlZTLPo7D3L3TWckgUUs/RHfDxw=
@ -121,8 +121,8 @@ github.com/sagernet/sing v0.0.0-20220817130738-ce854cda8522/go.mod h1:QVsS5L/ZA2
github.com/sagernet/sing v0.1.8/go.mod h1:jt1w2u7lJQFFSGLiRrRIs5YWmx4kAPfWuOejuDW9qMk=
github.com/sagernet/sing v0.2.2-0.20230407053809-308e421e33c2 h1:VjeHDxEgpB2fqK5G16yBvtLacibvg3h2MsIjal0UXH0=
github.com/sagernet/sing v0.2.2-0.20230407053809-308e421e33c2/go.mod h1:9uHswk2hITw8leDbiLS/xn0t9nzBcbePxzm9PJhwdlw=
github.com/sagernet/sing-box v1.2.3 h1:pXq/WYm/NOpev4WLKBWdkMMv15sNroRsr5f4uPIvuhI=
github.com/sagernet/sing-box v1.2.3/go.mod h1:u77aPtVY9C+x1JSxVizKj/nYn8NywMiQfJ2ZGGp53Io=
github.com/sagernet/sing-box v1.2.4-0.20230408011350-68439705360e h1:53gD8rU9R/dwMzBVMXog1J9fgw7MK9RgFhF5OXDL1rE=
github.com/sagernet/sing-box v1.2.4-0.20230408011350-68439705360e/go.mod h1:wJacyi8R2IqZQ25+XBL10bd7f35z8blXeSNagXHtvuA=
github.com/sagernet/sing-shadowsocks v0.2.0 h1:ILDWL7pwWfkPLEbviE/MyCgfjaBmJY/JVVY+5jhSb58=
github.com/sagernet/sing-shadowsocks v0.2.0/go.mod h1:ysYzszRLpNzJSorvlWRMuzU6Vchsp7sd52q+JNY4axw=
github.com/sagernet/sing-shadowtls v0.1.0 h1:05MYce8aR5xfKIn+y7xRFsdKhKt44QZTSEQW+lG5IWQ=

2
libcore/nb4a.go
View File

@ -32,7 +32,7 @@ func ForceGc() {
}
func SetLocalResolver(lr LocalResolver) {
underlyingResolver.localResolver = lr
localResolver = lr
}
func InitCore(process, cachePath, internalAssets, externalAssets string,

6
libcore/platform_java.go
View File

@ -9,6 +9,12 @@ type NB4AInterface interface {
UseOfficialAssets() bool
}
type LocalResolver interface {
LookupIP(network string, domain string) (string, error)
}
var localResolver LocalResolver // Android: passed from java (only when VPNService)
type BoxPlatformInterface interface {
AutoDetectInterfaceControl(fd int32) error
OpenTun(singTunOptionsJson, tunPlatformOptionsJson string) (int, error)