diff options
| author | dnobori <da.git@softether.co.jp> | 2015-05-31 13:02:35 +0300 |
|---|---|---|
| committer | dnobori <da.git@softether.co.jp> | 2015-05-31 13:02:35 +0300 |
| commit | ff497063732fdc08300c8bc166f4d4f62317e98a (patch) | |
| tree | cfadea91c0b83255d9f137e75903031bcb572744 /src/SeLow | |
| parent | 7785c41f3881f4527705c808c0e2a8d8a6e6d822 (diff) | |
v4.17-9562-beta
Diffstat (limited to 'src/SeLow')
| -rw-r--r-- | src/SeLow/SeLow.c | 3 | ||||
| -rw-r--r-- | src/SeLow/SeLow.vcproj | 16 | ||||
| -rw-r--r-- | src/SeLow/SeLowCommon.h | 5 |
3 files changed, 13 insertions, 11 deletions
diff --git a/src/SeLow/SeLow.c b/src/SeLow/SeLow.c index 6931fdba..92cea410 100644 --- a/src/SeLow/SeLow.c +++ b/src/SeLow/SeLow.c @@ -393,6 +393,7 @@ NTSTATUS SlDeviceOpenProc(DEVICE_OBJECT *device_object, IRP *irp) p.fAllocateNetBuffer = true;
p.ContextSize = 32 + sizeof(UINT32) * 12;
p.DataSize = SL_MAX_PACKET_SIZE;
+ p.PoolTag = 'SETH';
f->NetBufferListPool = NdisAllocateNetBufferListPool(NULL, &p);
@@ -1705,7 +1706,7 @@ void *SlMalloc(UINT size) }
// Allocate the non-paged memory
- r = NdisAllocateMemoryWithTag(&p, size, 0);
+ r = NdisAllocateMemoryWithTag(&p, size, 'SETH');
if (NG(r))
{
diff --git a/src/SeLow/SeLow.vcproj b/src/SeLow/SeLow.vcproj index a7719953..7d916054 100644 --- a/src/SeLow/SeLow.vcproj +++ b/src/SeLow/SeLow.vcproj @@ -21,7 +21,7 @@ <Configurations>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(SolutionDir)bin"
+ OutputDirectory="$(SolutionDir)BuiltDriverPackages\SeLow\x86"
IntermediateDirectory="$(PlatformName)_$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
@@ -72,7 +72,7 @@ />
<Tool
Name="VCPreLinkEventTool"
- CommandLine="$(SolutionDir)bin\BuildUtil.exe /CMD:GenerateVersionResource "$(TargetPath)" /OUT:"$(SolutionDir)tmp\VersionResources\$(ProjectName)_$(PlatformName).res""
+ CommandLine="$(SolutionDir)bin\BuildUtil.exe /CMD:GenerateVersionResource "$(TargetPath)" /OUT:"$(SolutionDir)tmp\VersionResources\$(ProjectName)_$(PlatformName).res" /PRODUCT:"SoftEther VPN""
/>
<Tool
Name="VCLinkerTool"
@@ -80,7 +80,7 @@ LinkLibraryDependencies="false"
AdditionalOptions="/driver /subsystem:native,5.00 /FULLBUILD /align:0x80 /osversion:5.00 /STACK:0x40000,0x1000 /MERGE:_PAGE=PAGE /MERGE:_TEXT=.text /NODEFAULTLIB /stub:C:\WINDDK\7600.16385.0\lib\win7\stub512.com"
AdditionalDependencies="bufferoverflowK.lib wdm.lib ndis.lib wdmsec.lib ntoskrnl.lib fwpkclnt.lib "$(SolutionDir)tmp\VersionResources\$(ProjectName)_$(PlatformName).res""
- OutputFile="$(OutDir)\hamcore\not_signed\SeLow_x86.sys"
+ OutputFile="$(OutDir)\SeLow_x86.sys"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\WINDDK\7600.16385.0\lib\win7\i386"
GenerateManifest="false"
@@ -121,12 +121,12 @@ />
<Tool
Name="VCPostBuildEventTool"
- CommandLine="$(SolutionDir)bin\BuildUtil.exe /CMD:SignCode "$(TargetPath)" /COMMENT:"VPN Software" /KERNEL:yes
$(SolutionDir)bin\BuildUtil.exe /CMD:SignSeLowInfFiles x86
"
+ CommandLine="$(SolutionDir)bin\BuildUtil.exe /CMD:SignCode "$(TargetPath)" /COMMENT:"VPN Software" /KERNEL:yes
"
/>
</Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory="$(SolutionDir)bin"
+ OutputDirectory="$(SolutionDir)BuiltDriverPackages\SeLow\x64"
IntermediateDirectory="$(PlatformName)_$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
@@ -178,7 +178,7 @@ />
<Tool
Name="VCPreLinkEventTool"
- CommandLine="$(SolutionDir)bin\BuildUtil.exe /CMD:GenerateVersionResource "$(TargetPath)" /OUT:"$(SolutionDir)tmp\VersionResources\$(ProjectName)_$(PlatformName).res""
+ CommandLine="$(SolutionDir)bin\BuildUtil.exe /CMD:GenerateVersionResource "$(TargetPath)" /OUT:"$(SolutionDir)tmp\VersionResources\$(ProjectName)_$(PlatformName).res" /PRODUCT:"SoftEther VPN""
/>
<Tool
Name="VCLinkerTool"
@@ -186,7 +186,7 @@ LinkLibraryDependencies="false"
AdditionalOptions="/driver /subsystem:native /FULLBUILD /align:0x80 /osversion:5.00 /STACK:0x40000,0x1000 /MERGE:_PAGE=PAGE /MERGE:_TEXT=.text /NODEFAULTLIB /stub:C:\WINDDK\7600.16385.0\lib\win7\stub512.com"
AdditionalDependencies="bufferoverflowK.lib wdm.lib ndis.lib wdmsec.lib ntoskrnl.lib fwpkclnt.lib "$(SolutionDir)tmp\VersionResources\$(ProjectName)_$(PlatformName).res""
- OutputFile="$(OutDir)\hamcore\not_signed\SeLow_x64.sys"
+ OutputFile="$(OutDir)\SeLow_x64.sys"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\WINDDK\7600.16385.0\lib\win7\amd64"
GenerateManifest="false"
@@ -227,7 +227,7 @@ />
<Tool
Name="VCPostBuildEventTool"
- CommandLine="$(SolutionDir)bin\BuildUtil.exe /CMD:SignCode "$(TargetPath)" /COMMENT:"VPN Software" /KERNEL:yes
$(SolutionDir)bin\BuildUtil.exe /CMD:SignSeLowInfFiles x64
"
+ CommandLine="$(SolutionDir)bin\BuildUtil.exe /CMD:SignCode "$(TargetPath)" /COMMENT:"VPN Software" /KERNEL:yes
"
/>
</Configuration>
</Configurations>
diff --git a/src/SeLow/SeLowCommon.h b/src/SeLow/SeLowCommon.h index b9cd1e8e..2e047160 100644 --- a/src/SeLow/SeLowCommon.h +++ b/src/SeLow/SeLowCommon.h @@ -115,10 +115,10 @@ // Change this number every time functions are added or modified on the driver.
// As long as this number does not change, installation of SeLow during the update
// installation of the VPN Server / VPN Client / VPN Bridge is skipped.
-#define SL_VER 43
+#define SL_VER 45
// Constants
-#define SL_MAX_PACKET_SIZE 1560
+#define SL_MAX_PACKET_SIZE 1600
#define SL_MAX_PACKET_SIZE_ANNOUNCE 1514
#define SL_MIN_PACKET_SIZE 14
#define SL_PACKET_HEADER_SIZE 14
@@ -155,6 +155,7 @@ typedef struct SL_IOCTL_EVENT_NAME // Registry key
#define SL_REG_KEY_NAME "SYSTEM\\CurrentControlSet\\services\\SeLow"
#define SL_REG_VER_VALUE "SlVersion"
+#define SL_REG_VER_VALUE_WIN10 "SlVersion_Win10"
// Adapter data
#define SL_ADAPTER_ID_LEN 64
|