VERSION 0.7.1: installation fixes, new supernode

This version contains fixes to Linux installation and deployment and adds a
new supernode in Tokyo, Japan. It also has a working Windows installer, though
a bit more testing is going to take place before Windows binaries are
actually released.

.gitignore

@@ -9,19 +9,18 @@
 /netconf-service/netconf-test
 /netconf-service/netconf.service
 /ipch
-/ZeroTierOne.sdf
-/ZeroTierOne.v11.suo
-/vsprojects/SelfTest/Debug
-/vsprojects/SelfTest/Release
-/vsprojects/ZeroTierOne/Debug
-/vsprojects/ZeroTierOne/Release
-/vsprojects/ZeroTierOne/x64
-/vsprojects/TapDriver/Win32
-/vsprojects/TapDriver/x64
-/vsprojects/InstallerUpdater/obj
-/vsprojects/Service/obj
-/vsprojects/SelfTest/SelfTest.aps
-/Build/*
+/windows/ZeroTierOne.sdf
+/windows/ZeroTierOne.v11.suo
+/windows/x64
+/windows/Win32
+/windows/*/x64
+/windows/*/Win32
+/windows/ZeroTierOne/Release
+/windows/ZeroTierOneService/obj
+/windows/ZeroTierOneService/bin
+/windows/Build
+/ext/installfiles/windows/ZeroTier One-SetupFiles
+/ext/installfiles/windows/Prerequisites
 *.log
 *.opensdf
 *.user
@@ -32,5 +31,4 @@
 /ZeroTierOneInstaller-*
 .qmake.stash
 *.autosave
-/ZeroTier One.zip
 /ZeroTier One.dmg

BUILDING.txt

@@ -8,21 +8,13 @@ do this eventually.
 
 -- Linux
 
-make
-
-That's it. Add ZT_AUTO_UPDATE=1 to the make command line to build an
-auto-update-enabled version that will update from ZeroTier's servers.
-This is disabled by default since such a build will automatically
-replace itself with our binary distributions.
+Just type 'make'. You'll need gcc and g++ installed, but ZeroTier One requires
+no other third party libraries beyond the standard libc, libstdc++, and libm.
 
 -- MacOS
 
 make
 
-The same ZT_AUTO_UPDATE=1 option as Linux supports can be used here to
-build an auto-update-enabled version. By default auto-updates are not
-enabled.
-
 If you are building ext/tap-mac you will need a different version of the
 OSX gcc compiler chain than what currently ships (clang). We've got a copy
 available here:

README.md

@@ -3,16 +3,12 @@ ZeroTier One
 
 ZeroTier One creates flat virtual Ethernet networks of almost unlimited size. [Visit ZeroTier Networks on the web](https://www.zerotier.com/) for more information.
 
-This project is now in beta, which means that major incompatible protocol shifts should now become considerably more rare. You should still update very often if you plan to use it. Binary packages with auto-update are coming very soon.
-
 Follow the [ZeroTier blog](http://blog.zerotier.com/) and the [GitHub project](https://github.com/zerotier/ZeroTierOne) to stay up to date.
 
-See BUILDING.txt and RUNNING.txt for instructions. It currently runs on Mac and Linux. A Windows port is well along the way to completion. If you're brave you can load the Visual Studio 2012 solution and play around.
+Auto-updating binary packages that install easily [can be found here.](https://www.zerotier.com/download.html) If you want to build from source, clone this repository and see BUILDING.txt and RUNNING.txt.
 
-Once you have it running you can join the Earth network -- a LAN for the planet -- by using the 'zerotier-cli' tool: 'sudo zerotier-cli join 8056c2e21c000001'. Right now Earth is the only network. Ability to create private networks, as well as some additional special-purpose public ones, will be coming soon. (Note: previous alpha versions auto-joined Earth, but since 0.5.0 it no longer does this.)
+Once you are up and running, you can [create an account on the network control panel](https://www.zerotier.com/networks.html) if you want to create a private network or you can join [Earth](https://www.zerotier.com/earth.html) by running (on Linux and Mac) `sudo ./zerotier-cli join 8056c2e21c000001`.
 
 Note that this won't work if your firewall does not allow outbound UDP. It must allow two way UDP conversations on port 9993 at a minimum.
 
 ZeroTier One is licensed under the GNU General Public License version 3. You are free to use, modify, or redistribute it under the terms of that license. If you would like to embed ZeroTier One in a closed source product or create a closed source derivative product, contact ZeroTier Networks LLC.
-
-(c)2012-2013 [ZeroTier Networks LLC](https://www.zerotier.com/)

RUNNING.txt

@@ -1,15 +1,19 @@
-First build it -- see BUILDING.txt -- then...
+This guide is for those building and running from source. See BUILDING.txt
+first.
 
--- MacOS --
+The wiki at GitHub contains several pages that are probably also of interest:
+  https://github.com/zerotier/ZeroTierOne/wiki
 
-By convention, ZeroTier One will keep its state here on mac:
+--- MacOS
+
+On Mac, the default ZeroTier home is:
 
 /Library/Application Support/ZeroTier/One
 
 ZeroTier ships with a kernel extension for its own tap device, which it
 stores in the above directory. To install this, type:
 
-sudo make -f Makefile.mac install-mac-tap
+sudo make install-mac-tap
 
 This will create the ZeroTier One home above if it does not exist and install
 the kext there. Note that the kext must be owned by root:wheel. The make
@@ -20,14 +24,7 @@ If run with no options, it will use the default home directory above.
 
 sudo ./zerotier-one &
 
-Finally, join the Earth network (the big public LAN and the only net for now):
-
-sudo zerotier-cli join 8056c2e21c000001
-
-Try pinging earth.zerotier.net and going to http://earth.zerotier.net/ in a
-browser to see if you're online.
-
--- Linux
+--- LINUX
 
 On Linux, the default ZeroTier home is:
 
@@ -38,31 +35,14 @@ Just type:
 sudo mkdir /var/lib/zerotier-one
 sudo ./zerotier-one &
 
-When run with no options, ZT1 uses its default home path on the current
-platform. Note that ZT1 requires the Linux tap driver, so it must be
-available in the kernel or as a module. In most Linux distributions it's
-included out of the box and should just work.
+Your system must have the Linux tun/tap driver available (tun). All tested
+distributions so far ship with this driver as a module that will load
+automatically.
 
-Finally, join the Earth network (the big public LAN and the only net for now):
+UDP port 9993 must be open in your local firewall for this to work properly.
+How to do this varies by Linux distribution.
 
-sudo zerotier-cli join bc8f9a8ee3000001
-
-Try pinging earth.zerotier.net and going to http://earth.zerotier.net/ in a
-browser to see if you're online.
-
--- Windows
-
-Port in progress, and it's going to pretty much always be more painful to
-build than *nix systems. Just wait for the binary release unless you're
-brave, in which case you can load the VS2012 solution and play around.
-
--- Open UDP port 9993
-
-As noted in README.md, to actually function properly, you need to open
-UDP port 9993 in your firewall. Following are instructions to open UDP port
-9993 for specific operating systems.
-
---- Ubuntu (version 12.04 and possibly other versions, too)
+ - Opening port 9993 on Ubuntu
 
 Follow the Ubuntu documentation about UFW https://help.ubuntu.com/community/UFW
 
@@ -76,3 +56,19 @@ sudo ufw allow 9993/udp
 
 You should now be able to ping and browse earth.zerotier.net
 
+--- WINDOWS
+
+A windows port is in progress.
+
+--- ONCE IT'S RUNNING:
+
+To use the command line interface, see this guide:
+  https://github.com/zerotier/ZeroTierOne/wiki/Command-Line-Interface
+
+If you want to test by joining the Earth network, try:
+  sudo ./zerotier-cli join 8056c2e21c000001
+
+An interface called 'zt0' should appear and should get an IP address in
+the 28.0.0.0/7 range (28.* or 29.*) within a few seconds or so. Then try
+pinging earth.zerotier.net or navigating to http://earth.zerotier.net/ in
+a web browser.

ZeroTierUI/WindowsBuildOfficial.bat

@@ -0,0 +1,9 @@
+REM If you're an OSS user and want to run this batch file, edit to change the path to Qt.
+REM Start Visual Studio command prompt and run this from within the ZeroTierUI subfolder.
+
+CD ..
+MKDIR build-ZeroTierUI-win32-release
+CD build-ZeroTierUI-win32-release
+C:\Qt\5.2.1\Src\qtbase\bin\qmake.exe ..\ZeroTierUI\ZeroTierUI.pro
+nmake clean
+nmake

ZeroTierUI/ZeroTierUI.pro

@@ -3,109 +3,118 @@ TARGET = "ZeroTier One"
 TEMPLATE = app
 
 win32:RC_FILE = ZeroTierUI.rc
+win32:LIBS += winhttp.lib Iphlpapi.lib ws2_32.lib advapi32.lib Shell32.lib Rpcrt4.lib
+win32:QMAKE_LFLAGS += /MANIFESTUAC:\"level=\'requireAdministrator\' uiAccess=\'false\'\"
 
 mac:ICON = zt1icon.icns
 mac:QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
 mac:QMAKE_INFO_PLIST = Info.plist
 mac:LIBS += -framework Cocoa
 
-SOURCES += main.cpp\
-				mainwindow.cpp \
-		aboutwindow.cpp \
-		../node/C25519.cpp \
-		../node/CertificateOfMembership.cpp \
-		../node/Defaults.cpp \
-		../node/Demarc.cpp \
-		../node/EthernetTap.cpp \
-		../node/HttpClient.cpp \
-		../node/Identity.cpp \
-		../node/InetAddress.cpp \
-		../node/Logger.cpp \
-		../node/Multicaster.cpp \
-		../node/Network.cpp \
-		../node/NetworkConfig.cpp \
-		../node/Node.cpp \
-		../node/NodeConfig.cpp \
-		../node/Packet.cpp \
-		../node/PacketDecoder.cpp \
-		../node/Peer.cpp \
-		../node/Poly1305.cpp \
-		../node/Salsa20.cpp \
-		../node/Service.cpp \
-		../node/SHA512.cpp \
-		../node/SoftwareUpdater.cpp \
-		../node/Switch.cpp \
-		../node/SysEnv.cpp \
-		../node/Topology.cpp \
-		../node/UdpSocket.cpp \
-		../node/Utils.cpp \
-		../ext/lz4/lz4.c \
-		../ext/lz4/lz4hc.c \
-		networkwidget.cpp \
-		installdialog.cpp \
-    licensedialog.cpp
+SOURCES += main.cpp \
+    mainwindow.cpp \
+    aboutwindow.cpp \
+    ../node/C25519.cpp \
+    ../node/CertificateOfMembership.cpp \
+    ../node/Defaults.cpp \
+    ../node/Demarc.cpp \
+    ../node/EthernetTap.cpp \
+    ../node/HttpClient.cpp \
+    ../node/Identity.cpp \
+    ../node/InetAddress.cpp \
+    ../node/Logger.cpp \
+    ../node/Multicaster.cpp \
+    ../node/Network.cpp \
+    ../node/NetworkConfig.cpp \
+    ../node/Node.cpp \
+    ../node/NodeConfig.cpp \
+    ../node/Packet.cpp \
+    ../node/PacketDecoder.cpp \
+    ../node/Peer.cpp \
+    ../node/Poly1305.cpp \
+    ../node/Salsa20.cpp \
+    ../node/Service.cpp \
+    ../node/SHA512.cpp \
+    ../node/SoftwareUpdater.cpp \
+    ../node/Switch.cpp \
+    ../node/SysEnv.cpp \
+    ../node/Topology.cpp \
+    ../node/UdpSocket.cpp \
+    ../node/Utils.cpp \
+    ../ext/lz4/lz4.c \
+    ../ext/lz4/lz4hc.c \
+    networkwidget.cpp \
+    installdialog.cpp \
+    licensedialog.cpp \
+    onetimedialog.cpp
 
 HEADERS  += mainwindow.h \
-		aboutwindow.h \
-		../node/Node.hpp \
-		../node/Utils.hpp \
-		../node/Defaults.hpp \
-		../node/Address.hpp \
-		../node/Array.hpp \
-		../node/AtomicCounter.hpp \
-		../node/BandwidthAccount.hpp \
-		../node/Buffer.hpp \
-		../node/C25519.hpp \
-		../node/CertificateOfMembership.hpp \
-		../node/CMWC4096.hpp \
-		../node/Condition.hpp \
-		../node/Constants.hpp \
-		../node/Demarc.hpp \
-		../node/Dictionary.hpp \
-		../node/EthernetTap.hpp \
-		../node/HttpClient.hpp \
-		../node/Identity.hpp \
-		../node/InetAddress.hpp \
-		../node/Logger.hpp \
-		../node/MAC.hpp \
-		../node/Multicaster.hpp \
-		../node/MulticastGroup.hpp \
-		../node/Mutex.hpp \
-		../node/Network.hpp \
-		../node/NetworkConfig.hpp \
-		../node/NodeConfig.hpp \
-		../node/NonCopyable.hpp \
-		../node/Packet.hpp \
-		../node/PacketDecoder.hpp \
-		../node/Peer.hpp \
-		../node/Poly1305.hpp \
-		../node/RuntimeEnvironment.hpp \
-		../node/Salsa20.hpp \
-		../node/Service.hpp \
-		../node/SHA512.hpp \
-		../node/SharedPtr.hpp \
-		../node/SoftwareUpdater.hpp \
-		../node/Switch.hpp \
-		../node/SysEnv.hpp \
-		../node/Thread.hpp \
-		../node/Topology.hpp \
-		../node/UdpSocket.hpp \
-		../ext/lz4/lz4.h \
-		../ext/lz4/lz4hc.h \
-		networkwidget.h \
-		installdialog.h \
-		mac_doprivileged.h \
+    aboutwindow.h \
+    ../node/Node.hpp \
+    ../node/Utils.hpp \
+    ../node/Defaults.hpp \
+    ../node/Address.hpp \
+    ../node/Array.hpp \
+    ../node/AtomicCounter.hpp \
+    ../node/BandwidthAccount.hpp \
+    ../node/Buffer.hpp \
+    ../node/C25519.hpp \
+    ../node/CertificateOfMembership.hpp \
+    ../node/CMWC4096.hpp \
+    ../node/Condition.hpp \
+    ../node/Constants.hpp \
+    ../node/Demarc.hpp \
+    ../node/Dictionary.hpp \
+    ../node/EthernetTap.hpp \
+    ../node/HttpClient.hpp \
+    ../node/Identity.hpp \
+    ../node/InetAddress.hpp \
+    ../node/Logger.hpp \
+    ../node/MAC.hpp \
+    ../node/Multicaster.hpp \
+    ../node/MulticastGroup.hpp \
+    ../node/Mutex.hpp \
+    ../node/Network.hpp \
+    ../node/NetworkConfig.hpp \
+    ../node/NodeConfig.hpp \
+    ../node/NonCopyable.hpp \
+    ../node/Packet.hpp \
+    ../node/PacketDecoder.hpp \
+    ../node/Peer.hpp \
+    ../node/Poly1305.hpp \
+    ../node/RuntimeEnvironment.hpp \
+    ../node/Salsa20.hpp \
+    ../node/Service.hpp \
+    ../node/SHA512.hpp \
+    ../node/SharedPtr.hpp \
+    ../node/SoftwareUpdater.hpp \
+    ../node/Switch.hpp \
+    ../node/SysEnv.hpp \
+    ../node/Thread.hpp \
+    ../node/Topology.hpp \
+    ../node/UdpSocket.hpp \
+    ../ext/lz4/lz4.h \
+    ../ext/lz4/lz4hc.h \
+    networkwidget.h \
+    installdialog.h \
+    mac_doprivileged.h \
     licensedialog.h \
-    main.h
+    main.h \
+    onetimedialog.h
 
 FORMS    += mainwindow.ui \
-		aboutwindow.ui \
-		networkwidget.ui \
-		installdialog.ui \
-    licensedialog.ui
+    aboutwindow.ui \
+    networkwidget.ui \
+    installdialog.ui \
+    licensedialog.ui \
+    quickstartdialog.ui \
+    onetimedialog.ui
 
 RESOURCES += \
 		resources.qrc
 
 mac:OBJECTIVE_SOURCES += \
 		mac_doprivileged.mm
+
+OTHER_FILES += \
+    stylesheet.css

ZeroTierUI/aboutwindow.cpp

@@ -1,6 +1,6 @@
 /*
  * ZeroTier One - Global Peer to Peer Ethernet
- * Copyright (C) 2012-2013  ZeroTier Networks LLC
+ * Copyright (C) 2011-2014  ZeroTier Networks LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,7 +29,9 @@
 #include "ui_aboutwindow.h"
 
 #include <QMessageBox>
+#include <QFont>
 
+#include "../node/Constants.hpp"
 #include "../node/Node.hpp"
 
 AboutWindow::AboutWindow(QWidget *parent) :
@@ -37,7 +39,6 @@ AboutWindow::AboutWindow(QWidget *parent) :
 	ui(new Ui::AboutWindow)
 {
 	ui->setupUi(this);
-
 	ui->aboutTextLabel->setText(QString("ZeroTier One\nVersion ")+ZeroTier::Node::versionString()+"\nQt Graphical User Interface\n\n(c)2011-2014 ZeroTier Networks LLC\n\nReleased under the terms of the GNU\nGeneral Public License v3.0, see: http://gplv3.fsf.org for terms.\n\nAuthor(s): Adam Ierymenko");
 }
 

ZeroTierUI/aboutwindow.h

@@ -1,6 +1,6 @@
 /*
  * ZeroTier One - Global Peer to Peer Ethernet
- * Copyright (C) 2012-2013  ZeroTier Networks LLC
+ * Copyright (C) 2011-2014  ZeroTier Networks LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

ZeroTierUI/aboutwindow.ui

@@ -134,7 +134,7 @@
          <enum>QFrame::StyledPanel</enum>
         </property>
         <property name="frameShadow">
-         <enum>QFrame::Raised</enum>
+         <enum>QFrame::Sunken</enum>
         </property>
         <layout class="QVBoxLayout" name="verticalLayout_2">
          <item>

ZeroTierUI/installdialog.cpp

@@ -1,6 +1,6 @@
 /*
  * ZeroTier One - Global Peer to Peer Ethernet
- * Copyright (C) 2012-2013  ZeroTier Networks LLC
+ * Copyright (C) 2011-2014  ZeroTier Networks LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

ZeroTierUI/installdialog.h

@@ -1,6 +1,6 @@
 /*
  * ZeroTier One - Global Peer to Peer Ethernet
- * Copyright (C) 2012-2013  ZeroTier Networks LLC
+ * Copyright (C) 2011-2014  ZeroTier Networks LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,6 +38,8 @@
 
 #include "../node/Address.hpp"
 
+// Right now InstallDialog is only used on Mac
+
 namespace Ui {
 class InstallDialog;
 }

ZeroTierUI/licensedialog.cpp

@@ -5,11 +5,22 @@
 #include "licensedialog.h"
 #include "ui_licensedialog.h"
 
+#include "../node/Constants.hpp"
+
 LicenseDialog::LicenseDialog(QWidget *parent) :
 	QDialog(parent),
 	ui(new Ui::LicenseDialog)
 {
 	ui->setupUi(this);
+
+#ifdef __WINDOWS__
+	QWidgetList widgets = this->findChildren<QWidget*>();
+	foreach(QWidget *widget, widgets) {
+		QFont font(widget->font());
+		font.setPointSizeF(font.pointSizeF() * 0.75);
+		widget->setFont(font);
+	}
+#endif
 }
 
 LicenseDialog::~LicenseDialog()

ZeroTierUI/main.cpp

@@ -1,6 +1,6 @@
 /*
  * ZeroTier One - Global Peer to Peer Ethernet
- * Copyright (C) 2012-2013  ZeroTier Networks LLC
+ * Copyright (C) 2011-2014  ZeroTier Networks LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,6 +25,10 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "mainwindow.h"
 #include "installdialog.h"
 #include "licensedialog.h"
@@ -32,37 +36,158 @@
 #include <QApplication>
 #include <QDir>
 #include <QString>
+#include <QFont>
+#include <QMessageBox>
 
+#include "../node/Constants.hpp"
+#include "../node/Defaults.hpp"
+
+// Uncomment for testing to disable making sure Windows service is running
+//#define DISABLE_WINDOWS_SERVICE_MANAGEMENT
+
+#ifdef __WINDOWS__
+#include <WinSock2.h>
+#include <windows.h>
+#include "../windows/ZeroTierOne/ZeroTierOneService.h"
+
+#ifndef DISABLE_WINDOWS_SERVICE_MANAGEMENT
+// Returns true if started or already running, false if failed or not installed
+static bool startWindowsService()
+{
+	SERVICE_STATUS ssSvcStatus;
+	SC_HANDLE schSCManager = NULL;
+	SC_HANDLE schService = NULL;
+
+	schSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT);
+	if (schSCManager == NULL)
+		return false;
+
+	schService = OpenServiceA(schSCManager, ZT_SERVICE_NAME, SERVICE_QUERY_STATUS | SERVICE_START);
+	if (schService == NULL) {
+		CloseServiceHandle(schSCManager);
+		return false;
+	}
+
+	int tries = 0;
+	bool running = true;
+
+	for(;;) {
+		memset(&ssSvcStatus,0,sizeof(ssSvcStatus));
+		if ((++tries > 20)||(!QueryServiceStatus(schService,&ssSvcStatus))) {
+			running = false;
+			break;
+		}
+
+		if (ssSvcStatus.dwCurrentState == SERVICE_RUNNING) {
+			break;
+		} else if (ssSvcStatus.dwCurrentState == SERVICE_START_PENDING) {
+			Sleep(500);
+			continue;
+		}
+
+		StartService(schService,0,NULL);
+		Sleep(500);
+	}
+
+	CloseServiceHandle(schService);
+	CloseServiceHandle(schSCManager);
+	return running;
+}
+#endif // !DISABLE_WINDOWS_SERVICE_MANAGEMENT
+#endif // __WINDOWS__
+
+// Globally visible settings for the app
 QSettings *settings = (QSettings *)0;
 
 int main(int argc, char *argv[])
 {
 	QApplication a(argc, argv);
 
+#ifdef __WINDOWS__
+	// Start up Winsock2
+	{
+		WSADATA wsaData;
+		WSAStartup(MAKEWORD(2,2),&wsaData);
+	}
+#endif
+
+	{
+		QFile qss(":css/stylesheet.css");
+		qss.open(QFile::ReadOnly);
+		QString style(qss.readAll());
+		a.setStyleSheet(style);
+	}
+
 #ifdef __APPLE__
 	// If service isn't installed, download and install it
 	if (!QFile::exists("/Library/Application Support/ZeroTier/One/zerotier-one")) {
 		// InstallDialog is an alternative main window. It will re-launch the app
 		// when done.
 		InstallDialog id;
+		id.setStyleSheet(a.styleSheet());
 		id.show();
 		return a.exec();
 	}
-#endif
 
-#ifdef __APPLE__
-	QString zt1AppSupport(QDir::homePath() + "/Library/Application Support/ZeroTier/One");
-	QDir::root().mkpath(zt1AppSupport);
-	settings = new QSettings(zt1AppSupport + "/ui.ini",QSettings::IniFormat);
-#else
+	{
+		// Put QSettings here because this is one of the writable directories allowed
+		// in Apple's app store sandbox specs. We might end up in app store someday.
+		QString zt1AppSupport(QDir::homePath() + "/Library/Application Support/ZeroTier/One");
+		QDir::root().mkpath(zt1AppSupport);
+		settings = new QSettings(zt1AppSupport + "/ui.ini",QSettings::IniFormat);
+	}
+#else // on non-Apple boxen put it in the standard place using the default format
 	settings = new QSettings("ZeroTier Networks","ZeroTier One");
 #endif
 
 	if (!settings->value("acceptedLicenseV1",false).toBool()) {
 		LicenseDialog ld;
+		ld.setStyleSheet(a.styleSheet());
 		ld.exec();
 	}
 
+#if defined(__WINDOWS__) && !defined(DISABLE_WINDOWS_SERVICE_MANAGEMENT)
+	{
+		bool winSvcInstalled = false;
+		while (!startWindowsService()) {
+			if (winSvcInstalled) {
+				// Service was installed and subsequently failed to start again, so
+				// something is wrong!
+				QMessageBox::critical((QWidget *)0,"Service Not Available","Unable to locate or start ZeroTier One service. There may be a problem with the installation. Try installing from the .msi file again or e-mail contact@zerotier.com if you cannot install. (Error: service failed to start)",QMessageBox::Ok);
+				return 1;
+			}
+
+#ifdef _WIN64
+			BOOL is64Bit = TRUE;
+#else
+			BOOL is64Bit = FALSE;
+			IsWow64Process(GetCurrentProcess(),&is64Bit);
+#endif
+			std::string exe(ZeroTier::ZT_DEFAULTS.defaultHomePath + "\\zerotier-one_");
+			exe.append((is64Bit == TRUE) ? "x64.exe" : "x86.exe");
+
+			if (QFile::exists(exe.c_str())) {
+				STARTUPINFOA si;
+				PROCESS_INFORMATION pi;
+				memset(&si,0,sizeof(si));
+				memset(&pi,0,sizeof(pi));
+				if (CreateProcessA(NULL,const_cast <LPSTR>((exe + " -I").c_str()),NULL,NULL,FALSE,CREATE_NO_WINDOW|CREATE_NEW_PROCESS_GROUP,NULL,NULL,&si,&pi)) {
+					WaitForSingleObject(pi.hProcess,INFINITE);
+					CloseHandle(pi.hProcess);
+					CloseHandle(pi.hThread);
+					winSvcInstalled = true;
+				}
+			}
+
+			if (!winSvcInstalled) {
+				// Service failed to install -- installation problem like missing .exe
+				QMessageBox::critical((QWidget *)0,"Service Not Available","Unable to locate or start ZeroTier One service. There may be a problem with the installation. Try installing from the .msi file again or e-mail contact@zerotier.com if you cannot install. (Error: service not installed)",QMessageBox::Ok);
+				return 1;
+			}
+		}
+	}
+#endif
+
 	MainWindow w;
 	w.show();
 	return a.exec();

ZeroTierUI/main.h

@@ -2,6 +2,7 @@
 #define MAIN_H
 
 #include <QSettings>
+#include <QMainWindow>
 
 extern QSettings *settings;
 

ZeroTierUI/mainwindow.cpp

@@ -1,6 +1,6 @@
 /*
  * ZeroTier One - Global Peer to Peer Ethernet
- * Copyright (C) 2012-2013  ZeroTier Networks LLC
+ * Copyright (C) 2011-2014  ZeroTier Networks LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -44,12 +44,14 @@
 #include <QVBoxLayout>
 #include <QScrollBar>
 #include <QEventLoop>
+#include <QFont>
 
 #include "main.h"
 #include "mainwindow.h"
 #include "aboutwindow.h"
 #include "networkwidget.h"
 #include "ui_mainwindow.h"
+#include "ui_quickstartdialog.h"
 
 #ifdef __APPLE__
 #include <stdio.h>
@@ -64,7 +66,7 @@
 ZeroTier::Node::LocalClient *zeroTierClient = (ZeroTier::Node::LocalClient *)0;
 
 // Main window instance for app
-static MainWindow *mainWindow = (MainWindow *)0;
+QMainWindow *mainWindow = (MainWindow *)0;
 
 // Handles message from ZeroTier One service
 static void handleZTMessage(void *arg,unsigned long id,const char *line)
@@ -99,13 +101,31 @@ MainWindow::MainWindow(QWidget *parent) :
 	ui->setupUi(this);
 	if (ui->networkListWidget->verticalScrollBar())
 		ui->networkListWidget->verticalScrollBar()->setSingleStep(8);
+
+#ifdef __APPLE__
 	QWidgetList widgets = this->findChildren<QWidget*>();
 	foreach(QWidget *widget, widgets)
 		widget->setAttribute(Qt::WA_MacShowFocusRect,false);
-	ui->noNetworksLabel->setText("Connecting to Service..."); // changed when result is received
+#endif
 
-	this->pollServiceTimerId = this->startTimer(1000);
-	this->setEnabled(false); // gets enabled when updates are received
+#ifdef __WINDOWS__
+	QWidgetList widgets = this->findChildren<QWidget*>();
+	foreach(QWidget *widget, widgets) {
+		if ((typeid(*widget) != typeid(ui->menuBar))&&(typeid(*widget) != typeid(ui->menuFile))) {
+			QFont font(widget->font());
+			font.setPointSizeF(font.pointSizeF() * 0.75);
+			widget->setFont(font);
+		}
+	}
+#endif
+
+	ui->noNetworksLabel->setVisible(true);
+	ui->noNetworksLabel->setText("Connecting to Service...");
+	ui->bottomContainerWidget->setVisible(false);
+	ui->networkListWidget->setVisible(false);
+
+	this->firstTimerTick = true;
+	this->pollServiceTimerId = this->startTimer(200);
 	this->cyclesSinceResponseFromService = 0;
 }
 
@@ -117,15 +137,26 @@ MainWindow::~MainWindow()
 	mainWindow = (MainWindow *)0;
 }
 
-void MainWindow::timerEvent(QTimerEvent *event)
+void MainWindow::timerEvent(QTimerEvent *event) // event can be null since code also calls this directly
 {
-	event->accept();
-
 	if (this->isHidden())
 		return;
-	if (pollServiceTimerId < 0)
+	if (this->pollServiceTimerId < 0)
 		return;
 
+	if (this->firstTimerTick) {
+		this->firstTimerTick = false;
+		this->killTimer(this->pollServiceTimerId);
+
+		if (!settings->value("shown_quickStart",false).toBool()) {
+			on_actionQuick_Start_triggered();
+			settings->setValue("shown_quickStart",true);
+			settings->sync();
+		}
+
+		this->pollServiceTimerId = this->startTimer(1500);
+	}
+
 	if (!zeroTierClient) {
 		std::string authToken;
 		if (!ZeroTier::Utils::readFile(ZeroTier::Node::LocalClient::authTokenDefaultUserPath().c_str(),authToken)) {
@@ -173,19 +204,25 @@ void MainWindow::timerEvent(QTimerEvent *event)
 #endif
 
 			if (!ZeroTier::Utils::readFile(ZeroTier::Node::LocalClient::authTokenDefaultUserPath().c_str(),authToken)) {
-				QMessageBox::critical(this,"Cannot Authorize","Unable to authorize this user to administrate ZeroTier One. (Did you enter your password correctly?)",QMessageBox::Ok,QMessageBox::NoButton);
-				QApplication::exit(1);
-				return;
+				if (!ZeroTier::Utils::readFile(ZeroTier::Node::LocalClient::authTokenDefaultSystemPath().c_str(),authToken)) {
+					QMessageBox::critical(this,"Cannot Authorize","Unable to authorize this user to administrate ZeroTier One. (Did you enter your password correctly?)",QMessageBox::Ok,QMessageBox::NoButton);
+					QApplication::exit(1);
+					return;
+				}
 			}
 		}
 
 		zeroTierClient = new ZeroTier::Node::LocalClient(authToken.c_str(),0,&handleZTMessage,this);
 	}
 
-	// TODO: do something more user-friendly here... or maybe try to restart
-	// the service?
-	if (++this->cyclesSinceResponseFromService == 4)
-		QMessageBox::critical(this,"No Response from Service","The ZeroTier One service does not appear to be running.",QMessageBox::Ok,QMessageBox::NoButton);
+	if (++this->cyclesSinceResponseFromService >= 3) {
+		if (this->cyclesSinceResponseFromService == 3)
+			QMessageBox::warning(this,"Service Not Running","Can't connect to the ZeroTier One service. Is it running?",QMessageBox::Ok);
+		ui->noNetworksLabel->setVisible(true);
+		ui->noNetworksLabel->setText("Connecting to Service...");
+		ui->bottomContainerWidget->setVisible(false);
+		ui->networkListWidget->setVisible(false);
+	}
 
 	zeroTierClient->send("info");
 	zeroTierClient->send("listnetworks");
@@ -198,14 +235,14 @@ void MainWindow::customEvent(QEvent *event)
 	if (m->ztMessage.size() == 0)
 		return;
 
+	this->cyclesSinceResponseFromService = 0;
+
 	std::vector<std::string> hdr(ZeroTier::Node::LocalClient::splitLine(m->ztMessage[0]));
 	if (hdr.size() < 2)
 		return;
 	if (hdr[0] != "200")
 		return;
 
-	this->cyclesSinceResponseFromService = 0;
-
 	if (hdr[1] == "info") {
 		if (hdr.size() >= 3)
 			this->myAddress = hdr[2].c_str();
@@ -281,6 +318,11 @@ void MainWindow::customEvent(QEvent *event)
 		ui->noNetworksLabel->setVisible(true);
 	} else ui->noNetworksLabel->setVisible(false);
 
+	if (!ui->bottomContainerWidget->isVisible())
+		ui->bottomContainerWidget->setVisible(true);
+	if (!ui->networkListWidget->isVisible())
+		ui->networkListWidget->setVisible(true);
+
 	if (this->myAddress.size())
 		ui->addressButton->setText(this->myAddress);
 	else ui->addressButton->setText("          ");
@@ -292,14 +334,6 @@ void MainWindow::customEvent(QEvent *event)
 	st += QString::number(this->numPeers);
 	st += " direct links to peers";
 	ui->statusLabel->setText(st);
-
-	if (this->myStatus == "ONLINE") {
-		if (!this->isEnabled())
-			this->setEnabled(true);
-	} else {
-		if (this->isEnabled())
-			this->setEnabled(false);
-	}
 }
 
 void MainWindow::on_joinNetworkButton_clicked()
@@ -363,3 +397,12 @@ void MainWindow::on_addressButton_clicked()
 {
 	QApplication::clipboard()->setText(this->myAddress);
 }
+
+void MainWindow::on_actionQuick_Start_triggered()
+{
+	Ui::QuickstartDialog qd;
+	QDialog *qdd = new QDialog(this);
+	qd.setupUi(qdd);
+	qdd->setModal(false);
+	qdd->show();
+}

ZeroTierUI/mainwindow.h

@@ -1,6 +1,6 @@
 /*
  * ZeroTier One - Global Peer to Peer Ethernet
- * Copyright (C) 2012-2013  ZeroTier Networks LLC
+ * Copyright (C) 2011-2014  ZeroTier Networks LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,6 +39,7 @@
 #include <vector>
 #include <string>
 
+#include "../node/Constants.hpp"
 #include "../node/Node.hpp"
 #include "../node/Utils.hpp"
 
@@ -50,6 +51,9 @@ class MainWindow;
 // Can be null if not connected, or will point to current
 extern ZeroTier::Node::LocalClient *zeroTierClient;
 
+// Globally visible pointer to main app window
+extern QMainWindow *mainWindow;
+
 class MainWindow : public QMainWindow
 {
 	Q_OBJECT
@@ -78,6 +82,7 @@ private slots:
 	void on_actionAbout_triggered();
 	void on_networkIdLineEdit_textChanged(const QString &text);
 	void on_addressButton_clicked();
+	void on_actionQuick_Start_triggered();
 
 private:
 	Ui::MainWindow *ui;
@@ -85,6 +90,7 @@ private:
 	QString myAddress;
 	QString myStatus;
 	QString myVersion;
+	bool firstTimerTick;
 	int pollServiceTimerId;
 	unsigned int numPeers;
 	unsigned int cyclesSinceResponseFromService;

ZeroTierUI/mainwindow.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>668</width>
+    <width>720</width>
     <height>300</height>
    </rect>
   </property>
@@ -36,43 +36,6 @@
     </property>
     <item>
      <widget class="QLabel" name="noNetworksLabel">
-      <property name="palette">
-       <palette>
-        <active>
-         <colorrole role="WindowText">
-          <brush brushstyle="SolidPattern">
-           <color alpha="64">
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
-           </color>
-          </brush>
-         </colorrole>
-        </active>
-        <inactive>
-         <colorrole role="WindowText">
-          <brush brushstyle="SolidPattern">
-           <color alpha="64">
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
-           </color>
-          </brush>
-         </colorrole>
-        </inactive>
-        <disabled>
-         <colorrole role="WindowText">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>127</red>
-            <green>127</green>
-            <blue>127</blue>
-           </color>
-          </brush>
-         </colorrole>
-        </disabled>
-       </palette>
-      </property>
       <property name="font">
        <font>
         <pointsize>16</pointsize>
@@ -106,16 +69,6 @@
       <property name="focusPolicy">
        <enum>Qt::NoFocus</enum>
       </property>
-      <property name="styleSheet">
-       <string notr="true">QListWidget#networkListWidget {
-	background-color: transparent;
-}
-
-QListWidget#networkListWidget::Item {
-	background-color: palette(base);
-	border: 0;
-}</string>
-      </property>
       <property name="frameShape">
        <enum>QFrame::NoFrame</enum>
       </property>
@@ -135,7 +88,7 @@ QListWidget#networkListWidget::Item {
        <enum>QAbstractItemView::ScrollPerPixel</enum>
       </property>
       <property name="spacing">
-       <number>2</number>
+       <number>0</number>
       </property>
       <property name="uniformItemSizes">
        <bool>true</bool>
@@ -161,7 +114,7 @@ QListWidget#networkListWidget::Item {
         <number>0</number>
        </property>
        <item>
-        <widget class="QPushButton" name="addressButton">
+        <widget class="QToolButton" name="addressButton">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -179,33 +132,14 @@ QListWidget#networkListWidget::Item {
          <property name="statusTip">
           <string>Your 10-digit ZeroTier address; click to copy to clipboard.</string>
          </property>
-         <property name="styleSheet">
-          <string notr="true">QPushButton {
-	border: 0;
-	text-align: left;
-	padding: 0 5px 0 5px;
-	margin: 0;
-	background-color: transparent;
-}
-
-QPushButton:focus {
-	background-color: rgba(0,0,0,15);
-}
-
-QPushButton:hover {
-	background-color: rgba(0,0,0,15);
-}
-
-QPushButton:pressed {
-	background-color: rgba(0,0,0,75);
-}
-s</string>
-         </property>
          <property name="text">
-          <string/>
+          <string notr="true">----------</string>
          </property>
-         <property name="flat">
-          <bool>true</bool>
+         <property name="toolButtonStyle">
+          <enum>Qt::ToolButtonTextOnly</enum>
+         </property>
+         <property name="class" stdset="0">
+          <string notr="true">clickToCopy</string>
          </property>
         </widget>
        </item>
@@ -225,11 +159,6 @@ s</string>
          <property name="statusTip">
           <string>Your network connection status.</string>
          </property>
-         <property name="styleSheet">
-          <string notr="true">padding: 0 0.75em 0 0.75em;
-margin: 0 4px 0 0;
-</string>
-         </property>
          <property name="text">
           <string/>
          </property>
@@ -267,7 +196,7 @@ margin: 0 4px 0 0;
         </widget>
        </item>
        <item>
-        <widget class="QPushButton" name="joinNetworkButton">
+        <widget class="QToolButton" name="joinNetworkButton">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -285,33 +214,9 @@ margin: 0 4px 0 0;
          <property name="statusTip">
           <string>Join this network.</string>
          </property>
-         <property name="styleSheet">
-          <string notr="true">QPushButton {
-	padding: 0 0.8em 0 0.8em;
-	margin: 0;
-	border: 0;
-	background-color: rgba(0,0,0,25);
-}
-
-QPushButton:focus {
-	background-color: rgba(0,0,0,33);
-}
-
-QPushButton:hover {
-	background-color: rgba(0,0,0,33);
-}
-
-QPushButton:pressed {
-	background-color: rgba(0,0,0,75);
-}
-</string>
-         </property>
          <property name="text">
           <string notr="true">+</string>
          </property>
-         <property name="flat">
-          <bool>true</bool>
-         </property>
         </widget>
        </item>
       </layout>
@@ -324,10 +229,15 @@ QPushButton:pressed {
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>668</width>
+     <width>720</width>
      <height>22</height>
     </rect>
    </property>
+   <property name="font">
+    <font>
+     <pointsize>12</pointsize>
+    </font>
+   </property>
    <property name="layoutDirection">
     <enum>Qt::LeftToRight</enum>
    </property>
@@ -336,6 +246,7 @@ QPushButton:pressed {
      <string>Help</string>
     </property>
     <addaction name="actionAbout"/>
+    <addaction name="actionQuick_Start"/>
    </widget>
    <widget class="QMenu" name="menuFile">
     <property name="title">
@@ -350,7 +261,7 @@ QPushButton:pressed {
   <widget class="QStatusBar" name="statusBar">
    <property name="font">
     <font>
-     <pointsize>12</pointsize>
+     <pointsize>10</pointsize>
     </font>
    </property>
   </widget>
@@ -364,6 +275,11 @@ QPushButton:pressed {
     <string>Exit</string>
    </property>
   </action>
+  <action name="actionQuick_Start">
+   <property name="text">
+    <string>Quick Start</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>

ZeroTierUI/networkwidget.cpp

@@ -1,6 +1,6 @@
 /*
  * ZeroTier One - Global Peer to Peer Ethernet
- * Copyright (C) 2012-2013  ZeroTier Networks LLC
+ * Copyright (C) 2011-2014  ZeroTier Networks LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,6 +28,8 @@
 #include "networkwidget.h"
 #include "mainwindow.h"
 #include "ui_networkwidget.h"
+#include "onetimedialog.h"
+#include "main.h"
 
 #include <QClipboard>
 #include <QString>
@@ -36,23 +38,38 @@
 #include <QProcess>
 #include <QList>
 #include <QMessageBox>
+#include <QFont>
+
+#include "../node/Constants.hpp"
 
 NetworkWidget::NetworkWidget(QWidget *parent,const std::string &nwid) :
 	QWidget(parent),
 	ui(new Ui::NetworkWidget),
-	networkIdStr(nwid)
+	networkIdStr(nwid),
+	publicWarningShown(false)
 {
 	ui->setupUi(this);
-	ui->networkIdPushButton->setText(QString(nwid.c_str()));
+	ui->networkIdButton->setText(QString(nwid.c_str()));
 
 	QFontMetrics fm(ui->ipListWidget->font());
 	int lineHeight = ui->ipListWidget->spacing() + fm.height();
 	ui->ipListWidget->setMinimumHeight(lineHeight * 4);
 	ui->ipListWidget->setMaximumHeight(lineHeight * 4);
 
+#ifdef __APPLE__
 	QWidgetList widgets = this->findChildren<QWidget*>();
 	foreach(QWidget* widget, widgets)
 		widget->setAttribute(Qt::WA_MacShowFocusRect,false);
+#endif
+
+#ifdef __WINDOWS__
+	QWidgetList widgets = this->findChildren<QWidget*>();
+	foreach(QWidget *widget, widgets) {
+		QFont font(widget->font());
+		font.setPointSizeF(font.pointSizeF() * 0.75);
+		widget->setFont(font);
+	}
+#endif
 }
 
 NetworkWidget::~NetworkWidget()
@@ -64,7 +81,7 @@ void NetworkWidget::setStatus(const std::string &status,const std::string &age)
 {
 	ui->statusLabel->setText(QString(status.c_str()));
 	if (status == "OK")
-		ui->ageLabel->setText(QString("(configuration is ") + age.c_str() + " seconds old)");
+		ui->ageLabel->setText(QString("[") + age.c_str() + "s ago]");
 	else ui->ageLabel->setText(QString());
 }
 
@@ -84,9 +101,15 @@ void NetworkWidget::setNetworkType(const std::string &type)
 	ui->networkTypeLabel->setText(QString(type.c_str()));
 	if (type == "?")
 		ui->networkTypeLabel->setStatusTip("Waiting for configuration...");
-	else if (type == "public")
+	else if (type == "public") {
+		if ((!publicWarningShown)&&(!settings->value("shown_publicWarning",false).toBool())) {
+			publicWarningShown = true;
+			OneTimeDialog *d = new OneTimeDialog(mainWindow,"shown_publicWarning","Security Notice","Security Notice:"ZT_EOL_S""ZT_EOL_S"You have joined a public network. Anyone can join these. We recommend making sure that your system's automatic software updates are enabled and turning off any shared network services that you do not want people to access.");
+			d->setModal(false);
+			d->show();
+		}
 		ui->networkTypeLabel->setStatusTip("This network can be joined by anyone in the world.");
-	else if (type == "private")
+	} else if (type == "private")
 		ui->networkTypeLabel->setStatusTip("This network is private; only authorized peers can join.");
 	else ui->networkTypeLabel->setStatusTip("Unknown network type.");
 }
@@ -138,13 +161,19 @@ void NetworkWidget::on_leaveNetworkButton_clicked()
 	}
 }
 
-void NetworkWidget::on_networkIdPushButton_clicked()
+void NetworkWidget::on_networkIdButton_clicked()
 {
-	QApplication::clipboard()->setText(ui->networkIdPushButton->text());
+	QApplication::clipboard()->setText(ui->networkIdButton->text());
 }
 
 void NetworkWidget::on_ipListWidget_itemActivated(QListWidgetItem *item)
 {
-		if (item)
-			QApplication::clipboard()->setText(item->text());
+	if (item)
+		QApplication::clipboard()->setText(item->text());
+}
+
+void NetworkWidget::on_ipListWidget_currentItemChanged(QListWidgetItem *current, QListWidgetItem *previous)
+{
+	if (current)
+		QApplication::clipboard()->setText(current->text());
 }