Use newlines for current options information

Added .editorconfig

.editorconfig

@@ -0,0 +1,8 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+end_of_line = lf

Makefile

@@ -1,37 +0,0 @@
-ifndef MSYSTEM
-	CPREFIX = x86_64-w64-mingw32-
-endif
-
-WINDIVERTHEADERS = ../../include
-WINDIVERTLIBS = ../binary
-
-TARGET = goodbyedpi.exe
-LIBS = -L$(WINDIVERTLIBS) -lWinDivert -lws2_32
-CC = $(CPREFIX)gcc
-CCWINDRES = $(CPREFIX)windres
-CFLAGS = -Wall -Wextra -I$(WINDIVERTHEADERS) -L$(WINDIVERTLIBS) \
-         -O2 -pie -fPIE -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2
-LDFLAGS = -Wl,-O1,--sort-common,--as-needed
-
-.PHONY: default all clean
-
-default: manifest $(TARGET)
-all: default
-
-OBJECTS = $(patsubst %.c, %.o, $(wildcard *.c)) goodbyedpi-rc.o
-HEADERS = $(wildcard *.h)
-
-%.o: %.c $(HEADERS)
-	$(CC) $(CFLAGS) -c $< -o $@
-
-manifest:
-	$(CCWINDRES) goodbyedpi-rc.rc goodbyedpi-rc.o
-
-.PRECIOUS: $(TARGET) $(OBJECTS)
-
-$(TARGET): $(OBJECTS)
-	$(CC) $(OBJECTS) -Wall $(LDFLAGS) $(LIBS) -s -o $@
-
-clean:
-	-rm -f *.o
-	-rm -f $(TARGET)

README.md

@@ -23,12 +23,16 @@ Usage: goodbyedpi.exe [OPTION...]
  -e [value]  set HTTPS fragmentation to value
  -a          additional space between Method and Request-URI (enables -s, may break sites)
  -w          try to find and parse HTTP traffic on all processed ports (not only on port 80)
- --port      [value]    additional TCP port to perform fragmentation on (and HTTP tricks with -w)
+ --port        [value]    additional TCP port to perform fragmentation on (and HTTP tricks with -w)
- --dns-addr  [value]    redirect UDP DNS requests to the supplied IP address (experimental)
+ --ip-id       [value]    handle additional IP ID (decimal, drop redirects and TCP RSTs with this ID).
- --dns-port  [value]    redirect UDP DNS requests to the supplied port (53 by default)
+                          This option can be supplied multiple times.
- --dns-verb             print verbose DNS redirection messages
+ --dns-addr    [value]    redirect UDP DNS requests to the supplied IP address (experimental)
- --blacklist [txtfile]  perform HTTP tricks only to host names and subdomains from
+ --dns-port    [value]    redirect UDP DNS requests to the supplied port (53 by default)
-                        supplied text file. This option can be supplied multiple times.
+ --dnsv6-addr  [value]    redirect UDPv6 DNS requests to the supplied IPv6 address (experimental)
+ --dnsv6-port  [value]    redirect UDPv6 DNS requests to the supplied port (53 by default)
+ --dns-verb               print verbose DNS redirection messages
+ --blacklist   [txtfile]  perform HTTP tricks only to host names and subdomains from
+                          supplied text file. This option can be supplied multiple times.
 
  -1          -p -r -s -f 2 -k 2 -n -e 2 (most compatible mode, default)
  -2          -p -r -s -f 2 -k 2 -n -e 40 (better speed for HTTPS yet still compatible)
@@ -48,11 +52,11 @@ Use `goodbyedpi.exe -4` if it works for your ISP's DPI. This is the fastest mode
 
 ### Passive DPI
 
-Most Passive DPI send HTTP 302 Redirect if you try to access blocked website over HTTP and TCP Reset in case of HTTPS, faster than destination website. Packets sent by DPI always have IP Identification field equal to `0x0000` or `0x0001`, as seen with Russian providers. These packets, if they redirect you to another website (censorship page), are blocked by GoodbyeDPI.
+Most Passive DPI send HTTP 302 Redirect if you try to access blocked website over HTTP and TCP Reset in case of HTTPS, faster than destination website. Packets sent by DPI usually have IP Identification field equal to `0x0000` or `0x0001`, as seen with Russian providers. These packets, if they redirect you to another website (censorship page), are blocked by GoodbyeDPI.
 
 ### Active DPI
 
-Active DPI is more tricky to fool. Currently the software uses 4 methods to circumvent Active DPI:
+Active DPI is more tricky to fool. Currently the software uses 6 methods to circumvent Active DPI:
 
 * TCP-level fragmentation for first data packet
 * TCP-level fragmentation for persistent (keep-alive) HTTP sessions
@@ -75,13 +79,20 @@ To build x86 exe run:
 
 And for x86_64:
 
-`make CPREFIX=x86_64-w64-mingw32- WINDIVERTHEADERS=/path/to/windivert/include WINDIVERTLIBS=/path/to/windivert/amd64`
+`make CPREFIX=x86_64-w64-mingw32- BIT64=1 WINDIVERTHEADERS=/path/to/windivert/include WINDIVERTLIBS=/path/to/windivert/amd64`
 
 # How to install as Windows Service
 
 Use `service_install_russia_blacklist.cmd`, `service_install_russia_blacklist_dnsredir.cmd` and `service_remove.cmd` scripts.  
 Modify them according to your own needs.
 
+# Known issues
+
+* Horribly outdated Windows 7 installations are not able to load WinDivert driver due to missing support for SHA256 digital signatures. Install [KB3033929](https://www.microsoft.com/en-us/download/details.aspx?id=46078), or better, update the whole system using Windows Update.
+* Some SSL/TLS stacks unable to process fragmented ClientHello packets, and HTTPS websites won't open. Bug: [#4](https://github.com/ValdikSS/GoodbyeDPI/issues/4), [#64](https://github.com/ValdikSS/GoodbyeDPI/issues/64).
+* ESET Antivirus is incompatible with WinDivert driver [#91](https://github.com/ValdikSS/GoodbyeDPI/issues/91). This is most probably antivirus bug, not WinDivert.
+
+
 # Similar projects
 
 [zapret](https://github.com/bol-van/zapret) by @bol-van (for Linux).

dnsredir.h

@@ -1,19 +0,0 @@
-#include <stdint.h>
-
-typedef struct conntrack_info {
-    uint32_t srcip;
-    uint16_t srcport;
-    uint32_t dstip;
-    uint16_t dstport;
-} conntrack_info_t;
-
-int dns_handle_incoming(const uint32_t srcip, const uint16_t srcport,
-                        const char *packet_data, const UINT packet_dataLen,
-                        conntrack_info_t *conn_info);
-
-int dns_handle_outgoing(const uint32_t srcip, const uint16_t srcport,
-                        const uint32_t dstip, const uint16_t dstport,
-                        const char *packet_data, const UINT packet_dataLen);
-
-void flush_dns_cache();
-int dns_is_dns_packet(const char *packet_data, const UINT packet_dataLen, const int outgoing);

src/Makefile

@@ -0,0 +1,50 @@
+ifndef MSYSTEM
+	CPREFIX = x86_64-w64-mingw32-
+endif
+
+WINDIVERTHEADERS = ../../../include
+WINDIVERTLIBS = ../../binary
+MINGWLIB = /usr/x86_64-w64-mingw32/lib/
+
+TARGET = goodbyedpi.exe
+# Linking SSP does not work for some reason, the executable doesn't start.
+#LIBS = -L$(WINDIVERTLIBS) -Wl,-Bstatic -lssp -Wl,-Bdynamic -lWinDivert -lws2_32
+LIBS = -L$(WINDIVERTLIBS) -lWinDivert -lws2_32
+CC = $(CPREFIX)gcc
+CCWINDRES = $(CPREFIX)windres
+CFLAGS = -std=c99 -pie -fPIE -pipe -I$(WINDIVERTHEADERS) -L$(WINDIVERTLIBS) \
+         -O2 -D_FORTIFY_SOURCE=2 \
+         -Wall -Wextra -Wpedantic -Wformat=2 -Wshadow -Wstrict-aliasing=1 -Werror=format-security \
+         -Wfloat-equal -Wcast-align -Wsign-conversion \
+         #-fstack-protector-strong
+LDFLAGS = -Wl,-O1,-pie,--dynamicbase,--nxcompat,--sort-common,--as-needed \
+-Wl,--image-base,0x140000000 -Wl,--disable-auto-image-base
+
+ifdef BIT64
+	LDFLAGS += -Wl,--high-entropy-va -Wl,--pic-executable,-e,mainCRTStartup
+else
+	LDFLAGS += -Wl,--pic-executable,-e,_mainCRTStartup
+endif
+
+.PHONY: default all clean
+
+default: manifest $(TARGET)
+all: default
+
+OBJECTS = $(patsubst %.c, %.o, $(wildcard *.c utils/*.c)) goodbyedpi-rc.o
+HEADERS = $(wildcard *.h utils/*.h)
+
+%.o: %.c $(HEADERS)
+	$(CC) $(CFLAGS) -c $< -o $@
+
+manifest:
+	$(CCWINDRES) goodbyedpi-rc.rc goodbyedpi-rc.o
+
+.PRECIOUS: $(TARGET) $(OBJECTS)
+
+$(TARGET): $(OBJECTS)
+	$(CC) $(OBJECTS) $(LDFLAGS) $(LIBS) -s -o $@
+
+clean:
+	-rm -f *.o utils/*.o
+	-rm -f $(TARGET)

src/blackwhitelist.c

@@ -8,8 +8,8 @@
 #include <windows.h>
 #include <stdio.h>
 #include "goodbyedpi.h"
-#include "uthash.h"
+#include "utils/uthash.h"
-#include "getline.h"
+#include "utils/getline.h"
 
 typedef struct blackwhitelist_record {
     const char *host;

src/dnsredir.c

@@ -15,10 +15,10 @@
 #include <stdio.h>
 #include "goodbyedpi.h"
 #include "dnsredir.h"
-#include "uthash.h"
+#include "utils/uthash.h"
 
-// IPv6 incompatible!
+/* key ('4' for IPv4 or '6' for IPv6 + srcip[16] + srcport[2]) */
-#define UDP_CONNRECORD_KEY_LEN 6
+#define UDP_CONNRECORD_KEY_LEN 19
 
 #define DNS_CLEANUP_INTERVAL_SEC 30
 
@@ -32,10 +32,10 @@
 #define uthash_strlen(s) UDP_CONNRECORD_KEY_LEN
 
 typedef struct udp_connrecord {
-    /* key (srcip[4] + srcport[2]) */
+    /* key ('4' for IPv4 or '6' for IPv6 + srcip[16] + srcport[2]) */
     char key[UDP_CONNRECORD_KEY_LEN];
     time_t time;         /* time when this record was added */
-    uint32_t dstip;
+    uint32_t dstip[4];
     uint16_t dstport;
     UT_hash_handle hh;   /* makes this structure hashable */
 } udp_connrecord_t;
@@ -59,26 +59,60 @@ void flush_dns_cache() {
     FreeLibrary(dnsapi);
 }
 
-inline static void construct_key(const uint32_t srcip, const uint16_t srcport, char *key) {
+inline static void fill_key_data(char *key, const uint8_t is_ipv6, const uint32_t srcip[4],
+                          const uint16_t srcport)
+{
+    if (is_ipv6) {
+        *(uint8_t*)(key) = '6';
+        ipv6_copy_addr((uint32_t*)(key + sizeof(uint8_t)), srcip);
+    }
+    else {
+        *(uint8_t*)(key) = '4';
+        ipv4_copy_addr((uint32_t*)(key + sizeof(uint8_t)), srcip);
+    }
+
+    *(uint16_t*)(key + sizeof(uint8_t) + sizeof(uint32_t) * 4) = srcport;
+}
+
+inline static void fill_data_from_key(uint8_t *is_ipv6, uint32_t srcip[4], uint16_t *srcport,
+                                      const char *key)
+{
+    if (key[0] == '6') {
+        *is_ipv6 = 1;
+        ipv6_copy_addr(srcip, (uint32_t*)(key + sizeof(uint8_t)));
+    }
+    else {
+        *is_ipv6 = 0;
+        ipv4_copy_addr(srcip, (uint32_t*)(key + sizeof(uint8_t)));
+    }
+    *srcport = *(uint16_t*)(key + sizeof(uint8_t) + sizeof(uint32_t) * 4);
+}
+
+inline static void construct_key(const uint32_t srcip[4], const uint16_t srcport,
+                                 char *key, int is_ipv6)
+{
     debug("Construct key enter\n");
     if (key) {
         debug("Constructing key\n");
-
+        fill_key_data(key, is_ipv6, srcip, srcport);
-        *(uint32_t*)(key) = srcip;
-        *(uint16_t*)(key + sizeof(srcip)) = srcport;
     }
     debug("Construct key end\n");
 }
 
-inline static void deconstruct_key(const char *key, udp_connrecord_t *connrecord,
+inline static void deconstruct_key(const char *key, const udp_connrecord_t *connrecord,
-                                   conntrack_info_t *conn_info) {
+                                   conntrack_info_t *conn_info)
+{
     debug("Deconstruct key enter\n");
     if (key && conn_info) {
         debug("Deconstructing key\n");
+        fill_data_from_key(&conn_info->is_ipv6, conn_info->srcip,
+                           &conn_info->srcport, key);
+
+        if (conn_info->is_ipv6)
+            ipv6_copy_addr(conn_info->dstip, connrecord->dstip);
+        else
+            ipv4_copy_addr(conn_info->dstip, connrecord->dstip);
 
-        conn_info->srcip = *(uint32_t*)(key);
-        conn_info->srcport = *(uint16_t*)(key + sizeof(conn_info->srcip));
-        conn_info->dstip = connrecord->dstip;
         conn_info->dstport = connrecord->dstport;
     }
     debug("Deconstruct key end\n");
@@ -99,17 +133,26 @@ static int check_get_udp_conntrack_key(const char *key, udp_connrecord_t **connr
     return FALSE;
 }
 
-static int add_udp_conntrack(const uint32_t srcip, const uint16_t srcport,
+static int add_udp_conntrack(const uint32_t srcip[4], const uint16_t srcport,
-                             const uint32_t dstip, const uint16_t dstport) {
+                             const uint32_t dstip[4], const uint16_t dstport,
+                             const int is_ipv6
+                            )
+{
     if (!(srcip && srcport && dstip && dstport))
         return FALSE;
 
     udp_connrecord_t *tmp_connrecord = malloc(sizeof(udp_connrecord_t));
-    construct_key(srcip, srcport, tmp_connrecord->key);
+    construct_key(srcip, srcport, tmp_connrecord->key, is_ipv6);
 
     if (!check_get_udp_conntrack_key(tmp_connrecord->key, NULL)) {
         tmp_connrecord->time = time(NULL);
-        tmp_connrecord->dstip = dstip;
+
+        if (is_ipv6) {
+            ipv6_copy_addr(tmp_connrecord->dstip, dstip);
+        }
+        else {
+            ipv4_copy_addr(tmp_connrecord->dstip, dstip);
+        }
         tmp_connrecord->dstport = dstport;
         HASH_ADD_STR(conntrack, key, tmp_connrecord);
         debug("Added UDP conntrack\n");
@@ -120,7 +163,7 @@ static int add_udp_conntrack(const uint32_t srcip, const uint16_t srcport,
     return FALSE;
 }
 
-void dns_cleanup() {
+static void dns_cleanup() {
     udp_connrecord_t *tmp_connrecord, *tmp_connrecord2 = NULL;
 
     if (last_cleanup == 0) {
@@ -154,10 +197,11 @@ int dns_is_dns_packet(const char *packet_data, const UINT packet_dataLen, const
     return FALSE;
 }
 
-int dns_handle_outgoing(const uint32_t srcip, const uint16_t srcport,
+int dns_handle_outgoing(const uint32_t srcip[4], const uint16_t srcport,
-                        const uint32_t dstip, const uint16_t dstport,
+                        const uint32_t dstip[4], const uint16_t dstport,
-                        const char *packet_data, const UINT packet_dataLen) {
+                        const char *packet_data, const UINT packet_dataLen,
-
+                        const uint8_t is_ipv6)
+{
     if (packet_dataLen < 16)
         return FALSE;
 
@@ -166,16 +210,16 @@ int dns_handle_outgoing(const uint32_t srcip, const uint16_t srcport,
     if (dns_is_dns_packet(packet_data, packet_dataLen, 1)) {
         /* Looks like DNS request */
         debug("trying to add srcport = %hu, dstport = %hu\n", ntohs(srcport), ntohs(dstport));
-        return add_udp_conntrack(srcip, srcport, dstip, dstport);
+        return add_udp_conntrack(srcip, srcport, dstip, dstport, is_ipv6);
     }
     debug("____dns_handle_outgoing FALSE: srcport = %hu, dstport = %hu\n", ntohs(srcport), ntohs(dstport));
     return FALSE;
 }
 
-int dns_handle_incoming(const uint32_t srcip, const uint16_t srcport,
+int dns_handle_incoming(const uint32_t srcip[4], const uint16_t srcport,
                         const char *packet_data, const UINT packet_dataLen,
-                        conntrack_info_t *conn_info) {
+                        conntrack_info_t *conn_info, const uint8_t is_ipv6)
-
+{
     char key[UDP_CONNRECORD_KEY_LEN];
     udp_connrecord_t *tmp_connrecord = NULL;
 
@@ -186,7 +230,7 @@ int dns_handle_incoming(const uint32_t srcip, const uint16_t srcport,
 
     if (dns_is_dns_packet(packet_data, packet_dataLen, 0)) {
         /* Looks like DNS response */
-        construct_key(srcip, srcport, key);
+        construct_key(srcip, srcport, key, is_ipv6);
         if (check_get_udp_conntrack_key(key, &tmp_connrecord) && tmp_connrecord) {
             /* Connection exists in conntrack, moving on */
             deconstruct_key(key, tmp_connrecord, conn_info);
@@ -195,6 +239,6 @@ int dns_handle_incoming(const uint32_t srcip, const uint16_t srcport,
             return TRUE;
         }
     }
-    debug("____dns_handle_incoming FALSE: srcport = %hu, dstport = %hu\n", ntohs(srcport), ntohs(dstport));
+    debug("____dns_handle_incoming FALSE: srcport = %hu\n", ntohs(srcport));
     return FALSE;
 }

src/dnsredir.h

@@ -0,0 +1,36 @@
+#include <stdint.h>
+
+typedef struct conntrack_info {
+    uint8_t  is_ipv6;
+    uint32_t srcip[4];
+    uint16_t srcport;
+    uint32_t dstip[4];
+    uint16_t dstport;
+} conntrack_info_t;
+
+inline static void ipv4_copy_addr(uint32_t dst[4], const uint32_t src[4]) {
+    dst[0] = src[0];
+    dst[1] = 0;
+    dst[2] = 0;
+    dst[3] = 0;
+}
+
+inline static void ipv6_copy_addr(uint32_t dst[4], const uint32_t src[4]) {
+    dst[0] = src[0];
+    dst[1] = src[1];
+    dst[2] = src[2];
+    dst[3] = src[3];
+}
+
+int dns_handle_incoming(const uint32_t srcip[4], const uint16_t srcport,
+                        const char *packet_data, const UINT packet_dataLen,
+                        conntrack_info_t *conn_info, const uint8_t is_ipv6);
+
+int dns_handle_outgoing(const uint32_t srcip[4], const uint16_t srcport,
+                        const uint32_t dstip[4], const uint16_t dstport,
+                        const char *packet_data, const UINT packet_dataLen,
+                        const uint8_t is_ipv6
+                       );
+
+void flush_dns_cache();
+int dns_is_dns_packet(const char *packet_data, const UINT packet_dataLen, const int outgoing);

src/goodbyedpi.c

@@ -9,27 +9,33 @@
 #include <unistd.h>
 #include <string.h>
 #include <getopt.h>
+#include <in6addr.h>
+#include <ws2tcpip.h>
 #include "windivert.h"
 #include "goodbyedpi.h"
+#include "utils/repl_str.h"
 #include "service.h"
 #include "dnsredir.h"
 #include "blackwhitelist.h"
 
-#define die() do { printf("Something went wrong!\n" \
+// My mingw installation does not load inet_pton definition for some reason
-    "Make sure you're running this program with administrator privileges\n"); \
+WINSOCK_API_LINKAGE INT WSAAPI inet_pton(INT Family, LPCSTR pStringBuf, PVOID pAddr);
-    sleep(10); exit(EXIT_FAILURE); } while (0)
+
+#define GOODBYEDPI_VERSION "v0.1.5"
+
+#define die() do { sleep(20); exit(EXIT_FAILURE); } while (0)
 
 #define MAX_FILTERS 4
 #define MAX_PACKET_SIZE 9016
 
-#define DIVERT_NO_LOCALNETS_DST "(" \
+#define DIVERT_NO_LOCALNETSv4_DST "(" \
                    "(ip.DstAddr < 127.0.0.1 or ip.DstAddr > 127.255.255.255) and " \
                    "(ip.DstAddr < 10.0.0.0 or ip.DstAddr > 10.255.255.255) and " \
                    "(ip.DstAddr < 192.168.0.0 or ip.DstAddr > 192.168.255.255) and " \
                    "(ip.DstAddr < 172.16.0.0 or ip.DstAddr > 172.31.255.255) and " \
                    "(ip.DstAddr < 169.254.0.0 or ip.DstAddr > 169.254.255.255)" \
                    ")"
-#define DIVERT_NO_LOCALNETS_SRC "(" \
+#define DIVERT_NO_LOCALNETSv4_SRC "(" \
                    "(ip.SrcAddr < 127.0.0.1 or ip.SrcAddr > 127.255.255.255) and " \
                    "(ip.SrcAddr < 10.0.0.0 or ip.SrcAddr > 10.255.255.255) and " \
                    "(ip.SrcAddr < 192.168.0.0 or ip.SrcAddr > 192.168.255.255) and " \
@@ -37,10 +43,49 @@
                    "(ip.SrcAddr < 169.254.0.0 or ip.SrcAddr > 169.254.255.255)" \
                    ")"
 
+#define DIVERT_NO_LOCALNETSv6_DST "(" \
+                   "(ipv6.DstAddr > ::1) and " \
+                   "(ipv6.DstAddr < 2001::0 or ipv6.DstAddr > 2001:1::0) and " \
+                   "(ipv6.DstAddr < fc00::0 or ipv6.DstAddr > fe00::0) and " \
+                   "(ipv6.DstAddr < fe80::0 or ipv6.DstAddr > fec0::0) and " \
+                   "(ipv6.DstAddr < ff00::0 or ipv6.DstAddr > ffff::0)" \
+                   ")"
+#define DIVERT_NO_LOCALNETSv6_SRC "(" \
+                   "(ipv6.SrcAddr > ::1) and " \
+                   "(ipv6.SrcAddr < 2001::0 or ipv6.SrcAddr > 2001:1::0) and " \
+                   "(ipv6.SrcAddr < fc00::0 or ipv6.SrcAddr > fe00::0) and " \
+                   "(ipv6.SrcAddr < fe80::0 or ipv6.SrcAddr > fec0::0) and " \
+                   "(ipv6.SrcAddr < ff00::0 or ipv6.SrcAddr > ffff::0)" \
+                   ")"
+
+/* #IPID# is a template to find&replace */
+#define IPID_TEMPLATE "#IPID#"
+#define FILTER_STRING_TEMPLATE \
+        "(tcp and !impostor and !loopback and " \
+        "((inbound and (" \
+         "(" \
+          "(" \
+           "(ipv6 or (ip.Id >= 0x0 and ip.Id <= 0xF) " IPID_TEMPLATE \
+           ") and " \
+           "tcp.SrcPort == 80 and tcp.Ack" \
+          ") or " \
+          "((tcp.SrcPort == 80 or tcp.SrcPort == 443) and tcp.Ack and tcp.Syn)" \
+         ")" \
+         " and (" DIVERT_NO_LOCALNETSv4_SRC " or " DIVERT_NO_LOCALNETSv6_SRC "))) or " \
+        "(outbound and " \
+         "(tcp.DstPort == 80 or tcp.DstPort == 443) and tcp.Ack and " \
+         "(" DIVERT_NO_LOCALNETSv4_DST " or " DIVERT_NO_LOCALNETSv6_DST "))" \
+        "))"
+#define FILTER_PASSIVE_STRING_TEMPLATE "inbound and ip and tcp and " \
+        "!impostor and !loopback and " \
+        "((ip.Id <= 0xF and ip.Id >= 0x0) " IPID_TEMPLATE ") and " \
+        "(tcp.SrcPort == 443 or tcp.SrcPort == 80) and tcp.Rst and " \
+        DIVERT_NO_LOCALNETSv4_SRC
+
 #define SET_HTTP_FRAGMENT_SIZE_OPTION(fragment_size) do { \
     if (!http_fragment_size) { \
         if (fragment_size <= 0 || fragment_size > 65535) { \
-            puts(fragment_size_message); \
+            puts("Fragment size should be in range [0 - 65535]\n"); \
             exit(EXIT_FAILURE); \
         } \
         http_fragment_size = fragment_size; \
@@ -74,28 +119,25 @@ static const char *http_methods[] = {
 };
 
 static struct option long_options[] = {
-    {"port",      required_argument, 0,  'z' },
+    {"port",        required_argument, 0,  'z' },
-    {"dns-addr",  required_argument, 0,  'd' },
+    {"dns-addr",    required_argument, 0,  'd' },
-    {"dns-port",  required_argument, 0,  'g' },
+    {"dns-port",    required_argument, 0,  'g' },
-    {"dns-verb",  no_argument,       0,  'v' },
+    {"dnsv6-addr",  required_argument, 0,  '!' },
-    {"blacklist", required_argument, 0,  'b' },
+    {"dnsv6-port",  required_argument, 0,  '@' },
-    {0,           0,                 0,   0  }
+    {"dns-verb",    no_argument,       0,  'v' },
+    {"blacklist",   required_argument, 0,  'b' },
+    {"ip-id",       required_argument, 0,  'i' },
+    {0,             0,                 0,   0  }
 };
 
 static char *filter_string = NULL;
-static char *filter_string_template = "(ip and tcp and "
+static char *filter_passive_string = NULL;
-        "(inbound and (("
-         "((ip.Id == 0x0001 or ip.Id == 0x0000) and tcp.SrcPort == 80 and tcp.Ack) or "
-         "((tcp.SrcPort == 80 or tcp.SrcPort == 443) and tcp.Ack and tcp.Syn)"
-         ") and " DIVERT_NO_LOCALNETS_SRC ") or "
-        "(outbound and "
-         "(tcp.DstPort == 80 or tcp.DstPort == 443) and tcp.Ack and "
-         DIVERT_NO_LOCALNETS_DST ")"
-        "))";
 
 static void add_filter_str(int proto, int port) {
-    const char *udp = " or (ip and udp and (udp.SrcPort == %d or udp.DstPort == %d))";
+    const char *udp = " or (udp and !impostor and !loopback and " \
-    const char *tcp = " or (ip and tcp and (tcp.SrcPort == %d or tcp.DstPort == %d))";
+                      "(udp.SrcPort == %d or udp.DstPort == %d))";
+    const char *tcp = " or (tcp and !impostor and !loopback and " \
+                      "(tcp.SrcPort == %d or tcp.DstPort == %d))";
 
     char *current_filter = filter_string;
     int new_filter_size = strlen(current_filter) +
@@ -112,6 +154,34 @@ static void add_filter_str(int proto, int port) {
     free(current_filter);
 }
 
+static void add_ip_id_str(int id) {
+    char *newstr;
+    const char *ipid = " or ip.Id == %d";
+    char *addfilter = malloc(strlen(ipid) + 16);
+
+    sprintf(addfilter, ipid, id);
+
+    newstr = repl_str(filter_string, IPID_TEMPLATE, addfilter);
+    free(filter_string);
+    filter_string = newstr;
+
+    newstr = repl_str(filter_passive_string, IPID_TEMPLATE, addfilter);
+    free(filter_passive_string);
+    filter_passive_string = newstr;
+}
+
+static void finalize_filter_strings() {
+    char *newstr;
+
+    newstr = repl_str(filter_string, IPID_TEMPLATE, "");
+    free(filter_string);
+    filter_string = newstr;
+
+    newstr = repl_str(filter_passive_string, IPID_TEMPLATE, "");
+    free(filter_passive_string);
+    filter_passive_string = newstr;
+}
+
 static char* dumb_memmem(const char* haystack, int hlen, const char* needle, int nlen) {
     // naive implementation
     if (nlen > hlen) return NULL;
@@ -126,15 +196,27 @@ static char* dumb_memmem(const char* haystack, int hlen, const char* needle, int
 
 static HANDLE init(char *filter, UINT64 flags) {
     LPTSTR errormessage = NULL;
+    DWORD errorcode = 0;
     filter = WinDivertOpen(filter, WINDIVERT_LAYER_NETWORK, 0, flags);
     if (filter != INVALID_HANDLE_VALUE)
         return filter;
+    errorcode = GetLastError();
     FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM |
                   FORMAT_MESSAGE_IGNORE_INSERTS,
-                  NULL, GetLastError(), MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT),
+                  NULL, errorcode, MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT),
                   (LPTSTR)&errormessage, 0, NULL);
-    printf("%s", errormessage);
+    printf("Error opening filter: %s", errormessage);
-    free(errormessage);
+    LocalFree(errormessage);
+    if (errorcode == 577)
+        printf("Windows Server 2016 systems must have secure boot disabled to be "
+               "able to load WinDivert driver.\n"
+               "Windows 7 systems must be up-to-date or at least have KB3033929 installed.\n"
+               "https://www.microsoft.com/en-us/download/details.aspx?id=46078\n\n"
+               "WARNING! If you see this error on Windows 7, it means your system is horribly "
+               "outdated and SHOULD NOT BE USED TO ACCESS THE INTERNET!\n"
+               "Most probably, you don't have security patches installed and anyone in you LAN or "
+               "public Wi-Fi network can get full access to your computer (MS17-010 and others).\n"
+               "You should install updates IMMEDIATELY.\n");
     return NULL;
 }
 
@@ -245,10 +327,14 @@ static PVOID find_http_method_end(const char *pkt, int http_frag, int *is_fragme
 }
 
 int main(int argc, char *argv[]) {
-    static const char *fragment_size_message =
+    static enum packet_type_e {
-                "Fragment size should be in range [0 - 65535]\n";
+        unknown,
+        ipv4_tcp, ipv4_tcp_data, ipv4_udp_data,
+        ipv6_tcp, ipv6_tcp_data, ipv6_udp_data
+    } packet_type;
     int i, should_reinject, should_recalc_checksum = 0;
     int opt;
+    int packet_v4, packet_v6;
     HANDLE w_filter = NULL;
     WINDIVERT_ADDRESS addr;
     char packet[MAX_PACKET_SIZE];
@@ -256,6 +342,7 @@ int main(int argc, char *argv[]) {
     UINT packetLen;
     UINT packet_dataLen;
     PWINDIVERT_IPHDR ppIpHdr;
+    PWINDIVERT_IPV6HDR ppIpV6Hdr;
     PWINDIVERT_TCPHDR ppTcpHdr;
     PWINDIVERT_UDPHDR ppUdpHdr;
     conntrack_info_t dns_conn_info;
@@ -266,12 +353,16 @@ int main(int argc, char *argv[]) {
         do_fragment_https = 0, do_host = 0,
         do_host_removespace = 0, do_additional_space = 0,
         do_http_allports = 0,
-        do_host_mixedcase = 0, do_dns_redirect = 0,
+        do_host_mixedcase = 0,
+        do_dnsv4_redirect = 0, do_dnsv6_redirect = 0,
         do_dns_verb = 0, do_blacklist = 0;
-    unsigned int http_fragment_size = 2;
+    unsigned int http_fragment_size = 0;
-    unsigned int https_fragment_size = 2;
+    unsigned int https_fragment_size = 0;
-    uint32_t dns_addr = 0;
+    uint32_t dnsv4_addr = 0;
-    uint16_t dns_port = htons(53);
+    struct in6_addr dnsv6_addr = {0};
+    struct in6_addr dns_temp_addr = {0};
+    uint16_t dnsv4_port = htons(53);
+    uint16_t dnsv6_port = htons(53);
     char *host_addr, *useragent_addr, *method_addr;
     int host_len, useragent_len;
     int http_req_fragmented;
@@ -279,24 +370,42 @@ int main(int argc, char *argv[]) {
     char *hdr_name_addr = NULL, *hdr_value_addr = NULL;
     int hdr_value_len;
 
-    if (!running_from_service && service_register(argc, argv)) {
+    // Make sure to search DLLs only in safe path, not in current working dir.
-        /* We've been called as a service. Register service
+    SetDllDirectory("");
-         * and exit this thread. main() would be called from
+    SetSearchPathMode(BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE | BASE_SEARCH_PATH_PERMANENT);
-         * service.c next time.
+
-         */
+    if (!running_from_service) {
         running_from_service = 1;
-        return 0;
+        if (service_register(argc, argv)) {
+            /* We've been called as a service. Register service
+             * and exit this thread. main() would be called from
+             * service.c next time.
+             *
+             * Note that if service_register() succeedes it does
+             * not return until the service is stopped.
+             * That is why we should set running_from_service
+             * before calling service_register and unset it
+             * afterwards.
+             */
+            return 0;
+        }
+        running_from_service = 0;
     }
 
-    if (filter_string == NULL) {
+    if (filter_string == NULL)
-        filter_string = malloc(strlen(filter_string_template) + 1);
+        filter_string = strdup(FILTER_STRING_TEMPLATE);
-        strcpy(filter_string, filter_string_template);
+    if (filter_passive_string == NULL)
-    }
+        filter_passive_string = strdup(FILTER_PASSIVE_STRING_TEMPLATE);
 
-    printf("GoodbyeDPI: Passive DPI blocker and Active DPI circumvention utility\n");
+    printf(
+        "GoodbyeDPI " GOODBYEDPI_VERSION
+        ": Passive DPI blocker and Active DPI circumvention utility\n"
+        "https://github.com/ValdikSS/GoodbyeDPI\n\n"
+    );
 
     if (argc == 1) {
         /* enable mode -1 by default */
+        http_fragment_size = https_fragment_size = 2;
         do_passivedpi = do_host = do_host_removespace \
                 = do_fragment_http = do_fragment_https \
                 = do_fragment_http_persistent \
@@ -357,7 +466,7 @@ int main(int argc, char *argv[]) {
                 do_fragment_https = 1;
                 https_fragment_size = atoi(optarg);
                 if (https_fragment_size <= 0 || https_fragment_size > 65535) {
-                    puts(fragment_size_message);
+                    puts("Fragment size should be in range [0 - 65535]\n");
                     exit(EXIT_FAILURE);
                 }
                 break;
@@ -375,34 +484,81 @@ int main(int argc, char *argv[]) {
                     add_filter_str(IPPROTO_TCP, i);
                 i = 0;
                 break;
+            case 'i':
+                /* i is used as a temporary variable here */
+                i = atoi(optarg);
+                if (i < 0 || i > 65535) {
+                    printf("IP ID parameter error!\n");
+                    exit(EXIT_FAILURE);
+                }
+                add_ip_id_str(i);
+                i = 0;
+                break;
             case 'd':
-                if (!do_dns_redirect) {
+                if ((inet_pton(AF_INET, optarg, dns_temp_addr.s6_addr) == 1) &&
-                    do_dns_redirect = 1;
+                    !do_dnsv4_redirect)
-                    dns_addr = inet_addr(optarg);
+                {
-                    if (!dns_addr) {
+                    do_dnsv4_redirect = 1;
-                        printf("DNS address parameter error!\n");
+                    if (inet_pton(AF_INET, optarg, &dnsv4_addr) != 1) {
+                        puts("DNS address parameter error!");
                         exit(EXIT_FAILURE);
                     }
                     add_filter_str(IPPROTO_UDP, 53);
                     flush_dns_cache();
+                    break;
                 }
+                puts("DNS address parameter error!");
+                exit(EXIT_FAILURE);
+                break;
+            case '!':
+                if ((inet_pton(AF_INET6, optarg, dns_temp_addr.s6_addr) == 1) &&
+                    !do_dnsv6_redirect)
+                {
+                    do_dnsv6_redirect = 1;
+                    if (inet_pton(AF_INET6, optarg, dnsv6_addr.s6_addr) != 1) {
+                        puts("DNS address parameter error!");
+                        exit(EXIT_FAILURE);
+                    }
+                    add_filter_str(IPPROTO_UDP, 53);
+                    flush_dns_cache();
+                    break;
+                }
+                puts("DNS address parameter error!");
+                exit(EXIT_FAILURE);
                 break;
             case 'g':
-                if (!do_dns_redirect) {
+                if (!do_dnsv4_redirect) {
-                    printf("--dns-port should be used with --dns-addr!\n"
+                    puts("--dns-port should be used with --dns-addr!\n"
                         "Make sure you use --dns-addr and pass it before "
-                        "--dns-port\n");
+                        "--dns-port");
                     exit(EXIT_FAILURE);
                 }
-                dns_port = atoi(optarg);
+                dnsv4_port = atoi(optarg);
                 if (atoi(optarg) <= 0 || atoi(optarg) > 65535) {
-                    printf("DNS port parameter error!\n");
+                    puts("DNS port parameter error!");
                     exit(EXIT_FAILURE);
                 }
-                if (dns_port != 53) {
+                if (dnsv4_port != 53) {
-                    add_filter_str(IPPROTO_UDP, dns_port);
+                    add_filter_str(IPPROTO_UDP, dnsv4_port);
                 }
-                dns_port = ntohs(dns_port);
+                dnsv4_port = htons(dnsv4_port);
+                break;
+            case '@':
+                if (!do_dnsv6_redirect) {
+                    puts("--dnsv6-port should be used with --dnsv6-addr!\n"
+                        "Make sure you use --dnsv6-addr and pass it before "
+                        "--dnsv6-port");
+                    exit(EXIT_FAILURE);
+                }
+                dnsv6_port = atoi(optarg);
+                if (atoi(optarg) <= 0 || atoi(optarg) > 65535) {
+                    puts("DNS port parameter error!");
+                    exit(EXIT_FAILURE);
+                }
+                if (dnsv6_port != 53) {
+                    add_filter_str(IPPROTO_UDP, dnsv6_port);
+                }
+                dnsv6_port = htons(dnsv6_port);
                 break;
             case 'v':
                 do_dns_verb = 1;
@@ -415,7 +571,7 @@ int main(int argc, char *argv[]) {
                 }
                 break;
             default:
-                printf("Usage: goodbyedpi.exe [OPTION...]\n"
+                puts("Usage: goodbyedpi.exe [OPTION...]\n"
                 " -p          block passive DPI\n"
                 " -r          replace Host with hoSt\n"
                 " -s          remove space between host header and its value\n"
@@ -426,30 +582,39 @@ int main(int argc, char *argv[]) {
                 " -n          do not wait for first segment ACK when -k is enabled\n"
                 " -e [value]  set HTTPS fragmentation to value\n"
                 " -w          try to find and parse HTTP traffic on all processed ports (not only on port 80)\n"
-                " --port      [value]    additional TCP port to perform fragmentation on (and HTTP tricks with -w)\n"
+                " --port        [value]    additional TCP port to perform fragmentation on (and HTTP tricks with -w)\n"
-                " --dns-addr  [value]    redirect UDP DNS requests to the supplied IP address (experimental)\n"
+                " --ip-id       [value]    handle additional IP ID (decimal, drop redirects and TCP RSTs with this ID).\n"
-                " --dns-port  [value]    redirect UDP DNS requests to the supplied port (53 by default)\n"
+                " --dns-addr    [value]    redirect UDPv4 DNS requests to the supplied IPv4 address (experimental)\n"
-                " --dns-verb             print verbose DNS redirection messages\n"
+                " --dns-port    [value]    redirect UDPv4 DNS requests to the supplied port (53 by default)\n"
-                " --blacklist [txtfile]  perform HTTP tricks only to host names and subdomains from\n"
+                " --dnsv6-addr  [value]    redirect UDPv6 DNS requests to the supplied IPv6 address (experimental)\n"
-                "                        supplied text file. This option can be supplied multiple times.\n"
+                " --dnsv6-port  [value]    redirect UDPv6 DNS requests to the supplied port (53 by default)\n"
+                " --dns-verb               print verbose DNS redirection messages\n"
+                " --blacklist   [txtfile]  perform HTTP tricks only to host names and subdomains from\n"
+                "                          supplied text file. This option can be supplied multiple times.\n"
                 "\n"
                 " -1          -p -r -s -f 2 -k 2 -n -e 2 (most compatible mode, default)\n"
                 " -2          -p -r -s -f 2 -k 2 -n -e 40 (better speed for HTTPS yet still compatible)\n"
                 " -3          -p -r -s -e 40 (better speed for HTTP and HTTPS)\n"
-                " -4          -p -r -s (best speed)\n");
+                " -4          -p -r -s (best speed)");
                 exit(EXIT_FAILURE);
         }
     }
 
-    printf("Block passive: %d, Fragment HTTP: %d, Fragment persistent HTTP: %d, "
+    if (!http_fragment_size)
-           "Fragment HTTPS: %d, "
+        http_fragment_size = 2;
-           "hoSt: %d, Host no space: %d, Additional space: %d, Mix Host: %d, "
+    if (!https_fragment_size)
-           "HTTP AllPorts: %d, HTTP Persistent Nowait: %d, DNS redirect: %d\n",
+        https_fragment_size = 2;
+
+    printf("Block passive: %d\nFragment HTTP: %d\nFragment persistent HTTP: %d\n"
+           "Fragment HTTPS: %d\nhoSt: %d\nHost no space: %d\nAdditional space: %d\n"
+           "Mix Host: %d\nHTTP AllPorts: %d\nHTTP Persistent Nowait: %d\n"
+           "DNS redirect: %d\nDNSv6 redirect: %d\n",
            do_passivedpi, (do_fragment_http ? http_fragment_size : 0),
            (do_fragment_http_persistent ? http_fragment_size : 0),
            (do_fragment_https ? https_fragment_size : 0),
            do_host, do_host_removespace, do_additional_space, do_host_mixedcase,
-           do_http_allports, do_fragment_http_persistent_nowait, do_dns_redirect
+           do_http_allports, do_fragment_http_persistent_nowait, do_dnsv4_redirect,
+           do_dnsv6_redirect
           );
 
     if (do_fragment_http && http_fragment_size > 2) {
@@ -459,21 +624,21 @@ int main(int argc, char *argv[]) {
     }
 
     printf("\nOpening filter\n");
+    finalize_filter_strings();
     filter_num = 0;
 
     if (do_passivedpi) {
-        /* IPv4 filter for inbound RST packets with ID = 0 or 1 */
+        /* IPv4 only filter for inbound RST packets with ID [0x0; 0xF] */
         filters[filter_num] = init(
-            "inbound and ip and tcp and "
+            filter_passive_string,
-            "(ip.Id == 0x0001 or ip.Id == 0x0000) and "
-            "(tcp.SrcPort == 443 or tcp.SrcPort == 80) and tcp.Rst and "
-            DIVERT_NO_LOCALNETS_SRC,
             WINDIVERT_FLAG_DROP);
+        if (filters[filter_num] == NULL)
+            die();
         filter_num++;
     }
 
     /* 
-     * IPv4 filter for inbound HTTP redirection packets and
+     * IPv4 & IPv6 filter for inbound HTTP redirection packets and
      * active DPI circumvention
      */
     filters[filter_num] = init(filter_string, 0);
@@ -491,13 +656,53 @@ int main(int argc, char *argv[]) {
 
     while (1) {
         if (WinDivertRecv(w_filter, packet, sizeof(packet), &addr, &packetLen)) {
-            //printf("Got %s packet, len=%d!\n", addr.Direction ? "inbound" : "outbound",
+            debug("Got %s packet, len=%d!\n", addr.Direction ? "inbound" : "outbound",
-            //       packetLen);
+                   packetLen);
             should_reinject = 1;
             should_recalc_checksum = 0;
 
-            if (WinDivertHelperParsePacket(packet, packetLen, &ppIpHdr,
+            ppIpHdr = (PWINDIVERT_IPHDR)NULL;
-                NULL, NULL, NULL, &ppTcpHdr, NULL, &packet_data, &packet_dataLen)) {
+            ppIpV6Hdr = (PWINDIVERT_IPV6HDR)NULL;
+            ppTcpHdr = (PWINDIVERT_TCPHDR)NULL;
+            ppUdpHdr = (PWINDIVERT_UDPHDR)NULL;
+            packet_v4 = packet_v6 = 0;
+            packet_type = unknown;
+
+            // Parse network packet and set it's type
+            if ((packet_v4 = WinDivertHelperParsePacket(packet, packetLen, &ppIpHdr,
+                NULL, NULL, NULL, &ppTcpHdr, NULL, &packet_data, &packet_dataLen)))
+            {
+                packet_type = ipv4_tcp_data;
+            }
+            else if ((packet_v6 = WinDivertHelperParsePacket(packet, packetLen, NULL,
+                &ppIpV6Hdr, NULL, NULL, &ppTcpHdr, NULL, &packet_data, &packet_dataLen)))
+            {
+                packet_type = ipv6_tcp_data;
+            }
+            else if ((packet_v4 = WinDivertHelperParsePacket(packet, packetLen, &ppIpHdr,
+                NULL, NULL, NULL, &ppTcpHdr, NULL, NULL, NULL)))
+            {
+                packet_type = ipv4_tcp;
+            }
+            else if ((packet_v6 = WinDivertHelperParsePacket(packet, packetLen, NULL,
+                &ppIpV6Hdr, NULL, NULL, &ppTcpHdr, NULL, NULL, NULL)))
+            {
+                packet_type = ipv6_tcp;
+            }
+            else if ((packet_v4 = WinDivertHelperParsePacket(packet, packetLen, &ppIpHdr,
+                NULL, NULL, NULL, NULL, &ppUdpHdr, &packet_data, &packet_dataLen)))
+            {
+                packet_type = ipv4_udp_data;
+            }
+            else if ((packet_v6 = WinDivertHelperParsePacket(packet, packetLen, NULL,
+                &ppIpV6Hdr, NULL, NULL, NULL, &ppUdpHdr, &packet_data, &packet_dataLen)))
+            {
+                packet_type = ipv6_udp_data;
+            }
+
+            debug("packet_type: %d, packet_v4: %d, packet_v6: %d\n", packet_type, packet_v4, packet_v6);
+
+            if (packet_type == ipv4_tcp_data || packet_type == ipv6_tcp_data) {
                 //printf("Got parsed packet, len=%d!\n", packet_dataLen);
                 /* Got a TCP packet WITH DATA */
 
@@ -507,8 +712,20 @@ int main(int argc, char *argv[]) {
 
                     /* Drop packets from filter with HTTP 30x Redirect */
                     if (do_passivedpi && is_passivedpi_redirect(packet_data, packet_dataLen)) {
-                        //printf("Dropping HTTP Redirect packet!\n");
+                        if (packet_v4) {
-                        should_reinject = 0;
+                            //printf("Dropping HTTP Redirect packet!\n");
+                            should_reinject = 0;
+                        }
+                        else if (packet_v6 && WINDIVERT_IPV6HDR_GET_FLOWLABEL(ppIpV6Hdr) == 0x0) {
+                                /* Contrary to IPv4 where we get only packets with IP ID 0x0-0xF,
+                                 * for IPv6 we got all the incoming data packets since we can't
+                                 * filter them in a driver.
+                                 *
+                                 * Handle only IPv6 Flow Label == 0x0 for now
+                                 */
+                                //printf("Dropping HTTP Redirect packet!\n");
+                                should_reinject = 0;
+                        }
                     }
                 }
                 /* Handle OUTBOUND packet on port 80, search for Host header */
@@ -544,25 +761,39 @@ int main(int argc, char *argv[]) {
                          * but it's better to send it anyway since it eliminates one RTT.
                          */
                         if (do_fragment_http_persistent && !http_req_fragmented &&
-                            (packet_dataLen > http_fragment_size)
+                            (packet_dataLen > http_fragment_size))
-                        ) {
+                        {
-                            ppIpHdr->Length = htons(
+                            if (packet_v4)
-                                ntohs(ppIpHdr->Length) -
+                                ppIpHdr->Length = htons(
-                                packet_dataLen + http_fragment_size
+                                    ntohs(ppIpHdr->Length) -
-                            );
+                                    packet_dataLen + http_fragment_size
+                                );
+                            else if (packet_v6)
+                                ppIpV6Hdr->Length = htons(
+                                    ntohs(ppIpV6Hdr->Length) -
+                                    packet_dataLen + http_fragment_size
+                                );
+
                             WinDivertHelperCalcChecksums(
-                                packet, packetLen - packet_dataLen + http_fragment_size, 0
+                                packet, packetLen - packet_dataLen + http_fragment_size, &addr, 0
                             );
                             WinDivertSend(
                                 w_filter, packet,
                                 packetLen - packet_dataLen + http_fragment_size,
                                 &addr, NULL
                             );
+
                             if (do_fragment_http_persistent_nowait) {
-                                ppIpHdr->Length = htons(
+                                if (packet_v4)
-                                    ntohs(ppIpHdr->Length) -
+                                    ppIpHdr->Length = htons(
-                                    http_fragment_size + packet_dataLen - http_fragment_size
+                                        ntohs(ppIpHdr->Length) -
-                                );
+                                        http_fragment_size + packet_dataLen - http_fragment_size
+                                    );
+                                else if (packet_v6)
+                                    ppIpV6Hdr->Length = htons(
+                                        ntohs(ppIpV6Hdr->Length) -
+                                        http_fragment_size + packet_dataLen - http_fragment_size
+                                    );
                                 memmove(packet_data,
                                         packet_data + http_fragment_size,
                                         packet_dataLen);
@@ -659,8 +890,7 @@ int main(int argc, char *argv[]) {
             } /* Handle TCP packet with data */
 
             /* Else if we got TCP packet without data */
-            else if (WinDivertHelperParsePacket(packet, packetLen, &ppIpHdr,
+            else if (packet_type == ipv4_tcp || packet_type == ipv6_tcp) {
-                NULL, NULL, NULL, &ppTcpHdr, NULL, NULL, NULL)) {
                 /* If we got INBOUND SYN+ACK packet */
                 if (addr.Direction == WINDIVERT_DIRECTION_INBOUND &&
                     ppTcpHdr->Syn == 1 && ppTcpHdr->Ack == 1) {
@@ -681,17 +911,24 @@ int main(int argc, char *argv[]) {
             }
 
             /* Else if we got UDP packet with data */
-            else if (do_dns_redirect && WinDivertHelperParsePacket(packet, packetLen, &ppIpHdr,
+            else if ((do_dnsv4_redirect && (packet_type == ipv4_udp_data)) ||
-                NULL, NULL, NULL, NULL, &ppUdpHdr, &packet_data, &packet_dataLen)) {
+                     (do_dnsv6_redirect && (packet_type == ipv6_udp_data)))
-
+            {
                 if (addr.Direction == WINDIVERT_DIRECTION_INBOUND) {
-                    if (dns_handle_incoming(ppIpHdr->DstAddr, ppUdpHdr->DstPort,
+                    if ((packet_v4 && dns_handle_incoming(&ppIpHdr->DstAddr, ppUdpHdr->DstPort,
                                         packet_data, packet_dataLen,
-                                        &dns_conn_info))
+                                        &dns_conn_info, 0))
+                        ||
+                        (packet_v6 && dns_handle_incoming(ppIpV6Hdr->DstAddr, ppUdpHdr->DstPort,
+                                        packet_data, packet_dataLen,
+                                        &dns_conn_info, 1)))
                     {
                         /* Changing source IP and port to the values
                          * from DNS conntrack */
-                        ppIpHdr->SrcAddr = dns_conn_info.dstip;
+                        if (packet_v4)
+                            ppIpHdr->SrcAddr = dns_conn_info.dstip[0];
+                        else if (packet_v6)
+                            ipv6_copy_addr(ppIpV6Hdr->SrcAddr, dns_conn_info.dstip);
                         ppUdpHdr->DstPort = dns_conn_info.srcport;
                         ppUdpHdr->SrcPort = dns_conn_info.dstport;
                         should_recalc_checksum = 1;
@@ -708,14 +945,24 @@ int main(int argc, char *argv[]) {
                 }
 
                 else if (addr.Direction == WINDIVERT_DIRECTION_OUTBOUND) {
-                    if (dns_handle_outgoing(ppIpHdr->SrcAddr, ppUdpHdr->SrcPort,
+                    if ((packet_v4 && dns_handle_outgoing(&ppIpHdr->SrcAddr, ppUdpHdr->SrcPort,
-                                        ppIpHdr->DstAddr, ppUdpHdr->DstPort,
+                                        &ppIpHdr->DstAddr, ppUdpHdr->DstPort,
-                                        packet_data, packet_dataLen))
+                                        packet_data, packet_dataLen, 0))
+                        ||
+                        (packet_v6 && dns_handle_outgoing(ppIpV6Hdr->SrcAddr, ppUdpHdr->SrcPort,
+                                        ppIpV6Hdr->DstAddr, ppUdpHdr->DstPort,
+                                        packet_data, packet_dataLen, 1)))
                     {
                         /* Changing destination IP and port to the values
                          * from configuration */
-                        ppIpHdr->DstAddr = dns_addr;
+                        if (packet_v4) {
-                        ppUdpHdr->DstPort = dns_port;
+                            ppIpHdr->DstAddr = dnsv4_addr;
+                            ppUdpHdr->DstPort = dnsv4_port;
+                        }
+                        else if (packet_v6) {
+                            ipv6_copy_addr(ppIpV6Hdr->DstAddr, (uint32_t*)dnsv6_addr.s6_addr);
+                            ppUdpHdr->DstPort = dnsv6_port;
+                        }
                         should_recalc_checksum = 1;
                     }
                     else {
@@ -733,11 +980,7 @@ int main(int argc, char *argv[]) {
             if (should_reinject) {
                 //printf("Re-injecting!\n");
                 if (should_recalc_checksum) {
-                    WinDivertHelperCalcChecksums(packet, packetLen, 0);
+                    WinDivertHelperCalcChecksums(packet, packetLen, &addr, NULL);
-                }
-                else {
-                    WinDivertHelperCalcChecksums(packet, packetLen,
-                                                 WINDIVERT_HELPER_NO_REPLACE);
                 }
                 WinDivertSend(w_filter, packet, packetLen, &addr, NULL);
             }

src/goodbyedpi.exe.manifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-    <assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="GoodbyeDPI" type="win32"/> 
+    <assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="GoodbyeDPI" type="win32"/>
-    <description>Divert</description> 
+    <description>GoodbyeDPI</description>
     <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
         <security>
             <requestedPrivileges>
@@ -9,4 +9,4 @@
             </requestedPrivileges>
         </security>
     </trustInfo>
-</assembly> 
+</assembly>

src/service.c

@@ -7,11 +7,12 @@
 
 static SERVICE_STATUS ServiceStatus;
 static SERVICE_STATUS_HANDLE hStatus;
-static int service_argc;
+static int service_argc = 0;
-static char **service_argv;
+static char **service_argv = NULL;
 
 int service_register(int argc, char *argv[])
 {
+    int i, ret;
     SERVICE_TABLE_ENTRY ServiceTable[] = {
         {SERVICE_NAME, (LPSERVICE_MAIN_FUNCTION)service_main},
         {NULL, NULL}
@@ -21,13 +22,30 @@ int service_register(int argc, char *argv[])
      * arguments, which are passed from "start" command, not
      * from the program command line.
      * We don't need this behaviour.
+     *
+     * Note that if StartServiceCtrlDispatcher() succeedes
+     * it does not return until the service is stopped,
+     * so we should copy all arguments first and then
+     * handle the failure.
      */
-    service_argc = argc;
+    if (!service_argc && !service_argv) {
-    service_argv = malloc(sizeof(void*) * argc);
+        service_argc = argc;
-    for (int i = 0; i < argc; i++) {
+        service_argv = malloc(sizeof(void*) * argc);
-        service_argv[i] = strdup(argv[i]);
+        for (i = 0; i < argc; i++) {
+            service_argv[i] = strdup(argv[i]);
+        }
     }
-    return StartServiceCtrlDispatcher(ServiceTable);
+
+    ret = StartServiceCtrlDispatcher(ServiceTable);
+
+    if (service_argc && service_argv) {
+        for (i = 0; i < service_argc; i++) {
+            free(service_argv[i]);
+        }
+        free(service_argv);
+    }
+
+    return ret;
 }
 
 void service_main(int argc __attribute__((unused)),
@@ -53,14 +71,9 @@ void service_main(int argc __attribute__((unused)),
     SetServiceStatus(hStatus, &ServiceStatus);
 
     // Calling main with saved argc & argv
-    main(service_argc, service_argv);
+    ServiceStatus.dwWin32ExitCode = main(service_argc, service_argv);
-
+    ServiceStatus.dwCurrentState  = SERVICE_STOPPED;
-    if (ServiceStatus.dwCurrentState != SERVICE_STOPPED) {
+    SetServiceStatus(hStatus, &ServiceStatus);
-        // If terminated with error
-        ServiceStatus.dwWin32ExitCode = 1;
-        ServiceStatus.dwCurrentState  = SERVICE_STOPPED;
-        SetServiceStatus (hStatus, &ServiceStatus);
-    }
     return;
 }
 
@@ -78,6 +91,6 @@ void service_controlhandler(DWORD request)
             break;
     }
     // Report current status
-    SetServiceStatus (hStatus, &ServiceStatus);
+    SetServiceStatus(hStatus, &ServiceStatus);
     return;
 }

src/utils/repl_str.c

@@ -0,0 +1,90 @@
+#include <string.h>
+#include <stdlib.h>
+#include <stddef.h>
+
+#if (__STDC_VERSION__ >= 199901L)
+#include <stdint.h>
+#endif
+
+char *repl_str(const char *str, const char *from, const char *to) {
+
+	/* Adjust each of the below values to suit your needs. */
+
+	/* Increment positions cache size initially by this number. */
+	size_t cache_sz_inc = 16;
+	/* Thereafter, each time capacity needs to be increased,
+	 * multiply the increment by this factor. */
+	const size_t cache_sz_inc_factor = 3;
+	/* But never increment capacity by more than this number. */
+	const size_t cache_sz_inc_max = 1048576;
+
+	char *pret, *ret = NULL;
+	const char *pstr2, *pstr = str;
+	size_t i, count = 0;
+	#if (__STDC_VERSION__ >= 199901L)
+	uintptr_t *pos_cache_tmp, *pos_cache = NULL;
+	#else
+	ptrdiff_t *pos_cache_tmp, *pos_cache = NULL;
+	#endif
+	size_t cache_sz = 0;
+	size_t cpylen, orglen, retlen, tolen, fromlen = strlen(from);
+
+	/* Find all matches and cache their positions. */
+	while ((pstr2 = strstr(pstr, from)) != NULL) {
+		count++;
+
+		/* Increase the cache size when necessary. */
+		if (cache_sz < count) {
+			cache_sz += cache_sz_inc;
+			pos_cache_tmp = realloc(pos_cache, sizeof(*pos_cache) * cache_sz);
+			if (pos_cache_tmp == NULL) {
+				goto end_repl_str;
+			} else pos_cache = pos_cache_tmp;
+			cache_sz_inc *= cache_sz_inc_factor;
+			if (cache_sz_inc > cache_sz_inc_max) {
+				cache_sz_inc = cache_sz_inc_max;
+			}
+		}
+
+		pos_cache[count-1] = pstr2 - str;
+		pstr = pstr2 + fromlen;
+	}
+
+	orglen = pstr - str + strlen(pstr);
+
+	/* Allocate memory for the post-replacement string. */
+	if (count > 0) {
+		tolen = strlen(to);
+		retlen = orglen + (tolen - fromlen) * count;
+	} else	retlen = orglen;
+	ret = malloc(retlen + 1);
+	if (ret == NULL) {
+		goto end_repl_str;
+	}
+
+	if (count == 0) {
+		/* If no matches, then just duplicate the string. */
+		strcpy(ret, str);
+	} else {
+		/* Otherwise, duplicate the string whilst performing
+		 * the replacements using the position cache. */
+		pret = ret;
+		memcpy(pret, str, pos_cache[0]);
+		pret += pos_cache[0];
+		for (i = 0; i < count; i++) {
+			memcpy(pret, to, tolen);
+			pret += tolen;
+			pstr = str + pos_cache[i] + fromlen;
+			cpylen = (i == count-1 ? orglen : pos_cache[i+1]) - pos_cache[i] - fromlen;
+			memcpy(pret, pstr, cpylen);
+			pret += cpylen;
+		}
+		ret[retlen] = '\0';
+	}
+
+end_repl_str:
+	/* Free the cache and return the post-replacement string,
+	 * which will be NULL in the event of an error. */
+	free(pos_cache);
+	return ret;
+}

src/utils/repl_str.h

@@ -0,0 +1 @@
+char *repl_str(const char *str, const char *from, const char *to);