mirror of
https://github.com/proxysu/ProxySU.git
synced 2024-11-21 20:56:08 +03:00
update flow control
This commit is contained in:
parent
be74f42f19
commit
332f54224f
@ -9,12 +9,14 @@ namespace ProxySuper.Core.Models.Projects
|
|||||||
{
|
{
|
||||||
public class XraySettings : V2raySettings
|
public class XraySettings : V2raySettings
|
||||||
{
|
{
|
||||||
public static List<string> FlowList = new List<string> { "xtls-rprx-origin", "xtls-rprx-origin-udp443", "xtls-rprx-direct", "xtls-rprx-direct-udp443", "xtls-rprx-splice", "xtls-rprx-splice-udp443" };
|
public static List<string> UTLSList = new List<string> { "", "chrome", "firefox", "safari", "ios", "android", "edge", "360", "qq", "random", "randomized" };
|
||||||
public static List<string> UTLSList = new List<string> { "", "chrome", "firefox", "safari", "randomized" };
|
|
||||||
|
//流控参数在服务端只有两种 "none", "xtls-rprx-vision",客户端可以选择三种:"none", "xtls-rprx-vision", "xtls-rprx-vision-udp443",但是选择了XTLS模式就是默认flow不为空或者"none",所以这里不再填加"none"这一项。
|
||||||
|
public static List<string> FlowList = new List<string> { "xtls-rprx-vision", "xtls-rprx-vision-udp443" }; //{ "xtls-rprx-origin", "xtls-rprx-origin-udp443", "xtls-rprx-direct", "xtls-rprx-direct-udp443", "xtls-rprx-splice", "xtls-rprx-splice-udp443" };
|
||||||
|
|
||||||
public string UTLS { get; set; } = UTLSList[1];
|
public string UTLS { get; set; } = UTLSList[1];
|
||||||
|
|
||||||
public string Flow { get; set; } = FlowList[2];
|
public string Flow { get; set; } = FlowList[0];
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// vless xtls shareLink
|
/// vless xtls shareLink
|
||||||
|
@ -184,7 +184,7 @@ namespace ProxySuper.Core.Services
|
|||||||
case RayType.VLESS_TCP_XTLS:
|
case RayType.VLESS_TCP_XTLS:
|
||||||
_protocol = "vless";
|
_protocol = "vless";
|
||||||
_type = "tcp";
|
_type = "tcp";
|
||||||
_security = "xtls";
|
_security = "tls";
|
||||||
_descriptiveText = "vless-tcp-xtls";
|
_descriptiveText = "vless-tcp-xtls";
|
||||||
break;
|
break;
|
||||||
case RayType.VLESS_WS:
|
case RayType.VLESS_WS:
|
||||||
|
@ -103,6 +103,7 @@ namespace ProxySuper.Core.Services
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
flow = "xtls-rprx-vision,none";//兼容普通tls与xtls
|
||||||
obj = new { id = id, flow = flow };
|
obj = new { id = id, flow = flow };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -58,7 +58,7 @@
|
|||||||
|
|
||||||
<StackPanel Orientation="Horizontal" Margin="0,10,0,0">
|
<StackPanel Orientation="Horizontal" Margin="0,10,0,0">
|
||||||
<Label Content="传输安全(tls)" Width="140" />
|
<Label Content="传输安全(tls)" Width="140" />
|
||||||
<TextBox Text="xtls" IsReadOnly="True" Width="300" />
|
<TextBox Text="tls" IsReadOnly="True" Width="300" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
<StackPanel Orientation="Horizontal" Margin="0,10,0,0">
|
<StackPanel Orientation="Horizontal" Margin="0,10,0,0">
|
||||||
|
@ -167,7 +167,7 @@
|
|||||||
Binding Path=Checked_VLESS_TCP_XTLS,
|
Binding Path=Checked_VLESS_TCP_XTLS,
|
||||||
Converter={StaticResource VisibleConverter}
|
Converter={StaticResource VisibleConverter}
|
||||||
}">
|
}">
|
||||||
<Label Content="{Binding Path=Flow}" Width="120" VerticalAlignment="Bottom"/>
|
<Label Content="{DynamicResource Flow}" Width="120" VerticalAlignment="Bottom"/>
|
||||||
<ComboBox Width="260"
|
<ComboBox Width="260"
|
||||||
VerticalAlignment="Bottom"
|
VerticalAlignment="Bottom"
|
||||||
ItemsSource="{Binding Path=FlowList}"
|
ItemsSource="{Binding Path=FlowList}"
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
WindowStartupLocation="CenterScreen"
|
WindowStartupLocation="CenterScreen"
|
||||||
Icon="/Resources/ProxySU.ico"
|
Icon="/Resources/ProxySU.ico"
|
||||||
Title="ProxySU v4.1.10" Height="600" Width="1000">
|
Title="ProxySU v4.1.10" Height="600" Width="1000">
|
||||||
<Grid>
|
<Grid>
|
||||||
|
|
||||||
</Grid>
|
</Grid>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
"clients": [
|
"clients": [
|
||||||
{
|
{
|
||||||
"id": "",
|
"id": "",
|
||||||
"flow": "xtls-rprx-direct"
|
"flow": "xtls-rprx-vision,none"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"decryption": "none",
|
"decryption": "none",
|
||||||
@ -13,15 +13,13 @@
|
|||||||
},
|
},
|
||||||
"streamSettings": {
|
"streamSettings": {
|
||||||
"network": "tcp",
|
"network": "tcp",
|
||||||
"security": "xtls",
|
"security": "tls",
|
||||||
"xtlsSettings": {
|
"tlsSettings": {
|
||||||
"allowInsecure": false,
|
"rejectUnknownSni": true,
|
||||||
"minVersion": "1.2",
|
"minVersion": "1.2",
|
||||||
"alpn": [
|
|
||||||
"http/1.1"
|
|
||||||
],
|
|
||||||
"certificates": [
|
"certificates": [
|
||||||
{
|
{
|
||||||
|
"ocspStapling": 3600,
|
||||||
"certificateFile": "/usr/local/etc/xray/ssl/xray_ssl.crt",
|
"certificateFile": "/usr/local/etc/xray/ssl/xray_ssl.crt",
|
||||||
"keyFile": "/usr/local/etc/xray/ssl/xray_ssl.key"
|
"keyFile": "/usr/local/etc/xray/ssl/xray_ssl.key"
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user