summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--RELEASE-NOTES.md6
-rw-r--r--debian/changelog6
-rw-r--r--debian/compat2
-rw-r--r--debian/control2
-rw-r--r--debian/control.wheezy2
-rw-r--r--debian/postinst4
-rw-r--r--ext/ed25519-amd64-asm/ge25519_scalarmult_base.c2
-rwxr-xr-xext/installfiles/mac/ZeroTier One.pkgproj2
-rw-r--r--ext/installfiles/windows/chocolatey/zerotier-one/zerotier-one.nuspec2
-rw-r--r--make-linux.mk6
-rw-r--r--service/OneService.cpp14
-rw-r--r--version.h2
-rw-r--r--windows/WinUI/AboutView.xaml2
-rw-r--r--zerotier-one.spec12
14 files changed, 44 insertions, 20 deletions
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 0ff36519..54dd1375 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,6 +1,12 @@
ZeroTier Release Notes
======
+# 2018-05-08 -- Version 1.2.10
+
+ * Fix bug loading `moons.d/` files for federated root operation.
+ * Fix compile problem with ZT_DEBUG on some versions of `clang`
+ * Fix slow network startup bug related to loading of `networks.d/` cache files
+
# 2018-04-27 -- Version 1.2.8
* Linux version once again builds with PIE (position independent executable) flags
diff --git a/debian/changelog b/debian/changelog
index bc89ab07..1c020411 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+zerotier-one (1.2.10) unstable; urgency=medium
+
+ * See https://github.com/zerotier/ZeroTierOne for release notes.
+
+ -- Adam Ierymenko <adam.ierymenko@zerotier.com> Tue, 08 May 2018 01:00:00 -0700
+
zerotier-one (1.2.8) unstable; urgency=medium
* See https://github.com/zerotier/ZeroTierOne for release notes.
diff --git a/debian/compat b/debian/compat
index f11c82a4..301160a9 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9 \ No newline at end of file
+8 \ No newline at end of file
diff --git a/debian/control b/debian/control
index a9554f19..1eb147e0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Adam Ierymenko <adam.ierymenko@zerotier.com>
Section: net
Priority: optional
Standards-Version: 3.9.6
-Build-Depends: debhelper (>= 9), dh-systemd
+Build-Depends: debhelper (>= 9)
Vcs-Git: git://github.com/zerotier/ZeroTierOne
Vcs-Browser: https://github.com/zerotier/ZeroTierOne
Homepage: https://www.zerotier.com/
diff --git a/debian/control.wheezy b/debian/control.wheezy
index f14c8760..a8e24084 100644
--- a/debian/control.wheezy
+++ b/debian/control.wheezy
@@ -3,7 +3,7 @@ Maintainer: Adam Ierymenko <adam.ierymenko@zerotier.com>
Section: net
Priority: optional
Standards-Version: 3.9.4
-Build-Depends: debhelper (>= 9)
+Build-Depends: debhelper
Vcs-Git: git://github.com/zerotier/ZeroTierOne
Vcs-Browser: https://github.com/zerotier/ZeroTierOne
Homepage: https://www.zerotier.com/
diff --git a/debian/postinst b/debian/postinst
index ecd148a4..2e673aef 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -2,7 +2,9 @@
case "$1" in
configure)
- adduser --system --group --home /var/lib/zerotier-one --no-create-home zerotier-one
+ if ! id zerotier-one >>/dev/null 2>&1; then
+ useradd --system --user-group --home-dir /var/lib/zerotier-one --no-create-home zerotier-one
+ fi
;;
esac
diff --git a/ext/ed25519-amd64-asm/ge25519_scalarmult_base.c b/ext/ed25519-amd64-asm/ge25519_scalarmult_base.c
index 986abaf6..ffa6e2fa 100644
--- a/ext/ed25519-amd64-asm/ge25519_scalarmult_base.c
+++ b/ext/ed25519-amd64-asm/ge25519_scalarmult_base.c
@@ -12,7 +12,7 @@ static const ge25519_niels ge25519_base_multiples_niels[] = {
};
/* d */
-static const fe25519 ecd = {{0x75EB4DCA135978A3, 0x00700A4D4141D8AB, 0x8CC740797779E898, 0x52036CEE2B6FFE73}};
+/*static const fe25519 ecd = {{0x75EB4DCA135978A3, 0x00700A4D4141D8AB, 0x8CC740797779E898, 0x52036CEE2B6FFE73}};*/
void ge25519_scalarmult_base(ge25519_p3 *r, const sc25519 *s)
{
diff --git a/ext/installfiles/mac/ZeroTier One.pkgproj b/ext/installfiles/mac/ZeroTier One.pkgproj
index 1083d47b..866029ee 100755
--- a/ext/installfiles/mac/ZeroTier One.pkgproj
+++ b/ext/installfiles/mac/ZeroTier One.pkgproj
@@ -664,7 +664,7 @@
<key>USE_HFS+_COMPRESSION</key>
<false/>
<key>VERSION</key>
- <string>1.2.8</string>
+ <string>1.2.10</string>
</dict>
<key>PROJECT_COMMENTS</key>
<dict>
diff --git a/ext/installfiles/windows/chocolatey/zerotier-one/zerotier-one.nuspec b/ext/installfiles/windows/chocolatey/zerotier-one/zerotier-one.nuspec
index c0112029..1270652b 100644
--- a/ext/installfiles/windows/chocolatey/zerotier-one/zerotier-one.nuspec
+++ b/ext/installfiles/windows/chocolatey/zerotier-one/zerotier-one.nuspec
@@ -26,7 +26,7 @@ This is a nuspec. It mostly adheres to https://docs.nuget.org/create/Nuspec-Refe
<!-- version should MATCH as closely as possible with the underlying software -->
<!-- Is the version a prerelease of a version? https://docs.nuget.org/create/versioning#creating-prerelease-packages -->
<!-- Note that unstable versions like 0.0.1 can be considered a released version, but it's possible that one can release a 0.0.1-beta before you release a 0.0.1 version. If the version number is final, that is considered a released version and not a prerelease. -->
- <version>1.2.8</version>
+ <version>1.2.10</version>
<!-- <packageSourceUrl>Where is this Chocolatey package located (think GitHub)? packageSourceUrl is highly recommended for the community feed</packageSourceUrl>-->
<!-- owners is a poor name for maintainers of the package. It sticks around by this name for compatibility reasons. It basically means you. -->
<!--<owners>ZeroTier, Inc.</owners>-->
diff --git a/make-linux.mk b/make-linux.mk
index 4a2a3e2d..62f319bf 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -237,6 +237,7 @@ ifeq ($(ZT_ARCHITECTURE),3)
else
override CFLAGS+=-march=armv5 -mno-unaligned-access -marm
override CXXFLAGS+=-march=armv5 -mno-unaligned-access -marm
+ ZT_USE_ARM32_NEON_ASM_CRYPTO=0
endif
endif
@@ -287,7 +288,7 @@ manpages: FORCE
doc: manpages
clean: FORCE
- rm -rf *.a *.so *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/miniupnpc/*.o ext/libnatpmp/*.o $(CORE_OBJS) $(ONE_OBJS) zerotier-one zerotier-idtool zerotier-cli zerotier-selftest build-* ZeroTierOneInstaller-* *.deb *.rpm .depend debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one doc/node_modules ext/misc/*.o
+ rm -rf *.a *.so *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/miniupnpc/*.o ext/libnatpmp/*.o $(CORE_OBJS) $(ONE_OBJS) zerotier-one zerotier-idtool zerotier-cli zerotier-selftest build-* ZeroTierOneInstaller-* *.deb *.rpm .depend debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one doc/node_modules ext/misc/*.o debian/.debhelper debian/debhelper-build-stamp
distclean: clean
@@ -355,6 +356,9 @@ uninstall: FORCE
debian: FORCE
debuild -I -i -us -uc -nc -b
+debian-clean: FORCE
+ rm -rf debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one debian/.debhelper debian/debhelper-build-stamp
+
redhat: FORCE
rpmbuild -ba zerotier-one.spec
diff --git a/service/OneService.cpp b/service/OneService.cpp
index 1d271b21..04d8c8df 100644
--- a/service/OneService.cpp
+++ b/service/OneService.cpp
@@ -1083,8 +1083,8 @@ public:
/*
fprintf(stderr, "path = %s\n", path.c_str());
fprintf(stderr, "headers.size=%d\n", headers.size());
- std::map<std::string, std::string>::const_iterator it(headers.begin());
- while(it != headers.end()) {
+ std::map<std::string, std::string>::const_iterator it(headers.begin());
+ while(it != headers.end()) {
fprintf(stderr,"header[%s] = %s\n", (it->first).c_str(), (it->second).c_str());
it++;
}
@@ -1092,7 +1092,7 @@ public:
// parse out url args
int synotoken_pos = path.find("SynoToken");
int argpos = path.find("?");
- if(synotoken_pos != std::string::npos && argpos != std::string::npos) {
+ if(synotoken_pos != std::string::npos && argpos != std::string::npos) {
std::string cookie = path.substr(argpos+1, synotoken_pos-(argpos+1));
std::string synotoken = path.substr(synotoken_pos);
std::string cookie_val = cookie.substr(cookie.find("=")+1);
@@ -1589,7 +1589,7 @@ public:
if (std::find(n.managedIps.begin(),n.managedIps.end(),*ip) == n.managedIps.end()) {
if (!n.tap->addIp(*ip))
fprintf(stderr,"ERROR: unable to add ip address %s" ZT_EOL_S, ip->toString(ipbuf));
- }
+ }
}
#endif
n.managedIps.swap(newManagedIps);
@@ -2004,7 +2004,7 @@ public:
if (n.tap) { // sanity check
#if defined(__WINDOWS__) && !defined(ZT_SDK)
// wait for up to 5 seconds for the WindowsEthernetTap to actually be initialized
- //
+ //
// without WindowsEthernetTap::isInitialized() returning true, the won't actually
// be online yet and setting managed routes on it will fail.
const int MAX_SLEEP_COUNT = 500;
@@ -2164,10 +2164,10 @@ public:
OSUtils::ztsnprintf(p,sizeof(p),"%s" ZT_PATH_SEPARATOR_S "planet",_homePath.c_str());
break;
case ZT_STATE_OBJECT_MOON:
- OSUtils::ztsnprintf(p,sizeof(p),"%s" ZT_PATH_SEPARATOR_S "moons.d" ZT_PATH_SEPARATOR_S "%.16llx.moon",_homePath.c_str(),(unsigned long long)id);
+ OSUtils::ztsnprintf(p,sizeof(p),"%s" ZT_PATH_SEPARATOR_S "moons.d" ZT_PATH_SEPARATOR_S "%.16llx.moon",_homePath.c_str(),(unsigned long long)id[0]);
break;
case ZT_STATE_OBJECT_NETWORK_CONFIG:
- OSUtils::ztsnprintf(p,sizeof(p),"%s" ZT_PATH_SEPARATOR_S "networks.d" ZT_PATH_SEPARATOR_S "%.16llx.conf",_homePath.c_str(),(unsigned long long)id);
+ OSUtils::ztsnprintf(p,sizeof(p),"%s" ZT_PATH_SEPARATOR_S "networks.d" ZT_PATH_SEPARATOR_S "%.16llx.conf",_homePath.c_str(),(unsigned long long)id[0]);
break;
case ZT_STATE_OBJECT_PEER:
OSUtils::ztsnprintf(p,sizeof(p),"%s" ZT_PATH_SEPARATOR_S "peers.d" ZT_PATH_SEPARATOR_S "%.10llx.peer",_homePath.c_str(),(unsigned long long)id[0]);
diff --git a/version.h b/version.h
index c82986fe..808879d7 100644
--- a/version.h
+++ b/version.h
@@ -40,7 +40,7 @@
/**
* Revision
*/
-#define ZEROTIER_ONE_VERSION_REVISION 8
+#define ZEROTIER_ONE_VERSION_REVISION 10
/**
* Build version
diff --git a/windows/WinUI/AboutView.xaml b/windows/WinUI/AboutView.xaml
index 3e83c2e2..b1df750b 100644
--- a/windows/WinUI/AboutView.xaml
+++ b/windows/WinUI/AboutView.xaml
@@ -19,7 +19,7 @@
<Run Text="ZeroTier One"/>
</Paragraph>
<Paragraph TextAlignment="Center">
- <Run FontSize="14" Text="Version 1.2.8"/>
+ <Run FontSize="14" Text="Version 1.2.10"/>
<LineBreak/>
<Run FontSize="14" Text="(c) 2011-2017 ZeroTier, Inc."/>
<LineBreak/>
diff --git a/zerotier-one.spec b/zerotier-one.spec
index bc8eaf80..41af5aca 100644
--- a/zerotier-one.spec
+++ b/zerotier-one.spec
@@ -1,5 +1,5 @@
Name: zerotier-one
-Version: 1.2.8
+Version: 1.2.10
Release: 1%{?dist}
Summary: ZeroTier One network virtualization service
@@ -110,8 +110,8 @@ case "$1" in
chkconfig --add zerotier-one
;;
2)
- chkconfig --del newservice
- chkconfig --add newservice
+ chkconfig --del zerotier-one
+ chkconfig --add zerotier-one
;;
esac
%endif
@@ -145,6 +145,12 @@ esac
%endif
%changelog
+* Tue May 08 2018 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.2.10-0.1
+- see https://github.com/zerotier/ZeroTierOne for release notes
+
+* Thu May 03 2018 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.2.8-0.1
+- see https://github.com/zerotier/ZeroTierOne for release notes
+
* Mon Apr 24 2017 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.2.2-0.1
- see https://github.com/zerotier/ZeroTierOne for release notes
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-04 14:19:43 +0000