Merge d0031ad0bb into ef5fee9975

v2rayN/ServiceLib/Models/V2rayConfig.cs

@@ -463,7 +463,7 @@ public class HysteriaSettings4Ray
 
 public class UdpHop4Ray
 {
-    public string? ports { get; set; }
+    public string? port { get; set; }
     public string? interval { get; set; }
 }
 
@@ -490,7 +490,7 @@ public class QuicParams4Ray
     public string? congestion { get; set; }
     public string? brutalUp { get; set; }
     public string? brutalDown { get; set; }
-    public UdpHop4Ray? udpHop { get; set; }
+    public UdpHop4Ray? udphop { get; set; }
 }
 
 public class AccountsItem4Ray

v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs

@@ -223,14 +223,13 @@ public partial class CoreConfigSingboxService
                                 password = protocolExtra.SalamanderPass.TrimEx(),
                             };
                         }
-                        int? upMbps = protocolExtra?.UpMbps is { } su and >= 0
+
+                        outbound.up_mbps = protocolExtra?.UpMbps is { } su and >= 0
                             ? su
                             : _config.HysteriaItem.UpMbps;
-                        int? downMbps = protocolExtra?.DownMbps is { } sd and >= 0
+                        outbound.down_mbps = protocolExtra?.DownMbps is { } sd and >= 0
                             ? sd
-                            : _config.HysteriaItem.UpMbps;
-                        outbound.up_mbps = upMbps > 0 ? upMbps : null;
-                        outbound.down_mbps = downMbps > 0 ? downMbps : null;
+                            : _config.HysteriaItem.DownMbps;
                         var ports = protocolExtra?.Ports?.IsNullOrEmpty() == false ? protocolExtra.Ports : null;
                         if ((!ports.IsNullOrEmpty()) && (ports.Contains(':') || ports.Contains('-') || ports.Contains(',')))
                         {

v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs

@@ -605,10 +605,10 @@ public partial class CoreConfigV2rayService
                     {
                         var udpHop = new UdpHop4Ray
                         {
-                            ports = ports.Replace(':', '-'),
+                            port = ports.Replace(':', '-'),
                             interval = hopInterval,
                         };
-                        quicParams.udpHop = udpHop;
+                        quicParams.udphop = udpHop;
                     }
                     if (upMbps > 0 || downMbps > 0)
                     {