void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-05 03:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of github.com:zerotier/ZeroTierOne into dev

Browse source
This commit is contained in:
Adam Ierymenko 2020-11-24 17:02:17 -05:00
commit 13d7e2f2b9
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
java/src/com/zerotier/sdk/VirtualNetworkConfig.java
View file

@ -151,6 +151,11 @@ public final class VirtualNetworkConfig implements Comparable<VirtualNetworkConf
} }
} }
boolean dnsEquals = false;
if (this.dns != null && cfg.dns != null) {
dnsEquals = this.dns.equals(cfg.dns);
}
return this.nwid == cfg.nwid && return this.nwid == cfg.nwid &&
this.mac == cfg.mac && this.mac == cfg.mac &&
this.name.equals(cfg.name) && this.name.equals(cfg.name) &&
@ -162,7 +167,7 @@ public final class VirtualNetworkConfig implements Comparable<VirtualNetworkConf
this.broadcastEnabled == cfg.broadcastEnabled && this.broadcastEnabled == cfg.broadcastEnabled &&
this.portError == cfg.portError && this.portError == cfg.portError &&
this.enabled == cfg.enabled && this.enabled == cfg.enabled &&
this.dns.equals(cfg.dns) && dnsEquals &&
aaEqual && routesEqual; aaEqual && routesEqual;
} }