[WLANware] freifunk dhcpsplash

[lorenz schori]

Hallo Nochmals,

Habe leider noch ein Bug gefunden. Unter Verwalten -> DHCP Splash  
liess sich der Public Mode nicht auswählen. Das ist jetzt im CVS  
gefixt, das Log+Diff sind unten aufgeführt. Die gefixten Versionen  
kann man vom Openwireless-Repository ziehen:
http://ipkg.openwireless.ch/ch/packages/

LG
Lorenz



Working file: work/cgi-bin/dhcpsplash.html
----------------------------
revision 1.11
date: 2008/03/07 21:14:50;  author: lschori;  state: Exp;  lines: +2 -2
dhcpsplash: fixed one more bug in /cgi-bin/dhcpsplash.html preventing
update of ff_dhcpsplash_publicmode

Working file: work/cgi-bin/dhcpsplash/functions.sh:
----------------------------
revision 1.10
date: 2008/03/06 10:33:02;  author: lschori;  state: Exp;  lines: +1 -1
dhcpsplash: added missing -j RETURN for icmp public services rule
----------------------------
revision 1.9
date: 2008/03/05 20:26:02;  author: lschori;  state: Exp;  lines: +4 -0
fixed little glitch in dhcpsplash: allow forwarding of icmp and dns by
default again.
----------------------------


RCS file: /cvsroot/ff-firmware/ff-devel/freifunk-dhcpsplash/work/cgi- 
bin/dhcpsplash.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- work/cgi-bin/dhcpsplash.html        19 Jan 2008 19:19:08  
-0000      1.10
+++ work/cgi-bin/dhcpsplash.html        7 Mar 2008 21:14:50  
-0000       1.11
@@ -307,7 +307,7 @@

  <SCRIPT LANGUAGE="shell" TYPE="text/plain">
    elif [ -n "$post_dhcpsplash_reset" ]; then
-    for V in ff_dhcpsplash_wifi ff_dhcpsplash_lan ff_dhcpsplash_agurl  
ff_dhcpsplash_ag ff_dhcpsplash_hpurl ff_dhcpsplash_hp  
ff_dhcpsplash_block; do
+    for V in ff_dhcpsplash_wifi ff_dhcpsplash_lan ff_dhcpsplash_agurl  
ff_dhcpsplash_ag ff_dhcpsplash_hpurl ff_dhcpsplash_hp  
ff_dhcpsplash_block ff_dhcpsplash_publicmode; do
        nvram unset "$V"
      done
      rm -f /etc/dhcpsplash/agreement /etc/dhcpsplash/welcome /etc/ 
dhcpsplash/blocked_message >/dev/null 2>&1
@@ -355,7 +355,7 @@
      fi

      ## update variables
-    for V in ff_dhcpsplash_wifi ff_dhcpsplash_lan ff_dhcpsplash_agurl  
ff_dhcpsplash_ag ff_dhcpsplash_hpurl ff_dhcpsplash_hp  
ff_dhcpsplash_block; do
+    for V in ff_dhcpsplash_wifi ff_dhcpsplash_lan ff_dhcpsplash_agurl  
ff_dhcpsplash_ag ff_dhcpsplash_hpurl ff_dhcpsplash_hp  
ff_dhcpsplash_block ff_dhcpsplash_publicmode; do
        eval "C=\$$V"
        C=$(unescape $C)
        if [ "$C" != "$(nvram get $V)" ]; then
Index: work/cgi-bin/dhcpsplash/functions.sh
===================================================================
RCS file: /cvsroot/ff-firmware/ff-devel/freifunk-dhcpsplash/work/cgi- 
bin/dhcpsplash/functions.sh,v
retrieving revision 1.8
retrieving revision 1.10
diff -u -r1.8 -r1.10
--- work/cgi-bin/dhcpsplash/functions.sh        19 Jan 2008 19:19:08  
-0000      1.8
+++ work/cgi-bin/dhcpsplash/functions.sh        6 Mar 2008 10:33:02  
-0000       1.10
@@ -98,6 +98,10 @@
                 return 0
         fi

+       # be nice and allow DNS and icmp for everyone to anywhere
+       $IPTABLES -t filter -A splash_public_services -p udp --dport  
53 -j RETURN
+       $IPTABLES -t filter -A splash_public_services -p icmp -j RETURN
+
         # allow ag/hp uris
         test "$(splash_getvar ff_dhcpsplash_ag)" = "url" && \
                 aghost=$(splash_getvar ff_dhcpsplash_agurl | sed -n  
"s#^\(https\{0,1\}\)://\([\.0-9a-zA-Z-]*\).*#\2#p")