Upgrade to WinDivert 1.4.0-rc.

Author: basil00

VERSION

@@ -1 +1 @@
-1.3.1
+1.3.2

build.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 # build.sh
-# (C) 2017, all rights reserved,
+# (C) 2018, all rights reserved,
 #
 # 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
@@ -43,7 +43,7 @@ make client_install32
 make server_install
 
 # Build Windows 64/32-bit
-DIVERT_VERSION=WinDivert-1.3.0-MINGW
+DIVERT_VERSION=WinDivert-1.4.0-rc-A-MINGW
 set +x
 if [ "$DIVERT" = "" ]
 then

configure-freebsd.ac

@@ -1,5 +1,5 @@
 # configure.ac
-# (C) 2017, all rights reserved,
+# (C) 2018, all rights reserved,
 #
 # 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
@@ -45,7 +45,7 @@ case `uname -m` in
         ;;
     *)
         AC_SUBST(BITS, 64)
-        AC_SUBST(ARCH, amd64)
+        AC_SUBST(ARCH, x86_64)
         ;;
 esac
 

configure-windows.ac

@@ -1,5 +1,5 @@
 # configure-windows-cross.ac
-# (C) 2017, all rights reserved,
+# (C) 2018, all rights reserved,
 #
 # 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
@@ -65,8 +65,8 @@ AC_MSG_CHECKING([for $DIVERT_NAME files])
 
 if test -e $DIVERT/x86/${DIVERT_NAME}32.sys -a \
         -e $DIVERT/x86/$DIVERT_NAME.dll -a \
-        -e $DIVERT/amd64/${DIVERT_NAME}64.sys -a \
-        -e $DIVERT/amd64/$DIVERT_NAME.dll -a \
+        -e $DIVERT/x86_64/${DIVERT_NAME}64.sys -a \
+        -e $DIVERT/x86_64/$DIVERT_NAME.dll -a \
         -e $DIVERT/include/$DIVERT_WORD.h
 then
     AC_MSG_RESULT([yes])
@@ -85,11 +85,11 @@ fi
 case "$host" in
     amd64-*)
         AC_SUBST(BITS, 64)
-        AC_SUBST(ARCH, amd64)
+        AC_SUBST(ARCH, x86_64)
         ;;
     x86_64-*)
         AC_SUBST(BITS, 64)
-        AC_SUBST(ARCH, amd64)
+        AC_SUBST(ARCH, x86_64)
         ;;
     *)
         AC_SUBST(BITS, 32)

configure.ac

@@ -1,5 +1,5 @@
 # configure.ac
-# (C) 2017, all rights reserved,
+# (C) 2018, all rights reserved,
 #
 # 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
@@ -58,7 +58,7 @@ case `uname -m` in
         ;;
     *)
         AC_SUBST(BITS, 64)
-        AC_SUBST(ARCH, amd64)
+        AC_SUBST(ARCH, x86_64)
         ;;
 esac
 

src/Makefile.windows

@@ -1,5 +1,5 @@
 # Makefile.windows
-# (C) 2017, all rights reserved,
+# (C) 2018, all rights reserved,
 #
 # 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
@@ -77,7 +77,7 @@ tools/file2c.exe: tools/file2c.c
 install: client
 	cp "$(DIVERT_ROOT)/x86/WinDivert32.sys" \
         "$(ROOT)/src/$(PLATFORM)/install/WinDivert32.sys"
-	cp "$(DIVERT_ROOT)/amd64/WinDivert64.sys" \
+	cp "$(DIVERT_ROOT)/x86_64/WinDivert64.sys" \
         "$(ROOT)/src/$(PLATFORM)/install/WinDivert64.sys"
 	cp "$(DIVERT_ROOT)/$(ARCH)/WinDivert.dll" \
         "$(ROOT)/src/$(PLATFORM)/install/WinDivert.dll"

src/windows/capture.c

@@ -1,6 +1,6 @@
 /*
  * capture.c
- * (C) 2017, all rights reserved,
+ * (C) 2018, all rights reserved,
  *
  * 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
@@ -52,11 +52,11 @@ void init_capture(void)
 {
     handle = WinDivertOpen(
         "ip and "
-        "(outbound and (tcp.DstPort == 80 or"
-        " tcp.DstPort == 443 or "
-        " udp.DstPort == 53) or"
-        " inbound and icmp.Type == 11 and icmp.Code == 0) and "
-        "ip.DstAddr != 127.0.0.1",
+        "!loopback and "
+        "(outbound? tcp.DstPort == 80 or"
+        " tcp.DstPort == 443 or"
+        " udp.DstPort == 53 :"
+        " icmp.Type == 11 and icmp.Code == 0)",
         WINDIVERT_LAYER_NETWORK, -501, 0);
     if (handle == INVALID_HANDLE_VALUE)
     {
@@ -94,8 +94,8 @@ size_t get_packet(uint8_t *buff, size_t len)
     peth_header->pad2       = 0x0;
     peth_header->proto      = htons(ETH_P_IP);
 
-    WinDivertHelperCalcChecksums((PVOID)(buff+offset), (UINT)(len-offset),
-        WINDIVERT_HELPER_NO_REPLACE);
+    WinDivertHelperCalcChecksums((PVOID)(buff+offset), (UINT)read_len,
+        NULL, 0);
 
     return (size_t)(read_len+offset);
 }
@@ -112,9 +112,11 @@ void inject_packet(uint8_t *buff, size_t len)
     }
     struct pethhdr_s *peth_header = (struct pethhdr_s *)buff;
     WINDIVERT_ADDRESS addr;
+    memset(&addr, 0, sizeof(addr));
     addr.Direction = peth_header->direction;
     addr.IfIdx     = peth_header->if_idx;
     addr.SubIfIdx  = peth_header->sub_if_idx;
+    addr.Impostor  = 1;
 
     len -= offset;
     buff += offset;