From 4bcc3cd6f1aafd8c848e27fb5332e456f765fd59 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 8 Aug 2024 05:05:52 +0330 Subject: [PATCH] Update sing-box related stuff --- db/ConfigBuilder.cpp | 5 +++-- go/cmd/nekobox_core/go.mod | 2 +- go/cmd/nekobox_core/go.sum | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/db/ConfigBuilder.cpp b/db/ConfigBuilder.cpp index 8794f84..f1680ae 100644 --- a/db/ConfigBuilder.cpp +++ b/db/ConfigBuilder.cpp @@ -477,8 +477,9 @@ namespace NekoGui { inboundObj["stack"] = Preset::SingBox::VpnImplementation.value(dataStore->vpn_implementation); inboundObj["strict_route"] = dataStore->vpn_strict_route; inboundObj["gso"] = dataStore->enable_gso; - inboundObj["inet4_address"] = "172.19.0.1/28"; - if (dataStore->vpn_ipv6) inboundObj["inet6_address"] = "fdfe:dcba:9876::1/126"; + auto tunAddress = QJsonArray{"172.19.0.1/24"}; + if (dataStore->vpn_ipv6) tunAddress += "fdfe:dcba:9876::1/96"; + inboundObj["address"] = tunAddress; if (dataStore->routing->sniffing_mode != SniffingMode::DISABLE) { inboundObj["sniff"] = true; inboundObj["sniff_override_destination"] = dataStore->routing->sniffing_mode == SniffingMode::FOR_DESTINATION; diff --git a/go/cmd/nekobox_core/go.mod b/go/cmd/nekobox_core/go.mod index c2ab4a9..c928fec 100644 --- a/go/cmd/nekobox_core/go.mod +++ b/go/cmd/nekobox_core/go.mod @@ -3,7 +3,7 @@ module nekobox_core go 1.19 require ( - github.com/Mahdi-zarei/sing-box-extra v0.0.0-20240808005324-7aa6169c0fd0 + github.com/Mahdi-zarei/sing-box-extra v0.0.0-20240808013412-aef87550ef06 github.com/matsuridayo/libneko v0.0.0-20230913024055-5277a5bfc889 github.com/sagernet/sing v0.5.0-alpha.14.0.20240806051909-7beca62e4f0d github.com/sagernet/sing-box v1.9.4-0.20240807020727-fbe803a11ee2 diff --git a/go/cmd/nekobox_core/go.sum b/go/cmd/nekobox_core/go.sum index f70fbd5..a8e859f 100644 --- a/go/cmd/nekobox_core/go.sum +++ b/go/cmd/nekobox_core/go.sum @@ -4,8 +4,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc= cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/Mahdi-zarei/sing-box-extra v0.0.0-20240808005324-7aa6169c0fd0 h1:kbufzkc/17ZUbnRcObpze3ZmfxZII0kM8HaOBUPXsn0= -github.com/Mahdi-zarei/sing-box-extra v0.0.0-20240808005324-7aa6169c0fd0/go.mod h1:UtP+CVNAci0gu76MS6t3ccGPsR95Erqbq7ELpeNIJ5g= +github.com/Mahdi-zarei/sing-box-extra v0.0.0-20240808013412-aef87550ef06 h1:HaebXqQzdfa9kA4CezE0VK/OFI0SLJ6Js0vs3Tc0Crk= +github.com/Mahdi-zarei/sing-box-extra v0.0.0-20240808013412-aef87550ef06/go.mod h1:UtP+CVNAci0gu76MS6t3ccGPsR95Erqbq7ELpeNIJ5g= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI=