fix

MatsuriDayo · Jun 14, 2023 · 0decd3f · 0decd3f
1 parent f29c82a
commit 0decd3f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/fmt/Bean2CoreObj_box.cpp b/fmt/Bean2CoreObj_box.cpp
@@ -69,9 +69,13 @@ namespace NekoGui_fmt {
             outbound->insert("tls", tls);
         }
 
-        auto pkt = packet_encoding;
-        if (pkt == "packet") pkt = "packetaddr";
-        outbound->insert("packet_encoding", pkt);
+        if (!packet_encoding.isEmpty()) {
+            auto pkt = packet_encoding;
+            if (pkt == "packet") pkt = "packetaddr";
+            outbound->insert("packet_encoding", pkt);
+        } else if (outbound->value("type").toString() == "vless") {
+            outbound->insert("packet_encoding", "");
+        }
     }
 
     CoreObjOutboundBuildResult SocksHttpBean::BuildCoreObjSingBox() {

diff --git a/go/cmd/nekobox_core/go.mod b/go/cmd/nekobox_core/go.mod
@@ -57,7 +57,7 @@ require (
 	github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97 // indirect
 	github.com/sagernet/quic-go v0.0.0-20230202071646-a8c8afb18b32 // indirect
 	github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691 // indirect
-	github.com/sagernet/sing v0.2.5-0.20230611070640-2812461739c3 // indirect
+	github.com/sagernet/sing v0.2.5-0.20230613142554-a3b120b25eab // indirect
 	github.com/sagernet/sing-dns v0.1.5-0.20230426113254-25d948c44223 // indirect
 	github.com/sagernet/sing-mux v0.0.0-20230517134606-1ebe6bb26646 // indirect
 	github.com/sagernet/sing-shadowsocks v0.2.2-0.20230509053848-d83f8fe1194c // indirect

diff --git a/go/cmd/nekobox_core/go.sum b/go/cmd/nekobox_core/go.sum
@@ -141,8 +141,8 @@ github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691 h1:5Th31OC6yj8byL
 github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691/go.mod h1:B8lp4WkQ1PwNnrVMM6KyuFR20pU8jYBD+A4EhJovEXU=
 github.com/sagernet/sing v0.0.0-20220817130738-ce854cda8522/go.mod h1:QVsS5L/ZA2Q5UhQwLrn0Trw+msNd/NPGEhBKR/ioWiY=
 github.com/sagernet/sing v0.1.8/go.mod h1:jt1w2u7lJQFFSGLiRrRIs5YWmx4kAPfWuOejuDW9qMk=
-github.com/sagernet/sing v0.2.5-0.20230611070640-2812461739c3 h1:OnlfGM8HncECbFiV4s6uAX961fm2UpEKSCXYBLZ1Chg=
-github.com/sagernet/sing v0.2.5-0.20230611070640-2812461739c3/go.mod h1:Ta8nHnDLAwqySzKhGoKk4ZIB+vJ3GTKj7UPrWYvM+4w=
+github.com/sagernet/sing v0.2.5-0.20230613142554-a3b120b25eab h1:9AVUIqqz/UJCgIrcJBU9mb06JXzfQ/FgEmlgdPgo2dk=
+github.com/sagernet/sing v0.2.5-0.20230613142554-a3b120b25eab/go.mod h1:Ta8nHnDLAwqySzKhGoKk4ZIB+vJ3GTKj7UPrWYvM+4w=
 github.com/sagernet/sing-dns v0.1.5-0.20230426113254-25d948c44223 h1:L4eMuM07iSHY3UCknFnuFuHoe5clZuF2Xnf2wwA6Lwc=
 github.com/sagernet/sing-dns v0.1.5-0.20230426113254-25d948c44223/go.mod h1:ZKuuqgsHRxDahYrzgSgy4vIAGGuKPlIf4hLcNzYzLkY=
 github.com/sagernet/sing-mux v0.0.0-20230517134606-1ebe6bb26646 h1:X3ADfMqeGns1Q1FlXc9kaL9FwW1UM6D6tEQo8jFstpc=

diff --git a/libs/get_source_env.sh b/libs/get_source_env.sh
@@ -1,5 +1,5 @@
 if [ ! -z $ENV_NEKORAY ]; then
-  export COMMIT_SING_BOX_EXTRA="6f59c055b2bf76f3a44329f0ce266042b463994c"
+  export COMMIT_SING_BOX_EXTRA="45d1ca77966206026ee24d9b80bf290d52cb8f76"
   export COMMIT_MATSURI_V2RAY="8134d3cc23aa6b8e2a056887addf22d7d22bd969"
 fi
 

diff --git a/main/NekoGui.cpp b/main/NekoGui.cpp
@@ -278,7 +278,7 @@ namespace NekoGui {
         _add(new configItem("core_box_clash_api_secret", &core_box_clash_api_secret, itemType::string));
         _add(new configItem("core_box_underlying_dns", &core_box_underlying_dns, itemType::string));
         _add(new configItem("core_ray_direct_dns", &core_ray_direct_dns, itemType::boolean));
-        _add(new configItem("core_ray_freedom_domainStrategy", &core_ray_freedom_domainStrategy, itemType::boolean));
+        _add(new configItem("core_ray_freedom_domainStrategy", &core_ray_freedom_domainStrategy, itemType::string));
         _add(new configItem("vpn_internal_tun", &vpn_internal_tun, itemType::boolean));
 #ifdef Q_OS_WIN
         _add(new configItem("core_ray_windows_disable_auto_interface", &core_ray_windows_disable_auto_interface, itemType::boolean));