mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2025-06-06 12:33:44 +02:00
Merge branch 'dev' of http://10.187.0.8/zerotier/ZeroTierOne into dev
This commit is contained in:
commit
221a3f9a08
4 changed files with 55 additions and 21 deletions
7
debian/changelog
vendored
7
debian/changelog
vendored
|
@ -1,3 +1,10 @@
|
||||||
|
zerotier-one (1.4.4) unstable; urgency=medium
|
||||||
|
|
||||||
|
* See https://github.com/zerotier/ZeroTierOne for release notes.
|
||||||
|
* License changed to BSL 1.1
|
||||||
|
|
||||||
|
-- Adam Ierymenko <adam.ierymenko@zerotier.com> Thu, 23 Aug 2019 01:00:00 -0700
|
||||||
|
|
||||||
zerotier-one (1.4.2-2) unstable; urgency=medium
|
zerotier-one (1.4.2-2) unstable; urgency=medium
|
||||||
|
|
||||||
* See https://github.com/zerotier/ZeroTierOne for release notes.
|
* See https://github.com/zerotier/ZeroTierOne for release notes.
|
||||||
|
|
28
debian/copyright
vendored
28
debian/copyright
vendored
|
@ -4,21 +4,15 @@ Source: https://github.com/zerotier/ZeroTierOne
|
||||||
|
|
||||||
Files: *
|
Files: *
|
||||||
Copyright: 2011-2016 ZeroTier, Inc.
|
Copyright: 2011-2016 ZeroTier, Inc.
|
||||||
License: GPL-3.0+
|
License: ZeroTier BSL 1.1
|
||||||
|
|
||||||
License: GPL-3.0+
|
License: ZeroTier BSL 1.1
|
||||||
This program is free software: you can redistribute it and/or modify
|
Copyright (c)2019 ZeroTier, Inc.
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
Use of this software is governed by the Business Source License included
|
||||||
(at your option) any later version.
|
in the LICENSE.TXT file in the project's root directory.
|
||||||
.
|
|
||||||
This package is distributed in the hope that it will be useful,
|
Change Date: 2023-01-01
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
On the date above, in accordance with the Business Source License, use
|
||||||
GNU General Public License for more details.
|
of this software will be governed by version 2.0 of the Apache License.
|
||||||
.
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
.
|
|
||||||
On Debian systems, the complete text of the GNU General
|
|
||||||
Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
|
|
||||||
|
|
|
@ -181,8 +181,38 @@ private:
|
||||||
inline bool _isV6NDPEmulated(const NetworkConfig &nconf,const MAC &m) const { return false; }
|
inline bool _isV6NDPEmulated(const NetworkConfig &nconf,const MAC &m) const { return false; }
|
||||||
inline bool _isV6NDPEmulated(const NetworkConfig &nconf,const InetAddress &ip) const
|
inline bool _isV6NDPEmulated(const NetworkConfig &nconf,const InetAddress &ip) const
|
||||||
{
|
{
|
||||||
if ((ip.isV6())&&(nconf.ndpEmulation())&&((InetAddress::makeIpv66plane(nconf.networkId,nconf.issuedTo.toInt()).ipsEqual(ip))||(InetAddress::makeIpv6rfc4193(nconf.networkId,nconf.issuedTo.toInt()).ipsEqual(ip)))) {
|
if ((ip.isV6())&&(nconf.ndpEmulation())) {
|
||||||
return true;
|
const InetAddress sixpl(InetAddress::makeIpv66plane(nconf.networkId,nconf.issuedTo.toInt()));
|
||||||
|
for(int i=0;i<nconf.staticIpCount;++i) {
|
||||||
|
if (nconf.staticIps[i].ipsEqual(sixpl)) {
|
||||||
|
bool prefixMatches = true;
|
||||||
|
for(int j=0;j<5;++j) { // check for match on /40
|
||||||
|
if ((((const struct sockaddr_in6 *)&ip)->sin6_addr.s6_addr)[j] != (((const struct sockaddr_in6 *)&sixpl)->sin6_addr.s6_addr)[j]) {
|
||||||
|
prefixMatches = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (prefixMatches)
|
||||||
|
return true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const InetAddress rfc4193(InetAddress::makeIpv6rfc4193(nconf.networkId,nconf.issuedTo.toInt()));
|
||||||
|
for(int i=0;i<nconf.staticIpCount;++i) {
|
||||||
|
if (nconf.staticIps[i].ipsEqual(rfc4193)) {
|
||||||
|
bool prefixMatches = true;
|
||||||
|
for(int j=0;j<11;++j) { // check for match on /88
|
||||||
|
if ((((const struct sockaddr_in6 *)&ip)->sin6_addr.s6_addr)[j] != (((const struct sockaddr_in6 *)&rfc4193)->sin6_addr.s6_addr)[j]) {
|
||||||
|
prefixMatches = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (prefixMatches)
|
||||||
|
return true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
Name: zerotier-one
|
Name: zerotier-one
|
||||||
Version: 1.4.2
|
Version: 1.4.4
|
||||||
Release: 2%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: ZeroTier One network virtualization service
|
Summary: ZeroTier One network virtualization service
|
||||||
|
|
||||||
License: GPLv3
|
License: ZeroTier BSL 1.1
|
||||||
URL: https://www.zerotier.com
|
URL: https://www.zerotier.com
|
||||||
|
|
||||||
%if 0%{?rhel} >= 7
|
%if 0%{?rhel} >= 7
|
||||||
|
@ -145,6 +145,9 @@ esac
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Aug 23 2019 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.4.4-0.1
|
||||||
|
- see https://github.com/zerotier/ZeroTierOne for release notes
|
||||||
|
|
||||||
* Mon Aug 04 2019 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.4.2-0.1
|
* Mon Aug 04 2019 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.4.2-0.1
|
||||||
- see https://github.com/zerotier/ZeroTierOne for release notes
|
- see https://github.com/zerotier/ZeroTierOne for release notes
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue