5 年之前 · eef70e198b
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -11,7 +11,7 @@ Parameters
 
				 
			
 
				 Licensor:             ZeroTier, Inc.
			
 
				 Licensed Work:        ZeroTier Network Virtualization Engine
			
 
				-                      The Licensed Work is (c)2019 ZeroTier, Inc.
			
 
				+                      The Licensed Work is (c)2013-2020 ZeroTier, Inc.
			
 
				 Additional Use Grant: You may make use of the Licensed Work, provided you
			
 
				                       do not use it in any of the following ways:
			
 
				 
			
@@ -47,7 +47,7 @@ Additional Use Grant: You may make use of the Licensed Work, provided you
 
				                       services, social welfare, senior care, child care, and
			
 
				                       the care of persons with disabilities.
			
 
				 
			
 
				-Change Date:          2023-01-01
			
 
				+Change Date:          2024-01-01
			
 
				 
			
 
				 Change License:       Apache License version 2.0 as published by the Apache
			
 
				                       Software Foundation
			
--- a/One.xcodeproj/project.pbxproj
+++ b/One.xcodeproj/project.pbxproj
--- a/One.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/One.xcodeproj/project.xcworkspace/contents.xcworkspacedata
--- a/One/AboutViewController.h
+++ b/One/AboutViewController.h
--- a/One/AboutViewController.m
+++ b/One/AboutViewController.m
--- a/One/AboutViewController.xib
+++ b/One/AboutViewController.xib
--- a/attic/macui/ZeroTier
+++ b/attic/macui/ZeroTier
--- a/attic/macui/ZeroTier
+++ b/attic/macui/ZeroTier
--- a/One/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/One/Assets.xcassets/AppIcon.appiconset/Contents.json
--- a/One/Assets.xcassets/AppIcon.appiconset/ZeroTierIcon512x512.png
+++ b/One/Assets.xcassets/AppIcon.appiconset/ZeroTierIcon512x512.png
--- a/One/Assets.xcassets/Contents.json
+++ b/One/Assets.xcassets/Contents.json
--- a/One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json
+++ b/One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json
--- a/One/Assets.xcassets/MenuBarIconMac.imageset/[email
+++ b/One/Assets.xcassets/MenuBarIconMac.imageset/[email
--- a/One/Assets.xcassets/MenuBarIconMac.imageset/Menubar.png
+++ b/One/Assets.xcassets/MenuBarIconMac.imageset/Menubar.png
--- a/One/Assets.xcassets/MenuBarIconMacWhite.imageset/Contents.json
+++ b/One/Assets.xcassets/MenuBarIconMacWhite.imageset/Contents.json
--- a/One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite.png
+++ b/One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite.png
--- a/One/Assets.xcassets/MenuBarIconMacWhite.imageset/[email
+++ b/One/Assets.xcassets/MenuBarIconMacWhite.imageset/[email
--- a/attic/macui/ZeroTier
+++ b/attic/macui/ZeroTier
--- a/attic/macui/ZeroTier
+++ b/attic/macui/ZeroTier
--- a/One/Base.lproj/MainMenu.xib
+++ b/One/Base.lproj/MainMenu.xib
--- a/attic/macui/ZeroTier
+++ b/attic/macui/ZeroTier
--- a/One/JoinNetworkViewController.h
+++ b/One/JoinNetworkViewController.h
--- a/One/JoinNetworkViewController.m
+++ b/One/JoinNetworkViewController.m
--- a/One/JoinNetworkViewController.xib
+++ b/One/JoinNetworkViewController.xib
--- a/attic/macui/ZeroTier
+++ b/attic/macui/ZeroTier
--- a/attic/macui/ZeroTier
+++ b/attic/macui/ZeroTier
--- a/One/NetworkInfoCell.h
+++ b/One/NetworkInfoCell.h
--- a/One/NetworkInfoCell.m
+++ b/One/NetworkInfoCell.m
--- a/One/NetworkMonitor.h
+++ b/One/NetworkMonitor.h
--- a/One/NetworkMonitor.m
+++ b/One/NetworkMonitor.m
--- a/attic/macui/ZeroTier
+++ b/attic/macui/ZeroTier
--- a/attic/macui/ZeroTier
+++ b/attic/macui/ZeroTier
--- a/One/PreferencesViewController.h
+++ b/One/PreferencesViewController.h
--- a/One/PreferencesViewController.m
+++ b/One/PreferencesViewController.m
--- a/One/PreferencesViewController.xib
+++ b/One/PreferencesViewController.xib
--- a/attic/macui/ZeroTier
+++ b/attic/macui/ZeroTier
--- a/attic/macui/ZeroTier
+++ b/attic/macui/ZeroTier
--- a/One/ShowNetworksViewController.h
+++ b/One/ShowNetworksViewController.h
--- a/One/ShowNetworksViewController.m
+++ b/One/ShowNetworksViewController.m
--- a/One/ShowNetworksViewController.xib
+++ b/One/ShowNetworksViewController.xib
--- a/One/ZeroTierIcon.icns
+++ b/One/ZeroTierIcon.icns
--- a/attic/macui/ZeroTier
+++ b/attic/macui/ZeroTier
--- a/attic/macui/ZeroTier
+++ b/attic/macui/ZeroTier
--- a/attic/windows/README.md
+++ b/attic/windows/README.md
--- a/attic/windows/TapDriver6/TapDriver6.vcxproj
+++ b/attic/windows/TapDriver6/TapDriver6.vcxproj
--- a/attic/windows/TapDriver6/TapDriver6.vcxproj.filters
+++ b/attic/windows/TapDriver6/TapDriver6.vcxproj.filters
--- a/attic/windows/TapDriver6/adapter.c
+++ b/attic/windows/TapDriver6/adapter.c
--- a/attic/windows/TapDriver6/adapter.h
+++ b/attic/windows/TapDriver6/adapter.h
--- a/attic/windows/TapDriver6/config.h
+++ b/attic/windows/TapDriver6/config.h
--- a/attic/windows/TapDriver6/constants.h
+++ b/attic/windows/TapDriver6/constants.h
--- a/attic/windows/TapDriver6/device.c
+++ b/attic/windows/TapDriver6/device.c
--- a/attic/windows/TapDriver6/device.h
+++ b/attic/windows/TapDriver6/device.h
--- a/attic/windows/TapDriver6/endian.h
+++ b/attic/windows/TapDriver6/endian.h
--- a/attic/windows/TapDriver6/error.c
+++ b/attic/windows/TapDriver6/error.c
--- a/attic/windows/TapDriver6/error.h
+++ b/attic/windows/TapDriver6/error.h
--- a/attic/windows/TapDriver6/hexdump.h
+++ b/attic/windows/TapDriver6/hexdump.h
--- a/attic/windows/TapDriver6/lock.h
+++ b/attic/windows/TapDriver6/lock.h
--- a/attic/windows/TapDriver6/macinfo.c
+++ b/attic/windows/TapDriver6/macinfo.c
--- a/attic/windows/TapDriver6/macinfo.h
+++ b/attic/windows/TapDriver6/macinfo.h
--- a/attic/windows/TapDriver6/mem.c
+++ b/attic/windows/TapDriver6/mem.c
--- a/attic/windows/TapDriver6/mem.h
+++ b/attic/windows/TapDriver6/mem.h
--- a/attic/windows/TapDriver6/oidrequest.c
+++ b/attic/windows/TapDriver6/oidrequest.c
--- a/attic/windows/TapDriver6/proto.h
+++ b/attic/windows/TapDriver6/proto.h
--- a/attic/windows/TapDriver6/prototypes.h
+++ b/attic/windows/TapDriver6/prototypes.h
--- a/attic/windows/TapDriver6/resource.h
+++ b/attic/windows/TapDriver6/resource.h
--- a/attic/windows/TapDriver6/resource.rc
+++ b/attic/windows/TapDriver6/resource.rc
--- a/attic/windows/TapDriver6/rxpath.c
+++ b/attic/windows/TapDriver6/rxpath.c
--- a/attic/windows/TapDriver6/tap-windows.h
+++ b/attic/windows/TapDriver6/tap-windows.h
--- a/attic/windows/TapDriver6/tap.h
+++ b/attic/windows/TapDriver6/tap.h
--- a/attic/windows/TapDriver6/tapdrvr.c
+++ b/attic/windows/TapDriver6/tapdrvr.c
--- a/attic/windows/TapDriver6/txpath.c
+++ b/attic/windows/TapDriver6/txpath.c
--- a/attic/windows/TapDriver6/types.h
+++ b/attic/windows/TapDriver6/types.h
--- a/attic/windows/TapDriver6/zttap300.inf
+++ b/attic/windows/TapDriver6/zttap300.inf
--- a/attic/windows/WinUI/APIHandler.cs
+++ b/attic/windows/WinUI/APIHandler.cs
--- a/attic/windows/WinUI/AboutView.xaml
+++ b/attic/windows/WinUI/AboutView.xaml
--- a/attic/windows/WinUI/AboutView.xaml.cs
+++ b/attic/windows/WinUI/AboutView.xaml.cs
--- a/attic/windows/WinUI/App.config
+++ b/attic/windows/WinUI/App.config
--- a/attic/windows/WinUI/App.xaml
+++ b/attic/windows/WinUI/App.xaml
--- a/attic/windows/WinUI/App.xaml.cs
+++ b/attic/windows/WinUI/App.xaml.cs
--- a/attic/windows/WinUI/CMakeLists.txt
+++ b/attic/windows/WinUI/CMakeLists.txt
--- a/attic/windows/WinUI/CentralAPI.cs
+++ b/attic/windows/WinUI/CentralAPI.cs
--- a/attic/windows/WinUI/CentralLogin.cs
+++ b/attic/windows/WinUI/CentralLogin.cs
--- a/attic/windows/WinUI/CentralNetwork.cs
+++ b/attic/windows/WinUI/CentralNetwork.cs
--- a/attic/windows/WinUI/CentralServer.cs
+++ b/attic/windows/WinUI/CentralServer.cs
--- a/attic/windows/WinUI/CentralToken.cs
+++ b/attic/windows/WinUI/CentralToken.cs
--- a/attic/windows/WinUI/CentralUser.cs
+++ b/attic/windows/WinUI/CentralUser.cs
--- a/attic/windows/WinUI/Fonts/segoeui.ttf
+++ b/attic/windows/WinUI/Fonts/segoeui.ttf
--- a/attic/windows/WinUI/Fonts/segoeuib.ttf
+++ b/attic/windows/WinUI/Fonts/segoeuib.ttf
--- a/attic/windows/WinUI/Fonts/segoeuii.ttf
+++ b/attic/windows/WinUI/Fonts/segoeuii.ttf
--- a/attic/windows/WinUI/Fonts/segoeuiz.ttf
+++ b/attic/windows/WinUI/Fonts/segoeuiz.ttf
--- a/attic/windows/WinUI/ISwitchable.cs
+++ b/attic/windows/WinUI/ISwitchable.cs
--- a/attic/windows/WinUI/JoinNetworkView.xaml
+++ b/attic/windows/WinUI/JoinNetworkView.xaml
--- a/attic/windows/WinUI/JoinNetworkView.xaml.cs
+++ b/attic/windows/WinUI/JoinNetworkView.xaml.cs
--- a/attic/windows/WinUI/MainWindow.xaml.cs
+++ b/attic/windows/WinUI/MainWindow.xaml.cs
--- a/attic/windows/WinUI/NetworkInfoView.xaml
+++ b/attic/windows/WinUI/NetworkInfoView.xaml
--- a/attic/windows/WinUI/NetworkInfoView.xaml.cs
+++ b/attic/windows/WinUI/NetworkInfoView.xaml.cs
--- a/attic/windows/WinUI/NetworkListView.xaml
+++ b/attic/windows/WinUI/NetworkListView.xaml
--- a/attic/windows/WinUI/NetworkListView.xaml.cs
+++ b/attic/windows/WinUI/NetworkListView.xaml.cs
--- a/attic/windows/WinUI/NetworkMonitor.cs
+++ b/attic/windows/WinUI/NetworkMonitor.cs
--- a/attic/windows/WinUI/NetworkNameGenerator.cs
+++ b/attic/windows/WinUI/NetworkNameGenerator.cs