Clean up...

6 files changed, 5 insertions, 171 deletions

diff --git a/.gitignore b/.gitignore
index 9d6f45ca..5659e573 100755
--- a/.gitignore
+++ b/.gitignore
@@ -6,12 +6,13 @@ zerotier-*
 *.dSYM
 mac-tap/tuntap/src/tap/tap
 mac-tap/tuntap/tap.kext
-/ZeroTierOne.sdf
 /ipch
+/ZeroTierOne.sdf
 /ZeroTierOne.v11.suo
-/ZeroTierOne.opensdf
 /vsprojects/SelfTest/Debug
-/vsprojects/SelfTest/SelfTest.vcxproj.user
+/vsprojects/SelfTest/Release
 /Debug
 /Release
-/vsprojects/SelfTest/Release
+*.log
+*.opensdf
+*.user
diff --git a/ZeroTierOne.sln b/ZeroTierOne.sln
index 2c6fd426..352e74c5 100644
--- a/ZeroTierOne.sln
+++ b/ZeroTierOne.sln
@@ -3,8 +3,6 @@ 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}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EthTapDevelopment", "vsprojects\EthTapDevelopment\EthTapDevelopment.vcxproj", "{055CA606-B5C0-443A-8741-60EB753A3F3C}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -55,36 +53,6 @@ Global
 		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win8 Release|Win32.Build.0 = Release|Win32
 		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win8 Release|Win32.Deploy.0 = Release|Win32
 		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win8 Release|x64.ActiveCfg = Release|Win32
-		{055CA606-B5C0-443A-8741-60EB753A3F3C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{055CA606-B5C0-443A-8741-60EB753A3F3C}.Debug|Win32.Build.0 = Debug|Win32
-		{055CA606-B5C0-443A-8741-60EB753A3F3C}.Debug|x64.ActiveCfg = Debug|Win32
-		{055CA606-B5C0-443A-8741-60EB753A3F3C}.Release|Win32.ActiveCfg = Release|Win32
-		{055CA606-B5C0-443A-8741-60EB753A3F3C}.Release|Win32.Build.0 = Release|Win32
-		{055CA606-B5C0-443A-8741-60EB753A3F3C}.Release|x64.ActiveCfg = Release|Win32
-		{055CA606-B5C0-443A-8741-60EB753A3F3C}.Vista Debug|Win32.ActiveCfg = Debug|Win32
-		{055CA606-B5C0-443A-8741-60EB753A3F3C}.Vista Debug|Win32.Build.0 = Debug|Win32
-		{055CA606-B5C0-443A-8741-60EB753A3F3C}.Vista Debug|Win32.Deploy.0 = Debug|Win32
-		{055CA606-B5C0-443A-8741-60EB753A3F3C}.Vista Debug|x64.ActiveCfg = Debug|Win32
-		{055CA606-B5C0-443A-8741-60EB753A3F3C}.Vista Release|Win32.ActiveCfg = Release|Win32
-		{055CA606-B5C0-443A-8741-60EB753A3F3C}.Vista Release|Win32.Build.0 = Release|Win32
-		{055CA606-B5C0-443A-8741-60EB753A3F3C}.Vista Release|Win32.Deploy.0 = Release|Win32
-		{055CA606-B5C0-443A-8741-60EB753A3F3C}.Vista Release|x64.ActiveCfg = Release|Win32
-		{055CA606-B5C0-443A-8741-60EB753A3F3C}.Win7 Debug|Win32.ActiveCfg = Debug|Win32
-		{055CA606-B5C0-443A-8741-60EB753A3F3C}.Win7 Debug|Win32.Build.0 = Debug|Win32
-		{055CA606-B5C0-443A-8741-60EB753A3F3C}.Win7 Debug|Win32.Deploy.0 = Debug|Win32
-		{055CA606-B5C0-443A-8741-60EB753A3F3C}.Win7 Debug|x64.ActiveCfg = Debug|Win32
-		{055CA606-B5C0-443A-8741-60EB753A3F3C}.Win7 Release|Win32.ActiveCfg = Release|Win32
-		{055CA606-B5C0-443A-8741-60EB753A3F3C}.Win7 Release|Win32.Build.0 = Release|Win32
-		{055CA606-B5C0-443A-8741-60EB753A3F3C}.Win7 Release|Win32.Deploy.0 = Release|Win32
-		{055CA606-B5C0-443A-8741-60EB753A3F3C}.Win7 Release|x64.ActiveCfg = Release|Win32
-		{055CA606-B5C0-443A-8741-60EB753A3F3C}.Win8 Debug|Win32.ActiveCfg = Debug|Win32
-		{055CA606-B5C0-443A-8741-60EB753A3F3C}.Win8 Debug|Win32.Build.0 = Debug|Win32
-		{055CA606-B5C0-443A-8741-60EB753A3F3C}.Win8 Debug|Win32.Deploy.0 = Debug|Win32
-		{055CA606-B5C0-443A-8741-60EB753A3F3C}.Win8 Debug|x64.ActiveCfg = Debug|Win32
-		{055CA606-B5C0-443A-8741-60EB753A3F3C}.Win8 Release|Win32.ActiveCfg = Release|Win32
-		{055CA606-B5C0-443A-8741-60EB753A3F3C}.Win8 Release|Win32.Build.0 = Release|Win32
-		{055CA606-B5C0-443A-8741-60EB753A3F3C}.Win8 Release|Win32.Deploy.0 = Release|Win32
-		{055CA606-B5C0-443A-8741-60EB753A3F3C}.Win8 Release|x64.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/vsprojects/EthTapDevelopment/EthTapDevelopment.cpp b/vsprojects/EthTapDevelopment/EthTapDevelopment.cpp
deleted file mode 100644
index f68c6c69..00000000
--- a/vsprojects/EthTapDevelopment/EthTapDevelopment.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-
-#include <tchar.h>
-
-#include <WinSock2.h>
-#include <Windows.h>
-
-int _tmain(int argc, _TCHAR* argv[])
-{
-	return 0;
-}
diff --git a/vsprojects/EthTapDevelopment/EthTapDevelopment.vcxproj b/vsprojects/EthTapDevelopment/EthTapDevelopment.vcxproj
deleted file mode 100644
index ba56bb0b..00000000
--- a/vsprojects/EthTapDevelopment/EthTapDevelopment.vcxproj
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{055CA606-B5C0-443A-8741-60EB753A3F3C}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>EthTapDevelopment</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="targetver.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="EthTapDevelopment.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vsprojects/EthTapDevelopment/EthTapDevelopment.vcxproj.filters b/vsprojects/EthTapDevelopment/EthTapDevelopment.vcxproj.filters
deleted file mode 100644
index f20a8838..00000000
--- a/vsprojects/EthTapDevelopment/EthTapDevelopment.vcxproj.filters
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="targetver.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="EthTapDevelopment.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/vsprojects/EthTapDevelopment/targetver.h b/vsprojects/EthTapDevelopment/targetver.h
deleted file mode 100644
index 87c0086d..00000000
--- a/vsprojects/EthTapDevelopment/targetver.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-// Including SDKDDKVer.h defines the highest available Windows platform.
-
-// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
-// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
-
-#include <SDKDDKVer.h>