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

Fix server_ports

Browse Source
This commit is contained in:
armv9 2025-02-24 22:02:46 +09:00
parent 8a6cc26c50
commit 0cf1c81933
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/io/nekohasekai/sagernet/fmt/hysteria/HysteriaFmt.kt
View File

@ -284,7 +284,7 @@ fun buildSingBoxOutboundHysteriaBean(bean: HysteriaBean): MutableMap<String, Any
if (port != null) { if (port != null) {
server_port = port server_port = port
} else { } else {
server_ports = bean.serverPorts server_ports = hopPortsToSingboxList(bean.serverPorts)
} }
hop_interval = "${bean.hopInterval}s" hop_interval = "${bean.hopInterval}s"
up_mbps = bean.uploadMbps up_mbps = bean.uploadMbps
@ -323,7 +323,7 @@ fun buildSingBoxOutboundHysteriaBean(bean: HysteriaBean): MutableMap<String, Any
if (port != null) { if (port != null) {
server_port = port server_port = port
} else { } else {
server_ports = bean.serverPorts server_ports = hopPortsToSingboxList(bean.serverPorts)
} }
hop_interval = "${bean.hopInterval}s" hop_interval = "${bean.hopInterval}s"
up_mbps = bean.uploadMbps up_mbps = bean.uploadMbps
@ -358,3 +358,14 @@ fun buildSingBoxOutboundHysteriaBean(bean: HysteriaBean): MutableMap<String, Any
else -> mutableMapOf("error_version" to bean.protocolVersion) else -> mutableMapOf("error_version" to bean.protocolVersion)
} }
} }
fun hopPortsToSingboxList(s: String): List<String> {
return s.split(",").mapNotNull {
val pRange = it.replace("-", ":")
if (pRange.split(":").size == 2) {
pRange
} else {
null
}
}
}

8
app/src/main/java/moe/matsuri/nb4a/SingBoxOptions.java
View File

@ -449,7 +449,7 @@ public class SingBoxOptions {
public OutboundTLSOptions tls; public OutboundTLSOptions tls;
public String server_ports; public List<String> server_ports;
public String hop_interval; public String hop_interval;
@ -575,7 +575,7 @@ public class SingBoxOptions {
public OutboundTLSOptions tls; public OutboundTLSOptions tls;
public String server_ports; public List<String> server_ports;
public String hop_interval; public String hop_interval;
@ -3902,7 +3902,7 @@ public class SingBoxOptions {
public OutboundTLSOptions tls; public OutboundTLSOptions tls;
public String server_ports; public List<String> server_ports;
public String hop_interval; public String hop_interval;
@ -4276,7 +4276,7 @@ public class SingBoxOptions {
public OutboundTLSOptions tls; public OutboundTLSOptions tls;
public String server_ports; public List<String> server_ports;
public String hop_interval; public String hop_interval;