GitHub issue #241 -- and also some appearance updates. Eventually this might get replaced by a native Mac app.

ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>14E46</string>
+	<string>15B42</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -22,26 +22,35 @@
 	<string>1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>6E35b</string>
+	<string>7B1005</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>14D125</string>
+	<string>15A278</string>
 	<key>DTSDKName</key>
-	<string>macosx10.10</string>
+	<string>macosx10.11</string>
 	<key>DTXcode</key>
-	<string>0640</string>
+	<string>0711</string>
 	<key>DTXcodeBuild</key>
-	<string>6E35b</string>
+	<string>7B1005</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.7</string>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/_CodeSignature/CodeResources

@@ -30,7 +30,7 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			kkFJZm0JXF9gTUF2keyMJQ9p9SY=
+			8JZXf4/3df3LD+o74Y8WM0dV8io=
 			</data>
 			<key>optional</key>
 			<true/>
@@ -39,7 +39,7 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			42zB9+COYMmPW0WlnU1juN2B9SA=
+			7dgumnPDtoIzhi9QoaFhDvCo9ys=
 			</data>
 			<key>optional</key>
 			<true/>
@@ -73,7 +73,7 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			kkFJZm0JXF9gTUF2keyMJQ9p9SY=
+			8JZXf4/3df3LD+o74Y8WM0dV8io=
 			</data>
 			<key>optional</key>
 			<true/>
@@ -82,7 +82,7 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			42zB9+COYMmPW0WlnU1juN2B9SA=
+			7dgumnPDtoIzhi9QoaFhDvCo9ys=
 			</data>
 			<key>optional</key>
 			<true/>

ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.pbxproj

@@ -269,7 +269,7 @@
 		FAE451B114BA79C600190544 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0450;
+				LastUpgradeCheck = 0710;
 				ORGANIZATIONNAME = Twitter;
 			};
 			buildConfigurationList = FAE451B414BA79C600190544 /* Build configuration list for PBXProject "MacGap" */;
@@ -374,9 +374,9 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				CLANG_ENABLE_OBJC_ARC = YES;
 				COPY_PHASE_STRIP = NO;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
@@ -402,7 +402,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				CLANG_ENABLE_OBJC_ARC = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -434,6 +433,7 @@
 				GCC_VERSION = "";
 				INFOPLIST_FILE = "MacGap/MacGap-Info.plist";
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.zerotier.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "ZeroTier One";
 				SDKROOT = macosx;
 				WRAPPER_EXTENSION = app;
@@ -455,6 +455,7 @@
 				GCC_VERSION = "";
 				INFOPLIST_FILE = "MacGap/MacGap-Info.plist";
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.zerotier.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "ZeroTier One";
 				SDKROOT = macosx;
 				WRAPPER_EXTENSION = app;

ext/mac-ui-macgap1-wrapper/src/MacGap/AppDelegate.m

@@ -32,6 +32,7 @@
 
 - (void) applicationDidFinishLaunching:(NSNotification *)aNotification { 
     char buf[16384],userAuthTokenPath[4096];
+    struct stat systemAuthTokenStat,userAuthTokenStat;
 
     FILE *pf = fopen("/Library/Application Support/ZeroTier/One/zerotier-one.port","r");
     long port = 9993; // default
@@ -50,14 +51,27 @@
     const char *homeDir = getenv("HOME");
     if (homeDir) {
         snprintf(userAuthTokenPath,sizeof(userAuthTokenPath),"%s/Library/Application Support/ZeroTier/One/authtoken.secret",homeDir);
-        pf = fopen(userAuthTokenPath,"r");
+
-        if (pf) {
+        bool userAuthTokenOutOfDate = false;
-            long n = fread(buf,1,sizeof(buf)-1,pf);
+        memset(&systemAuthTokenStat,0,sizeof(systemAuthTokenStat));
-            if (n > 0) {
+        memset(&userAuthTokenStat,0,sizeof(userAuthTokenStat));
-                buf[n] = (char)0;
+        if (stat("/Library/Application Support/ZeroTier/One/authtoken.secret",&systemAuthTokenStat) == 0) {
-                snprintf(url,sizeof(url),"http://127.0.0.1:%ld/index.html?authToken=%s",port,buf);
+            if (stat(userAuthTokenPath,&userAuthTokenStat) == 0) {
+                if (userAuthTokenStat.st_mtimespec.tv_sec < systemAuthTokenStat.st_mtimespec.tv_sec)
+                    userAuthTokenOutOfDate = true;
+            }
+        }
+
+        if (!userAuthTokenOutOfDate) {
+            pf = fopen(userAuthTokenPath,"r");
+            if (pf) {
+                long n = fread(buf,1,sizeof(buf)-1,pf);
+                if (n > 0) {
+                    buf[n] = (char)0;
+                    snprintf(url,sizeof(url),"http://127.0.0.1:%ld/index.html?authToken=%s",port,buf);
+                }
+                fclose(pf);
             }
-            fclose(pf);
         }
     }
 

ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/ContentView.m

@@ -39,11 +39,11 @@
     [self.webView setApplicationNameForUserAgent: @"MacGap"];
     
 	self.delegate = [[WebViewDelegate alloc] initWithMenu:[NSApp mainMenu]];
-	[self.webView setFrameLoadDelegate:self.delegate];
+//	[self.webView setFrameLoadDelegate:self.delegate];
-	[self.webView setUIDelegate:self.delegate];
+//	[self.webView setUIDelegate:self.delegate];
-	[self.webView setResourceLoadDelegate:self.delegate];
+//	[self.webView setResourceLoadDelegate:self.delegate];
-	[self.webView setDownloadDelegate:self.delegate];
+//	[self.webView setDownloadDelegate:self.delegate];
-	[self.webView setPolicyDelegate:self.delegate];	
+//	[self.webView setPolicyDelegate:self.delegate];
     [self.webView setDrawsBackground:NO];
     [self.webView setShouldCloseWithWindow:NO];
     

ext/mac-ui-macgap1-wrapper/src/MacGap/MacGap-Info.plist

@@ -2,14 +2,14 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleIconFile</key>
-	<string>ZeroTierIcon</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
 	<string>ZeroTier One</string>
+	<key>CFBundleIconFile</key>
+	<string>ZeroTierIcon</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.zerotier.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -30,5 +30,10 @@
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 </dict>
 </plist>

ext/mac-ui-macgap1-wrapper/src/MacGap/en.lproj/Window.xib

@@ -1,337 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9060" systemVersion="15B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
-	<data>
+    <dependencies>
-		<int key="IBDocument.SystemTarget">1070</int>
+        <deployment identifier="macosx"/>
-		<string key="IBDocument.SystemVersion">11C74</string>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9060"/>
-		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
+        <plugIn identifier="com.apple.WebKitIBPlugin" version="9060"/>
-		<string key="IBDocument.AppKitVersion">1138.23</string>
+    </dependencies>
-		<string key="IBDocument.HIToolboxVersion">567.00</string>
+    <objects>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+        <customObject id="-2" userLabel="File's Owner" customClass="WindowController">
-			<bool key="EncodedWithXMLCoder">YES</bool>
+            <connections>
-			<object class="NSArray" key="dict.sortedKeys">
+                <outlet property="contentView" destination="2" id="23"/>
-				<bool key="EncodedWithXMLCoder">YES</bool>
+                <outlet property="window" destination="1" id="25"/>
-				<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+            </connections>
-				<string>com.apple.WebKitIBPlugin</string>
+        </customObject>
-			</object>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-			<object class="NSMutableArray" key="dict.values">
+        <customObject id="-3" userLabel="Application"/>
-				<bool key="EncodedWithXMLCoder">YES</bool>
+        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" animationBehavior="default" id="1">
-				<string>1938</string>
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
-				<string>822</string>
+            <rect key="contentRect" x="575" y="564" width="500" height="700"/>
-			</object>
+            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1178"/>
-		</object>
+            <value key="minSize" type="size" width="500" height="700"/>
-		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
+            <value key="maxSize" type="size" width="500" height="700"/>
-			<bool key="EncodedWithXMLCoder">YES</bool>
+            <view key="contentView" id="2" customClass="ContentView">
-			<string>NSWindowTemplate</string>
+                <rect key="frame" x="0.0" y="0.0" width="500" height="700"/>
-			<string>NSView</string>
+                <autoresizingMask key="autoresizingMask"/>
-			<string>NSCustomObject</string>
+                <subviews>
-			<string>WebView</string>
+                    <webView id="5">
-		</object>
+                        <rect key="frame" x="0.0" y="0.0" width="500" height="700"/>
-		<object class="NSArray" key="IBDocument.PluginDependencies">
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-			<bool key="EncodedWithXMLCoder">YES</bool>
+                        <animations/>
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                        <webPreferences key="preferences" defaultFontSize="12" defaultFixedFontSize="12"/>
-			<string>com.apple.WebKitIBPlugin</string>
+                    </webView>
-		</object>
+                </subviews>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+                <animations/>
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+                <connections>
-			<integer value="1" key="NS.object.0"/>
+                    <outlet property="webView" destination="5" id="19"/>
-		</object>
+                </connections>
-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+            </view>
-			<bool key="EncodedWithXMLCoder">YES</bool>
+            <connections>
-			<object class="NSCustomObject" id="1001">
+                <binding destination="-2" name="title" keyPath="contentView.webView.mainFrameTitle" id="31"/>
-				<string key="NSClassName">WindowController</string>
+            </connections>
-			</object>
+        </window>
-			<object class="NSCustomObject" id="1003">
+    </objects>
-				<string key="NSClassName">FirstResponder</string>
+</document>
-			</object>
-			<object class="NSCustomObject" id="1004">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSWindowTemplate" id="1005">
-				<int key="NSWindowStyleMask">15</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{196, 240}, {758, 410}}</string>
-				<int key="NSWTFlags">544735232</int>
-				<string key="NSWindowTitle">Window</string>
-				<string key="NSWindowClass">NSWindow</string>
-				<nil key="NSViewClass"/>
-				<nil key="NSUserInterfaceItemIdentifier"/>
-				<object class="NSView" key="NSWindowView" id="1006">
-					<reference key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<object class="NSMutableArray" key="NSSubviews">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="WebView" id="807146547">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">274</int>
-							<object class="NSMutableSet" key="NSDragTypes">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSArray" key="set.sortedObjects">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>Apple HTML pasteboard type</string>
-									<string>Apple PDF pasteboard type</string>
-									<string>Apple PICT pasteboard type</string>
-									<string>Apple URL pasteboard type</string>
-									<string>Apple Web Archive pasteboard type</string>
-									<string>NSColor pasteboard type</string>
-									<string>NSFilenamesPboardType</string>
-									<string>NSStringPboardType</string>
-									<string>NeXT RTFD pasteboard type</string>
-									<string>NeXT Rich Text Format v1.0 pasteboard type</string>
-									<string>NeXT TIFF v4.0 pasteboard type</string>
-									<string>WebURLsWithTitlesPboardType</string>
-									<string>public.png</string>
-									<string>public.url</string>
-									<string>public.url-name</string>
-								</object>
-							</object>
-							<string key="NSFrameSize">{758, 410}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView"/>
-							<int key="NSViewLayerContentsRedrawPolicy">2</int>
-							<string key="NSReuseIdentifierKey">_NS:51</string>
-							<string key="FrameName"/>
-							<string key="GroupName"/>
-							<object class="WebPreferences" key="Preferences">
-								<string key="Identifier"/>
-								<object class="NSMutableDictionary" key="Values">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<object class="NSArray" key="dict.sortedKeys">
-										<bool key="EncodedWithXMLCoder">YES</bool>
-										<string>WebKitDefaultFixedFontSize</string>
-										<string>WebKitDefaultFontSize</string>
-										<string>WebKitMinimumFontSize</string>
-									</object>
-									<object class="NSMutableArray" key="dict.values">
-										<bool key="EncodedWithXMLCoder">YES</bool>
-										<integer value="12"/>
-										<integer value="12"/>
-										<integer value="1"/>
-									</object>
-								</object>
-							</object>
-							<bool key="UseBackForwardList">YES</bool>
-							<bool key="AllowsUndo">YES</bool>
-						</object>
-					</object>
-					<string key="NSFrameSize">{758, 410}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
-					<reference key="NSNextKeyView" ref="807146547"/>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
-				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
-				<int key="NSWindowCollectionBehavior">128</int>
-				<bool key="NSWindowIsRestorable">YES</bool>
-			</object>
-		</object>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<object class="NSMutableArray" key="connectionRecords">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">contentView</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="1006"/>
-					</object>
-					<int key="connectionID">23</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">window</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="1005"/>
-					</object>
-					<int key="connectionID">25</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">title: contentView.webView.mainFrameTitle</string>
-						<reference key="source" ref="1005"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="1005"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">title: contentView.webView.mainFrameTitle</string>
-							<string key="NSBinding">title</string>
-							<string key="NSKeyPath">contentView.webView.mainFrameTitle</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">31</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">webView</string>
-						<reference key="source" ref="1006"/>
-						<reference key="destination" ref="807146547"/>
-					</object>
-					<int key="connectionID">19</int>
-				</object>
-			</object>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<object class="NSArray" key="orderedObjects">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<object class="NSArray" key="object" id="1002">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="1001"/>
-						<reference key="parent" ref="1002"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="1003"/>
-						<reference key="parent" ref="1002"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="1004"/>
-						<reference key="parent" ref="1002"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1</int>
-						<reference key="object" ref="1005"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1006"/>
-						</object>
-						<reference key="parent" ref="1002"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2</int>
-						<reference key="object" ref="1006"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="807146547"/>
-						</object>
-						<reference key="parent" ref="1005"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5</int>
-						<reference key="object" ref="807146547"/>
-						<reference key="parent" ref="1006"/>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="flattenedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>-1.IBPluginDependency</string>
-					<string>-2.IBPluginDependency</string>
-					<string>-3.IBPluginDependency</string>
-					<string>1.IBPluginDependency</string>
-					<string>1.IBWindowTemplateEditedContentRect</string>
-					<string>1.NSWindowTemplate.visibleAtLaunch</string>
-					<string>2.CustomClassName</string>
-					<string>2.IBPluginDependency</string>
-					<string>5.IBPluginDependency</string>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{357, 418}, {480, 270}}</string>
-					<integer value="1"/>
-					<string>ContentView</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.WebKitIBPlugin</string>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="unlocalizedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="1002"/>
-				<reference key="dict.values" ref="1002"/>
-			</object>
-			<nil key="activeLocalization"/>
-			<object class="NSMutableDictionary" key="localizations">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="1002"/>
-				<reference key="dict.values" ref="1002"/>
-			</object>
-			<nil key="sourceID"/>
-			<int key="maxID">31</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">ContentView</string>
-					<string key="superclassName">NSView</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">webView</string>
-						<string key="NS.object.0">WebView</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">webView</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">webView</string>
-							<string key="candidateClassName">WebView</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ContentView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">WebView</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">reloadFromOrigin:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">reloadFromOrigin:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">reloadFromOrigin:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/WebView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">WindowController</string>
-					<string key="superclassName">NSWindowController</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">contentView</string>
-						<string key="NS.object.0">ContentView</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">contentView</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">contentView</string>
-							<string key="candidateClassName">ContentView</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/WindowController.h</string>
-					</object>
-				</object>
-			</object>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-			<integer value="3000" key="NS.object.0"/>
-		</object>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-	</data>
-</archive>

ui/ZeroTierNetwork.jsx

@@ -4,19 +4,17 @@ var ZeroTierNetwork = React.createClass({
 	},
 
 	leaveNetwork: function(event) {
-		if (confirm("Are you sure you want to leave this network?")) {
+		Ajax.call({
-			Ajax.call({
+			url: 'network/'+this.props.nwid+'?auth='+this.props.authToken,
-				url: 'network/'+this.props.nwid+'?auth='+this.props.authToken,
+			cache: false,
-				cache: false,
+			type: 'DELETE',
-				type: 'DELETE',
+			success: function(data) {
-				success: function(data) {
+				if (this.props.onNetworkDeleted)
-					if (this.props.onNetworkDeleted)
+					this.props.onNetworkDeleted(this.props.nwid);
-						this.props.onNetworkDeleted(this.props.nwid);
+			}.bind(this),
-				}.bind(this),
+			error: function(error) {
-				error: function(error) {
+			}.bind(this)
-				}.bind(this)
+		});
-			});
-		}
 		event.preventDefault();
 	},
 

ui/ZeroTierNode.jsx

@@ -122,7 +122,6 @@ var ZeroTierNode = React.createClass({
 	},
 
 	componentDidMount: function() {
-		this.tabIndex = 0;
 		this.updateAll();
 		this.updateIntervalId = setInterval(this.updateAll,2500);
 	},
@@ -130,74 +129,19 @@ var ZeroTierNode = React.createClass({
 		clearInterval(this.updateIntervalId);
 	},
 	render: function() {
-		/* We implement tabs in a very simple way here with a React JSX conditional. The tabIndex
-		 * local variable indicates the tab, and switching it determines which set of things we
-		 * render in the main middle portion. On tab switch calls forceUpdate(). */
 		return (
 			<div className="zeroTierNode">
-				<div className="top">&nbsp;&nbsp;
-					<button disabled={this.tabIndex === 0} onClick={function() {this.tabIndex = 0; this.forceUpdate();}.bind(this)}>Networks</button>
-					<button disabled={this.tabIndex === 1} onClick={function() {this.tabIndex = 1; this.forceUpdate();}.bind(this)}>Peers</button>
-				</div>
 				<div className="middle"><div className="middleCell">
 					<div className="middleScroll">
-						{
+						<div className="networks" key="_networks">
-							(this.tabIndex === 1) ? (
+							{
-								<div className="peers" key="_peers">
+								this.state._networks.map(function(network) {
-									<div className="peerHeader" key="_peersHeader">
+									network['authToken'] = this.props.authToken;
-										<div className="f">Address</div>
+									network['onNetworkDeleted'] = this.handleNetworkDelete;
-										<div className="f">Version</div>
+									return React.createElement('div',{className: 'network',key: network.nwid},React.createElement(ZeroTierNetwork,network));
-										<div className="f">Latency</div>
+								}.bind(this))
-										<div className="f">Data&nbsp;Paths</div>
+							}
-										<div className="f">Last&nbsp;Unicast</div>
+						</div>
-										<div className="f">Last&nbsp;Multicast</div>
-										<div className="f">Role</div>
-									</div>
-									{
-										this.state._peers.map(function(peer) {
-											return (
-												<div className="peer" key={peer['address']}>
-													<div className="f zeroTierAddress">{peer['address']}</div>
-													<div className="f">{(peer['version'] === '-1.-1.-1') ? '-' : peer['version']}</div>
-													<div className="f">{peer['latency']}</div>
-													<div className="f">
-														{
-															(peer['paths'].length === 0) ? (
-																<div className="peerPath"></div>
-															) : (
-																<div>
-																{
-																	peer['paths'].map(function(path) {
-																		var cn = ((path.active)||(path.fixed)) ? (path.preferred ? 'peerPathPreferred' : 'peerPathActive') : 'peerPathInactive';
-																		return (
-																			<div className={cn}>{path.address}&nbsp;&nbsp;{this.ago(path.lastSend)}/{this.ago(path.lastReceive)}</div>
-																		);
-																	}.bind(this))
-																}
-																</div>
-															)
-														}
-													</div>
-													<div className="f">{this.ago(peer['lastUnicastFrame'])}</div>
-													<div className="f">{this.ago(peer['lastMulticastFrame'])}</div>
-													<div className="f">{peer['role']}</div>
-												</div>
-											);
-										}.bind(this))
-									}
-								</div>
-							) : (
-								<div className="networks" key="_networks">
-									{
-										this.state._networks.map(function(network) {
-											network['authToken'] = this.props.authToken;
-											network['onNetworkDeleted'] = this.handleNetworkDelete;
-											return React.createElement('div',{className: 'network',key: network.nwid},React.createElement(ZeroTierNetwork,network));
-										}.bind(this))
-									}
-								</div>
-							)
-						}
 					</div>
 				</div></div>
 				<div className="bottom">

ui/zerotier.css

@@ -25,34 +25,6 @@ html,body {
 	display: table;
 }
 
-.zeroTierNode > .top {
-	width: 100%;
-	overflow: hidden;
-	display: table-row;
-	white-space: nowrap;
-	background: #234447;
-	color: #ffffff;
-	padding: 0;
-	margin: 0;
-}
-.zeroTierNode > .top button {
-	display: inline-block;
-	padding: 0.25rem 0.75rem 0.25rem 0.75rem;
-	color: #ffffff;
-	margin: 0;
-	border: 0;
-	outline: none;
-	background: #234447;
-	font-size: 12pt;
-	cursor: pointer;
-}
-.zeroTierNode > .top button:hover {
-	background: #91a2a3;
-}
-.zeroTierNode > .top button:disabled {
-	background: #91a2a3;
-}
-
 .zeroTierNode > .middle {
 	width: 100%;
 	height: 100%;
@@ -65,6 +37,7 @@ html,body {
 	width: 100%;
 	height: 100%;
 	display: table-cell;
+	border-bottom: 1px solid #000000;
 }
 .zeroTierNode > .middle > .middleCell > .middleScroll {
 	display: block;
@@ -87,76 +60,19 @@ html,body {
 	border-collapse: collapse;
 }
 .zeroTierNode > .middle > .middleCell > .middleScroll > .networks > .network {
-	display: inline-block;
+	display: block;
+	border-top: 0.12rem solid #dddddd;
+	border-bottom: 0.12rem solid #dddddd;
 	padding: 0.25rem;
-	margin: 0.25rem 0 0 1%;
-	min-width: 31%;
-	max-width: 98%;
-	border: 1px solid #234447;
 	background: #ffffff;
 }
-.zeroTierNode > .middle > .middleCell > .middleScroll > .peers {
-	display: table;
-	width: 100%;
-	margin: 0;
-	border-collapse: collapse;
-}
-.zeroTierNode > .middle > .middleCell > .middleScroll > .peers > .peer {
-	width: 100%;
-	display: table-row;
-	background: #ffffff;
-}
-.zeroTierNode > .middle > .middleCell > .middleScroll > .peers > .peer:nth-child(odd) {
-	background: #f3f3f3;
-}
-.zeroTierNode > .middle > .middleCell > .middleScroll > .peers > .peer:nth-child(even) {
-}
-.zeroTierNode > .middle > .middleCell > .middleScroll > .peers > .peer .peerPathActive {
-	font-size: 8pt;
-	color: #555555;
-	font-style: italic;
-	font-family: monospace;
-	white-space: nowrap;
-}
-.zeroTierNode > .middle > .middleCell > .middleScroll > .peers > .peer .peerPathPreferred {
-	font-size: 8pt;
-	color: #000000;
-	font-family: monospace;
-	white-space: nowrap;
-}
-.zeroTierNode > .middle > .middleCell > .middleScroll > .peers > .peer .peerPathInactive {
-	font-size: 8pt;
-	font-family: monospace;
-	color: #aaaaaa;
-	font-style: italic;
-	text-decoration: line-through;
-	white-space: nowrap;
-}
-.zeroTierNode > .middle > .middleCell > .middleScroll > .peers > .peer > .f {
-	display: table-cell;
-	padding: 0.05rem 0.15rem 0.05rem 0.15rem;
-	font-size: 8pt;
-}
-.zeroTierNode > .middle > .middleCell > .middleScroll > .peers > .peerHeader {
-	width: 100%;
-	font-size: 8pt;
-	display: table-row;
-	background: #ffffff;
-	border-bottom: 1px solid #000000;
-}
-.zeroTierNode > .middle > .middleCell > .middleScroll > .peers > .peerHeader > .f {
-	display: table-cell;
-	font-size: 8pt;
-	padding: 0.05rem 0.15rem 0.05rem 0.15rem;
-	font-weight: bold;
-}
 
 .zeroTierNode > .bottom {
 	font-size: 12pt;
 	width: 100%;
 	overflow: hidden;
 	display: table-row;
-	background: #234447;
+	background: #000000;
 	color: #ffffff;
 }
 .zeroTierNode > .bottom > .left {
@@ -233,7 +149,7 @@ html,body {
 .zeroTierNetwork .networkInfo .networkId {
 	font-size: 11pt;
 	font-family: monospace;
-	color: #91a2a3;
+	color: #000000;
 }
 .zeroTierNetwork .networkInfo .networkName {
 	padding: 0 0 0 1rem;
@@ -271,7 +187,7 @@ html,body {
 .zeroTierNetwork .leaveNetworkButton {
 	padding: 0.25rem 0.5rem 0.25rem 0.5rem;
 	margin: 0.25rem 0 0 0;
-	font-size: 10pt;
+	font-size: 9pt;
 	background: #ffffff;
 	outline: none;
 	background: #ffb354;