mirror of
https://github.com/2dust/v2rayN.git
synced 2026-02-28 21:23:04 +00:00
Compare commits
1 commit
06677431a0
...
fe33c0e0e6
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fe33c0e0e6 |
3 changed files with 54 additions and 52 deletions
|
|
@ -295,53 +295,56 @@ public sealed class AppManager
|
|||
MultipleLoad = groupItem.MultipleLoad,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
switch (item.ConfigType)
|
||||
{
|
||||
case EConfigType.Shadowsocks:
|
||||
extra = extra with {SsMethod = item.Security.NullIfEmpty() };
|
||||
break;
|
||||
case EConfigType.VMess:
|
||||
extra = extra with
|
||||
{
|
||||
AlterId = item.AlterId.ToString(),
|
||||
VmessSecurity = item.Security.NullIfEmpty(),
|
||||
};
|
||||
break;
|
||||
case EConfigType.VLESS:
|
||||
extra = extra with
|
||||
{
|
||||
Flow = item.Flow.NullIfEmpty(),
|
||||
};
|
||||
break;
|
||||
case EConfigType.Hysteria2:
|
||||
extra = extra with
|
||||
{
|
||||
SalamanderPass = item.Path.NullIfEmpty(),
|
||||
Ports = item.Ports.NullIfEmpty(),
|
||||
UpMbps = _config.HysteriaItem.UpMbps,
|
||||
DownMbps = _config.HysteriaItem.DownMbps,
|
||||
HopInterval = _config.HysteriaItem.HopInterval
|
||||
};
|
||||
break;
|
||||
case EConfigType.TUIC:
|
||||
extra = extra with
|
||||
{
|
||||
Username = item.Id,
|
||||
};
|
||||
item.Id = item.Security;
|
||||
item.Password = item.Security;
|
||||
break;
|
||||
case EConfigType.WireGuard:
|
||||
extra = extra with
|
||||
{
|
||||
WgPublicKey = item.PublicKey.NullIfEmpty(),
|
||||
WgInterfaceAddress = item.RequestHost.NullIfEmpty(),
|
||||
WgReserved = item.Path.NullIfEmpty(),
|
||||
WgMtu = int.TryParse(item.ShortId, out var mtu) ? mtu : 1280
|
||||
};
|
||||
break;
|
||||
}
|
||||
switch (item.ConfigType)
|
||||
{
|
||||
case EConfigType.Shadowsocks:
|
||||
extra = extra with { SsMethod = item.Security.NullIfEmpty() };
|
||||
break;
|
||||
case EConfigType.VMess:
|
||||
extra = extra with
|
||||
{
|
||||
AlterId = item.AlterId.ToString(),
|
||||
VmessSecurity = item.Security.NullIfEmpty(),
|
||||
};
|
||||
break;
|
||||
case EConfigType.VLESS:
|
||||
extra = extra with
|
||||
{
|
||||
Flow = item.Flow.NullIfEmpty(),
|
||||
VlessEncryption = item.Security,
|
||||
};
|
||||
break;
|
||||
case EConfigType.Hysteria2:
|
||||
extra = extra with
|
||||
{
|
||||
SalamanderPass = item.Path.NullIfEmpty(),
|
||||
Ports = item.Ports.NullIfEmpty(),
|
||||
UpMbps = _config.HysteriaItem.UpMbps,
|
||||
DownMbps = _config.HysteriaItem.DownMbps,
|
||||
HopInterval = _config.HysteriaItem.HopInterval
|
||||
};
|
||||
break;
|
||||
case EConfigType.TUIC:
|
||||
extra = extra with
|
||||
{
|
||||
Username = item.Id,
|
||||
};
|
||||
item.Id = item.Security;
|
||||
item.Password = item.Security;
|
||||
break;
|
||||
case EConfigType.WireGuard:
|
||||
extra = extra with
|
||||
{
|
||||
WgPublicKey = item.PublicKey.NullIfEmpty(),
|
||||
WgInterfaceAddress = item.RequestHost.NullIfEmpty(),
|
||||
WgReserved = item.Path.NullIfEmpty(),
|
||||
WgMtu = int.TryParse(item.ShortId, out var mtu) ? mtu : 1280
|
||||
};
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
item.SetProtocolExtra(extra);
|
||||
|
|
|
|||
|
|
@ -114,13 +114,13 @@ public partial class CoreConfigSingboxService
|
|||
|
||||
outbound.packet_encoding = "xudp";
|
||||
|
||||
if (protocolExtra.Flow.IsNullOrEmpty())
|
||||
if (!protocolExtra.Flow.IsNullOrEmpty())
|
||||
{
|
||||
await GenOutboundMux(node, outbound);
|
||||
outbound.flow = protocolExtra.Flow;
|
||||
}
|
||||
else
|
||||
{
|
||||
outbound.flow = protocolExtra.Flow;
|
||||
await GenOutboundMux(node, outbound);
|
||||
}
|
||||
|
||||
await GenOutboundTransport(node, outbound);
|
||||
|
|
|
|||
|
|
@ -144,13 +144,12 @@ public partial class CoreConfigV2rayService
|
|||
usersItem.email = Global.UserEMail;
|
||||
usersItem.encryption = protocolExtra.VlessEncryption;
|
||||
|
||||
if (protocolExtra.Flow.IsNullOrEmpty())
|
||||
if (!protocolExtra.Flow.IsNullOrEmpty())
|
||||
{
|
||||
await GenOutboundMux(node, outbound, muxEnabled, muxEnabled);
|
||||
usersItem.flow = protocolExtra.Flow;
|
||||
}
|
||||
else
|
||||
{
|
||||
usersItem.flow = protocolExtra.Flow;
|
||||
await GenOutboundMux(node, outbound, false, muxEnabled);
|
||||
}
|
||||
outbound.settings.servers = null;
|
||||
|
|
|
|||
Loading…
Reference in a new issue