Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-04-19 13:42:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix server deduplicaiton failure (#6900)
Some checks failed
release Linux / build (Release) (push) Has been cancelled
Details
release macOS / build (Release) (push) Has been cancelled
Details
release Windows desktop (Avalonia UI) / build (Release) (push) Has been cancelled
Details
release Windows / build (Release) (push) Has been cancelled
Details

Browse source 
- Add a local method AreEquel to compare string values, return TRUE when compare between 'null' and 'string.Emtpy'
This commit is contained in:
Avery Lynn 2025-03-13 20:11:10 +08:00 committed by GitHub
parent d561f10edc
commit d0e2cc9442
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
v2rayN/ServiceLib/Handler/ConfigHandler.cs
View file

@ -951,22 +951,27 @@ namespace ServiceLib.Handler
return false;
}
static bool AreEqual(string? a, string? b)
{
return string.Equals(a, b) || (string.IsNullOrEmpty(a) && string.IsNullOrEmpty(b));
}
return o.ConfigType == n.ConfigType
&& o.Address == n.Address
&& AreEqual(o.Address, n.Address)
&& o.Port == n.Port
&& o.Id == n.Id
&& o.Security == n.Security
&& o.Network == n.Network
&& o.HeaderType == n.HeaderType
&& o.RequestHost == n.RequestHost
&& o.Path == n.Path
&& AreEqual(o.Id, n.Id)
&& AreEqual(o.Security, n.Security)
&& AreEqual(o.Network, n.Network)
&& AreEqual(o.HeaderType, n.HeaderType)
&& AreEqual(o.RequestHost, n.RequestHost)
&& AreEqual(o.Path, n.Path)
&& (o.ConfigType == EConfigType.Trojan || o.StreamSecurity == n.StreamSecurity)
&& o.Flow == n.Flow
&& o.Sni == n.Sni
&& o.Alpn == n.Alpn
&& o.Fingerprint == n.Fingerprint
&& o.PublicKey == n.PublicKey
&& o.ShortId == n.ShortId
&& AreEqual(o.Flow, n.Flow)
&& AreEqual(o.Sni, n.Sni)
&& AreEqual(o.Alpn, n.Alpn)
&& AreEqual(o.Fingerprint, n.Fingerprint)
&& AreEqual(o.PublicKey, n.PublicKey)
&& AreEqual(o.ShortId, n.ShortId)
&& (!remarks || o.Remarks == n.Remarks);
}