Add an ETHERNET layer to WinDivert.

Adds a new ETHERNET layer to WinDivert.  This
layer is similar to the NETWORK layers in that
packets can be blocked/modified/injected.  This
change requires Windows 8 or newer.

Author: basil00

dll/windivert.c

@@ -479,6 +479,7 @@ HANDLE WinDivertOpen(const char *filter, WINDIVERT_LAYER layer, INT16 priority,
     // Parameter checking:
     switch (layer)
     {
+        case WINDIVERT_LAYER_ETHERNET:
         case WINDIVERT_LAYER_NETWORK:
         case WINDIVERT_LAYER_NETWORK_FORWARD:
         case WINDIVERT_LAYER_FLOW:

dll/windivert.def

@@ -13,8 +13,10 @@ EXPORTS
     WinDivertHelperDecrementTTL
     WinDivertHelperHashPacket
     WinDivertHelperParsePacket
+    WinDivertHelperParseMACAddress
     WinDivertHelperParseIPv4Address
     WinDivertHelperParseIPv6Address
+    WinDivertHelperFormatMACAddress
     WinDivertHelperFormatIPv4Address
     WinDivertHelperFormatIPv6Address
     WinDivertHelperCompileFilter
@@ -26,6 +28,8 @@ EXPORTS
     WinDivertHelperHtonl
     WinDivertHelperNtohll
     WinDivertHelperHtonll
+    WinDivertHelperNtohMACAddress
+    WinDivertHelperHtonMACAddress
     WinDivertHelperNtohIPv6Address
     WinDivertHelperHtonIPv6Address
     WinDivertHelperNtohIpv6Address

dll/windivert_hash.c

@@ -105,8 +105,8 @@ static UINT64 WinDivertXXH64Avalanche(UINT64 h64)
  * WinDivert packet hash function.
  */
 static UINT64 WinDivertHashPacket(UINT64 seed,
-    const WINDIVERT_IPHDR *ip_header, const WINDIVERT_IPV6HDR *ipv6_header,
-    const WINDIVERT_ICMPHDR *icmp_header,
+    const WINDIVERT_ETHHDR *eth_header, const WINDIVERT_IPHDR *ip_header,
+    const WINDIVERT_IPV6HDR *ipv6_header, const WINDIVERT_ICMPHDR *icmp_header,
     const WINDIVERT_ICMPV6HDR *icmpv6_header,
     const WINDIVERT_TCPHDR *tcp_header, const WINDIVERT_UDPHDR *udp_header)
 {