From 2da6a7570b1bdbb99da9662c7e66c3028f342a5d Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Wed, 22 Jan 2014 18:38:45 -0800 Subject: More tap driver work, increment version number, remove old binaries since signatures may not have been valid. --- .../TapDriver Package/TapDriver Package.vcxproj | 30 -------- .../TapDriver Package.vcxproj.filters | 8 --- windows/TapDriver/TapDriver.vcxproj | 5 +- windows/TapDriver/TapDriver.vcxproj.filters | 2 +- windows/TapDriver/config.h | 12 ++-- windows/TapDriver/constants.h | 1 - windows/TapDriver/ztTap100.inf | 84 ---------------------- windows/TapDriver/zttap200.inf | 78 ++++++++++++++++++++ 8 files changed, 88 insertions(+), 132 deletions(-) delete mode 100644 windows/TapDriver/ztTap100.inf create mode 100644 windows/TapDriver/zttap200.inf (limited to 'windows') 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 @@ false - - - false - false - false - false - false - false - true - true - true - true - true - true - - - true - true - true - true - true - true - false - false - false - false - false - false - - 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 @@ inf;inv;inx;mof;mc; - - - Driver Files - - - Driver Files - - \ 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 @@ http://timestamp.digicert.com/ - ztTap100 + zttap200 $(SolutionDir)\Build\$(Platform)\$(ConfigurationName)\ http://timestamp.digicert.com/ + true ztTap100 @@ -266,7 +267,7 @@ - + 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 @@ - + Driver Files 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/ztTap100.inf deleted file mode 100644 index cf31e9ff..00000000 --- a/windows/TapDriver/ztTap100.inf +++ /dev/null @@ -1,84 +0,0 @@ -[Version] -Signature="$WINDOWS NT$" -Class=Net -ClassGuid={4d36e972-e325-11ce-bfc1-08002be10318} -Provider=%Provider% -CatalogFile=ztTap100.cat - - -[Strings] -DeviceDescription = "ZeroTier One Ethernet Tap" -Provider = "ZeroTier Networks" - -[Manufacturer] -%Provider%=ztTap100,NTamd64 - -[ztTap100] -%DeviceDescription%=ztTap100.ndi,ztTap100 - -[ztTap100.NTamd64] -%DeviceDescription%=ztTap100.ndi,ztTap100 - -[ztTap100.ndi] -CopyFiles = ztTap100.driver,ztTap100.files -AddReg = ztTap100.reg -AddReg = ztTap100.params.reg -Characteristics = 0x81 - -[ztTap100.ndi.Services] -AddService = ztTap100, 2, ztTap100.service - -[ztTap100.reg] -HKR, Ndi, Service, 0, "ztTap100" -HKR, Ndi\Interfaces, UpperRange, 0, "ndis5" -HKR, Ndi\Interfaces, LowerRange, 0, "ethernet" -HKR, , Manufacturer, 0, "%Provider%" -HKR, , ProductName, 0, "%DeviceDescription%" - -[ztTap100.params.reg] -HKR, Ndi\params\MTU, ParamDesc, 0, "MTU" -HKR, Ndi\params\MTU, Type, 0, "int" -HKR, Ndi\params\MTU, Default, 0, "2800" -HKR, Ndi\params\MTU, Optional, 0, "0" -HKR, Ndi\params\MTU, Min, 0, "100" -HKR, Ndi\params\MTU, Max, 0, "2800" -HKR, Ndi\params\MTU, Step, 0, "1" -HKR, Ndi\params\MediaStatus, ParamDesc, 0, "Media Status" -HKR, Ndi\params\MediaStatus, Type, 0, "enum" -HKR, Ndi\params\MediaStatus, Default, 0, "0" -HKR, Ndi\params\MediaStatus, Optional, 0, "0" -HKR, Ndi\params\MediaStatus\enum, "0", 0, "Application Controlled" -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] -DisplayName = %DeviceDescription% -ServiceType = 1 -StartType = 3 -ErrorControl = 1 -LoadOrderGroup = NDIS -ServiceBinary = %12%\ztTap100.sys - -[SourceDisksNames] -1 = %DeviceDescription%, ztTap100.sys - -[SourceDisksFiles] -ztTap100.sys = 1 - -[DestinationDirs] -ztTap100.files = 11 -ztTap100.driver = 12 - -[ztTap100.files] -; - -[ztTap100.driver] -ztTap100.sys,,,6 ; COPYFLG_NOSKIP | COPYFLG_NOVERSIONCHECK diff --git a/windows/TapDriver/zttap200.inf b/windows/TapDriver/zttap200.inf new file mode 100644 index 00000000..fdd05f53 --- /dev/null +++ b/windows/TapDriver/zttap200.inf @@ -0,0 +1,78 @@ +[Version] +Signature="$WINDOWS NT$" +Class=Net +ClassGuid={4d36e972-e325-11ce-bfc1-08002be10318} +Provider=%Provider% +CatalogFile=zttap200.cat + +[Strings] +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%=zttap200,NTamd64 + +[zttap200] +%DeviceDescription%=zttap200.ndi,zttap200 + +[ztTap200.NTamd64] +%DeviceDescription%=zttap200.ndi,zttap200 + +[zttap200.ndi] +CopyFiles = zttap200.driver,zttap200.files +AddReg = zttap200.reg +AddReg = zttap200.params.reg +Characteristics = 0x81 + +[zttap200.ndi.Services] +AddService = zttap200, 2, zttap200.service + +[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%" + +[zttap200.params.reg] +HKR, Ndi\params\MTU, ParamDesc, 0, "MTU" +HKR, Ndi\params\MTU, Type, 0, "int" +HKR, Ndi\params\MTU, Default, 0, "2800" +HKR, Ndi\params\MTU, Optional, 0, "0" +HKR, Ndi\params\MTU, Min, 0, "100" +HKR, Ndi\params\MTU, Max, 0, "2800" +HKR, Ndi\params\MTU, Step, 0, "1" +HKR, Ndi\params\MediaStatus, ParamDesc, 0, "Media Status" +HKR, Ndi\params\MediaStatus, Type, 0, "enum" +HKR, Ndi\params\MediaStatus, Default, 0, "0" +HKR, Ndi\params\MediaStatus, Optional, 0, "0" +HKR, Ndi\params\MediaStatus\enum, "0", 0, "Application Controlled" +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" + +[zttap200.service] +DisplayName = %DeviceDescription% +ServiceType = 1 +StartType = 3 +ErrorControl = 1 +LoadOrderGroup = NDIS +ServiceBinary = %12%\zttap200.sys + +[SourceDisksNames] +1 = %DeviceDescription%, zttap200.sys + +[SourceDisksFiles] +zttap200.sys = 1 + +[DestinationDirs] +zttap200.files = 11 +zttap200.driver = 12 + +[zttap200.files] +; + +[zttap200.driver] +zttap200.sys,,,6 ; COPYFLG_NOSKIP | COPYFLG_NOVERSIONCHECK -- cgit v1.2.3