summaryrefslogtreecommitdiff
path: root/windows
diff options
context:
space:
mode:
Diffstat (limited to 'windows')
-rw-r--r--windows/TapDriver Package/TapDriver Package.vcxproj30
-rw-r--r--windows/TapDriver Package/TapDriver Package.vcxproj.filters8
-rw-r--r--windows/TapDriver/TapDriver.vcxproj5
-rw-r--r--windows/TapDriver/TapDriver.vcxproj.filters2
-rw-r--r--windows/TapDriver/config.h12
-rw-r--r--windows/TapDriver/constants.h1
-rw-r--r--windows/TapDriver/zttap200.inf (renamed from windows/TapDriver/ztTap100.inf)60
7 files changed, 37 insertions, 81 deletions
diff --git a/windows/TapDriver Package/TapDriver Package.vcxproj b/windows/TapDriver Package/TapDriver Package.vcxproj
index 3e311b48..3f0d1df0 100644
--- a/windows/TapDriver Package/TapDriver Package.vcxproj
+++ b/windows/TapDriver Package/TapDriver Package.vcxproj
@@ -195,36 +195,6 @@
<UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
</ProjectReference>
</ItemGroup>
- <ItemGroup>
- <None Include="..\Build\Win32\VistaRelease\ztTap100.sys">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Vista Debug|Win32'">false</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">false</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Vista Release|Win32'">false</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|Win32'">false</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win7 Release|Win32'">false</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">false</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Vista Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Vista Release|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win7 Release|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">true</ExcludedFromBuild>
- </None>
- <None Include="..\Build\x64\VistaRelease\ztTap100.sys">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Vista Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Vista Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win7 Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Vista Debug|x64'">false</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">false</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Vista Release|x64'">false</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|x64'">false</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win7 Release|x64'">false</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">false</ExcludedFromBuild>
- </None>
- </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
diff --git a/windows/TapDriver Package/TapDriver Package.vcxproj.filters b/windows/TapDriver Package/TapDriver Package.vcxproj.filters
index 44a2620e..e1b34f2a 100644
--- a/windows/TapDriver Package/TapDriver Package.vcxproj.filters
+++ b/windows/TapDriver Package/TapDriver Package.vcxproj.filters
@@ -6,12 +6,4 @@
<Extensions>inf;inv;inx;mof;mc;</Extensions>
</Filter>
</ItemGroup>
- <ItemGroup>
- <None Include="..\Build\x64\VistaRelease\ztTap100.sys">
- <Filter>Driver Files</Filter>
- </None>
- <None Include="..\Build\Win32\VistaRelease\ztTap100.sys">
- <Filter>Driver Files</Filter>
- </None>
- </ItemGroup>
</Project> \ No newline at end of file
diff --git a/windows/TapDriver/TapDriver.vcxproj b/windows/TapDriver/TapDriver.vcxproj
index 33421c84..ec1d9c45 100644
--- a/windows/TapDriver/TapDriver.vcxproj
+++ b/windows/TapDriver/TapDriver.vcxproj
@@ -173,9 +173,10 @@
<TimeStampServer>http://timestamp.digicert.com/</TimeStampServer>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Vista Release|x64'">
- <TargetName>ztTap100</TargetName>
+ <TargetName>zttap200</TargetName>
<OutDir>$(SolutionDir)\Build\$(Platform)\$(ConfigurationName)\</OutDir>
<TimeStampServer>http://timestamp.digicert.com/</TimeStampServer>
+ <DiagnosticMode>true</DiagnosticMode>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|x64'">
<TargetName>ztTap100</TargetName>
@@ -266,7 +267,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <Inf Include="ztTap100.inf" />
+ <Inf Include="zttap200.inf" />
</ItemGroup>
<ItemGroup>
<FilesToPackage Include="$(TargetPath)" />
diff --git a/windows/TapDriver/TapDriver.vcxproj.filters b/windows/TapDriver/TapDriver.vcxproj.filters
index 1b864a26..570ea727 100644
--- a/windows/TapDriver/TapDriver.vcxproj.filters
+++ b/windows/TapDriver/TapDriver.vcxproj.filters
@@ -68,7 +68,7 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
- <Inf Include="ztTap100.inf">
+ <Inf Include="zttap200.inf">
<Filter>Driver Files</Filter>
</Inf>
</ItemGroup>
diff --git a/windows/TapDriver/config.h b/windows/TapDriver/config.h
index 1dc6ac87..28bd73f6 100644
--- a/windows/TapDriver/config.h
+++ b/windows/TapDriver/config.h
@@ -1,12 +1,12 @@
-#define PRODUCT_NAME "ZeroTier One Ethernet Tap"
-#define PRODUCT_VERSION "1.0.0"
-#define PRODUCT_VERSION_RESOURCE 1,0,0,1
-#define PRODUCT_TAP_WIN_COMPONENT_ID "ztTap100"
-#define PRODUCT_TAP_WIN_MAJOR 1
+#define PRODUCT_NAME "ZeroTier One Virtual Network Port"
+#define PRODUCT_VERSION "2.0.0"
+#define PRODUCT_VERSION_RESOURCE 2,0,0,1
+#define PRODUCT_TAP_WIN_COMPONENT_ID "zttap200"
+#define PRODUCT_TAP_WIN_MAJOR 2
#define PRODUCT_TAP_WIN_MINOR 0
#define PRODUCT_TAP_WIN_PROVIDER "ZeroTier Networks"
#define PRODUCT_TAP_WIN_DEVICE_DESCRIPTION PRODUCT_NAME
-#define PRODUCT_TAP_WIN_RELDATE "01/20/2014"
+#define PRODUCT_TAP_WIN_RELDATE "01/22/2014"
#define TAP_DRIVER_MAJOR_VERSION PRODUCT_TAP_WIN_MAJOR
#define TAP_DRIVER_MINOR_VERSION PRODUCT_TAP_WIN_MINOR
diff --git a/windows/TapDriver/constants.h b/windows/TapDriver/constants.h
index 0e8d86f3..78174d25 100644
--- a/windows/TapDriver/constants.h
+++ b/windows/TapDriver/constants.h
@@ -47,6 +47,5 @@
#define PACKET_QUEUE_SIZE 64 // tap -> userspace queue size
#define IRP_QUEUE_SIZE 16 // max number of simultaneous i/o operations from userspace
-#define INJECT_QUEUE_SIZE 16 // DHCP/ARP -> tap injection queue
#define TAP_LITTLE_ENDIAN // affects ntohs, htonl, etc. functions
diff --git a/windows/TapDriver/ztTap100.inf b/windows/TapDriver/zttap200.inf
index cf31e9ff..fdd05f53 100644
--- a/windows/TapDriver/ztTap100.inf
+++ b/windows/TapDriver/zttap200.inf
@@ -3,39 +3,39 @@ Signature="$WINDOWS NT$"
Class=Net
ClassGuid={4d36e972-e325-11ce-bfc1-08002be10318}
Provider=%Provider%
-CatalogFile=ztTap100.cat
-
+CatalogFile=zttap200.cat
[Strings]
-DeviceDescription = "ZeroTier One Ethernet Tap"
-Provider = "ZeroTier Networks"
+DeviceDescription = "ZeroTier One Virtual Network Port"
+Provider = "ZeroTier Networks LLC"
+; To build for x86, take NTamd64 off this and off the named section manually, build, then put it back!
[Manufacturer]
-%Provider%=ztTap100,NTamd64
+%Provider%=zttap200,NTamd64
-[ztTap100]
-%DeviceDescription%=ztTap100.ndi,ztTap100
+[zttap200]
+%DeviceDescription%=zttap200.ndi,zttap200
-[ztTap100.NTamd64]
-%DeviceDescription%=ztTap100.ndi,ztTap100
+[ztTap200.NTamd64]
+%DeviceDescription%=zttap200.ndi,zttap200
-[ztTap100.ndi]
-CopyFiles = ztTap100.driver,ztTap100.files
-AddReg = ztTap100.reg
-AddReg = ztTap100.params.reg
+[zttap200.ndi]
+CopyFiles = zttap200.driver,zttap200.files
+AddReg = zttap200.reg
+AddReg = zttap200.params.reg
Characteristics = 0x81
-[ztTap100.ndi.Services]
-AddService = ztTap100, 2, ztTap100.service
+[zttap200.ndi.Services]
+AddService = zttap200, 2, zttap200.service
-[ztTap100.reg]
-HKR, Ndi, Service, 0, "ztTap100"
+[zttap200.reg]
+HKR, Ndi, Service, 0, "zttap200"
HKR, Ndi\Interfaces, UpperRange, 0, "ndis5"
HKR, Ndi\Interfaces, LowerRange, 0, "ethernet"
HKR, , Manufacturer, 0, "%Provider%"
HKR, , ProductName, 0, "%DeviceDescription%"
-[ztTap100.params.reg]
+[zttap200.params.reg]
HKR, Ndi\params\MTU, ParamDesc, 0, "MTU"
HKR, Ndi\params\MTU, Type, 0, "int"
HKR, Ndi\params\MTU, Default, 0, "2800"
@@ -52,33 +52,27 @@ HKR, Ndi\params\MediaStatus\enum, "1", 0, "Always Connected"
HKR, Ndi\params\MAC, ParamDesc, 0, "MAC Address"
HKR, Ndi\params\MAC, Type, 0, "edit"
HKR, Ndi\params\MAC, Optional, 0, "1"
-HKR, Ndi\params\AllowNonAdmin, ParamDesc, 0, "Non-Admin Access"
-HKR, Ndi\params\AllowNonAdmin, Type, 0, "enum"
-HKR, Ndi\params\AllowNonAdmin, Default, 0, "0"
-HKR, Ndi\params\AllowNonAdmin, Optional, 0, "0"
-HKR, Ndi\params\AllowNonAdmin\enum, "0", 0, "Not Allowed"
-HKR, Ndi\params\AllowNonAdmin\enum, "1", 0, "Allowed"
-[ztTap100.service]
+[zttap200.service]
DisplayName = %DeviceDescription%
ServiceType = 1
StartType = 3
ErrorControl = 1
LoadOrderGroup = NDIS
-ServiceBinary = %12%\ztTap100.sys
+ServiceBinary = %12%\zttap200.sys
[SourceDisksNames]
-1 = %DeviceDescription%, ztTap100.sys
+1 = %DeviceDescription%, zttap200.sys
[SourceDisksFiles]
-ztTap100.sys = 1
+zttap200.sys = 1
[DestinationDirs]
-ztTap100.files = 11
-ztTap100.driver = 12
+zttap200.files = 11
+zttap200.driver = 12
-[ztTap100.files]
+[zttap200.files]
;
-[ztTap100.driver]
-ztTap100.sys,,,6 ; COPYFLG_NOSKIP | COPYFLG_NOVERSIONCHECK
+[zttap200.driver]
+zttap200.sys,,,6 ; COPYFLG_NOSKIP | COPYFLG_NOVERSIONCHECK
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 21:15:39 +0000