Max/basil00_WinDivert
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 21 Wiki Activity

Invert the checksum flags.

Browse Source 
Zeroing the addr will default to full checksums.
This commit is contained in:
basil00
2017-11-14 20:20:18 +08:00
parent 80b31815b2
commit dbb6b0fe60
3 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dll/windivert_helper.c
+3 -3
View File
@@ -435,7 +435,7 @@ extern UINT WinDivertHelperCalcChecksums(PVOID pPacket, UINT packetLen,
if (ip_header != NULL && !(flags & WINDIVERT_HELPER_NO_IP_CHECKSUM))
{
ip_header->Checksum = 0;
if (pAddr == NULL || pAddr->IPv4Checksum != 0)
if (pAddr == NULL || pAddr->PseudoIPChecksum == 0)
{
ip_header->Checksum = WinDivertHelperCalcChecksum(NULL, 0,
ip_header, ip_header->HdrLength*sizeof(UINT32));
@@ -478,7 +478,7 @@ extern UINT WinDivertHelperCalcChecksums(PVOID pPacket, UINT packetLen,
{
return count;
}
if (pAddr == NULL || pAddr->TCPChecksum != 0)
if (pAddr == NULL || pAddr->PseudoTCPChecksum == 0)
{
// Full TCP checksum
checksum_len = payload_len + tcp_header->HdrLength*sizeof(UINT32);
@@ -512,7 +512,7 @@ extern UINT WinDivertHelperCalcChecksums(PVOID pPacket, UINT packetLen,
{
return count;
}
if (pAddr == NULL || pAddr->UDPChecksum != 0)
if (pAddr == NULL || pAddr->PseudoUDPChecksum == 0)
{
// Full UDP checksum
checksum_len = payload_len + sizeof(WINDIVERT_UDPHDR);
include/windivert.h
+3 -3
View File
@@ -63,9 +63,9 @@ typedef struct
UINT8 Direction:1; /* Packet's direction. */
UINT8 Loopback:1; /* Packet is loopback? */
UINT8 Impostor:1; /* Packet is impostor? */
UINT8 IPv4Checksum:1; /* Packet has full IPv4 checksum? */
UINT8 TCPChecksum:1; /* Packet has full TCP checksum? */
UINT8 UDPChecksum:1; /* Packet has full UDP checksum? */
UINT8 PseudoIPChecksum:1; /* Packet has pseudo IPv4 checksum? */
UINT8 PseudoTCPChecksum:1; /* Packet has pseudo TCP checksum? */
UINT8 PseudoUDPChecksum:1; /* Packet has pseudo UDP checksum? */
UINT8 Reserved:2;
} WINDIVERT_ADDRESS, *PWINDIVERT_ADDRESS;
sys/windivert.c
+21 -9
View File
@@ -1554,9 +1554,12 @@ static void windivert_read_service_request(packet_t packet,
addr->Direction = direction;
addr->Loopback = (loopback? 1: 0);
addr->Impostor = (impostor? 1: 0);
addr->IPv4Checksum = ((checksums & WINDIVERT_IP_CHECKSUM) != 0? 1: 0);
addr->TCPChecksum = ((checksums & WINDIVERT_TCP_CHECKSUM) != 0? 1: 0);
addr->UDPChecksum = ((checksums & WINDIVERT_UDP_CHECKSUM) != 0? 1: 0);
addr->PseudoIPChecksum =
((checksums & WINDIVERT_IP_CHECKSUM) == 0? 1: 0);
addr->PseudoTCPChecksum =
((checksums & WINDIVERT_TCP_CHECKSUM) == 0? 1: 0);
addr->PseudoUDPChecksum =
((checksums & WINDIVERT_UDP_CHECKSUM) == 0? 1: 0);
addr->Reserved = 0;
}
@@ -1763,24 +1766,33 @@ windivert_write_bad_packet:
if (addr->Direction == WINDIVERT_DIRECTION_OUTBOUND)
{
checksums_info.Transmit.TcpChecksum =
(addr->TCPChecksum != 0? 0: 1);
(addr->PseudoTCPChecksum == 0? 0: 1);
checksums_info.Transmit.UdpChecksum =
(addr->UDPChecksum != 0? 0: 1);
(addr->PseudoUDPChecksum == 0? 0: 1);
checksums_info.Transmit.IpHeaderChecksum =
(addr->IPv4Checksum != 0? 0: 1);
(addr->PseudoIPChecksum == 0? 0: 1);
}
else
{
checksums_info.Receive.TcpChecksumSucceeded =
(addr->TCPChecksum != 0? 0: 1);
(addr->PseudoTCPChecksum == 0? 0: 1);
checksums_info.Receive.UdpChecksumSucceeded =
(addr->UDPChecksum != 0? 0: 1);
(addr->PseudoUDPChecksum == 0? 0: 1);
checksums_info.Receive.IpChecksumSucceeded =
(addr->IPv4Checksum != 0? 0: 1);
(addr->PseudoIPChecksum == 0? 0: 1);
}
NET_BUFFER_LIST_INFO(buffers, TcpIpChecksumNetBufferListInfo) =
checksums_info.Value;
}
else
{
if (addr->PseudoTCPChecksum != 0 || addr->PseudoUDPChecksum != 0 ||
addr->PseudoIPChecksum != 0)
{
status = STATUS_INVALID_PARAMETER;
goto windivert_write_exit;
}
}
if (addr->Impostor)
{