From dd2d2c1638b9d1c8465eec52958a5275088f2f43 Mon Sep 17 00:00:00 2001 From: yuhan6665 <1588741+yuhan6665@users.noreply.github.com> Date: Wed, 31 Mar 2021 22:10:17 -0400 Subject: [PATCH] Add some missing config from Xray --- .../kotlin/com/v2ray/ang/dto/V2rayConfig.kt | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/V2rayConfig.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/V2rayConfig.kt index 5cdaf5d9..d86a65dc 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/V2rayConfig.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/V2rayConfig.kt @@ -5,6 +5,7 @@ import com.google.gson.GsonBuilder import com.google.gson.JsonPrimitive import com.google.gson.JsonSerializationContext import com.google.gson.JsonSerializer +import com.google.gson.annotations.SerializedName import com.google.gson.reflect.TypeToken import java.lang.reflect.Type @@ -34,7 +35,8 @@ data class V2rayConfig( data class LogBean(val access: String, val error: String, - var loglevel: String?) + var loglevel: String?, + val dnsLog: Boolean? = null) data class InboundBean( var tag: String, @@ -126,13 +128,22 @@ data class V2rayConfig( val sockopt: Any? = null ) { - data class TcpSettingsBean(var header: HeaderBean = HeaderBean()) { + data class TcpSettingsBean(var header: HeaderBean = HeaderBean(), + val acceptProxyProtocol: Boolean? = null) { data class HeaderBean(var type: String = "none", var request: RequestBean? = null, var response: Any? = null) { data class RequestBean(var path: List = ArrayList(), - var headers: HeadersBean = HeadersBean()) { - data class HeadersBean(var Host: List = ArrayList()) + var headers: HeadersBean = HeadersBean(), + val version: String? = null, + val method: String? = null) { + data class HeadersBean(var Host: List = ArrayList(), + @SerializedName("User-Agent") + val userAgent: List? = null, + @SerializedName("Accept-Encoding") + val acceptEncoding: List? = null, + val Connection: List? = null, + val Pragma: String? = null) } } } @@ -150,7 +161,8 @@ data class V2rayConfig( } data class WsSettingsBean(var path: String = "", - var headers: HeadersBean = HeadersBean()) { + var headers: HeadersBean = HeadersBean(), + val acceptProxyProtocol: Boolean? = null) { data class HeadersBean(var Host: String = "") } @@ -160,8 +172,14 @@ data class V2rayConfig( data class TlsSettingsBean(var allowInsecure: Boolean = false, var serverName: String = "", val alpn: List? = null, + val minVersion: String? = null, + val maxVersion: String? = null, + val preferServerCipherSuites: Boolean? = null, + val cipherSuites: String? = null, + val fingerprint: String? = null, val certificates: List? = null, - val disableSystemRoot: Boolean? = null) + val disableSystemRoot: Boolean? = null, + val enableSessionResumption: Boolean? = null) data class QuicSettingBean(var security: String = "none", var key: String = "",