35 files changed, 300 insertions, 22 deletions
diff --git a/ZeroTierUI/ZeroTierUI.pro b/ZeroTierUI/ZeroTierUI.pro
index fcdba8ca..7c907c06 100644
--- a/ZeroTierUI/ZeroTierUI.pro
+++ b/ZeroTierUI/ZeroTierUI.pro
@@ -19,7 +19,8 @@ SOURCES += main.cpp\
 
 HEADERS  += mainwindow.h \
     network.h \
-    aboutwindow.h
+    aboutwindow.h \
+    ../node/Node.hpp
 
 FORMS    += mainwindow.ui \
     network.ui \
diff --git a/ZeroTierUI/mainwindow.cpp b/ZeroTierUI/mainwindow.cpp
index 41d94987..bb2c263b 100644
--- a/ZeroTierUI/mainwindow.cpp
+++ b/ZeroTierUI/mainwindow.cpp
@@ -28,6 +28,7 @@ void MainWindow::on_actionAbout_triggered()
 
 void MainWindow::on_actionJoin_Network_triggered()
 {
+	// Does the same thing as clicking join button on main UI
 	on_joinNetworkButton_clicked();
 }
 
@@ -37,6 +38,35 @@ void MainWindow::on_actionShow_Detailed_Status_triggered()
 
 void MainWindow::on_networkIdLineEdit_textChanged(const QString &text)
 {
+	QString newText;
+	for(QString::const_iterator i(text.begin());i!=text.end();++i) {
+		switch(i->toLatin1()) {
+			case '0': newText.append('0'); break;
+			case '1': newText.append('1'); break;
+			case '2': newText.append('2'); break;
+			case '3': newText.append('3'); break;
+			case '4': newText.append('4'); break;
+			case '5': newText.append('5'); break;
+			case '6': newText.append('6'); break;
+			case '7': newText.append('7'); break;
+			case '8': newText.append('8'); break;
+			case '9': newText.append('9'); break;
+			case 'a': newText.append('a'); break;
+			case 'b': newText.append('b'); break;
+			case 'c': newText.append('c'); break;
+			case 'd': newText.append('d'); break;
+			case 'e': newText.append('e'); break;
+			case 'f': newText.append('f'); break;
+			case 'A': newText.append('a'); break;
+			case 'B': newText.append('b'); break;
+			case 'C': newText.append('c'); break;
+			case 'D': newText.append('d'); break;
+			case 'E': newText.append('e'); break;
+			case 'F': newText.append('f'); break;
+			default: break;
+		}
+	}
+	ui->networkIdLineEdit->setText(newText);
 }
 
 void MainWindow::on_statusAndAddressButton_clicked()
diff --git a/ZeroTierUI/mainwindow.ui b/ZeroTierUI/mainwindow.ui
index c9366ccf..d4824d59 100644
--- a/ZeroTierUI/mainwindow.ui
+++ b/ZeroTierUI/mainwindow.ui
@@ -64,6 +64,9 @@
         </rect>
        </property>
        <layout class="QVBoxLayout" name="verticalLayout_2">
+        <property name="spacing">
+         <number>0</number>
+        </property>
         <property name="leftMargin">
          <number>0</number>
         </property>
@@ -128,7 +131,7 @@
           <string notr="true">border: 0;</string>
          </property>
          <property name="text">
-          <string>0000000000    (OFFLINE, 0 peers)</string>
+          <string>0000000000    (OFFLINE, 0 peers)   </string>
          </property>
          <property name="toolButtonStyle">
           <enum>Qt::ToolButtonTextOnly</enum>
diff --git a/ZeroTierUI/network.cpp b/ZeroTierUI/network.cpp
index fed644db..3826a8da 100644
--- a/ZeroTierUI/network.cpp
+++ b/ZeroTierUI/network.cpp
@@ -1,8 +1,10 @@
 #include "network.h"
 #include "ui_network.h"
 
+#include <QClipboard>
+
 Network::Network(QWidget *parent) :
-	QScrollArea(parent),
+	QWidget(parent),
 	ui(new Ui::Network)
 {
 	ui->setupUi(this);
@@ -12,3 +14,12 @@ Network::~Network()
 {
 	delete ui;
 }
+
+void Network::on_leaveNetworkButton_clicked()
+{
+}
+
+void Network::on_networkIdPushButton_clicked()
+{
+	QApplication::clipboard()->setText(ui->networkIdPushButton->text());
+}
diff --git a/ZeroTierUI/network.h b/ZeroTierUI/network.h
index 9c7273a1..730b7982 100644
--- a/ZeroTierUI/network.h
+++ b/ZeroTierUI/network.h
@@ -1,13 +1,13 @@
 #ifndef NETWORK_H
 #define NETWORK_H
 
-#include <QScrollArea>
+#include <QWidget>
 
 namespace Ui {
 class Network;
 }
 
-class Network : public QScrollArea
+class Network : public QWidget
 {
 	Q_OBJECT
 
@@ -15,6 +15,11 @@ public:
 	explicit Network(QWidget *parent = 0);
 	~Network();
 
+private slots:
+	void on_leaveNetworkButton_clicked();
+
+	void on_networkIdPushButton_clicked();
+
 private:
 	Ui::Network *ui;
 };
diff --git a/ZeroTierUI/network.ui b/ZeroTierUI/network.ui
index cb8a93ca..1f80a4c8 100644
--- a/ZeroTierUI/network.ui
+++ b/ZeroTierUI/network.ui
@@ -1,31 +1,259 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>Network</class>
- <widget class="QScrollArea" name="Network">
+ <widget class="QWidget" name="Network">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>618</width>
-    <height>79</height>
+    <height>93</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle">
-   <string>ScrollArea</string>
+   <string>Network</string>
   </property>
-  <property name="widgetResizable">
+  <property name="widgetResizable" stdset="0">
    <bool>true</bool>
   </property>
-  <widget class="QWidget" name="scrollAreaWidgetContents">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>616</width>
-     <height>77</height>
-    </rect>
+  <layout class="QHBoxLayout" name="horizontalLayout_3">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="leftMargin">
+    <number>6</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>6</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
    </property>
-  </widget>
+   <item>
+    <widget class="QWidget" name="leftWidget" native="true">
+     <layout class="QFormLayout" name="formLayout">
+      <property name="fieldGrowthPolicy">
+       <enum>QFormLayout::ExpandingFieldsGrow</enum>
+      </property>
+      <property name="labelAlignment">
+       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+      </property>
+      <property name="formAlignment">
+       <set>Qt::AlignHCenter|Qt::AlignTop</set>
+      </property>
+      <property name="horizontalSpacing">
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing">
+       <number>2</number>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Network ID:</string>
+        </property>
+        <property name="textFormat">
+         <enum>Qt::PlainText</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QPushButton" name="networkIdPushButton">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="font">
+         <font>
+          <family>Courier</family>
+          <pointsize>13</pointsize>
+          <weight>75</weight>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="toolTip">
+         <string>Click to Copy to Clipboard</string>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">border: 0;
+padding: 0;
+margin: 0;
+text-align: left;</string>
+        </property>
+        <property name="text">
+         <string>0000000000000000</string>
+        </property>
+        <property name="flat">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>Status:</string>
+        </property>
+        <property name="textFormat">
+         <enum>Qt::PlainText</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QLabel" name="statusLabel">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="font">
+         <font>
+          <weight>75</weight>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>OK</string>
+        </property>
+        <property name="textFormat">
+         <enum>Qt::PlainText</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
+         <string>Device:</string>
+        </property>
+        <property name="textFormat">
+         <enum>Qt::PlainText</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1">
+       <widget class="QLabel" name="deviceLabel">
+        <property name="font">
+         <font>
+          <weight>75</weight>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>zt0</string>
+        </property>
+        <property name="textFormat">
+         <enum>Qt::PlainText</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="1">
+       <widget class="QWidget" name="leaveNetworkButtonContainerWidget" native="true">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <spacer name="horizontalSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QPushButton" name="leaveNetworkButton">
+           <property name="font">
+            <font>
+             <pointsize>10</pointsize>
+             <underline>true</underline>
+            </font>
+           </property>
+           <property name="styleSheet">
+            <string notr="true">padding: 0; margin: 0;</string>
+           </property>
+           <property name="text">
+            <string>Leave Network</string>
+           </property>
+           <property name="flat">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QListWidget" name="ipListWidget">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="font">
+      <font>
+       <family>Courier</family>
+       <pointsize>10</pointsize>
+      </font>
+     </property>
+     <property name="showDropIndicator" stdset="0">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
  </widget>
  <resources/>
  <connections/>
diff --git a/vsprojects/SelfTest/SelfTest.vcxproj b/windows/SelfTest/SelfTest.vcxproj
index db4e163f..db4e163f 100644
--- a/vsprojects/SelfTest/SelfTest.vcxproj
+++ b/windows/SelfTest/SelfTest.vcxproj
diff --git a/vsprojects/SelfTest/SelfTest.vcxproj.filters b/windows/SelfTest/SelfTest.vcxproj.filters
index fa8c8331..fa8c8331 100644
--- a/vsprojects/SelfTest/SelfTest.vcxproj.filters
+++ b/windows/SelfTest/SelfTest.vcxproj.filters
diff --git a/vsprojects/SelfTest/targetver.h b/windows/SelfTest/targetver.h
index 87c0086d..87c0086d 100644
--- a/vsprojects/SelfTest/targetver.h
+++ b/windows/SelfTest/targetver.h
diff --git a/vsprojects/TapDriver Package/TapDriver Package.vcxproj b/windows/TapDriver Package/TapDriver Package.vcxproj
index 6ac36e9e..6ac36e9e 100644
--- a/vsprojects/TapDriver Package/TapDriver Package.vcxproj
+++ b/windows/TapDriver Package/TapDriver Package.vcxproj
diff --git a/vsprojects/TapDriver Package/TapDriver Package.vcxproj.filters b/windows/TapDriver Package/TapDriver Package.vcxproj.filters
index e1b34f2a..e1b34f2a 100644
--- a/vsprojects/TapDriver Package/TapDriver Package.vcxproj.filters
+++ b/windows/TapDriver Package/TapDriver Package.vcxproj.filters
diff --git a/vsprojects/TapDriver/TapDriver.vcxproj b/windows/TapDriver/TapDriver.vcxproj
index 03357d5f..03357d5f 100644
--- a/vsprojects/TapDriver/TapDriver.vcxproj
+++ b/windows/TapDriver/TapDriver.vcxproj
diff --git a/vsprojects/TapDriver/TapDriver.vcxproj.filters b/windows/TapDriver/TapDriver.vcxproj.filters
index 4bac59db..4bac59db 100644
--- a/vsprojects/TapDriver/TapDriver.vcxproj.filters
+++ b/windows/TapDriver/TapDriver.vcxproj.filters
diff --git a/vsprojects/TapDriver/config.h b/windows/TapDriver/config.h
index 5a6ff247..5a6ff247 100644
--- a/vsprojects/TapDriver/config.h
+++ b/windows/TapDriver/config.h
diff --git a/vsprojects/TapDriver/constants.h b/windows/TapDriver/constants.h
index 698dc629..698dc629 100644
--- a/vsprojects/TapDriver/constants.h
+++ b/windows/TapDriver/constants.h
diff --git a/vsprojects/TapDriver/dhcp.c b/windows/TapDriver/dhcp.c
index f3c61d6f..f3c61d6f 100644
--- a/vsprojects/TapDriver/dhcp.c
+++ b/windows/TapDriver/dhcp.c
diff --git a/vsprojects/TapDriver/dhcp.h b/windows/TapDriver/dhcp.h
index 92e5ca87..92e5ca87 100644
--- a/vsprojects/TapDriver/dhcp.h
+++ b/windows/TapDriver/dhcp.h
diff --git a/vsprojects/TapDriver/endian.h b/windows/TapDriver/endian.h
index 0f7025d5..0f7025d5 100644
--- a/vsprojects/TapDriver/endian.h
+++ b/windows/TapDriver/endian.h
diff --git a/vsprojects/TapDriver/error.c b/windows/TapDriver/error.c
index e03fd114..e03fd114 100644
--- a/vsprojects/TapDriver/error.c
+++ b/windows/TapDriver/error.c
diff --git a/vsprojects/TapDriver/error.h b/windows/TapDriver/error.h
index 47f436c5..47f436c5 100644
--- a/vsprojects/TapDriver/error.h
+++ b/windows/TapDriver/error.h
diff --git a/vsprojects/TapDriver/instance.c b/windows/TapDriver/instance.c
index 33ef878f..33ef878f 100644
--- a/vsprojects/TapDriver/instance.c
+++ b/windows/TapDriver/instance.c
diff --git a/vsprojects/TapDriver/lock.h b/windows/TapDriver/lock.h
index e2a2029e..e2a2029e 100644
--- a/vsprojects/TapDriver/lock.h
+++ b/windows/TapDriver/lock.h
diff --git a/vsprojects/TapDriver/macinfo.c b/windows/TapDriver/macinfo.c
index fca53079..fca53079 100644
--- a/vsprojects/TapDriver/macinfo.c
+++ b/windows/TapDriver/macinfo.c
diff --git a/vsprojects/TapDriver/macinfo.h b/windows/TapDriver/macinfo.h
index ba843e8c..ba843e8c 100644
--- a/vsprojects/TapDriver/macinfo.h
+++ b/windows/TapDriver/macinfo.h
diff --git a/vsprojects/TapDriver/mem.c b/windows/TapDriver/mem.c
index c56304cc..c56304cc 100644
--- a/vsprojects/TapDriver/mem.c
+++ b/windows/TapDriver/mem.c
diff --git a/vsprojects/TapDriver/proto.h b/windows/TapDriver/proto.h
index 71916a96..71916a96 100644
--- a/vsprojects/TapDriver/proto.h
+++ b/windows/TapDriver/proto.h
diff --git a/vsprojects/TapDriver/prototypes.h b/windows/TapDriver/prototypes.h
index 50cc4610..50cc4610 100644
--- a/vsprojects/TapDriver/prototypes.h
+++ b/windows/TapDriver/prototypes.h
diff --git a/vsprojects/TapDriver/tap-windows.h b/windows/TapDriver/tap-windows.h
index ff1baf17..ff1baf17 100644
--- a/vsprojects/TapDriver/tap-windows.h
+++ b/windows/TapDriver/tap-windows.h
diff --git a/vsprojects/TapDriver/tapdrvr.c b/windows/TapDriver/tapdrvr.c
index 4781c872..4781c872 100644
--- a/vsprojects/TapDriver/tapdrvr.c
+++ b/windows/TapDriver/tapdrvr.c
diff --git a/vsprojects/TapDriver/testcert.pfx b/windows/TapDriver/testcert.pfx
index 74f6b471..74f6b471 100644
--- a/vsprojects/TapDriver/testcert.pfx
+++ b/windows/TapDriver/testcert.pfx
diff --git a/vsprojects/TapDriver/types.h b/windows/TapDriver/types.h
index 4867a3e4..4867a3e4 100644
--- a/vsprojects/TapDriver/types.h
+++ b/windows/TapDriver/types.h
diff --git a/vsprojects/TapDriver/ztTap100.inf b/windows/TapDriver/ztTap100.inf
index cf31e9ff..cf31e9ff 100644
--- a/vsprojects/TapDriver/ztTap100.inf
+++ b/windows/TapDriver/ztTap100.inf
diff --git a/ZeroTierOne.sln b/windows/ZeroTierOne.sln
index 90f8243b..80c9c9d3 100644
--- a/ZeroTierOne.sln
+++ b/windows/ZeroTierOne.sln
@@ -1,16 +1,16 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SelfTest", "vsprojects\SelfTest\SelfTest.vcxproj", "{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SelfTest", "SelfTest\SelfTest.vcxproj", "{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TapDriver", "vsprojects\TapDriver\TapDriver.vcxproj", "{689210B1-467C-4850-BB7D-2E10D5B4A3DA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TapDriver", "TapDriver\TapDriver.vcxproj", "{689210B1-467C-4850-BB7D-2E10D5B4A3DA}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TapDriver Package", "vsprojects\TapDriver Package\TapDriver Package.vcxproj", "{FDA1DD8D-1D56-4BC1-B402-FCC0B550D946}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TapDriver Package", "TapDriver Package\TapDriver Package.vcxproj", "{FDA1DD8D-1D56-4BC1-B402-FCC0B550D946}"
 	ProjectSection(ProjectDependencies) = postProject
 		{689210B1-467C-4850-BB7D-2E10D5B4A3DA} = {689210B1-467C-4850-BB7D-2E10D5B4A3DA}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZeroTierOne", "vsprojects\ZeroTierOne\ZeroTierOne.vcxproj", "{B00A4957-5977-4AC1-9EF4-571DC27EADA2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZeroTierOne", "ZeroTierOne\ZeroTierOne.vcxproj", "{B00A4957-5977-4AC1-9EF4-571DC27EADA2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/vsprojects/ZeroTierOne/ZeroTierOne.vcxproj b/windows/ZeroTierOne/ZeroTierOne.vcxproj
index 2d01154d..2d01154d 100644
--- a/vsprojects/ZeroTierOne/ZeroTierOne.vcxproj
+++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj
diff --git a/vsprojects/ZeroTierOne/ZeroTierOne.vcxproj.filters b/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters
index 67e668e1..67e668e1 100644
--- a/vsprojects/ZeroTierOne/ZeroTierOne.vcxproj.filters
+++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters