Changeset 724

Timestamp:

09/08/05 23:30:32 (8 years ago)

Author:

aprilp

Message:

* Added compile instructions and installation for OpenWrt? Whiterussian-rc2
* Released 1.1.2

Location:

trunk/wifidog

Files:

• ChangeLog (modified) (1 diff)
• NEWS (modified) (1 diff)
• README.openwrt (modified) (1 diff)
• configure.in (modified) (1 diff)
• scripts/init.d/wifidog (modified) (2 diffs)

trunk/wifidog/ChangeLog

@@ -1 +1 @@
 # $Header$
+2005-05-23 Philippe April <philippe@ilesansfil.org>
+        * Added compile instructions and installation for OpenWrt Whiterussian-rc2
+        * Released 1.1.2
 
 2005-05-24 Mina Naguib <mina@ilesansfil.org>

trunk/wifidog/NEWS

@@ +1 @@
+WiFiDog 1.1.2:
+    - Added some informations so it compiles on newer OpenWRT's (whiterussian-rc2)
+    - Fixed minor issue with wdctl
+    - Changed the iptables rules priority to allow existing NAT rules to work
+    - read()s from central server in auth_server_request() are
+        now timed-out (via select).  This is hopefully a bugfix to the
+        thread-freezing problem.
+    - Bugfix non-RFC compliant HTTP requests using \n instead of \r\n as line
+        terminations as per email from ludocornut@users.sourceforge.net
+    - Firewall: make the default ruleset for validating users = allow all
+        (except sending SMTP)
+
+Fixed issue with FAQ
+
 WiFiDog 1.1.1:
     - An auth server on port 80 will now work

trunk/wifidog/README.openwrt

@@ -2 +2 @@
 
 OpenWRT specific README
+
+Since the newest OpenWRT releases, we will be able to release
+binary IPKGs that should work on all the OpenWRT installations.
+
+The binaries are available at sourceforge.
+
+The older instructions are now outdated, but they are still at the bottom.
+
+Because they now release the images and an SDK, you can also compile
+WiFiDog for the images they distribute if the current IPKG we distribute is
+not up-to-date enough for you.
+
+To do so, download the SDK named: OpenWrt-SDK-Linux..... from OpenWRT,
+then unpack the OpenWrt-SDK-WiFiDog tarball into the "package" directory of
+OpenWrt-SDK, to have the files in a layout similar to this:
+
+OpenWrt-SDK-Linux-i686-1/package/
+OpenWrt-SDK-Linux-i686-1/package/depend.mk
+OpenWrt-SDK-Linux-i686-1/package/rules.mk
+OpenWrt-SDK-Linux-i686-1/package/wifidog
+OpenWrt-SDK-Linux-i686-1/package/wifidog/Config.in
+OpenWrt-SDK-Linux-i686-1/package/wifidog/Makefile
+OpenWrt-SDK-Linux-i686-1/package/wifidog/ipkg
+OpenWrt-SDK-Linux-i686-1/package/wifidog/ipkg/wifidog.control
+OpenWrt-SDK-Linux-i686-1/package/wifidog/ipkg/wifidog.init
+OpenWrt-SDK-Linux-i686-1/package/wifidog/ipkg/wifidog.conffiles
+
+Then, simply run make at the root of OpenWrt-SDK-Linux-i686-1.
+
+You should end up with an IPKG file in OpenWrt-SDK-Linux-i686-1/bin/packages/
+if everything went well.
+
+---- OLDER INSTRUCTIONS ----
 
 In order to compile OpenWRT for the linksys WRT54G, you must first

trunk/wifidog/configure.in

@@ -21 +21 @@
 WIFIDOG_MAJOR_VERSION=1
 WIFIDOG_MINOR_VERSION=1
-WIFIDOG_MICRO_VERSION=2_pre1
+WIFIDOG_MICRO_VERSION=2
 WIFIDOG_VERSION=$WIFIDOG_MAJOR_VERSION.$WIFIDOG_MINOR_VERSION.$WIFIDOG_MICRO_VERSION
 

trunk/wifidog/scripts/init.d/wifidog

@@ -83 +83 @@
     }
 
+    ### Test ipt_REDIRECT with iptables
+    test_ipt_REDIRECT () {
+      IPTABLES_OK=$($IPT -t nat -A PREROUTING -p tcp --dport 80 -j REDIRECT --to-ports 2060 2>&1 | grep "No chain.target.match")
+      if [ -z "$IPTABLES_OK" ]; then
+        $IPT -t nat -D PREROUTING -p tcp --dport 80 -j REDIRECT --to-ports 2060 2>&1
+        echo 1
+      else
+        echo 0
+      fi
+    }
+
     ### Find a module on disk
     module_exists () {
@@ -153 +164 @@
     echo "   ipt_mark module is working"
     fi
+
+    echo "  Testing ipt_REDIRECT"
+    TEST_IPT_MAC=$(test_ipt_REDIRECT)
+    if [ "$TEST_IPT_MAC" = "0" ]; then
+      echo "   iptables is not working with ipt_REDIRECT"
+      echo "   Scanning disk for ipt_REDIRECT module"
+      TEST_IPT_MAC_MODULE_EXISTS=$(module_exists "ipt_REDIRECT")
+      if [ "$TEST_IPT_MAC_MODULE_EXISTS" = "0" ]; then
+        echo "   ipt_REDIRECT module is missing, please install it (kernel or module)"
+        exit
+      else
+        echo "   ipt_REDIRECT module exists, trying to load"
+        insmod ipt_REDIRECT > /dev/null
+        TEST_IPT_MAC_MODULE_MEMORY=$(module_in_memory "ipt_REDIRECT")
+        if [ "$TEST_IPT_MAC_MODULE_MEMORY" = "0" ]; then
+          echo "  Error: ipt_REDIRECT not loaded"
+          exit
+        else
+          echo "  ipt_REDIRECT loaded sucessfully"
+        fi
+      fi
+    else
+      echo "   ipt_REDIRECT  module is working"
+    fi
+
     ;;