diff --git a/v2rayN/ServiceLib/Models/SingboxConfig.cs b/v2rayN/ServiceLib/Models/SingboxConfig.cs index 5eba73e1..41eee042 100644 --- a/v2rayN/ServiceLib/Models/SingboxConfig.cs +++ b/v2rayN/ServiceLib/Models/SingboxConfig.cs @@ -78,8 +78,7 @@ public int? listen_port { get; set; } public string? domain_strategy { get; set; } public string interface_name { get; set; } - public string inet4_address { get; set; } - public string? inet6_address { get; set; } + public List? address { get; set; } public int? mtu { get; set; } public bool? auto_route { get; set; } public bool? strict_route { get; set; } diff --git a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx index f578f855..41753419 100644 --- a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx +++ b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx @@ -1033,4 +1033,340 @@ Select active node (Enter) + + Backup to remote (WebDAV) + + + Restore from remote (WebDAV) + + + Default domain strategy for outbound + + + Multi-Server lowest latency + + + Main layout orientation(Require restart) + + + Multi-server load balancing + + + Outbound DNS address + + + Auto column width adjustment + + + Export Base64-encoded Share Links to Clipboard + + + Export selected server for complete configuration to clipboard + + + Show or hide the main window + + + You are currently running a standalone package, please manually download the SelfContained.7z file to unzip and overwrite it! + + + Custom config socks port + + + Backup and Restore + + + Backup to local + + + Restore from local + + + Local + + + Remote (WebDAV) + + + WebDav Url + + + WebDav User Name + + + WebDav Password + + + WebDav Check + + + Remote folder name (optional) + + + Invalid backup file + + + Host filter + + + Active + + + Save Interface Layout + + + Geo files source (optional) + + + sing-box ruleset files source (optional) + + + UpgradeApp does not exist + + + Routing rules source (optional) + + + Regional presets setting + + + Default + + + Russia + + + Users in China region can ignore this item + + + Scan QR code in the image + + + Invalid address (Url) + + + Please do not use the insecure HTTP protocol subscription address + + + Install the font to the system and restart the settings + + + Are you sure to exit? + + + Remarks Memo + + + Enable logging to file + + + Updates are not enabled, skip this subscription + + + Restart as Administrator + + + More URLs, separated by commas; Subscription conversion will be invalid + + + {0} : {1}/s↑ | {2}/s↓ + + + Automatic update interval (minutes) + + + Convert target type + + + Please leave blank if no conversion is required + + + Please turn off when there is an abnormal disconnection + + + DNS Settings + + + Please fill in DNS Structure, Click to view the document + + + Click to import default DNS config + + + sing-box domain strategy + + + sing-box Mux Protocol + + + Full process name (Tun mode) + + + IP or IP CIDR + + + Domain + + + sing-box DNS settings + + + Waiting for testing (press ESC to terminate)... + + + SpiderX + + + ShortId + + + Move to group + + + Enable Server Drag Drop Sort(Require restart) + + + AutoRefresh + + + Skip test + + + Edit Server (Ctrl+D) + + + Double-click server make active + + + Test completed + + + Default TLS fingerprint + + + FontFamily(Require restart) + + + Copy the font TTF/TTC file to the directory guiFonts, restart the settings + + + http port = +1; Pac port = +4; *ray API port = +5; mihomo API port = +6; + + + Set this with admin privileges, get admin privileges after startup + + + Font Size + + + SpeedTest Single Timeout Value + + + SpeedTest URL + + + Move up and down + + + PublicKey + + + Add [Hysteria2] server + + + Hysteria Max bandwidth (Up/Dw) + + + Follow System Theme + + + Add [TUIC] server + + + Updating subscription, only determine remarks exists + + + Refresh Proxies + + + Network + + + Type + + + *grpc Authority + + + Add [HTTP] server + + + Speed Ping Test URL + + + Use Xray and enable non-Tun mode, which conflicts with the group previous proxy + + + Custom the rule-set of sing-box + + + Successful operation. Click the settings menu to reboot the app. + + + Open the storage location + + + Chain + + + Host + + + Use System Hosts + + + Enable fragment + + + Auto ScrollToEnd + + + Test terminating... + + + Next proxy remarks + + + obfs password + + + Congestion control + + + Previous proxy remarks + + + Address(Ip,Ipv6) + + + Reserved(2,3,4) + + + PrivateKey + + + Add [WireGuard] server + + + Enable IPv6 Address + + + Enable additional Inbound + + + Please make sure the remarks exists and is unique + + + (Domain or IP or ProcName) and Port and Protocol and InboundTag => OutboundTag + \ No newline at end of file diff --git a/v2rayN/ServiceLib/Resx/ResUI.ru.resx b/v2rayN/ServiceLib/Resx/ResUI.ru.resx index 7330bd49..bd2d6cd6 100644 --- a/v2rayN/ServiceLib/Resx/ResUI.ru.resx +++ b/v2rayN/ServiceLib/Resx/ResUI.ru.resx @@ -1046,6 +1046,327 @@ Россия - Используйте Настройки -> Региональные пресеты вместо изменения этого поля + Используйте Настройки -> Региональные пресеты вместо изменения этого поля + + + Remarks Memo + + + Speed Ping Test URL + + + Part Node Latency Test + + + Refresh Proxies + + + Auto ScrollToEnd + + + Select active node (Enter) + + + (Domain or IP or ProcName) and Port and Protocol and InboundTag => OutboundTag + + + obfs password + + + Address(Ip,Ipv6) + + + Default domain strategy for outbound + + + Multi-Server lowest latency + + + Main layout orientation(Require restart) + + + Multi-server load balancing + + + Latency Test + + + Reserved(2,3,4) + + + PrivateKey + + + Add [WireGuard] server + + + Auto column width adjustment + + + Export Base64-encoded Share Links to Clipboard + + + Delay + + + Enable additional Inbound + + + Please make sure the remarks exists and is unique + + + Export selected server for complete configuration to clipboard + + + Next proxy remarks + + + Show or hide the main window + + + Previous proxy remarks + + + Congestion control + + + Outbound DNS address + + + Updating subscription, only determine remarks exists + + + Test terminating... + + + *grpc Authority + + + Default + + + Chain + + + Sorting + + + Open the storage location + + + Successful operation. Click the settings menu to reboot the app. + + + Custom the rule-set of sing-box + + + Download Traffic + + + Host + + + Name + + + Network + + + Time + + + Type + + + Enable cache file for sing-box (ruleset files) + + + Upload Speed + + + Upload Traffic + + + Connections + + + Close Connection + + + Close All Connection + + + Proxies + + + Rule mode + + + Direct + + + Global + + + Do not change + + + Enable fragment + + + Use Xray and enable non-Tun mode, which conflicts with the group previous proxy + + + Rule + + + Add [HTTP] server + + + Add [TUIC] server + + + You are currently running a standalone package, please manually download the SelfContained.7z file to unzip and overwrite it! + + + Enable IPv6 Address + + + Custom config socks port + + + WebDav Check + + + Domain + + + IP or IP CIDR + + + Full process name (Tun mode) + + + sing-box Mux Protocol + + + Invalid backup file + + + sing-box domain strategy + + + Host filter + + + Click to import default DNS config + + + Active + + + Please fill in DNS Structure, Click to view the document + + + Please leave blank if no conversion is required + + + Convert target type + + + Save Interface Layout + + + {0} : {1}/s↑ | {2}/s↓ + + + More URLs, separated by commas; Subscription conversion will be invalid + + + Updates are not enabled, skip this subscription + + + UpgradeApp does not exist + + + Scan QR code in the image + + + Please turn off when there is an abnormal disconnection + + + Waiting for testing (press ESC to terminate)... + + + SpiderX + + + ShortId + + + Invalid address (Url) + + + Please do not use the insecure HTTP protocol subscription address + + + PublicKey + + + Move up and down + + + http port = +1; Pac port = +4; *ray API port = +5; mihomo API port = +6; + + + Install the font to the system and restart the settings + + + Add [Hysteria2] server + + + WebDav Password + + + Remote folder name (optional) + + + Download Speed + + + Restore from remote (WebDAV) + + + Backup to remote (WebDAV) + + + WebDav User Name + + + Restore from local + + + Backup to local + + + Use System Hosts + + + Backup and Restore + + + Local + + + Are you sure to exit? + + + Hysteria Max bandwidth (Up/Dw) + + + WebDav Url + + + Remote (WebDAV) \ No newline at end of file diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx index 6f122426..64f7fd70 100644 --- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx +++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx @@ -1246,4 +1246,124 @@ 備註備忘 + + 拥塞控制算法 + + + 设为活动节点 (Enter) + + + 刷新 + + + 排序 + + + 延迟测试 + + + 规则 + + + 随原配置 + + + 全局 + + + 直连 + + + 规则模式 + + + 当前代理 + + + 关闭所有连接 + + + Outbound默认解析策略 + + + 关闭连接 + + + 上传流量 + + + 上传速度 + + + 类型 + + + 时间 + + + 网络 + + + 名称 + + + 主机 + + + 下载流量 + + + 下载速度 + + + 延迟 + + + 默认 + + + 当前连接 + + + 多服务器最低延迟 (多选) + + + 当前部分节点延迟测试 + + + 多服务器负载均衡 (多选) + + + 添加[Hysteria2]服务器 + + + Hysteria 最大带宽(Up/Dw) + + + 主界面布局方向(需重启) + + + 添加[WireGuard]服务器 + + + PrivateKey + + + Reserved(2,3,4) + + + Address(Ip,Ipv6) + + + 使用系统hosts + + + 路由链 + + + Outbound域名解析地址 + + + 混淆密码(obfs password) + \ No newline at end of file diff --git a/v2rayN/ServiceLib/Sample/tun_singbox_inbound b/v2rayN/ServiceLib/Sample/tun_singbox_inbound index b4856dd3..db5b0b32 100644 --- a/v2rayN/ServiceLib/Sample/tun_singbox_inbound +++ b/v2rayN/ServiceLib/Sample/tun_singbox_inbound @@ -2,8 +2,10 @@ "type": "tun", "tag": "tun-in", "interface_name": "singbox_tun", - "inet4_address": "172.19.0.1/30", - "inet6_address": "fdfe:dcba:9876::1/126", + "address": [ + "172.18.0.1/30", + "fdfe:dcba:9876::1/126" + ], "mtu": 9000, "auto_route": true, "strict_route": false, diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs index 58f913e5..986168d0 100644 --- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs +++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs @@ -558,7 +558,7 @@ namespace ServiceLib.Services.CoreConfig //tunInbound.sniff_override_destination = _config.inbound[0].routeOnly ? false : _config.inbound[0].sniffingEnabled; if (_config.TunModeItem.EnableIPv6Address == false) { - tunInbound.inet6_address = null; + tunInbound.address = ["172.18.0.1/30"]; } singboxConfig.inbounds.Add(tunInbound); diff --git a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs index 90293b54..f66928ad 100644 --- a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs +++ b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs @@ -219,6 +219,7 @@ namespace ServiceLib.ViewModels await Reload(); await AutoHideStartup(); + Locator.Current.GetService()?.RefreshRoutingsMenu(); } #endregion Init diff --git a/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml b/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml index 7c48e9c2..a803d524 100644 --- a/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml +++ b/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml @@ -119,7 +119,6 @@ Text="{x:Static resx:ResUI.menuRemoteBackupAndRestore}" /> diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml b/v2rayN/v2rayN/Views/MainWindow.xaml index 32a22926..7c67cc47 100644 --- a/v2rayN/v2rayN/Views/MainWindow.xaml +++ b/v2rayN/v2rayN/Views/MainWindow.xaml @@ -277,7 +277,7 @@