mirror of
https://github.com/2dust/v2rayN.git
synced 2025-10-30 03:52:53 +00:00
Compare commits
37 commits
cf503da469
...
aba816425d
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
aba816425d | ||
|
|
7f6399933a | ||
|
|
1a27599d28 | ||
|
|
f4d6ac24af | ||
|
|
50706a13c7 | ||
|
|
5f5da59573 | ||
|
|
a5735895c6 | ||
|
|
47779e433d | ||
|
|
c5f222bf58 | ||
|
|
1945d9b798 | ||
|
|
2e283eb00e | ||
|
|
00505c7c17 | ||
|
|
9229b491c5 | ||
|
|
d9b0aff8da | ||
|
|
8ea39d7475 | ||
|
|
f14f39f5a1 | ||
|
|
228069f499 | ||
|
|
645e4e7711 | ||
|
|
d1c16ecb72 | ||
|
|
dca737bdad | ||
|
|
7f5489c5f7 | ||
|
|
3be0b312d6 | ||
|
|
b290a38ef4 | ||
|
|
70bdb3de16 | ||
|
|
8f9d1951a2 | ||
|
|
e2faf61a8b | ||
|
|
3824879d38 | ||
|
|
d54433aeb3 | ||
|
|
26b2240779 | ||
|
|
98a5caa47f | ||
|
|
d77c25aef5 | ||
|
|
7affcf97b1 | ||
|
|
9e1e5eb2aa | ||
|
|
d1928d80c7 | ||
|
|
ea55dfb6c5 | ||
|
|
b3acb89c29 | ||
|
|
922cf54d93 |
7 changed files with 7 additions and 8 deletions
|
|
@ -411,11 +411,11 @@ public class Utils
|
||||||
// Link-local address fe80::/10
|
// Link-local address fe80::/10
|
||||||
if (ipBytes[0] == 0xfe && (ipBytes[1] & 0xc0) == 0x80)
|
if (ipBytes[0] == 0xfe && (ipBytes[1] & 0xc0) == 0x80)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
// Unique local address fc00::/7 (typically fd00::/8)
|
// Unique local address fc00::/7 (typically fd00::/8)
|
||||||
if ((ipBytes[0] & 0xfe) == 0xfc)
|
if ((ipBytes[0] & 0xfe) == 0xfc)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
// Private portion in IPv4-mapped addresses ::ffff:0:0/96
|
// Private portion in IPv4-mapped addresses ::ffff:0:0/96
|
||||||
if (address.IsIPv4MappedToIPv6)
|
if (address.IsIPv4MappedToIPv6)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -2028,7 +2028,7 @@ public class ConfigHandler
|
||||||
|
|
||||||
if (!blImportAdvancedRules && items.Count > 0)
|
if (!blImportAdvancedRules && items.Count > 0)
|
||||||
{
|
{
|
||||||
//migrate
|
//migrate
|
||||||
//TODO Temporary code to be removed later
|
//TODO Temporary code to be removed later
|
||||||
if (config.RoutingBasicItem.RoutingIndexId.IsNotEmpty())
|
if (config.RoutingBasicItem.RoutingIndexId.IsNotEmpty())
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,7 @@ public class BaseFmt
|
||||||
if (item.Mldsa65Verify.IsNotEmpty())
|
if (item.Mldsa65Verify.IsNotEmpty())
|
||||||
{
|
{
|
||||||
dicQuery.Add("pqv", Utils.UrlEncode(item.Mldsa65Verify));
|
dicQuery.Add("pqv", Utils.UrlEncode(item.Mldsa65Verify));
|
||||||
}
|
}
|
||||||
if (item.AllowInsecure.Equals("true"))
|
if (item.AllowInsecure.Equals("true"))
|
||||||
{
|
{
|
||||||
dicQuery.Add("allowInsecure", "1");
|
dicQuery.Add("allowInsecure", "1");
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ public class CoreConfigClashService
|
||||||
{
|
{
|
||||||
_config = config;
|
_config = config;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<RetResult> GenerateClientCustomConfig(ProfileItem node, string? fileName)
|
public async Task<RetResult> GenerateClientCustomConfig(ProfileItem node, string? fileName)
|
||||||
{
|
{
|
||||||
var ret = new RetResult();
|
var ret = new RetResult();
|
||||||
|
|
|
||||||
|
|
@ -234,7 +234,7 @@ public class ClashProxiesViewModel : MyReactiveObject
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
SelectedGroup = _proxyGroups.First();
|
SelectedGroup = _proxyGroups.First();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -73,7 +73,6 @@
|
||||||
<ScrollViewer x:Name="msgScrollViewer" VerticalScrollBarVisibility="Auto">
|
<ScrollViewer x:Name="msgScrollViewer" VerticalScrollBarVisibility="Auto">
|
||||||
<SelectableTextBlock
|
<SelectableTextBlock
|
||||||
Name="txtMsg"
|
Name="txtMsg"
|
||||||
Margin="{StaticResource Margin8}"
|
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
Classes="TextArea"
|
Classes="TextArea"
|
||||||
TextAlignment="Left"
|
TextAlignment="Left"
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@ public partial class MsgView
|
||||||
menuMsgViewCopy.Click += menuMsgViewCopy_Click;
|
menuMsgViewCopy.Click += menuMsgViewCopy_Click;
|
||||||
menuMsgViewCopyAll.Click += menuMsgViewCopyAll_Click;
|
menuMsgViewCopyAll.Click += menuMsgViewCopyAll_Click;
|
||||||
menuMsgViewClear.Click += menuMsgViewClear_Click;
|
menuMsgViewClear.Click += menuMsgViewClear_Click;
|
||||||
|
|
||||||
cmbMsgFilter.ItemsSource = Global.PresetMsgFilters;
|
cmbMsgFilter.ItemsSource = Global.PresetMsgFilters;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue