adding cLSP class

AnwarMohamed · AnwarMohamed · commit 43f006a70003 · 2013-06-11T18:06:30.000+02:00
diff --git a/Packetyzer.h b/Packetyzer.h
@@ -79,6 +79,7 @@ namespace Packetyzer
 	{
 		class cWinpcapCapture;
 		class cLSPInstall;
+		class cLSP;
 	}
 
 	namespace Send
@@ -110,5 +111,6 @@ namespace Packetyzer
 
 #include "cWinpcapCapture.h"
 #include "cLSPInstall.h"
+#include "cLSP.h"
 
 #include "cWinpcapSend.h"
diff --git a/Packetyzer.sln b/Packetyzer.sln
@@ -14,6 +14,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VirusTotal-Checker", "Virus
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PacketyzerLSP", "PacketyzerLSP\PacketyzerLSP.vcxproj", "{CF41CA24-E07F-444B-B4C4-1ABEC258E9BD}"
+	ProjectSection(ProjectDependencies) = postProject
+		{68699F7C-9D1C-43C8-B680-F825115EB795} = {68699F7C-9D1C-43C8-B680-F825115EB795}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Packetyzer.v11.suo b/Packetyzer.v11.suo
diff --git a/Packetyzer.vcxproj b/Packetyzer.vcxproj
@@ -173,6 +173,7 @@
     <ClCompile Include="cHash.cpp" />
     <ClCompile Include="cHTTPStream.cpp" />
     <ClCompile Include="cICMPStream.cpp" />
+    <ClCompile Include="cLSP.cpp" />
     <ClCompile Include="cLSPInstall.cpp" />
     <ClCompile Include="cPacket.cpp" />
     <ClCompile Include="cPacketGen.cpp" />
@@ -196,6 +197,7 @@
     <ClInclude Include="cHash.h" />
     <ClInclude Include="cHTTPStream.h" />
     <ClInclude Include="cICMPStream.h" />
+    <ClInclude Include="cLSP.h" />
     <ClInclude Include="cLSPInstall.h" />
     <ClInclude Include="cPacket.h" />
     <ClInclude Include="cPacketGen.h" />
diff --git a/Packetyzer.vcxproj.filters b/Packetyzer.vcxproj.filters
@@ -84,6 +84,9 @@
     <ClCompile Include="LSPCommon\provider.cpp">
       <Filter>Source Files\LSPCommon</Filter>
     </ClCompile>
+    <ClCompile Include="cLSP.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="cFile.h">
@@ -155,5 +158,8 @@
     <ClInclude Include="LSPCommon\lspcommon.h">
       <Filter>Header Files\LSPCommon</Filter>
     </ClInclude>
+    <ClInclude Include="cLSP.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/PacketyzerLSP/PacketyzerLSP.def b/PacketyzerLSP/PacketyzerLSP.def
@@ -0,0 +1,4 @@
+LIBRARY    PacketyzerLSP
+EXPORTS   
+	WSPStartup
+	GetLspGuid
diff --git a/PacketyzerLSP/PacketyzerLSP.vcxproj b/PacketyzerLSP/PacketyzerLSP.vcxproj
@@ -28,7 +28,7 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -55,6 +55,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
@@ -66,10 +67,14 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PACKETYZERLSP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>C:\WpdPack\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ModuleDefinitionFile>PacketyzerLSP.def</ModuleDefinitionFile>
+      <AdditionalLibraryDirectories>H:\Github\Packetyzer\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>ws2_32.lib;rpcrt4.lib;mswsock.lib;ole32.lib;Packetyzer.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -87,9 +92,24 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <ModuleDefinitionFile>PacketyzerLSP.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Link>
+      <ModuleDefinitionFile>PacketyzerLSP.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Link>
+      <ModuleDefinitionFile>PacketyzerLSP.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <None Include="PacketyzerLSP.def" />
+  </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\PacketyzerTest\dllmain.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/PacketyzerLSP/PacketyzerLSP.vcxproj.filters b/PacketyzerLSP/PacketyzerLSP.vcxproj.filters
@@ -14,4 +14,14 @@
       <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>
+    <None Include="PacketyzerLSP.def">
+      <Filter>Source Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\PacketyzerTest\dllmain.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
 </Project>
diff --git a/PacketyzerTest/PacketyzerTest.cpp b/PacketyzerTest/PacketyzerTest.cpp
@@ -32,11 +32,12 @@ INT main(INT argc, CHAR* argv[])
 	
 	cLSPInstall* lspinstall = new cLSPInstall("PacketyzerLSP.dll");
 	
-	UINT Catalogs[] = {1001, 1002};
+	UINT Catalogs[] = {1008};
 
 	lspinstall->Install(Catalogs, "Packetyzer LSP",FALSE, FALSE, LspCatalog32Only);
 
 	//cout << lspinstall->LSPGuid << endl;
+	system("PAUSE");
 	lspinstall->UninstallAll();
 
 	if (lspinstall->ReadyInstall)
diff --git a/PacketyzerTest/dllmain.cpp b/PacketyzerTest/dllmain.cpp
@@ -0,0 +1,31 @@
+#include "..\Packetyzer.h"
+
+using namespace Packetyzer::Capture;
+
+// {AE8DA32A-2737-48E5-980A-882CA068279E}
+static GUID Guid = 
+{ 0xae8da32a, 0x2737, 0x48e5, { 0x98, 0xa, 0x88, 0x2c, 0xa0, 0x68, 0x27, 0x9e } };
+
+cLSP LSPObject(&Guid, LSP_NONIFS);
+
+BOOL WINAPI DllMain() 
+{ 
+	return LSPObject.DLLMain();
+};
+
+INT WSPAPI WSPStartup(
+	_In_   WORD wVersionRequested,
+	_Out_  LPWSPDATA lpWSPData,
+	_In_   LPWSAPROTOCOL_INFO lpProtocolInfo,
+	_In_   WSPUPCALLTABLE UpcallTable,
+	_Out_  LPWSPPROC_TABLE lpProcTable
+) 
+{
+	return LSPObject.Startup(wVersionRequested,lpWSPData,lpProtocolInfo,
+								UpcallTable,lpProcTable);
+};
+
+VOID WSPAPI GetLspGuid(LPGUID Guid)
+{
+	LSPObject.GetGuid(Guid);
+};
diff --git a/cLSP.cpp b/cLSP.cpp
@@ -0,0 +1,52 @@
+/*
+ *
+ *  Copyright (C) 2013  Anwar Mohamed <anwarelmakrahy[at]gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to Anwar Mohamed
+ *  anwarelmakrahy[at]gmail.com
+ *
+ */
+
+#include "Packetyzer.h"
+
+using namespace Packetyzer::Capture;
+
+cLSP::cLSP(LPGUID Guid, UCHAR LSPType)
+{
+	memset(&LSPGuid, 0, sizeof(GUID));
+	memcpy_s(&LSPGuid, sizeof(GUID), Guid, sizeof(GUID));
+}
+
+cLSP::~cLSP()
+{
+}
+
+void cLSP::GetGuid(LPGUID Guid)
+{
+	memcpy_s(Guid, sizeof(GUID), &LSPGuid, sizeof(GUID));
+}
+
+BOOL cLSP::DLLMain()
+{
+	return TRUE;
+}
+
+INT WSPAPI cLSP::Startup(	_In_   WORD wVersionRequested,  
+						_Out_  LPWSPDATA lpWSPData,  
+						_In_   LPWSAPROTOCOL_INFO lpProtocolInfo,
+						_In_   WSPUPCALLTABLE UpcallTable,  
+						_Out_  LPWSPPROC_TABLE lpProcTable)
+{
+	return 0;
+}
diff --git a/cLSP.h b/cLSP.h
@@ -0,0 +1,46 @@
+/*
+ *
+ *  Copyright (C) 2013  Anwar Mohamed <anwarelmakrahy[at]gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to Anwar Mohamed
+ *  anwarelmakrahy[at]gmail.com
+ *
+ */
+
+#pragma once
+#include "Packetyzer.h"
+
+#define LSP_NONIFS	0x00
+#define	LSP_IFS		0x01
+
+class DLLEXPORT Packetyzer::Capture::cLSP
+{
+public:
+
+	void SetGuid(LPGUID Guid);
+	void GetGuid(LPGUID Guid);
+
+	BOOL DLLMain();
+	INT WSPAPI Startup(	_In_   WORD wVersionRequested,  
+					_Out_  LPWSPDATA lpWSPData,  
+					_In_   LPWSAPROTOCOL_INFO lpProtocolInfo,
+					_In_   WSPUPCALLTABLE UpcallTable,  
+					_Out_  LPWSPPROC_TABLE lpProcTable);
+
+	cLSP(LPGUID Guid, UCHAR LSPType);
+	~cLSP();
+
+	GUID LSPGuid;
+};
+

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,7 @@ namespace Packetyzer`
`79`	`79`	`{`
`80`	`80`	`class cWinpcapCapture;`
`81`	`81`	`class cLSPInstall;`
	`82`	`+ class cLSP;`
`82`	`83`	`}`
`83`	`84`
`84`	`85`	`namespace Send`
`@@ -110,5 +111,6 @@ namespace Packetyzer`
`110`	`111`
`111`	`112`	`#include "cWinpcapCapture.h"`
`112`	`113`	`#include "cLSPInstall.h"`
	`114`	`+#include "cLSP.h"`
`113`	`115`
`114`	`116`	`#include "cWinpcapSend.h"`