Merge branch 'master' of github.com:zerotier/ZeroTierOne

This commit is contained in:
Adam Ierymenko 2021-02-02 17:03:48 -05:00
commit d3770eeccc
No known key found for this signature in database
GPG Key ID: C8877CF2D7A5D7F3

View File

@ -3017,6 +3017,7 @@ public:
if ((ifname[0] == 'z') && (ifname[1] == 't')) return false; // sanity check: zt#
if ((ifname[0] == 't') && (ifname[1] == 'u') && (ifname[2] == 'n')) return false; // tun# is probably an OpenVPN tunnel or similar
if ((ifname[0] == 't') && (ifname[1] == 'a') && (ifname[2] == 'p')) return false; // tap# is probably an OpenVPN tunnel or similar
if ((ifname[0] == 'w') && (ifname[1] == 'g')) return false; // wg# is probably a WireGuard tunnel or similar
#endif
#ifdef __APPLE__
@ -3025,6 +3026,7 @@ public:
if ((ifname[0] == 'z') && (ifname[1] == 't')) return false; // sanity check: zt#
if ((ifname[0] == 't') && (ifname[1] == 'u') && (ifname[2] == 'n')) return false; // tun# is probably an OpenVPN tunnel or similar
if ((ifname[0] == 't') && (ifname[1] == 'a') && (ifname[2] == 'p')) return false; // tap# is probably an OpenVPN tunnel or similar
if ((ifname[0] == 'w') && (ifname[1] == 'g')) return false; // wg# is probably a WireGuard tunnel or similar
if ((ifname[0] == 'u') && (ifname[1] == 't') && (ifname[2] == 'u') && (ifname[3] == 'n')) return false; // ... as is utun#
#endif