Test

2017-09-07 16:01:19 +03:00
29 changed files with 405 additions and 4090 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -1,8 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-indent_style = space
-indent_size = 4
-insert_final_newline = true
-end_of_line = lf
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@ -1,63 +0,0 @@
-name: Bug Report / Сообщение об ошибке
-description: File a bug report / Сообщить об ошибке в программе
-
-body:
-  - type: markdown
-    attributes:
-      value: |
-        ### USE THIS FORM ONLY FOR BUGS! The webside does not open? That's likely NOT a bug, do not report it here!
-        GoodbyeDPI does not guarantee to work with your ISP for every blocked website or at all. If GoodbyeDPI can't unblock some or any websites, this is most likely not a software bug, and you should not report it here.
-
-        Please only report software bugs, such as:
-          * program crash
-          * incorrect network packet handling
-          * antivirus incompatibility
-          * DNS redirection problems
-          * other software 
-
-        Please make sure to check other opened and closed issues, it could be your bug has been reported already.
-        For questions, or if in doubt, [use NTC.party forum](https://ntc.party/c/community-software/goodbyedpi).
-
-        ### ИСПОЛЬЗУЙТЕ ЭТУ ФОРМУ ТОЛЬКО ДЛЯ БАГОВ! Веб-сайт не открывается? Это, скорее всего, не баг, не сообщайте сюда!
-        GoodbyeDPI не гарантирует ни 100% работу с вашим провайдером, ни работу с каждым заблокированным сайтом. Если GoodbyeDPI не разблокирует доступ к некоторым или всем веб-сайтам, вероятнее всего, это не программная ошибка, и не стоит о ней сообщать здесь.
-
-        Пожалуйста, сообщайте только об ошибках в программе, таких как:
-          * падение программы
-          * некорректная обработка сетевых пакетов
-          * несовместимость с антивирусами
-          * проблемы с перенаправлением DNS
-          * другие ошибки в программе
-
-        Также посмотрите другие открытые и закрытые баги. Возможно, ошибка уже обсуждалась или исправлена.
-        Для вопросов, а также в случае сомнений в определении бага, обращайтесь [на форум NTC.party](https://ntc.party/c/community-software/goodbyedpi).
-  - type: input
-    id: os
-    attributes:
-      label: Operating system / операционная система
-      description: Enter your Windows version. For Windows 10 and 11 include build/update number.
-      placeholder: ex. Windows 10 20H2
-    validations:
-      required: true
-  - type: dropdown
-    id: is-svc
-    attributes:
-      label: Running as service / Запуск программы как сервис
-      description: Do you use GoodbyeDPI as a Windows Service?
-      options:
-        - I run it as a regular program / Запускаю программу обычным образом
-        - I installed it as a service / Установил как сервис Windows
-    validations:
-      required: true
-  - type: textarea
-    id: what-happened
-    attributes:
-      label: Describe the bug / Опишите ошибку программы
-      description: A clear and concise description of what the bug is / Подробно опишите, в чём заключается ошибка
-      placeholder: Attach the screenshots for clarity / При необходимости приложите скриншоты
-    validations:
-      required: true
-  - type: textarea
-    id: additional-info
-    attributes:
-      label: Additional information / Дополнительная информация
-      description: If you have a hints on why this bug happens, you can express it here / Если у вас есть предположения об источнике бага, вы можете изложить их здесь
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Questions about the program / Вопросы по програме
-    url: https://ntc.party/c/community-software/goodbyedpi/8
-    about: Please ask and answer questions on forum / Пожалуйста, задавайте вопросы только на форуме
--- a/.github/ISSUE_TEMPLATE/feature.yml
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@ -1,15 +0,0 @@
-name:  Feature request / Предложить новую функциональность 
-description:  Suggest an idea or function for this project / Предложить новую идею или функциональность в программе
-
-body:
-  - type: markdown
-    attributes:
-      value: |
-        If you think of a great function or circumvention method which is missing from the program, go ahead and suggest it here.
-        Если вы придумали новую функцию или метод обхода, которого еще нет в программе, напишите о нем подробнее здесь.
-  - type: textarea
-    id: description
-    attributes:
-      label: Describe your feature / Опишите ваше предложение
-    validations:
-      required: true
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -1,78 +0,0 @@
-name: Build GoodbyeDPI
-
-on:
-  push:
-    paths:
-      - 'src/**'
-  workflow_dispatch:
-
-env:
-  WINDIVERT_URL: https://reqrypt.org/download/WinDivert-2.2.0-D.zip
-  WINDIVERT_NAME: WinDivert-2.2.0-D.zip
-  WINDIVERT_BASENAME: WinDivert-2.2.0-D
-  WINDIVERT_SHA256: 1d461cfdfa7ba88ebcfbb3603b71b703e9f72aba8aeff99a75ce293e6f89d2ba
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Declare short commit variable
-        id: vars
-        run: |
-          echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-
-      - name: Install MinGW-w64
-        run: >
-          sudo rm /var/lib/man-db/auto-update &&
-          sudo DEBIAN_FRONTEND=noninteractive XZ_DEFAULTS="-T0" XZ_OPT="-T0" eatmydata
-          apt install -y --no-install-recommends gcc-mingw-w64
-
-      - name: Download WinDivert from cache
-        id: windivert-cache
-        uses: actions/cache@v4
-        with:
-          path: ${{ env. WINDIVERT_NAME }}
-          key: ${{ env. WINDIVERT_SHA256 }}
-
-      - name: Download WinDivert from the website
-        if: steps.windivert-cache.outputs.cache-hit != 'true'
-        run: >
-          wget ${{ env. WINDIVERT_URL }} &&
-          (echo ${{ env. WINDIVERT_SHA256 }} ${{ env. WINDIVERT_NAME }} | sha256sum -c)
-
-      - name: Unpack WinDivert
-        run: unzip ${{ env. WINDIVERT_NAME }}
-
-      - name: Compile x86_64
-        run: >
-          cd src && make clean &&
-          make CPREFIX=x86_64-w64-mingw32- BIT64=1 WINDIVERTHEADERS=../${{ env.WINDIVERT_BASENAME }}/include WINDIVERTLIBS=../${{ env.WINDIVERT_BASENAME }}/x64 -j4
-
-      - name: Prepare x86_64 directory
-        run: |
-          mkdir goodbyedpi_x86_64_${{ steps.vars.outputs.sha_short }}
-          cp src/goodbyedpi.exe ${{ env.WINDIVERT_BASENAME }}/x64/*.{dll,sys} goodbyedpi_x86_64_${{ steps.vars.outputs.sha_short }}
-
-      - name: Upload output file x86_64
-        uses: actions/upload-artifact@v4
-        with:
-          name: goodbyedpi_x86_64_${{ steps.vars.outputs.sha_short }}
-          path: goodbyedpi_x86_64_${{ steps.vars.outputs.sha_short }}
-
-      - name: Compile i686
-        run: >
-          cd src && make clean &&
-          make CPREFIX=i686-w64-mingw32- WINDIVERTHEADERS=../${{ env.WINDIVERT_BASENAME }}/include WINDIVERTLIBS=../${{ env.WINDIVERT_BASENAME }}/x86 -j4
-
-      - name: Prepare x86 directory
-        run: |
-          mkdir goodbyedpi_x86_${{ steps.vars.outputs.sha_short }}
-          cp src/goodbyedpi.exe ${{ env.WINDIVERT_BASENAME }}/x86/*.{dll,sys} goodbyedpi_x86_${{ steps.vars.outputs.sha_short }}
-
-      - name: Upload output file x86
-        uses: actions/upload-artifact@v4
-        with:
-          name: goodbyedpi_x86_${{ steps.vars.outputs.sha_short }}
-          path: goodbyedpi_x86_${{ steps.vars.outputs.sha_short }}
--- a/33
+++ b/33
@ -0,0 +1,33 @@
+CPREFIX = x86_64-w64-mingw32
+WINDIVERTHEADERS = ../../include
+WINDIVERTLIBS = ../binary
+
+TARGET = goodbyedpi.exe
+LIBS = -L $(WINDIVERTLIBS) -lWinDivert -lws2_32
+CC = $(CPREFIX)-gcc
+CCWINDRES = $(CPREFIX)-windres
+CFLAGS = -Wall -I $(WINDIVERTHEADERS) -L $(WINDIVERTLIBS) \
+         -O2 -fPIE -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2
+
+.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 $(LIBS) -s -o $@
+
+clean:
+	-rm -f *.o
+	-rm -f $(TARGET)
--- a/README.md
+++ b/README.md
@ -1,19 +1,11 @@
-GoodbyeDPI — Deep Packet Inspection circumvention utility
+GoodbyeDPI — Passive Deep Packet Inspection blocker and Active DPI circumvention utility
 =========================

 This software designed to bypass Deep Packet Inspection systems found in many Internet Service Providers which block access to certain websites.

 It handles DPI connected using optical splitter or port mirroring (**Passive DPI**) which do not block any data but just replying faster than requested destination, and **Active DPI** connected in sequence.

-**Windows 7, 8, 8.1, 10 or 11** with administrator privileges required.
-
-# Quick start
-
-* **For Russia**: Download [latest version from Releases page](https://github.com/ValdikSS/GoodbyeDPI/releases), unpack the file and run **1_russia_blacklist_dnsredir.cmd** script.
-* For other countries: Download [latest version from Releases page](https://github.com/ValdikSS/GoodbyeDPI/releases), unpack the file and run **2_any_country_dnsredir.cmd**.
-
-These scripts launch GoodbyeDPI in recommended mode with DNS resolver redirection to Yandex DNS on non-standard port (to prevent DNS poisoning).  
-If it works — congratulations! You can use it as-is or configure further.
+**Windows 7, 8, 8.1 and 10** with administrator privileges required.

 # How to use

@ -24,91 +16,38 @@ Usage: goodbyedpi.exe [OPTION...]
 -p          block passive DPI
 -r          replace Host with hoSt
 -s          remove space between host header and its value
- -m          mix Host header case (test.com -> tEsT.cOm)
- -f <value>  set HTTP fragmentation to value
- -k <value>  enable HTTP persistent (keep-alive) fragmentation and set it to value
- -n          do not wait for first segment ACK when -k is enabled
- -e <value>  set HTTPS fragmentation to value
+ -f [value]  set HTTP fragmentation to value
+ -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)
- --ip-id       <value>    handle additional IP ID (decimal, drop redirects and TCP RSTs with this ID).
-                          This option can be supplied multiple times.
- --dns-addr    <value>    redirect UDP DNS requests to the supplied IP address (experimental)
- --dns-port    <value>    redirect UDP DNS requests to the supplied port (53 by default)
- --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 circumvention tricks only to host names and subdomains from
-                          supplied text file (HTTP Host/TLS SNI).
-                          This option can be supplied multiple times.
- --allow-no-sni           perform circumvention if TLS SNI can't be detected with --blacklist enabled.
- --frag-by-sni            if SNI is detected in TLS packet, fragment the packet right before SNI value.
- --set-ttl     <value>    activate Fake Request Mode and send it with supplied TTL value.
-                          DANGEROUS! May break websites in unexpected ways. Use with care (or --blacklist).
- --auto-ttl    [a1-a2-m]  activate Fake Request Mode, automatically detect TTL and decrease
-                          it based on a distance. If the distance is shorter than a2, TTL is decreased
-                          by a2. If it's longer, (a1; a2) scale is used with the distance as a weight.
-                          If the resulting TTL is more than m(ax), set it to m.
-                          Default (if set): --auto-ttl 1-4-10. Also sets --min-ttl 3.
-                          DANGEROUS! May break websites in unexpected ways. Use with care (or --blacklist).
- --min-ttl     <value>    minimum TTL distance (128/64 - TTL) for which to send Fake Request
-                          in --set-ttl and --auto-ttl modes.
- --wrong-chksum           activate Fake Request Mode and send it with incorrect TCP checksum.
-                          May not work in a VM or with some routers, but is safer than set-ttl.
- --wrong-seq              activate Fake Request Mode and send it with TCP SEQ/ACK in the past.
- --native-frag            fragment (split) the packets by sending them in smaller packets, without
-                          shrinking the Window Size. Works faster (does not slow down the connection)
-                          and better.
- --reverse-frag           fragment (split) the packets just as --native-frag, but send them in the
-                          reversed order. Works with the websites which could not handle segmented
-                          HTTPS TLS ClientHello (because they receive the TCP flow "combined").
- --max-payload [value]    packets with TCP payload data more than [value] won't be processed.
-                          Use this option to reduce CPU usage by skipping huge amount of data
-                          (like file transfers) in already established sessions.
-                          May skip some huge HTTP requests from being processed.
-                          Default (if set): --max-payload 1200.

-
-LEGACY modesets:
- -1          -p -r -s -f 2 -k 2 -n -e 2 (most compatible mode)
- -2          -p -r -s -f 2 -k 2 -n -e 40 (better speed for HTTPS yet still compatible)
- -3          -p -r -s -e 40 (better speed for HTTP and HTTPS)
+ -1          -p -r -s -f 2 -e 2 (most compatible mode, default)
+ -2          -p -r -s -f 2 -e 40 (better speed yet still compatible)
+ -3          -p -r -s -e 40 (even better speed)
 -4          -p -r -s (best speed)
-
-Modern modesets (more stable, more compatible, faster):
- -5          -f 2 -e 2 --auto-ttl --reverse-frag --max-payload (this is the default)
- -6          -f 2 -e 2 --wrong-seq --reverse-frag --max-payload
 ```

-To check if your ISP's DPI could be circumvented, first make sure that your provider does not poison DNS answers by enabling "Secure DNS (DNS over HTTPS)" option in your browser.
+Try to run `goodbyedpi.exe -1 -a` first. If you can open blocked websites it means your ISP has DPI which can be circumvented. This is the slowest and prone to break websites mode, but suitable for most DPI.

-* **Chrome**: Settings → [Privacy and security](chrome://settings/security) → Use secure DNS → With: NextDNS
-* **Firefox**: [Settings](about:preferences) → Network Settings → Enable DNS over HTTPS → Use provider: NextDNS
+Try `-1` to see if it works too.

-Then run the `goodbyedpi.exe` executable without any options. If it works — congratulations! You can use it as-is or configure further, for example by using `--blacklist` option if the list of blocked websites is known and available for your country.
+Then try `goodbyedpi.exe -2`. It should be faster for HTTPS sites. Mode `-3` speed ups HTTP websites.

-If your provider intercepts DNS requests, you may want to use `--dns-addr` option to a public DNS resolver running on non-standard port (such as Yandex DNS `77.88.8.8:1253`) or configure DNS over HTTPS/TLS using third-party applications.
-
-Check the .cmd scripts and modify it according to your preference and network conditions.
+Use `goodbyedpi.exe -4` if it works for your ISP's DPI. This is the fastest mode but not compatible with every DPI.

 # How does it work

 ### 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 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.
+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.

 ### Active DPI

-Active DPI is more tricky to fool. Currently the software uses 7 methods to circumvent Active DPI:
+Active DPI is more tricky to fool. Currently the software uses 4 methods to circumvent Active DPI:

 * TCP-level fragmentation for first data packet
-* TCP-level fragmentation for persistent (keep-alive) HTTP sessions
 * Replacing `Host` header with `hoSt`
 * Removing space between header name and value in `Host` header
 * Adding additional space between HTTP Method (GET, POST etc) and URI
-* Mixing case of Host header value
-* Sending fake HTTP/HTTPS packets with low Time-To-Live value, incorrect checksum or incorrect TCP Sequence/Acknowledgement numbers to fool DPI and prevent delivering them to the destination

 These methods should not break any website as they're fully compatible with TCP and HTTP standards, yet it's sufficient to prevent DPI data classification and to circumvent censorship. Additional space may break some websites, although it's acceptable by HTTP/1.1 specification (see 19.3 Tolerant Applications).

@ -120,36 +59,38 @@ This project can be build using **GNU Make** and [**mingw**](https://mingw-w64.o

 To build x86 exe run:

-`make CPREFIX=i686-w64-mingw32- WINDIVERTHEADERS=/path/to/windivert/include WINDIVERTLIBS=/path/to/windivert/x86`
+`make CPREFIX=i686-w64-mingw32 WINDIVERTHEADERS=/path/to/windivert/include WINDIVERTLIBS=/path/to/windivert/x86`

 And for x86_64:

-`make CPREFIX=x86_64-w64-mingw32- BIT64=1 WINDIVERTHEADERS=/path/to/windivert/include WINDIVERTLIBS=/path/to/windivert/amd64`
+`make CPREFIX=x86_64-w64-mingw32 WINDIVERTHEADERS=/path/to/windivert/include WINDIVERTLIBS=/path/to/windivert/amd64`

 # How to install as Windows Service

-Check examples in `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 [x86](https://www.microsoft.com/en-us/download/details.aspx?id=46078)/[x64](https://www.microsoft.com/en-us/download/details.aspx?id=46148), 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).~~ Fragmentation issues are fixed in v0.1.7.
-* ~~ESET Antivirus is incompatible with WinDivert driver [#91](https://github.com/ValdikSS/GoodbyeDPI/issues/91). This is most probably antivirus bug, not WinDivert.~~
+One way is using an [srvstart](http://www.rozanski.org.uk/software) program.  
+Unpack it to `goodbyedpi` directory and create 3 files:

+*goodbyedpi.ini*
+```INI
+[GoodByeDPI]
+startup=goodbyedpi.exe
+shutdown_method=winmessage
+auto_restart=n
+```
+*srvinstall.bat*
+```Batchfile
+srvstart install GoodByeDPI -c %CD%\goodbyedpi.ini
+```
+*srvremove.bat*
+```Batchfile
+srvstart remove GoodByeDPI
+```
+Run these batch files as Administrator to install/remove service.  
+Open Windows Services panel to run service or make it start automaticaly.

 # Similar projects

- **[zapret](https://github.com/bol-van/zapret)** by @bol-van (for MacOS, Linux and Windows)
- **[Green Tunnel](https://github.com/SadeghHayeri/GreenTunnel)** by @SadeghHayeri (for MacOS, Linux and Windows)
- **[DPI Tunnel CLI](https://github.com/zhenyolka/DPITunnel-cli)** by @zhenyolka (for Linux and routers)
- **[DPI Tunnel for Android](https://github.com/zhenyolka/DPITunnel-android)** by @zhenyolka (for Android)
- **[PowerTunnel](https://github.com/krlvm/PowerTunnel)** by @krlvm (for Windows, MacOS and Linux)
- **[PowerTunnel for Android](https://github.com/krlvm/PowerTunnel-Android)** by @krlvm (for Android)
- **[SpoofDPI](https://github.com/xvzc/SpoofDPI)** by @xvzc (for macOS and Linux)
- **[GhosTCP](https://github.com/macronut/ghostcp)** by @macronut (for Windows)
- **[ByeDPI](https://github.com/hufrea/byedpi)** for Linux/Windows + **[ByeDPIAndroid](https://github.com/dovecoteescapee/ByeDPIAndroid/)** for Android (no root)
+[zapret](https://github.com/bol-van/zapret) by @bol-van (for Linux).

 # Kudos

--- a/src/goodbyedpi-rc.rc
+++ b/src/goodbyedpi-rc.rc
--- a/goodbyedpi.c
+++ b/goodbyedpi.c
@ -0,0 +1,334 @@
+/*
+ * GoodbyeDPI — Passive DPI blocker and Active DPI circumvention utility.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <unistd.h>
+#include <string.h>
+#include <winsock2.h>
+#include "windivert.h"
+
+#define die() do { printf("Something went wrong!\n" \
+    "Make sure you're running this program with administrator privileges\n"); \
+    sleep(10); exit(EXIT_FAILURE); } while (0)
+
+#define MAX_FILTERS 4
+#define MAX_PACKET_SIZE 1516
+#define IPV4_HDR_LEN 20
+#define TCP_HDR_LEN 20
+#define IPV4_TOTALLEN_OFFSET 2
+#define TCP_WINDOWSIZE_OFFSET 14
+
+#define DIVERT_NO_LOCALNETS_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 "(" \
+                   "(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 " \
+                   "(ip.SrcAddr < 172.16.0.0 or ip.SrcAddr > 172.31.255.255) and " \
+                   "(ip.SrcAddr < 169.254.0.0 or ip.SrcAddr > 169.254.255.255)" \
+                   ")"
+    
+static HANDLE filters[MAX_FILTERS];
+static int filter_num = 0;
+static const char *http10_redirect_302 = "HTTP/1.0 302 ";
+static const char *http11_redirect_302 = "HTTP/1.1 302 ";
+static const char *http_host_find = "\r\nHost: ";
+static const char *http_host_replace = "\r\nhoSt: ";
+static const char *http_useragent_find = "\r\nUser-Agent: ";
+static const char *location_http = "\r\nLocation: http://";
+static const char *connection_close = "\r\nConnection: close";
+static const char *http_methods[] = {
+    "GET ",
+    "HEAD ",
+    "POST ",
+    "PUT ",
+    "DELETE ",
+    "CONNECT ",
+    "OPTIONS ",
+};
+
+static char* dumb_memmem(const char* haystack, int hlen, const char* needle, int nlen) {
+    // naive implementation
+    if (nlen > hlen) return 0;
+    int i;
+    for (i=0; i<hlen-nlen+1; i++) {
+        if (memcmp(haystack+i,needle,nlen)==0) {
+            return (char*)(haystack+i);
+        }
+    }
+    return NULL;
+}
+
+static HANDLE init(char *filter, UINT64 flags) {
+    LPTSTR errormessage = NULL;
+    filter = WinDivertOpen(filter, WINDIVERT_LAYER_NETWORK, 0, flags);
+    if (filter != INVALID_HANDLE_VALUE)
+        return filter;
+    FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM |
+                  FORMAT_MESSAGE_IGNORE_INSERTS,
+                  NULL, GetLastError(), MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT),
+                  (LPTSTR)&errormessage, 0, NULL);
+    printf("%s", errormessage);
+    return NULL;
+}
+
+static int deinit(HANDLE handle) {
+    if (handle) {
+        WinDivertClose(handle);
+        return 1;
+    }
+    return 0;
+}
+
+static void deinit_all() {
+    for (int i = 0; i < filter_num; i++) {
+        deinit(filters[i]);
+    }
+}
+
+static void sigint_handler(int sig) {
+    deinit_all();
+    exit(EXIT_SUCCESS);
+}
+
+static int is_passivedpi_redirect(const char *pktdata, int pktlen) {
+    /* First check if this is HTTP 302 redirect */
+    if (memcmp(pktdata, http11_redirect_302, strlen(http11_redirect_302)) == 0 ||
+        memcmp(pktdata, http10_redirect_302, strlen(http10_redirect_302)) == 0)
+    {
+        /* Then check if this is a redirect to new http site with Connection: close */
+        if (dumb_memmem(pktdata, pktlen, location_http, strlen(location_http)) &&
+            dumb_memmem(pktdata, pktlen, connection_close, strlen(connection_close))) {
+            return 1;
+        }
+    }
+    return 0;
+}
+
+/* Finds Host header with \r\n before it */
+static PVOID find_host_header(const char *pktdata, int pktlen) {
+    return dumb_memmem(pktdata, pktlen,
+                http_host_find, strlen(http_host_find));
+}
+
+/* Finds User-Agent header with \r\n before it */
+static PVOID find_useragent_header(const char *pktdata, int pktlen) {
+    return dumb_memmem(pktdata, pktlen,
+                http_useragent_find, strlen(http_useragent_find));
+}
+
+static void change_window_size(const char *pkt, int size) {
+    *(uint16_t*)(pkt + IPV4_HDR_LEN + TCP_WINDOWSIZE_OFFSET) = htons(size);
+}
+
+/* HTTP method end without trailing space */
+static PVOID find_http_method_end(const char *pkt, int offset) {
+    int i;
+    for (i = 0; i<(sizeof(http_methods) / sizeof(*http_methods)); i++) {
+        if (memcmp(pkt, http_methods[i], strlen(http_methods[i])) == 0) {
+            return (char*)pkt + strlen(http_methods[i]) - 1;
+        }
+        /* Try to find HTTP method in a second part of fragmented packet */
+        if ((offset == 1 || offset == 2) &&
+            memcmp(pkt, http_methods[i] + offset,
+                   strlen(http_methods[i]) - offset) == 0
+           )
+        {
+            return (char*)pkt + strlen(http_methods[i]) - offset - 1;
+        }
+    }
+    return NULL;
+}
+
+int main(int argc, char *argv[]) {
+    static const char fragment_size_message[] =
+                "Fragment size should be in range [0 - 65535]\n";
+    int i, should_reinject, should_recalc_checksum = 0;
+    int opt;
+    HANDLE w_filter = NULL;
+    WINDIVERT_ADDRESS addr;
+    char packet[MAX_PACKET_SIZE];
+    PVOID packet_data;
+    UINT packetLen;
+    UINT packet_dataLen;
+    PWINDIVERT_IPHDR ppIpHdr;
+    PWINDIVERT_TCPHDR ppTcpHdr;
+
+    int do_passivedpi = 0, do_fragment_http = 0,
+        do_fragment_https = 0, do_host = 0,
+        do_host_removespace = 0, do_additional_space = 0;
+    int http_fragment_size = 2;
+    int https_fragment_size = 2;
+    char *data_addr, *data_addr_rn, *host_addr, *useragent_addr, *method_addr;
+    int data_len, host_len;
+
+    printf("GoodbyeDPI: Passive DPI blocker and Active DPI circumvention utility\n");
+
+    if (argc == 1) {
+        /* enable mode -1 by default */
+        do_passivedpi = do_host = do_host_removespace \
+            = do_fragment_http = do_fragment_https = 1;
+    }
+
+    while ((opt = getopt(argc, argv, "1234prsaf:e:")) != -1) {
+        switch (opt) {
+            case '1':
+                do_passivedpi = do_host = do_host_removespace \
+                = do_fragment_http = do_fragment_https = 1;
+                break;
+            case '2':
+                do_passivedpi = do_host = do_host_removespace \
+                = do_fragment_http = do_fragment_https = 1;
+                https_fragment_size = 40;
+                break;
+            case '3':
+                do_passivedpi = do_host = do_host_removespace \
+                = do_fragment_https = 1;
+                https_fragment_size = 40;
+            case '4':
+                do_passivedpi = do_host = do_host_removespace = 1;
+                break;
+            case 'p':
+                do_passivedpi = 1;
+                break;
+            case 'r':
+                do_host = 1;
+                break;
+            case 's':
+                do_host_removespace = 1;
+                break;
+            case 'a':
+                do_additional_space = 1;
+                do_host_removespace = 1;
+                break;
+            case 'f':
+                do_fragment_http = 1;
+                http_fragment_size = atoi(optarg);
+                if (http_fragment_size <= 0 || http_fragment_size > 65535) {
+                    printf(fragment_size_message);
+                    exit(EXIT_FAILURE);
+                }
+                break;
+            case 'e':
+                do_fragment_https = 1;
+                https_fragment_size = atoi(optarg);
+                if (https_fragment_size <= 0 || https_fragment_size > 65535) {
+                    printf(fragment_size_message);
+                    exit(EXIT_FAILURE);
+                }
+                break;
+            default:
+                printf("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"
+                " -a          additional space between Method and Request-URI (enables -s, may break sites)\n"
+                " -f [value]  set HTTP fragmentation to value\n"
+                " -e [value]  set HTTPS fragmentation to value\n"
+                "\n"
+                " -1          -p -r -s -f 2 -e 2 (most compatible mode, default)\n"
+                " -2          -p -r -s -f 2 -e 40 (better speed yet still compatible)\n"
+                " -3          -p -r -s -e 40 (even better speed)\n"
+                " -4          -p -r -s (best speed)\n");
+                exit(EXIT_FAILURE);
+        }
+    }
+
+    printf("Block passive: %d, Fragment HTTP: %d, Fragment HTTPS: %d, "
+           "hoSt: %d, Host no space: %d, Additional space: %d\n",
+           do_passivedpi, (do_fragment_http ? http_fragment_size : 0),
+           (do_fragment_https ? https_fragment_size : 0),
+           do_host, do_host_removespace, do_additional_space);
+
+    if (do_fragment_http && http_fragment_size > 2) {
+        printf("WARNING: HTTP fragmentation values > 2 are not fully compatible "
+               "with other options. Please use values <= 2 or disable HTTP fragmentation "
+               "completely.\n");
+    }
+
+    printf("\nOpening filter\n");
+    filter_num = 0;
+
+    if (do_passivedpi) {
+        /* IPv4 filter for inbound RST packets with ID = 0 or 1 */
+        filters[filter_num] = init(
+            "inbound and ip and tcp and "
+            "(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);
+        filter_num++;
+    }
+
+    /* 
+     * IPv4 filter for inbound HTTP redirection packets and
+     * active DPI circumvention
+     */
+    filters[filter_num] = init("ip and tcp and "
+        "(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 ")"
+        ")",
+        0);
+
+    w_filter = filters[filter_num];
+    filter_num++;
+
+    for (i = 0; i < filter_num; i++) {
+        if (filters[i] == NULL)
+            die();
+    }
+
+    printf("Filter activated!\n");
+    signal(SIGINT, sigint_handler);
+
+    while (1) {
+         if (WinDivertRecv(w_filter, packet, sizeof(packet), &addr, &packetLen)) {
+            printf("Got %s packet, len=%d!\n", addr.Direction ? "inbound" : "outbound",
+                   packetLen);
+
+            // do nothing for DATA packet
+            if (WinDivertHelperParsePacket(packet, packetLen, &ppIpHdr,
+                NULL, NULL, NULL, &ppTcpHdr, NULL, &packet_data, &packet_dataLen)) {
+            }
+
+            // reduce window size on non-data packet
+            else if (WinDivertHelperParsePacket(packet, packetLen, &ppIpHdr,
+                NULL, NULL, NULL, &ppTcpHdr, NULL, NULL, NULL)) {
+                /* If we got SYN+ACK packet */
+                if (addr.Direction == WINDIVERT_DIRECTION_INBOUND && 
+                    ppTcpHdr->Syn == 1) {
+                    printf("Changing Window Size!\n");
+                    if (do_fragment_http && ppTcpHdr->SrcPort == htons(80)) {
+                        change_window_size(packet, http_fragment_size);
+                        WinDivertHelperCalcChecksums(packet, packetLen, 0);
+                    }
+                    else if (do_fragment_https && ppTcpHdr->SrcPort != htons(80)) {
+                        change_window_size(packet, https_fragment_size);
+                        WinDivertHelperCalcChecksums(packet, packetLen, 0);
+                    }
+                }
+            }
+            // uncomment this to make it work
+            //WinDivertHelperCalcChecksums(packet, packetLen, 0);
+            WinDivertSend(w_filter, packet, packetLen, &addr, NULL);
+        }
+        else {
+            // error, ignore
+            printf("Error receiving packet!\n");
+            break;
+        }
+    }
+}
--- a/src/goodbyedpi.exe.manifest
+++ b/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"/>
-    <description>GoodbyeDPI</description>
+    <assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="GoodbyeDPI" type="win32"/> 
+    <description>Divert</description> 
    <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
        <security>
            <requestedPrivileges>
@ -9,4 +9,4 @@
            </requestedPrivileges>
        </security>
    </trustInfo>
-</assembly>
+</assembly> 
--- a/src/icon.ico
+++ b/src/icon.ico
--- a/src/Makefile
+++ b/src/Makefile
@ -1,60 +0,0 @@
-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 -l:libssp.a
-CC = $(CPREFIX)gcc
-
-CCWINDRES = $(CPREFIX)windres
-ifeq (, $(shell which $(CPREFIX)windres))
-	CCWINDRES = windres
-endif
-
-CFLAGS = -std=c99 -pie -fPIE -pipe -I$(WINDIVERTHEADERS) -L$(WINDIVERTLIBS) \
-         -O2 -D_FORTIFY_SOURCE=2 -fstack-protector \
-         -Wall -Wextra -Wpedantic -Wformat=2 -Wformat-overflow=2 -Wformat-truncation=2 \
-         -Wformat-security -Wno-format-nonliteral -Wshadow -Wstrict-aliasing=1 \
-         -Wnull-dereference -Warray-bounds=2 -Wimplicit-fallthrough=3 \
-         -Wstringop-overflow=4 \
-         -Wformat-signedness -Wstrict-overflow=2 -Wcast-align=strict \
-         -Wfloat-equal -Wcast-align -Wsign-conversion \
-         #-fstack-protector-strong
-LDFLAGS = -fstack-protector -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
-	CFLAGS += -m32
-	LDFLAGS += -Wl,--pic-executable,-e,_mainCRTStartup -m32
-endif
-
-.PHONY: default all clean
-
-default: $(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 $@
-
-goodbyedpi-rc.o:
-	$(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)
--- a/src/blackwhitelist.c
+++ b/src/blackwhitelist.c
@ -1,110 +0,0 @@
-/*
- * Blacklist for GoodbyeDPI HTTP DPI circumvention tricks
- *
- * This is a simple domain hash table.
- * Domain records are added from a text file, where every
- * domain is separated with a new line.
- */
-#include <windows.h>
-#include <stdio.h>
-#include "goodbyedpi.h"
-#include "utils/uthash.h"
-#include "utils/getline.h"
-
-typedef struct blackwhitelist_record {
-    const char *host;
-    UT_hash_handle hh;   /* makes this structure hashable */
-} blackwhitelist_record_t;
-
-static blackwhitelist_record_t *blackwhitelist = NULL;
-
-static int check_get_hostname(const char *host) {
-    blackwhitelist_record_t *tmp_record = NULL;
-    if (!blackwhitelist) return FALSE;
-
-    HASH_FIND_STR(blackwhitelist, host, tmp_record);
-    if (tmp_record) {
-        debug("check_get_hostname found host\n");
-        return TRUE;
-    }
-    debug("check_get_hostname host not found\n");
-    return FALSE;
-}
-
-static int add_hostname(const char *host) {
-    if (!host)
-        return FALSE;
-
-    blackwhitelist_record_t *tmp_record = malloc(sizeof(blackwhitelist_record_t));
-    char *host_c = NULL;
-
-    if (!check_get_hostname(host)) {
-        host_c = strdup(host);
-        tmp_record->host = host_c;
-        HASH_ADD_KEYPTR(hh, blackwhitelist, tmp_record->host,
-                        strlen(tmp_record->host), tmp_record);
-        debug("Added host %s\n", host_c);
-        return TRUE;
-    }
-    debug("Not added host %s\n", host);
-    free(tmp_record);
-    if (host_c)
-        free(host_c);
-    return FALSE;
-}
-
-int blackwhitelist_load_list(const char *filename) {
-    char *line = malloc(HOST_MAXLEN + 1);
-    size_t linelen = HOST_MAXLEN + 1;
-    int cnt = 0;
-    ssize_t read;
-
-    FILE *fp = fopen(filename, "r");
-    if (!fp) return FALSE;
-
-    while ((read = getline(&line, &linelen, fp)) != -1) {
-        /* works with both \n and \r\n */
-        line[strcspn(line, "\r\n")] = '\0';
-        if (strlen(line) > HOST_MAXLEN) {
-            printf("WARNING: host %s exceeds maximum host length and has not been added\n",
-                line);
-            continue;
-        }
-        if (strlen(line) < 3) {
-            printf("WARNING: host %s is less than 3 bytes, skipping\n", line);
-            continue;
-        }
-        if (add_hostname(line))
-            cnt++;
-    }
-    free(line);
-    if (!blackwhitelist) return FALSE;
-    printf("Loaded %d hosts from file %s\n", cnt, filename);
-    fclose(fp);
-    return TRUE;
-}
-
-int blackwhitelist_check_hostname(const char *host_addr, size_t host_len) {
-    char current_host[HOST_MAXLEN + 1];
-    char *tokenized_host = NULL;
-
-    if (host_len > HOST_MAXLEN) return FALSE;
-    if (host_addr && host_len) {
-        memcpy(current_host, host_addr, host_len);
-        current_host[host_len] = '\0';
-    }
-
-    if (check_get_hostname(current_host))
-            return TRUE;
-
-    tokenized_host = strchr(current_host, '.');
-    while (tokenized_host != NULL && tokenized_host < (current_host + HOST_MAXLEN)) {
-        /* Search hostname only if there is next token */
-        if (strchr(tokenized_host + 1, '.') && check_get_hostname(tokenized_host + 1))
-            return TRUE;
-        tokenized_host = strchr(tokenized_host + 1, '.');
-    }
-
-    debug("____blackwhitelist_check_hostname FALSE: host %s\n", current_host);
-    return FALSE;
-}
--- a/src/blackwhitelist.h
+++ b/src/blackwhitelist.h
@ -1,2 +0,0 @@
-int blackwhitelist_load_list(const char *filename);
-int blackwhitelist_check_hostname(const char *host_addr, size_t host_len);
--- a/src/dnsredir.c
+++ b/src/dnsredir.c
@ -1,244 +0,0 @@
-/*
- * DNS UDP Connection Tracker for GoodbyeDPI
- *
- * This is a simple connection tracker for DNS UDP data.
- * It's not a proper one. The caveats as follows:
- *    * Uses only source IP address and port as a hash key;
- *    * One-shot only. Removes conntrack record as soon as gets the reply;
- *    * Does not properly parse DNS request and response, only checks some bytes;
- *
- * But anyway, it works fine for DNS.
- */
-
-#include <windows.h>
-#include <time.h>
-#include <stdio.h>
-#include "goodbyedpi.h"
-#include "dnsredir.h"
-#include "utils/uthash.h"
-
-/* key ('4' for IPv4 or '6' for IPv6 + srcip[16] + srcport[2]) */
-#define UDP_CONNRECORD_KEY_LEN 19
-
-#define DNS_CLEANUP_INTERVAL_SEC 30
-
-/* HACK!
- * uthash uses strlen() for HASH_FIND_STR.
- * We have null bytes in our key, so we can't use strlen()
- * And since it's always UDP_CONNRECORD_KEY_LEN bytes long,
- * we don't need to use any string function to determine length.
- */
-#undef uthash_strlen
-#define uthash_strlen(s) UDP_CONNRECORD_KEY_LEN
-
-typedef struct udp_connrecord {
-    /* 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[4];
-    uint16_t dstport;
-    UT_hash_handle hh;   /* makes this structure hashable */
-} udp_connrecord_t;
-
-static time_t last_cleanup = 0;
-static udp_connrecord_t *conntrack = NULL;
-
-void flush_dns_cache() {
-    INT_PTR WINAPI (*DnsFlushResolverCache)();
-
-    HMODULE dnsapi = LoadLibrary("dnsapi.dll");
-    if (dnsapi == NULL)
-    {
-        printf("Can't load dnsapi.dll to flush DNS cache!\n");
-        exit(EXIT_FAILURE);
-    }
-
-    DnsFlushResolverCache = GetProcAddress(dnsapi, "DnsFlushResolverCache");
-    if (DnsFlushResolverCache == NULL || !DnsFlushResolverCache())
-        printf("Can't flush DNS cache!");
-    FreeLibrary(dnsapi);
-}
-
-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, const uint8_t is_ipv6)
-{
-    debug("Construct key enter\n");
-    if (key) {
-        debug("Constructing key\n");
-        fill_key_data(key, is_ipv6, srcip, srcport);
-    }
-    debug("Construct key end\n");
-}
-
-inline static void deconstruct_key(const char *key, const udp_connrecord_t *connrecord,
-                                   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->dstport = connrecord->dstport;
-    }
-    debug("Deconstruct key end\n");
-}
-
-static int check_get_udp_conntrack_key(const char *key, udp_connrecord_t **connrecord) {
-    udp_connrecord_t *tmp_connrecord = NULL;
-    if (!conntrack) return FALSE;
-
-    HASH_FIND_STR(conntrack, key, tmp_connrecord);
-    if (tmp_connrecord) {
-        if (connrecord)
-            *connrecord = tmp_connrecord;
-        debug("check_get_udp_conntrack_key found key\n");
-        return TRUE;
-    }
-    debug("check_get_udp_conntrack_key key not found\n");
-    return FALSE;
-}
-
-static int add_udp_conntrack(const uint32_t srcip[4], const uint16_t srcport,
-                             const uint32_t dstip[4], const uint16_t dstport,
-                             const uint8_t 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, is_ipv6);
-
-    if (!check_get_udp_conntrack_key(tmp_connrecord->key, NULL)) {
-        tmp_connrecord->time = time(NULL);
-
-        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");
-        return TRUE;
-    }
-    debug("Not added UDP conntrack\n");
-    free(tmp_connrecord);
-    return FALSE;
-}
-
-static void dns_cleanup() {
-    udp_connrecord_t *tmp_connrecord, *tmp_connrecord2 = NULL;
-
-    if (last_cleanup == 0) {
-        last_cleanup = time(NULL);
-        return;
-    }
-
-    if (difftime(time(NULL), last_cleanup) >= DNS_CLEANUP_INTERVAL_SEC) {
-        last_cleanup = time(NULL);
-
-        HASH_ITER(hh, conntrack, tmp_connrecord, tmp_connrecord2) {
-            if (difftime(last_cleanup, tmp_connrecord->time) >= DNS_CLEANUP_INTERVAL_SEC) {
-                HASH_DEL(conntrack, tmp_connrecord);
-                free(tmp_connrecord);
-            }
-        }
-    }
-}
-
-int dns_is_dns_packet(const char *packet_data, const UINT packet_dataLen, const int outgoing) {
-    if (packet_dataLen < 16) return FALSE;
-
-    if (outgoing && (ntohs(*(const uint16_t*)(packet_data + 2)) & 0xFA00) == 0 &&
-        (ntohs(*(const uint32_t*)(packet_data + 6))) == 0) {
-        return TRUE;
-    }
-    else if (!outgoing &&
-        (ntohs(*(const uint16_t*)(packet_data + 2)) & 0xF800) == 0x8000) {
-        return TRUE;
-    }
-    return FALSE;
-}
-
-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)
-{
-    if (packet_dataLen < 16)
-        return FALSE;
-
-    dns_cleanup();
-
-    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, 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[4], const uint16_t srcport,
-                        const char *packet_data, const UINT packet_dataLen,
-                        conntrack_info_t *conn_info, const uint8_t is_ipv6)
-{
-    char key[UDP_CONNRECORD_KEY_LEN];
-    udp_connrecord_t *tmp_connrecord = NULL;
-
-    if (packet_dataLen < 16 || !conn_info)
-        return FALSE;
-
-    dns_cleanup();
-
-    if (dns_is_dns_packet(packet_data, packet_dataLen, 0)) {
-        /* Looks like DNS response */
-        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);
-            HASH_DEL(conntrack, tmp_connrecord);
-            free(tmp_connrecord);
-            return TRUE;
-        }
-    }
-    debug("____dns_handle_incoming FALSE: srcport = %hu\n", ntohs(srcport));
-    return FALSE;
-}
--- a/src/dnsredir.h
+++ b/src/dnsredir.h
@ -1,39 +0,0 @@
-#ifndef _DNSREDIR_H
-#define _DNSREDIR_H
-#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);
-#endif
--- a/src/fakepackets.c
+++ b/src/fakepackets.c
@ -1,197 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <in6addr.h>
-#include <ws2tcpip.h>
-#include "windivert.h"
-#include "goodbyedpi.h"
-
-static const unsigned char fake_http_request[] = "GET / HTTP/1.1\r\nHost: www.w3.org\r\n"
-                                                 "User-Agent: curl/7.65.3\r\nAccept: */*\r\n"
-                                                 "Accept-Encoding: deflate, gzip, br\r\n\r\n";
-static const unsigned char fake_https_request[] = {
-    0x16, 0x03, 0x01, 0x02, 0x00, 0x01, 0x00, 0x01, 0xfc, 0x03, 0x03, 0x9a, 0x8f, 0xa7, 0x6a, 0x5d,
-    0x57, 0xf3, 0x62, 0x19, 0xbe, 0x46, 0x82, 0x45, 0xe2, 0x59, 0x5c, 0xb4, 0x48, 0x31, 0x12, 0x15,
-    0x14, 0x79, 0x2c, 0xaa, 0xcd, 0xea, 0xda, 0xf0, 0xe1, 0xfd, 0xbb, 0x20, 0xf4, 0x83, 0x2a, 0x94,
-    0xf1, 0x48, 0x3b, 0x9d, 0xb6, 0x74, 0xba, 0x3c, 0x81, 0x63, 0xbc, 0x18, 0xcc, 0x14, 0x45, 0x57,
-    0x6c, 0x80, 0xf9, 0x25, 0xcf, 0x9c, 0x86, 0x60, 0x50, 0x31, 0x2e, 0xe9, 0x00, 0x22, 0x13, 0x01,
-    0x13, 0x03, 0x13, 0x02, 0xc0, 0x2b, 0xc0, 0x2f, 0xcc, 0xa9, 0xcc, 0xa8, 0xc0, 0x2c, 0xc0, 0x30,
-    0xc0, 0x0a, 0xc0, 0x09, 0xc0, 0x13, 0xc0, 0x14, 0x00, 0x33, 0x00, 0x39, 0x00, 0x2f, 0x00, 0x35,
-    0x01, 0x00, 0x01, 0x91, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x0d, 0x00, 0x00, 0x0a, 0x77, 0x77, 0x77,
-    0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x00, 0x17, 0x00, 0x00, 0xff, 0x01, 0x00, 0x01, 0x00,
-    0x00, 0x0a, 0x00, 0x0e, 0x00, 0x0c, 0x00, 0x1d, 0x00, 0x17, 0x00, 0x18, 0x00, 0x19, 0x01, 0x00,
-    0x01, 0x01, 0x00, 0x0b, 0x00, 0x02, 0x01, 0x00, 0x00, 0x23, 0x00, 0x00, 0x00, 0x10, 0x00, 0x0e,
-    0x00, 0x0c, 0x02, 0x68, 0x32, 0x08, 0x68, 0x74, 0x74, 0x70, 0x2f, 0x31, 0x2e, 0x31, 0x00, 0x05,
-    0x00, 0x05, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x33, 0x00, 0x6b, 0x00, 0x69, 0x00, 0x1d, 0x00,
-    0x20, 0xb0, 0xe4, 0xda, 0x34, 0xb4, 0x29, 0x8d, 0xd3, 0x5c, 0x70, 0xd3, 0xbe, 0xe8, 0xa7, 0x2a,
-    0x6b, 0xe4, 0x11, 0x19, 0x8b, 0x18, 0x9d, 0x83, 0x9a, 0x49, 0x7c, 0x83, 0x7f, 0xa9, 0x03, 0x8c,
-    0x3c, 0x00, 0x17, 0x00, 0x41, 0x04, 0x4c, 0x04, 0xa4, 0x71, 0x4c, 0x49, 0x75, 0x55, 0xd1, 0x18,
-    0x1e, 0x22, 0x62, 0x19, 0x53, 0x00, 0xde, 0x74, 0x2f, 0xb3, 0xde, 0x13, 0x54, 0xe6, 0x78, 0x07,
-    0x94, 0x55, 0x0e, 0xb2, 0x6c, 0xb0, 0x03, 0xee, 0x79, 0xa9, 0x96, 0x1e, 0x0e, 0x98, 0x17, 0x78,
-    0x24, 0x44, 0x0c, 0x88, 0x80, 0x06, 0x8b, 0xd4, 0x80, 0xbf, 0x67, 0x7c, 0x37, 0x6a, 0x5b, 0x46,
-    0x4c, 0xa7, 0x98, 0x6f, 0xb9, 0x22, 0x00, 0x2b, 0x00, 0x09, 0x08, 0x03, 0x04, 0x03, 0x03, 0x03,
-    0x02, 0x03, 0x01, 0x00, 0x0d, 0x00, 0x18, 0x00, 0x16, 0x04, 0x03, 0x05, 0x03, 0x06, 0x03, 0x08,
-    0x04, 0x08, 0x05, 0x08, 0x06, 0x04, 0x01, 0x05, 0x01, 0x06, 0x01, 0x02, 0x03, 0x02, 0x01, 0x00,
-    0x2d, 0x00, 0x02, 0x01, 0x01, 0x00, 0x1c, 0x00, 0x02, 0x40, 0x01, 0x00, 0x15, 0x00, 0x96, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00
-};
-
-static int send_fake_data(const HANDLE w_filter,
-                          const PWINDIVERT_ADDRESS addr,
-                          const char *pkt,
-                          const UINT packetLen,
-                          const BOOL is_ipv6,
-                          const BOOL is_https,
-                          const BYTE set_ttl,
-                          const BYTE set_checksum,
-                          const BYTE set_seq
-                         ) {
-    char packet_fake[MAX_PACKET_SIZE];
-    WINDIVERT_ADDRESS addr_new;
-    PVOID packet_data;
-    UINT packet_dataLen;
-    UINT packetLen_new;
-    PWINDIVERT_IPHDR ppIpHdr;
-    PWINDIVERT_IPV6HDR ppIpV6Hdr;
-    PWINDIVERT_TCPHDR ppTcpHdr;
-    unsigned const char *fake_request_data = is_https ? fake_https_request : fake_http_request;
-    UINT fake_request_size = is_https ? sizeof(fake_https_request) : sizeof(fake_http_request) - 1;
-
-    memcpy(&addr_new, addr, sizeof(WINDIVERT_ADDRESS));
-    memcpy(packet_fake, pkt, packetLen);
-
-    addr_new.TCPChecksum = 0;
-    addr_new.IPChecksum = 0;
-
-    if (!is_ipv6) {
-        // IPv4 TCP Data packet
-        if (!WinDivertHelperParsePacket(packet_fake, packetLen, &ppIpHdr,
-            NULL, NULL, NULL, NULL, &ppTcpHdr, NULL, &packet_data, &packet_dataLen,
-            NULL, NULL))
-            return 1;
-    }
-    else {
-        // IPv6 TCP Data packet
-        if (!WinDivertHelperParsePacket(packet_fake, packetLen, NULL,
-            &ppIpV6Hdr, NULL, NULL, NULL, &ppTcpHdr, NULL, &packet_data, &packet_dataLen,
-            NULL, NULL))
-            return 1;
-    }
-
-    if (packetLen + fake_request_size + 1 > MAX_PACKET_SIZE)
-        return 2;
-
-    memcpy(packet_data, fake_request_data, fake_request_size);
-    packetLen_new = packetLen - packet_dataLen + fake_request_size;
-
-    if (!is_ipv6) {
-        ppIpHdr->Length = htons(
-            ntohs(ppIpHdr->Length) -
-            packet_dataLen + fake_request_size
-        );
-
-        if (set_ttl)
-            ppIpHdr->TTL = set_ttl;
-    }
-    else {
-        ppIpV6Hdr->Length = htons(
-            ntohs(ppIpV6Hdr->Length) -
-            packet_dataLen + fake_request_size
-        );
-
-        if (set_ttl)
-            ppIpV6Hdr->HopLimit = set_ttl;
-    }
-
-    if (set_seq) {
-        // This is the smallest ACK drift Linux can't handle already, since at least v2.6.18.
-        // https://github.com/torvalds/linux/blob/v2.6.18/net/netfilter/nf_conntrack_proto_tcp.c#L395
-        ppTcpHdr->AckNum = htonl(ntohl(ppTcpHdr->AckNum) - 66000);
-        // This is just random, no specifics about this value.
-        ppTcpHdr->SeqNum = htonl(ntohl(ppTcpHdr->SeqNum) - 10000);
-    }
-
-    // Recalculate the checksum
-    WinDivertHelperCalcChecksums(packet_fake, packetLen_new, &addr_new, 0ULL);
-
-    if (set_checksum) {
-        // ...and damage it
-        ppTcpHdr->Checksum = htons(ntohs(ppTcpHdr->Checksum) - 1);
-    }
-    //printf("Pseudo checksum: %d\n", addr_new.TCPChecksum);
-
-    WinDivertSend(
-        w_filter, packet_fake,
-        packetLen_new,
-        NULL, &addr_new
-    );
-    debug("Fake packet: OK");
-
-    return 0;
-}
-
-static int send_fake_request(const HANDLE w_filter,
-                                  const PWINDIVERT_ADDRESS addr,
-                                  const char *pkt,
-                                  const UINT packetLen,
-                                  const BOOL is_ipv6,
-                                  const BOOL is_https,
-                                  const BYTE set_ttl,
-                                  const BYTE set_checksum,
-                                  const BYTE set_seq
-                                 ) {
-    if (set_ttl) {
-        send_fake_data(w_filter, addr, pkt, packetLen,
-                          is_ipv6, is_https,
-                          set_ttl, FALSE, FALSE);
-    }
-    if (set_checksum) {
-        send_fake_data(w_filter, addr, pkt, packetLen,
-                          is_ipv6, is_https,
-                          FALSE, set_checksum, FALSE);
-    }
-    if (set_seq) {
-        send_fake_data(w_filter, addr, pkt, packetLen,
-                          is_ipv6, is_https,
-                          FALSE, FALSE, set_seq);
-    }
-    return 0;
-}
-
-int send_fake_http_request(const HANDLE w_filter,
-                                  const PWINDIVERT_ADDRESS addr,
-                                  const char *pkt,
-                                  const UINT packetLen,
-                                  const BOOL is_ipv6,
-                                  const BYTE set_ttl,
-                                  const BYTE set_checksum,
-                                  const BYTE set_seq
-                                 ) {
-    return send_fake_request(w_filter, addr, pkt, packetLen,
-                          is_ipv6, FALSE,
-                          set_ttl, set_checksum, set_seq);
-}
-
-int send_fake_https_request(const HANDLE w_filter,
-                                   const PWINDIVERT_ADDRESS addr,
-                                   const char *pkt,
-                                   const UINT packetLen,
-                                   const BOOL is_ipv6,
-                                   const BYTE set_ttl,
-                                   const BYTE set_checksum,
-                                   const BYTE set_seq
-                                 ) {
-    return send_fake_request(w_filter, addr, pkt, packetLen,
-                          is_ipv6, TRUE,
-                          set_ttl, set_checksum, set_seq);
-}
--- a/src/fakepackets.h
+++ b/src/fakepackets.h
@ -1,18 +0,0 @@
-int send_fake_http_request(const HANDLE w_filter,
-                                  const PWINDIVERT_ADDRESS addr,
-                                  const char *pkt,
-                                  const UINT packetLen,
-                                  const BOOL is_ipv6,
-                                  const BYTE set_ttl,
-                                  const BYTE set_checksum,
-                                  const BYTE set_seq
-                                 );
-int send_fake_https_request(const HANDLE w_filter,
-                                   const PWINDIVERT_ADDRESS addr,
-                                   const char *pkt,
-                                   const UINT packetLen,
-                                   const BOOL is_ipv6,
-                                   const BYTE set_ttl,
-                                   const BYTE set_checksum,
-                                   const BYTE set_seq
-                                 );
--- a/src/goodbyedpi.c
+++ b/src/goodbyedpi.c
--- a/src/goodbyedpi.h
+++ b/src/goodbyedpi.h
@ -1,11 +0,0 @@
-#define HOST_MAXLEN 253
-#define MAX_PACKET_SIZE 9016
-
-#ifndef DEBUG
-#define debug(...) do {} while (0)
-#else
-#define debug(...) printf(__VA_ARGS__)
-#endif
-
-int main(int argc, char *argv[]);
-void deinit_all();
--- a/src/service.c
+++ b/src/service.c
@ -1,96 +0,0 @@
-#include <windows.h>
-#include <stdio.h>
-#include "goodbyedpi.h"
-#include "service.h"
-
-#define SERVICE_NAME "GoodbyeDPI"
-
-static SERVICE_STATUS ServiceStatus;
-static SERVICE_STATUS_HANDLE hStatus;
-static int service_argc = 0;
-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}
-    };
-    /*
-     * Save argc & argv as service_main is called with different
-     * 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.
-     */
-    if (!service_argc && !service_argv) {
-        service_argc = argc;
-        service_argv = calloc((size_t)(argc + 1), sizeof(void*));
-        for (i = 0; i < argc; i++) {
-            service_argv[i] = strdup(argv[i]);
-        }
-    }
-
-    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)),
-                  char *argv[] __attribute__((unused)))
-{
-    ServiceStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; 
-    ServiceStatus.dwCurrentState = SERVICE_RUNNING;
-    ServiceStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;
-    ServiceStatus.dwWin32ExitCode = 0;
-    ServiceStatus.dwServiceSpecificExitCode = 0;
-    ServiceStatus.dwCheckPoint = 1;
-    ServiceStatus.dwWaitHint = 0;
-
-    hStatus = RegisterServiceCtrlHandler(
-        SERVICE_NAME,
-        (LPHANDLER_FUNCTION)service_controlhandler);
-    if (hStatus == (SERVICE_STATUS_HANDLE)0)
-    {
-        // Registering Control Handler failed
-        return;
-    }
-
-    SetServiceStatus(hStatus, &ServiceStatus);
-
-    // Calling main with saved argc & argv
-    ServiceStatus.dwWin32ExitCode = (DWORD)main(service_argc, service_argv);
-    ServiceStatus.dwCurrentState  = SERVICE_STOPPED;
-    SetServiceStatus(hStatus, &ServiceStatus);
-    return;
-}
-
-// Control handler function
-void service_controlhandler(DWORD request)
-{
-    switch(request)
-    {
-        case SERVICE_CONTROL_STOP:
-        case SERVICE_CONTROL_SHUTDOWN:
-            deinit_all();
-            ServiceStatus.dwWin32ExitCode = 0;
-            ServiceStatus.dwCurrentState  = SERVICE_STOPPED;
-        default:
-            break;
-    }
-    // Report current status
-    SetServiceStatus(hStatus, &ServiceStatus);
-    return;
-}
--- a/src/service.h
+++ b/src/service.h
@ -1,3 +0,0 @@
-int service_register();
-void service_main(int argc, char *argv[]);
-void service_controlhandler(DWORD request);
--- a/src/ttltrack.c
+++ b/src/ttltrack.c
@ -1,252 +0,0 @@
-/**
- * TCP (TTL) Connection Tracker for GoodbyeDPI
- *
- * Monitors SYN/ACK only, to extract the TTL value of the remote server.
- *
- */
-
-#include <windows.h>
-#include <time.h>
-#include <stdio.h>
-#include <math.h>
-#include "goodbyedpi.h"
-#include "ttltrack.h"
-#include "utils/uthash.h"
-
-
-/* key ('4' for IPv4 or '6' for IPv6 + srcip[16] + dstip[16] + srcport[2] + dstport[2]) */
-#define TCP_CONNRECORD_KEY_LEN 37
-
-#define TCP_CLEANUP_INTERVAL_SEC 30
-
-/* HACK!
- * uthash uses strlen() for HASH_FIND_STR.
- * We have null bytes in our key, so we can't use strlen()
- * And since it's always TCP_CONNRECORD_KEY_LEN bytes long,
- * we don't need to use any string function to determine length.
- */
-#undef uthash_strlen
-#define uthash_strlen(s) TCP_CONNRECORD_KEY_LEN
-
-typedef struct tcp_connrecord {
-    /* key ('4' for IPv4 or '6' for IPv6 + srcip[16] + dstip[16] + srcport[2] + dstport[2]) */
-    char key[TCP_CONNRECORD_KEY_LEN];
-    time_t time;         /* time when this record was added */
-    uint16_t ttl;
-    UT_hash_handle hh;   /* makes this structure hashable */
-} tcp_connrecord_t;
-
-static time_t last_cleanup = 0;
-static tcp_connrecord_t *conntrack = NULL;
-
-inline static void fill_key_data(char *key, const uint8_t is_ipv6, const uint32_t srcip[4],
-                    const uint32_t dstip[4], const uint16_t srcport, const uint16_t dstport)
-{
-    unsigned int offset = 0;
-
-    if (is_ipv6) {
-        *(uint8_t*)(key) = '6';
-        offset += sizeof(uint8_t);
-        ipv6_copy_addr((uint32_t*)(key + offset), srcip);
-        offset += sizeof(uint32_t) * 4;
-        ipv6_copy_addr((uint32_t*)(key + offset), dstip);
-        offset += sizeof(uint32_t) * 4;
-    }
-    else {
-        *(uint8_t*)(key) = '4';
-        offset += sizeof(uint8_t);
-        ipv4_copy_addr((uint32_t*)(key + offset), srcip);
-        offset += sizeof(uint32_t) * 4;
-        ipv4_copy_addr((uint32_t*)(key + offset), dstip);
-        offset += sizeof(uint32_t) * 4;
-    }
-
-    *(uint16_t*)(key + offset) = srcport;
-    offset += sizeof(srcport);
-    *(uint16_t*)(key + offset) = dstport;
-    offset += sizeof(dstport);
-}
-
-inline static void fill_data_from_key(uint8_t *is_ipv6, uint32_t srcip[4], uint32_t dstip[4],
-                                     uint16_t *srcport, uint16_t *dstport, const char *key)
-{
-    unsigned int offset = 0;
-
-    if (key[0] == '6') {
-        *is_ipv6 = 1;
-        offset += sizeof(uint8_t);
-        ipv6_copy_addr(srcip, (uint32_t*)(key + offset));
-        offset += sizeof(uint32_t) * 4;
-        ipv6_copy_addr(dstip, (uint32_t*)(key + offset));
-        offset += sizeof(uint32_t) * 4;
-    }
-    else {
-        *is_ipv6 = 0;
-        offset += sizeof(uint8_t);
-        ipv4_copy_addr(srcip, (uint32_t*)(key + offset));
-        offset += sizeof(uint32_t) * 4;
-        ipv4_copy_addr(dstip, (uint32_t*)(key + offset));
-        offset += sizeof(uint32_t) * 4;
-    }
-    *srcport = *(uint16_t*)(key + offset);
-    offset += sizeof(*srcport);
-    *dstport = *(uint16_t*)(key + offset);
-    offset += sizeof(*dstport);
-}
-
-inline static void construct_key(const uint32_t srcip[4], const uint32_t dstip[4],
-                                 const uint16_t srcport, const uint16_t dstport,
-                                 char *key, const uint8_t is_ipv6)
-{
-    debug("Construct key enter\n");
-    if (key) {
-        debug("Constructing key\n");
-        fill_key_data(key, is_ipv6, srcip, dstip, srcport, dstport);
-    }
-    debug("Construct key end\n");
-}
-
-inline static void deconstruct_key(const char *key, const tcp_connrecord_t *connrecord,
-                                   tcp_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->dstip,
-                           &conn_info->srcport, &conn_info->dstport,
-                           key);
-
-        conn_info->ttl = connrecord->ttl;
-    }
-    debug("Deconstruct key end\n");
-}
-
-static int check_get_tcp_conntrack_key(const char *key, tcp_connrecord_t **connrecord) {
-    tcp_connrecord_t *tmp_connrecord = NULL;
-    if (!conntrack) return FALSE;
-
-    HASH_FIND_STR(conntrack, key, tmp_connrecord);
-    if (tmp_connrecord) {
-        if (connrecord)
-            *connrecord = tmp_connrecord;
-        debug("check_get_tcp_conntrack_key found key\n");
-        return TRUE;
-    }
-    debug("check_get_tcp_conntrack_key key not found\n");
-    return FALSE;
-}
-
-static int add_tcp_conntrack(const uint32_t srcip[4], const uint32_t dstip[4],
-                             const uint16_t srcport, const uint16_t dstport,
-                             const uint8_t is_ipv6, const uint8_t ttl
-                            )
-{
-    if (!(srcip && srcport && dstip && dstport))
-        return FALSE;
-
-    tcp_connrecord_t *tmp_connrecord = malloc(sizeof(tcp_connrecord_t));
-    construct_key(srcip, dstip, srcport, dstport, tmp_connrecord->key, is_ipv6);
-
-    if (!check_get_tcp_conntrack_key(tmp_connrecord->key, NULL)) {
-        tmp_connrecord->time = time(NULL);
-        tmp_connrecord->ttl = ttl;
-        HASH_ADD_STR(conntrack, key, tmp_connrecord);
-        debug("Added TCP conntrack %u:%hu - %u:%hu\n", srcip[0], ntohs(srcport), dstip[0], ntohs(dstport));
-        return TRUE;
-    }
-    debug("Not added TCP conntrack %u:%hu - %u:%hu\n", srcip[0], ntohs(srcport), dstip[0], ntohs(dstport));
-    free(tmp_connrecord);
-    return FALSE;
-}
-
-static void tcp_cleanup() {
-    tcp_connrecord_t *tmp_connrecord, *tmp_connrecord2 = NULL;
-
-    if (last_cleanup == 0) {
-        last_cleanup = time(NULL);
-        return;
-    }
-
-    if (difftime(time(NULL), last_cleanup) >= TCP_CLEANUP_INTERVAL_SEC) {
-        last_cleanup = time(NULL);
-
-        HASH_ITER(hh, conntrack, tmp_connrecord, tmp_connrecord2) {
-            if (difftime(last_cleanup, tmp_connrecord->time) >= TCP_CLEANUP_INTERVAL_SEC) {
-                HASH_DEL(conntrack, tmp_connrecord);
-                free(tmp_connrecord);
-            }
-        }
-    }
-}
-
-int tcp_handle_incoming(uint32_t srcip[4], uint32_t dstip[4],
-                        uint16_t srcport, uint16_t dstport,
-                        uint8_t is_ipv6, uint8_t ttl)
-{
-    tcp_cleanup();
-
-    debug("trying to add TCP srcport = %hu, dstport = %hu\n", ntohs(srcport), ntohs(dstport));
-    return add_tcp_conntrack(srcip, dstip, srcport, dstport, is_ipv6, ttl);
-
-    debug("____tcp_handle_incoming FALSE: srcport = %hu, dstport = %hu\n", ntohs(srcport), ntohs(dstport));
-    return FALSE;
-}
-
-int tcp_handle_outgoing(uint32_t srcip[4], uint32_t dstip[4],
-                        uint16_t srcport, uint16_t dstport,
-                        tcp_conntrack_info_t *conn_info,
-                        uint8_t is_ipv6)
-{
-    char key[TCP_CONNRECORD_KEY_LEN];
-    tcp_connrecord_t *tmp_connrecord = NULL;
-
-    if (!conn_info)
-        return FALSE;
-
-    tcp_cleanup();
-    construct_key(dstip, srcip, dstport, srcport, key, is_ipv6);
-    if (check_get_tcp_conntrack_key(key, &tmp_connrecord) && tmp_connrecord) {
-        /* Connection exists in conntrack, moving on */
-        deconstruct_key(key, tmp_connrecord, conn_info);
-        HASH_DEL(conntrack, tmp_connrecord);
-        free(tmp_connrecord);
-        debug("____tcp_handle_outgoing TRUE: srcport = %hu\n", ntohs(srcport));
-        return TRUE;
-    }
-
-    debug("____tcp_handle_outgoing FALSE: srcport = %hu\n", ntohs(srcport));
-    return FALSE;
-}
-
-int tcp_get_auto_ttl(const uint8_t ttl, const uint8_t autottl1,
-                     const uint8_t autottl2, const uint8_t minhops,
-                     const uint8_t maxttl) {
-    uint8_t nhops = 0;
-    uint8_t ttl_of_fake_packet = 0;
-
-    if (ttl > 98 && ttl < 128) {
-        nhops = 128 - ttl;
-    }
-    else if (ttl > 34 && ttl < 64) {
-        nhops = 64 - ttl;
-    }
-    else {
-        return 0;
-    }
-
-    if (nhops <= autottl1 || nhops < minhops) {
-        return 0;
-    }
-
-    ttl_of_fake_packet = nhops - autottl2;
-    if (ttl_of_fake_packet < autottl2 && nhops <= 9) {
-        ttl_of_fake_packet = nhops - autottl1 - trunc((autottl2 - autottl1) * ((float)nhops/10));
-    }
-
-    if (maxttl && ttl_of_fake_packet > maxttl) {
-        ttl_of_fake_packet = maxttl;
-    }
-
-    return ttl_of_fake_packet;
-}
--- a/src/ttltrack.h
+++ b/src/ttltrack.h
@ -1,27 +0,0 @@
-#ifndef _TTLTRACK_H
-#define _TTLTRACK_H
-#include <stdint.h>
-#include "dnsredir.h"
-
-typedef struct tcp_conntrack_info {
-    uint8_t  is_ipv6;
-    uint8_t  ttl;
-    uint32_t srcip[4];
-    uint16_t srcport;
-    uint32_t dstip[4];
-    uint16_t dstport;
-} tcp_conntrack_info_t;
-
-int tcp_handle_incoming(uint32_t srcip[4], uint32_t dstip[4],
-                        uint16_t srcport, uint16_t dstport,
-                        uint8_t is_ipv6, uint8_t ttl);
-
-int tcp_handle_outgoing(uint32_t srcip[4], uint32_t dstip[4],
-                        uint16_t srcport, uint16_t dstport,
-                        tcp_conntrack_info_t *conn_info,
-                        uint8_t is_ipv6);
-
-int tcp_get_auto_ttl(const uint8_t ttl, const uint8_t autottl1,
-                     const uint8_t autottl2, const uint8_t minhops,
-                     const uint8_t maxttl);
-#endif
--- a/src/utils/getline.c
+++ b/src/utils/getline.c
@ -1,92 +0,0 @@
-/*	$NetBSD: getdelim.c,v 1.2 2015/12/25 20:12:46 joerg Exp $	*/
-/*	NetBSD-src: getline.c,v 1.2 2014/09/16 17:23:50 christos Exp 	*/
-
-/*-
- * Copyright (c) 2011 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "getline.h"
-
-#if !HAVE_GETDELIM
-
-ssize_t
-getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp)
-{
-	char *ptr, *eptr;
-
-
-	if (*buf == NULL || *bufsiz == 0) {
-		*bufsiz = BUFSIZ;
-		if ((*buf = malloc(*bufsiz)) == NULL)
-			return -1;
-	}
-
-	for (ptr = *buf, eptr = *buf + *bufsiz;;) {
-		int c = fgetc(fp);
-		if (c == -1) {
-			if (feof(fp)) {
-				ssize_t diff = (ssize_t)(ptr - *buf);
-				if (diff != 0) {
-					*ptr = '\0';
-					return diff;
-				}
-			}
-			return -1;
-		}
-		*ptr++ = c;
-		if (c == delimiter) {
-			*ptr = '\0';
-			return ptr - *buf;
-		}
-		if (ptr + 2 >= eptr) {
-			char *nbuf;
-			size_t nbufsiz = *bufsiz * 2;
-			ssize_t d = ptr - *buf;
-			if ((nbuf = realloc(*buf, nbufsiz)) == NULL)
-				return -1;
-			*buf = nbuf;
-			*bufsiz = nbufsiz;
-			eptr = nbuf + nbufsiz;
-			ptr = nbuf + d;
-		}
-	}
-}
-
-#endif
-
-#if !HAVE_GETLINE
-
-ssize_t
-getline(char **buf, size_t *bufsiz, FILE *fp)
-{
-	return getdelim(buf, bufsiz, '\n', fp);
-}
-
-#endif
--- a/src/utils/getline.h
+++ b/src/utils/getline.h
@ -1,7 +0,0 @@
-#if !HAVE_GETDELIM
-ssize_t	getdelim(char **, size_t *, int, FILE *);
-#endif
-
-#if !HAVE_GETLINE
-ssize_t	getline(char **, size_t *, FILE *);
-#endif
--- a/src/utils/repl_str.c
+++ b/src/utils/repl_str.c
@ -1,90 +0,0 @@
-#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] = (uintptr_t)(pstr2 - str);
-		pstr = pstr2 + fromlen;
-	}
-
-	orglen = (size_t)(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;
-}
--- a/src/utils/repl_str.h
+++ b/src/utils/repl_str.h
@ -1 +0,0 @@
-char *repl_str(const char *str, const char *from, const char *to);
--- a/src/utils/uthash.h
+++ b/src/utils/uthash.h
				`@ -1 +0,0 @@`
				`char repl_str(const char str, const char from, const char to);`