ppn/olcng
3
0
Fork 0
mirror of https://github.com/openlibrecommunity/olcng.git synced 2026-07-03 14:05:17 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

SplitHTTP is now XHTTP

Browse Source
This commit is contained in:
2dust
2024-11-18 18:58:15 +08:00
parent 834c1ba63d
commit 41893d79c0
14 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
V2rayNG/app/src/main/java/com/v2ray/ang/dto/NetworkType.kt
+1
View File
@@ -6,6 +6,7 @@ enum class NetworkType(val type: String) {
WS("ws"),
HTTP_UPGRADE("httpupgrade"),
SPLIT_HTTP("splithttp"),
XHTTP("xhttp"),
HTTP("http"),
H2("h2"),
//QUIC("quic"),
V2rayNG/app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt
+12 -12
View File
@@ -206,7 +206,7 @@ data class V2rayConfig(
var kcpSettings: KcpSettingsBean? = null,
var wsSettings: WsSettingsBean? = null,
var httpupgradeSettings: HttpupgradeSettingsBean? = null,
var splithttpSettings: SplithttpSettingsBean? = null,
var xhttpSettings: XhttpSettingsBean? = null,
var httpSettings: HttpSettingsBean? = null,
var tlsSettings: TlsSettingsBean? = null,
var quicSettings: QuicSettingBean? = null,
@@ -275,7 +275,7 @@ data class V2rayConfig(
val acceptProxyProtocol: Boolean? = null
)
data class SplithttpSettingsBean(
data class XhttpSettingsBean(
var path: String? = null,
var host: String? = null,
val maxUploadSize: Int? = null,
@@ -396,12 +396,12 @@ data class V2rayConfig(
httpupgradeSettings = httpupgradeSetting
}
"splithttp" -> {
val splithttpSetting = SplithttpSettingsBean()
splithttpSetting.host = host.orEmpty()
sni = splithttpSetting.host
splithttpSetting.path = path ?: "/"
splithttpSettings = splithttpSetting
"splithttp","xhttp" -> {
val xhttpSetting = XhttpSettingsBean()
xhttpSetting.host = host.orEmpty()
sni = xhttpSetting.host
xhttpSetting.path = path ?: "/"
xhttpSettings = xhttpSetting
}
"h2", "http" -> {
@@ -581,12 +581,12 @@ data class V2rayConfig(
)
}
"splithttp" -> {
val splithttpSetting = streamSettings?.splithttpSettings ?: return null
"splithttp" ,"xhttp"-> {
val xhttpSettings = streamSettings?.xhttpSettings ?: return null
listOf(
"",
splithttpSetting.host,
splithttpSetting.path
xhttpSettings.host,
xhttpSettings.path
)
}
V2rayNG/app/src/main/java/com/v2ray/ang/fmt/FmtBase.kt
+1 -1
View File
@@ -55,7 +55,7 @@ open class FmtBase {
config.seed.let { if (it.isNotNullEmpty()) dicQuery["seed"] = it.orEmpty() }
}
NetworkType.WS, NetworkType.HTTP_UPGRADE, NetworkType.SPLIT_HTTP -> {
NetworkType.WS, NetworkType.HTTP_UPGRADE, NetworkType.SPLIT_HTTP, NetworkType.XHTTP -> {
config.host.let { if (it.isNotNullEmpty()) dicQuery["host"] = it.orEmpty() }
config.path.let { if (it.isNotNullEmpty()) dicQuery["path"] = it.orEmpty() }
}
V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt
+2 -2
View File
@@ -185,7 +185,7 @@ class ServerActivity : BaseActivity() {
"tcp" -> R.string.server_lab_request_host_http
"ws" -> R.string.server_lab_request_host_ws
"httpupgrade" -> R.string.server_lab_request_host_httpupgrade
"splithttp" -> R.string.server_lab_request_host_splithttp
"splithttp","xhttp" -> R.string.server_lab_request_host_xhttp
"h2" -> R.string.server_lab_request_host_h2
//"quic" -> R.string.server_lab_request_host_quic
"grpc" -> R.string.server_lab_request_host_grpc
@@ -200,7 +200,7 @@ class ServerActivity : BaseActivity() {
"kcp" -> R.string.server_lab_path_kcp
"ws" -> R.string.server_lab_path_ws
"httpupgrade" -> R.string.server_lab_path_httpupgrade
"splithttp" -> R.string.server_lab_path_splithttp
"splithttp","xhttp" -> R.string.server_lab_path_xhttp
"h2" -> R.string.server_lab_path_h2
//"quic" -> R.string.server_lab_path_quic
"grpc" -> R.string.server_lab_path_grpc
V2rayNG/app/src/main/res/values-ar/strings.xml
+2 -2
View File
@@ -56,14 +56,14 @@
<string name="server_lab_request_host_http">http host</string>
<string name="server_lab_request_host_ws">ws host</string>
<string name="server_lab_request_host_httpupgrade">httpupgrade host</string>
<string name="server_lab_request_host_splithttp">splithttp host</string>
<string name="server_lab_request_host_xhttp">xhttp host</string>
<string name="server_lab_request_host_h2">h2 host</string>
<string name="server_lab_request_host_quic">QUIC security</string>
<string name="server_lab_request_host_grpc">gRPC Authority</string>
<string name="server_lab_path">path</string>
<string name="server_lab_path_ws">ws path</string>
<string name="server_lab_path_httpupgrade">httpupgrade path</string>
<string name="server_lab_path_splithttp">splithttp path</string>
<string name="server_lab_path_xhttp">xhttp path </string>
<string name="server_lab_path_h2">h2 path</string>
<string name="server_lab_path_quic">QUIC key</string>
<string name="server_lab_path_kcp">kcp seed</string>
V2rayNG/app/src/main/res/values-bn/strings.xml
+2 -2
View File
@@ -55,14 +55,14 @@
<string name="server_lab_request_host_http">http হোস্ট</string>
<string name="server_lab_request_host_ws">ws হোস্ট</string>
<string name="server_lab_request_host_httpupgrade">httpupgrade হোস্ট</string>
<string name="server_lab_request_host_splithttp">splithttp হোস্ট</string>
<string name="server_lab_request_host_xhttp">xhttp হোস্ট</string>
<string name="server_lab_request_host_h2">h2 হোস্ট</string>
<string name="server_lab_request_host_quic">QUIC নিরাপত্তা</string>
<string name="server_lab_request_host_grpc">gRPC কর্তৃপক্ষ</string>
<string name="server_lab_path">পথ</string>
<string name="server_lab_path_ws">ws পথ</string>
<string name="server_lab_path_httpupgrade">httpupgrade পথ</string>
<string name="server_lab_path_splithttp">splithttp পথ</string>
<string name="server_lab_path_xhttp">xhttp পথ</string>
<string name="server_lab_path_h2">h2 পথ</string>
<string name="server_lab_path_quic">QUIC কী</string>
<string name="server_lab_path_kcp">kcp বীজ</string>
V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml
+2 -2
View File
@@ -55,14 +55,14 @@
<string name="server_lab_request_host_http">هاست http</string>
<string name="server_lab_request_host_ws">هاست ws</string>
<string name="server_lab_request_host_httpupgrade">هاست httpupgrade</string>
<string name="server_lab_request_host_splithttp">هاست splithttp</string>
<string name="server_lab_request_host_xhttp">هاست xhttp</string>
<string name="server_lab_request_host_h2">هاست h2</string>
<string name="server_lab_request_host_quic">ٱمنیت QUIC</string>
<string name="server_lab_request_host_grpc">اختیار gRPC</string>
<string name="server_lab_path">تور</string>
<string name="server_lab_path_ws">تور ws</string>
<string name="server_lab_path_httpupgrade">تور httpupgrade</string>
<string name="server_lab_path_splithttp">تور splithttp</string>
<string name="server_lab_path_xhttp">تور xhttp</string>
<string name="server_lab_path_h2">تور h2</string>
<string name="server_lab_path_quic">کیلیت QUIC</string>
<string name="server_lab_path_kcp">سید kcp</string>
V2rayNG/app/src/main/res/values-fa/strings.xml
+2 -2
View File
@@ -54,14 +54,14 @@
<string name="server_lab_request_host_http">http host</string>
<string name="server_lab_request_host_ws">ws host</string>
<string name="server_lab_request_host_httpupgrade">httpupgrade host</string>
<string name="server_lab_request_host_splithttp">splithttp host</string>
<string name="server_lab_request_host_xhttp">xhttp host</string>
<string name="server_lab_request_host_h2">h2 host</string>
<string name="server_lab_request_host_quic">QUIC security</string>
<string name="server_lab_request_host_grpc">gRPC Authority</string>
<string name="server_lab_path">path</string>
<string name="server_lab_path_ws">ws path</string>
<string name="server_lab_path_httpupgrade">httpupgrade path</string>
<string name="server_lab_path_splithttp">splithttp path</string>
<string name="server_lab_path_xhttp">xhttp path </string>
<string name="server_lab_path_h2">h2 path</string>
<string name="server_lab_path_quic">QUIC key</string>
<string name="server_lab_path_kcp">kcp seed</string>
V2rayNG/app/src/main/res/values-ru/strings.xml
+2 -2
View File
@@ -54,14 +54,14 @@
<string name="server_lab_request_host_http">Узел HTTP</string>
<string name="server_lab_request_host_ws">Узел WS</string>
<string name="server_lab_request_host_httpupgrade">Узел HTTPUpgrade</string>
<string name="server_lab_request_host_splithttp">Узел SplitHTTP</string>
<string name="server_lab_request_host_xhttp">Узел SplitHTTP</string>
<string name="server_lab_request_host_h2">Узел H2</string>
<string name="server_lab_request_host_quic">Шифрование QUIC</string>
<string name="server_lab_request_host_grpc">Полномочия gRPC</string>
<string name="server_lab_path">Путь</string>
<string name="server_lab_path_ws">Путь WS</string>
<string name="server_lab_path_httpupgrade">Путь HTTPUpgrade</string>
<string name="server_lab_path_splithttp">Путь SplitHTTP</string>
<string name="server_lab_path_xhttp">Путь SplitHTTP</string>
<string name="server_lab_path_h2">Путь H2</string>
<string name="server_lab_path_quic">Ключ QUIC</string>
<string name="server_lab_path_kcp">Сид KCP</string>
V2rayNG/app/src/main/res/values-vi/strings.xml
+2 -2
View File
@@ -54,14 +54,14 @@
<string name="server_lab_request_host_http">http host</string>
<string name="server_lab_request_host_ws">ws host</string>
<string name="server_lab_request_host_httpupgrade">httpupgrade host</string>
<string name="server_lab_request_host_splithttp">splithttp host</string>
<string name="server_lab_request_host_xhttp">xhttp host</string>
<string name="server_lab_request_host_h2">h2 host</string>
<string name="server_lab_request_host_quic">QUIC security</string>
<string name="server_lab_request_host_grpc">gRPC Authority</string>
<string name="server_lab_path">path</string>
<string name="server_lab_path_ws">ws path</string>
<string name="server_lab_path_httpupgrade">httpupgrade path</string>
<string name="server_lab_path_splithttp">splithttp path</string>
<string name="server_lab_path_xhttp">xhttp path </string>
<string name="server_lab_path_h2">h2 path</string>
<string name="server_lab_path_quic">QUIC key</string>
<string name="server_lab_path_kcp">kcp seed</string>
V2rayNG/app/src/main/res/values-zh-rCN/strings.xml
+2 -2
View File
@@ -54,14 +54,14 @@
<string name="server_lab_request_host_http">http host</string>
<string name="server_lab_request_host_ws">ws host</string>
<string name="server_lab_request_host_httpupgrade">httpupgrade host</string>
<string name="server_lab_request_host_splithttp">splithttp host</string>
<string name="server_lab_request_host_xhttp">xhttp host</string>
<string name="server_lab_request_host_h2">h2 host</string>
<string name="server_lab_request_host_quic">QUIC 加密方式</string>
<string name="server_lab_request_host_grpc">gRPC Authority</string>
<string name="server_lab_path">path</string>
<string name="server_lab_path_ws">ws path</string>
<string name="server_lab_path_httpupgrade">httpupgrade path</string>
<string name="server_lab_path_splithttp">splithttp path</string>
<string name="server_lab_path_xhttp">xhttp path </string>
<string name="server_lab_path_h2">h2 path</string>
<string name="server_lab_path_quic">QUIC 加密密钥</string>
<string name="server_lab_path_kcp">kcp seed</string>
V2rayNG/app/src/main/res/values-zh-rTW/strings.xml
+2 -2
View File
@@ -54,14 +54,14 @@
<string name="server_lab_request_host_http">http host</string>
<string name="server_lab_request_host_ws">ws host</string>
<string name="server_lab_request_host_httpupgrade">httpupgrade host</string>
<string name="server_lab_request_host_splithttp">splithttp host</string>
<string name="server_lab_request_host_xhttp">xhttp host</string>
<string name="server_lab_request_host_h2">h2 host</string>
<string name="server_lab_request_host_quic">QUIC 加密方式</string>
<string name="server_lab_request_host_grpc">gRPC Authority</string>
<string name="server_lab_path">path</string>
<string name="server_lab_path_ws">ws path</string>
<string name="server_lab_path_httpupgrade">httpupgrade path</string>
<string name="server_lab_path_splithttp">splithttp path</string>
<string name="server_lab_path_xhttp">xhttp path </string>
<string name="server_lab_path_h2">h2 path</string>
<string name="server_lab_path_quic">QUIC 加密金鑰</string>
<string name="server_lab_path_kcp">kcp seed</string>
V2rayNG/app/src/main/res/values/arrays.xml
+1
View File
@@ -26,6 +26,7 @@
<item>kcp</item>
<item>ws</item>
<item>httpupgrade</item>
<item>xhttp</item>
<item>splithttp</item>
<item>h2</item>
<item>grpc</item>
V2rayNG/app/src/main/res/values/strings.xml
+2 -2
View File
@@ -55,14 +55,14 @@
<string name="server_lab_request_host_http">http host</string>
<string name="server_lab_request_host_ws">ws host</string>
<string name="server_lab_request_host_httpupgrade">httpupgrade host</string>
<string name="server_lab_request_host_splithttp">splithttp host</string>
<string name="server_lab_request_host_xhttp">xhttp host</string>
<string name="server_lab_request_host_h2">h2 host</string>
<string name="server_lab_request_host_quic">QUIC security</string>
<string name="server_lab_request_host_grpc">gRPC Authority</string>
<string name="server_lab_path">path</string>
<string name="server_lab_path_ws">ws path</string>
<string name="server_lab_path_httpupgrade">httpupgrade path</string>
<string name="server_lab_path_splithttp">splithttp path</string>
<string name="server_lab_path_xhttp">xhttp path </string>
<string name="server_lab_path_h2">h2 path</string>
<string name="server_lab_path_quic">QUIC key</string>
<string name="server_lab_path_kcp">kcp seed</string>