From 680b1ca208d6f54c9ac285133c8c810ea83ffc58 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 27 Mar 2018 14:19:45 -0700 Subject: Upgrade installer AIP versions and redo how we bundle the driver sub-installer to allow unattended driver installs (hopefully). --- .../x64/ZeroTierOne_NDIS6_x64.exe | Bin 0 -> 2418336 bytes .../x86/ZeroTierOne_NDIS6_x86.exe | Bin 0 -> 2353960 bytes ...roTier One Virtual Network Port (NDIS6_x64).aip | 95 +++++++++++++++++---- ...roTier One Virtual Network Port (NDIS6_x86).aip | 93 ++++++++++++++++---- ext/installfiles/windows/ZeroTier One.aip | 63 +++++++------- 5 files changed, 185 insertions(+), 66 deletions(-) create mode 100644 ext/bin/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.exe create mode 100644 ext/bin/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.exe diff --git a/ext/bin/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.exe b/ext/bin/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.exe new file mode 100644 index 00000000..4e4261fe Binary files /dev/null and b/ext/bin/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.exe differ diff --git a/ext/bin/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.exe b/ext/bin/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.exe new file mode 100644 index 00000000..58bb0622 Binary files /dev/null and b/ext/bin/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.exe differ diff --git a/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x64).aip b/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x64).aip index db8566cd..a4567f82 100644 --- a/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x64).aip +++ b/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x64).aip @@ -1,17 +1,19 @@ - + - + + - + + @@ -19,16 +21,21 @@ - + + - + - - - + + + + + + + @@ -36,11 +43,12 @@ + - + @@ -49,9 +57,11 @@ + + + - - + @@ -74,8 +84,20 @@ + + + + + + + + + + + + @@ -105,10 +127,23 @@ + + + + + + + + + + + + + @@ -118,7 +153,7 @@ - + @@ -128,21 +163,45 @@ - + + + + + + + + + + + + + + - - + + + + + - - + + + + - + + + + + + + diff --git a/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x86).aip b/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x86).aip index b83b382c..e8a14736 100644 --- a/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x86).aip +++ b/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x86).aip @@ -1,18 +1,20 @@ - + - + + - + + @@ -20,16 +22,21 @@ - + + - + - - - + + + + + + + @@ -37,11 +44,12 @@ + - + @@ -50,9 +58,11 @@ + + + - - + @@ -75,8 +85,20 @@ + + + + + + + + + + + + @@ -106,10 +128,23 @@ + + + + + + + + + + + + + @@ -129,21 +164,45 @@ - + + + + + + + + + + + + + + - - + + + + + - - + + + + - + + + + + + + diff --git a/ext/installfiles/windows/ZeroTier One.aip b/ext/installfiles/windows/ZeroTier One.aip index 169e3c49..cfc2a777 100644 --- a/ext/installfiles/windows/ZeroTier One.aip +++ b/ext/installfiles/windows/ZeroTier One.aip @@ -1,11 +1,10 @@ - + - @@ -71,35 +70,40 @@ + + - + - + + + + - + - + - + - + @@ -116,19 +120,11 @@ - + - - - - - - - - @@ -193,11 +189,12 @@ - - + + + @@ -243,8 +240,8 @@ + - @@ -274,12 +271,10 @@ - - @@ -295,13 +290,12 @@ + + - - - @@ -324,20 +318,19 @@ - + - - + - + @@ -355,16 +348,20 @@ + + + - + - + + @@ -430,6 +427,10 @@ + + + + -- cgit v1.2.3 From fcb529b3484cdf91fac9a4ee7b26cf0d1b4d2537 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 27 Mar 2018 17:53:28 -0700 Subject: Take two on unattended driver installs. I think it works now.' --- ext/bin/tap-windows-ndis6/certutil.exe | Bin 0 -> 1542144 bytes .../x64/ZeroTierOne_NDIS6_x64.exe | Bin 2418336 -> 0 bytes .../x64/ZeroTierOne_NDIS6_x64.msi | Bin 1453568 -> 2356224 bytes .../x86/ZeroTierOne_NDIS6_x86.exe | Bin 2353960 -> 0 bytes .../x86/ZeroTierOne_NDIS6_x86.msi | Bin 1070592 -> 1973760 bytes ext/bin/tap-windows-ndis6/zttap300.cer | Bin 0 -> 1321 bytes ...roTier One Virtual Network Port (NDIS6_x64).aip | 67 ++++++-------------- ...roTier One Virtual Network Port (NDIS6_x86).aip | 69 ++++++--------------- ext/installfiles/windows/ZeroTier One.aip | 34 ++++++---- 9 files changed, 59 insertions(+), 111 deletions(-) create mode 100644 ext/bin/tap-windows-ndis6/certutil.exe delete mode 100644 ext/bin/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.exe delete mode 100644 ext/bin/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.exe create mode 100644 ext/bin/tap-windows-ndis6/zttap300.cer diff --git a/ext/bin/tap-windows-ndis6/certutil.exe b/ext/bin/tap-windows-ndis6/certutil.exe new file mode 100644 index 00000000..3c01a865 Binary files /dev/null and b/ext/bin/tap-windows-ndis6/certutil.exe differ diff --git a/ext/bin/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.exe b/ext/bin/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.exe deleted file mode 100644 index 4e4261fe..00000000 Binary files a/ext/bin/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.exe and /dev/null differ diff --git a/ext/bin/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.msi b/ext/bin/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.msi index 4cfb7d77..bd320e1d 100644 Binary files a/ext/bin/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.msi and b/ext/bin/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.msi differ diff --git a/ext/bin/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.exe b/ext/bin/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.exe deleted file mode 100644 index 58bb0622..00000000 Binary files a/ext/bin/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.exe and /dev/null differ diff --git a/ext/bin/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.msi b/ext/bin/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.msi index 1b9aec40..4270f5ad 100644 Binary files a/ext/bin/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.msi and b/ext/bin/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.msi differ diff --git a/ext/bin/tap-windows-ndis6/zttap300.cer b/ext/bin/tap-windows-ndis6/zttap300.cer new file mode 100644 index 00000000..ef74e041 Binary files /dev/null and b/ext/bin/tap-windows-ndis6/zttap300.cer differ diff --git a/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x64).aip b/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x64).aip index a4567f82..d64d656a 100644 --- a/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x64).aip +++ b/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x64).aip @@ -5,15 +5,13 @@ - - + - @@ -22,7 +20,7 @@ - + @@ -40,28 +38,37 @@ + - + + + - + - + + + + + + + - + @@ -84,20 +91,8 @@ - - - - - - - - - - - - @@ -128,19 +123,9 @@ - - - - - - - - - - @@ -151,6 +136,7 @@ + @@ -163,20 +149,9 @@ - + - - - - - - - - - - - - + @@ -193,15 +168,9 @@ - - - - - - diff --git a/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x86).aip b/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x86).aip index e8a14736..1b9b51ff 100644 --- a/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x86).aip +++ b/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x86).aip @@ -5,16 +5,14 @@ - - + - @@ -23,7 +21,7 @@ - + @@ -41,28 +39,37 @@ + - + + + - + - + + + + + + + - + @@ -85,20 +92,8 @@ - - - - - - - - - - - - @@ -129,19 +124,9 @@ - - - - - - - - - - @@ -152,9 +137,10 @@ + - + @@ -164,20 +150,9 @@ - + - - - - - - - - - - - - + @@ -194,15 +169,9 @@ - - - - - - diff --git a/ext/installfiles/windows/ZeroTier One.aip b/ext/installfiles/windows/ZeroTier One.aip index cfc2a777..d1529935 100644 --- a/ext/installfiles/windows/ZeroTier One.aip +++ b/ext/installfiles/windows/ZeroTier One.aip @@ -5,6 +5,7 @@ + @@ -26,7 +27,7 @@ - + @@ -70,8 +71,6 @@ - - @@ -82,7 +81,7 @@ - + @@ -90,13 +89,11 @@ - - - + @@ -125,6 +122,14 @@ + + + + + + + + @@ -189,7 +194,9 @@ + + @@ -242,6 +249,7 @@ + @@ -271,10 +279,12 @@ + + @@ -290,12 +300,13 @@ - - + + + @@ -318,7 +329,7 @@ - + @@ -348,9 +359,8 @@ - - + -- cgit v1.2.3 From 1101c1d919190d44e587cf8720f23054d971169a Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 27 Mar 2018 18:46:06 -0700 Subject: Works on 32-bit too now. --- ext/bin/tap-windows-ndis6/certutil.exe | Bin 1542144 -> 903168 bytes .../x64/ZeroTierOne_NDIS6_x64.msi | Bin 2356224 -> 2056704 bytes .../x86/ZeroTierOne_NDIS6_x86.msi | Bin 1973760 -> 1673728 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/ext/bin/tap-windows-ndis6/certutil.exe b/ext/bin/tap-windows-ndis6/certutil.exe index 3c01a865..b9a0a09c 100644 Binary files a/ext/bin/tap-windows-ndis6/certutil.exe and b/ext/bin/tap-windows-ndis6/certutil.exe differ diff --git a/ext/bin/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.msi b/ext/bin/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.msi index bd320e1d..b4658f87 100644 Binary files a/ext/bin/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.msi and b/ext/bin/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.msi differ diff --git a/ext/bin/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.msi b/ext/bin/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.msi index 4270f5ad..ad18e125 100644 Binary files a/ext/bin/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.msi and b/ext/bin/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.msi differ -- cgit v1.2.3 From 6679a556935eb4eccf248f48ac4926983dcbda56 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 27 Mar 2018 19:15:14 -0700 Subject: certutil needs -f in case TrustedProvider store is not yet created --- .../x64/ZeroTierOne_NDIS6_x64.msi | Bin 2056704 -> 2056704 bytes .../x86/ZeroTierOne_NDIS6_x86.msi | Bin 1673728 -> 1673728 bytes ...roTier One Virtual Network Port (NDIS6_x64).aip | 2 +- ...roTier One Virtual Network Port (NDIS6_x86).aip | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/bin/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.msi b/ext/bin/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.msi index b4658f87..f69254eb 100644 Binary files a/ext/bin/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.msi and b/ext/bin/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.msi differ diff --git a/ext/bin/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.msi b/ext/bin/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.msi index ad18e125..03396549 100644 Binary files a/ext/bin/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.msi and b/ext/bin/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.msi differ diff --git a/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x64).aip b/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x64).aip index d64d656a..9a085111 100644 --- a/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x64).aip +++ b/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x64).aip @@ -136,7 +136,7 @@ - + diff --git a/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x86).aip b/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x86).aip index 1b9b51ff..436618f2 100644 --- a/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x86).aip +++ b/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x86).aip @@ -137,7 +137,7 @@ - + -- cgit v1.2.3 From 8c1b73b29c487c5bd1f0be981729f5e6001e60c3 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Thu, 29 Mar 2018 10:25:29 -0700 Subject: GitHub issue #701 --- make-linux.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/make-linux.mk b/make-linux.mk index 6c015ba2..cd946491 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -188,6 +188,10 @@ ifeq ($(CC_MACH),mips64el) ZT_ARCHITECTURE=6 override DEFS+=-DZT_NO_TYPE_PUNNING endif +ifeq ($(CC_MACH),powerpc64le) + ZT_ARCHITECTURE=7 + override DEFS+=-DZT_NO_TYPE_PUNNING +endif # Fail if system architecture could not be determined ifeq ($(ZT_ARCHITECTURE),999) -- cgit v1.2.3 From 40a9ebd07854e5ce07b0d70a5a778399c036b0e5 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Thu, 29 Mar 2018 10:44:57 -0700 Subject: GitHub issue #675 --- node/InetAddress.cpp | 4 ++-- node/InetAddress.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/node/InetAddress.cpp b/node/InetAddress.cpp index ecfc81ab..36b4e434 100644 --- a/node/InetAddress.cpp +++ b/node/InetAddress.cpp @@ -62,7 +62,7 @@ InetAddress::IpScope InetAddress::ipScope() const case 0x37: return IP_SCOPE_PSEUDOPRIVATE; // 55.0.0.0/8 (US DoD) case 0x38: return IP_SCOPE_PSEUDOPRIVATE; // 56.0.0.0/8 (US Postal Service) case 0x64: - if ((ip & 0xffc00000) == 0x64400000) return IP_SCOPE_SHARED; // 100.64.0.0/10 + if ((ip & 0xffc00000) == 0x64400000) return IP_SCOPE_PRIVATE; // 100.64.0.0/10 break; case 0x7f: return IP_SCOPE_LOOPBACK; // 127.0.0.0/8 case 0xa9: @@ -294,7 +294,7 @@ bool InetAddress::isEqualPrefix(const InetAddress &addr) const } return false; } - + bool InetAddress::containsAddress(const InetAddress &addr) const { if (addr.ss_family == ss_family) { diff --git a/node/InetAddress.hpp b/node/InetAddress.hpp index e6dfabf9..f69b3cc2 100644 --- a/node/InetAddress.hpp +++ b/node/InetAddress.hpp @@ -79,7 +79,7 @@ struct InetAddress : public sockaddr_storage IP_SCOPE_PSEUDOPRIVATE = 3, // 28.x.x.x, etc. -- unofficially unrouted IPv4 blocks often "bogarted" IP_SCOPE_GLOBAL = 4, // globally routable IP address (all others) IP_SCOPE_LINK_LOCAL = 5, // 169.254.x.x, IPv6 LL - IP_SCOPE_SHARED = 6, // 100.64.0.0/10, shared space for e.g. carrier-grade NAT + IP_SCOPE_SHARED = 6, // currently unused, formerly used for carrier-grade NAT ranges IP_SCOPE_PRIVATE = 7 // 10.x.x.x, 192.168.x.x, etc. }; -- cgit v1.2.3