- TorWall reborn as Tallow.

Makefile

@@ -1,11 +1,16 @@
-CC = x86_64-w64-mingw32-gcc
-CFLAGS = --std=c99 -I contrib/WinDivert-1.0.5-MINGW/include/
-CLIBS = -lws2_32 -lkernel32 -L contrib/WinDivert-1.0.5-MINGW/amd64/ -l WinDivert
-OBJS = tor_wall.o
+CC = i686-w64-mingw32-gcc
+WINDRES = i686-w64-mingw32-windres
+CFLAGS = --std=c99 -O2 -I contrib/WinDivert-1.1.5-MINGW/include/ -mwindows \
+    -mthreads -m32 -Wall
+CLIBS = -lws2_32 -lkernel32 -L contrib/WinDivert-1.1.5-MINGW/x86/ \
+    -lWinDivert -lcomctl32 -mwindows
+OBJS = main.o redirect.o domain.o
+PROG = tallow.exe
 
-tor_wall: $(OBJS)
-	$(CC) -s -o tor_wall.exe $(OBJS) $(CLIBS)
+$(PROG): $(OBJS)
+	$(WINDRES) main.rc -O coff -o main.res
+	$(CC) -s -o $(PROG) $(OBJS) main.res $(CLIBS)
 
 clean:
-	rm -rf $(OBJS) tor_wall.exe
+	rm -rf $(OBJS) $(PROG)
 

README.md

@@ -1,64 +1,67 @@
-TorWall
-=======
+Tallow (formally TorWall) - Transparent Tor for Windows
+=======================================================
 
-TorWall -- transparent Tor for Windows.
+Tallow is a small program that redirects all outbound traffic from a Windows
+machine via the Tor anonymity network.  Any traffic that cannot be handled by
+Tor, e.g. UDP, is blocked.  Tallow also intercepts and handles DNS requests
+preventing potential leaks.
 
-In a nutshell, TorWall sets up the following configuration:
+Tallow has several applications, including:
 
-    +-----------+        +-----------+        +-----------+        +----------+
-    |  BROWSER  |------->|  PRIVOXY  |------->|    TOR    |------->|  SERVER  |
-    |  a.b.c.d  |<-------|  a.b.c.d  |<-------|  a.b.c.d  |<-------|  x.y.z.w |
-    +-----------+        +-----------+        +-----------+        +----------+
+* "Tor-ifying" applications there were never designed to use Tor
+* Filter circumvention -- if you wish to bypass a local filter and are
+  not so concerned about anonymity
+* *Better-than-nothing-Tor* -- Some Tor may be better than no Tor.
 
-Here (a.b.c.d) represents the local address, and (x.y.z.w) represents a remote
-web server.
+Note that, by itself, Tallow is not designed to be a complete strong anonymity
+solution.  See the warnings below.
 
-TorWall works by redirecting your web traffic to a local instance of
-Privoxy/Tor.  This configuration is completely transparent to the web browser,
-i.e. the web browser sees a normal internet connection (albeit slower).
+Usage
+=====
 
-Unlike the TorBrowserBundle, TorWall works with any browser, including Chrome,
-Safari, Opera, Firefox, Internet Explorer, etc.  This may have some
-disadvantages too, e.g. some browsers may leak information.  To help mitigate
-this risk, TorWall routes all web traffic through Privoxy.
+Using the Tallow GUI, simply press the big "Tor" button to start redirecting
+traffic via the Tor network.  Press the button again to stop Tor redirection.
+Note that your Internet connection may be temporarily interrupted each time
+you toggle the button.
 
-To prevent non-browser related leaks, TorWall also blocks all non-Tor traffic
-when it is running.  Furthermore, TorWall poisons DNS traffic with fake
-responses to prevent leaks whilst still maintaining transparency for the
-browser.
+To test if Tor redirection is working, please visit the following site:
+[https://check.torproject.org](https://check.torproject.org).
 
-Limitations
-===========
+History
+=======
 
-Currently HTTPS (port 443) is not supported.  This is because Privoxy cannot
-intercept such traffic.
+Tallow was derived from the TorWall prototype (where "tallow" is an
+anagram of "torwall" minus the 'r').
 
-Support for HTTPS in "passthru" mode may be added later.
+Tallow works slightly differently, and aims to redirect all traffic rather
+than just HTTP port 80.  Also, unlike the prototype, Tallow does *not* use
+Privoxy nor does it alter the content of any TCP streams in any way (see
+warnings below).
 
 Building
 ========
 
-To build TorWall you need MinGW w64 cross-compiler for Linux.
+To build Tallow you need the MinGW cross-compiler for Linux.
 
 You also need to download and place the following external dependencies and
 place them in the contrib/ directory:
 
-* [WinDivert-1.0.5-MINGW.zip](http://reqrypt.org/windivert.html).
-* The following files extracted from the [Privoxy](http://www.privoxy.org/)
-  installation package: 
-   - privoxy.exe
-   - mgwz.dll
+* [WinDivert-1.1.5-MINGW.zip](http://reqrypt.org/windivert.html).
 * The following files extracted from the
-  [Tor Browser Bundle](https://www.torproject.org/):
+  [Tor Expert Bundle](https://www.torproject.org/):
    - tor.exe
-   - libaey32.dll
-   - sslea32.dll
 
 Then simply run the build.sh script.
 
-Warning
-=======
+Warnings
+========
+
+Tallow is beta quality software.  There may be bugs.
 
-TorWall is *experimental* software.  It should not be relied on if you need
-strong anonymity.  For this you should still use the TorBrowserBundle.
+Currently Tallow makes no attempt to anonymize the content of traffic sent
+*through* the Tor network.  This information may be used to de-anonymize you.
+See [this
+link](https://trac.torproject.org/projects/tor/wiki/doc/TransparentProxyLeaks)
+for more information.  Tallow *should not be relied on for strong anonymity*
+unless you know what you are doing.
 

build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# (C) 2013, all rights reserved,
+# (C) 2014, all rights reserved,
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,10 +20,8 @@
 
 set -e
 
-WINDIVERT=WinDivert-1.0.5-MINGW
-PRIVOXY=privoxy
+WINDIVERT=WinDivert-1.1.5-MINGW
 TOR=tor
-MGWZ=mgwz
 LIBEAY32=libeay32
 SSLEAY32=ssleay32
 
@@ -35,58 +33,45 @@ then
         "(http://reqrypt.org/windivert.html)" 2>&1
     exit 1
 fi
-for FILE in "$PRIVOXY.exe" "$MGWZ.dll"
-do
-    if [ ! -e "$FILE" ]
-    then
-        echo "ERROR: missing \"$FILE\"; download and extract from the" \
-            "Privoxy Windows installation package (http://www.privoxy.org/)" 2&1
-        exit 1
-    fi
-done
-for FILE in "$TOR.exe" "$LIBEAY32.dll" "$SSLEAY32.dll"
+for FILE in "$TOR.exe" 
 do
     if [ ! -e "$FILE" ]
     then
         echo "ERROR: missing \"$FILE\"; download and extract from the Tor" \
-            "Browser Bundle for Windows (https://www.torproject.org/)" 2>&1
+            "Expert Bundle for Windows (https://www.torproject.org/)" 2>&1
         exit 1;
     fi
 done
 
 echo "Extracting WinDivert..."
 unzip -o $WINDIVERT.zip
 
-echo "Building TorWall..."
+echo "Building Tallow..."
 cd ..
 make
 
-echo "Copying \"tor_wall.exe\"..."
-cp tor_wall.exe install/.
+echo "Copying \"tallow.exe\"..."
+cp tallow.exe install/.
+echo "Copying \"hosts.deny\"..."
+cp hosts.deny install/.
 
-for FILE in "$PRIVOXY.exe" "$MGWZ.dll" "$TOR.exe" "$LIBEAY32.dll" \
-       "$SSLEAY32.dll" \
-       "$WINDIVERT/amd64/WinDivert.sys" \
-       "$WINDIVERT/amd64/WinDivert.inf" \
-       "$WINDIVERT/amd64/WinDivert.dll" \
-       "$WINDIVERT/amd64/WdfCoInstaller01009.dll"
+for FILE in "$TOR.exe" \
+       "$WINDIVERT/amd64/WinDivert64.sys" \
+       "$WINDIVERT/x86/WinDivert32.sys" \
+       "$WINDIVERT/x86/WinDivert.dll"
 do
     echo "Copying \"$FILE\"..."
     cp contrib/"$FILE" install/.
 done
-cd config
-for FILE in *
-do
-    echo "Copying \"$FILE\"..."
-    cp "$FILE" ../install/.
-done
-cd ..
 
 echo "Building installation package..."
 cd install
+
+zip -r ../TallowBundle-files.zip *
 cp ../install.nsi .
+
 makensis install.nsi
-mv TorWall-install.exe ..
+mv TallowBundle-install.exe ..
 cd ..
 
 echo "Cleaning up..."