Forward Firewall: fix wlan clients now working with forwardfw
authorAlexander Marx <amarx@ipfire.org>
Thu, 21 Feb 2013 15:40:47 +0000 (16:40 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 9 Aug 2013 12:08:23 +0000 (14:08 +0200)
html/cgi-bin/forwardfw.cgi
src/initscripts/init.d/firewall

index c55cbf8a72a89439d5487e6f837316484cd30237..814f6ecc4cfd9c21c7ee5ec183f14f84873ab195 100755 (executable)
@@ -595,10 +595,10 @@ print <<END;
                <tr><td width='15%' align='left'>       <select name='POLICY' style="width: 100px">
                <option value='MODE1' $selected{'POLICY'}{'MODE1'}>$Lang::tr{'fwdfw pol block'}</option>
                <option value='MODE2' $selected{'POLICY'}{'MODE2'}>$Lang::tr{'fwdfw pol allow'}</option></select>
-           <td width='45%' align='left'><input type='submit' name='ACTION' value=$Lang::tr{'save'} />
-           <td width='45%' align='left'>
+           <input type='submit' name='ACTION' value=$Lang::tr{'save'} /></td><td width='45%' align='right'>
+           
 END
-       print "$Lang::tr{'outgoing firewall reset'}: <input type='submit' name='ACTION' value='$Lang::tr{'reset'}' />";
+       print "$Lang::tr{'outgoing firewall reset'}: <input type='submit' name='ACTION' value='$Lang::tr{'reset'}' /></td></tr>";
        print "</table></form>";
        print"<br><br>";
        print <<END;
@@ -610,10 +610,10 @@ END
                <tr><td width='15%' align='left'>       <select name='POLICY1' style="width: 100px">
                <option value='MODE1' $selected{'POLICY1'}{'MODE1'}>$Lang::tr{'fwdfw pol block'}</option>
                <option value='MODE2' $selected{'POLICY1'}{'MODE2'}>$Lang::tr{'fwdfw pol allow'}</option></select>
-           <td width='45%' align='left'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></form>
-           <td width='45%' align='left'>
+           <input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></form></td><td width='45%' align='right'>
+           
 END
-       print "$Lang::tr{'outgoing firewall reset'}: <form method='post' action='$ENV{'SCRIPT_NAME'}' style='display:inline'><input type='submit' value='$Lang::tr{'reset'}' /><input type='hidden' name='ACTION' value='resetoutgoing' />";
+       print "$Lang::tr{'outgoing firewall reset'}: <form method='post' action='$ENV{'SCRIPT_NAME'}' style='display:inline'><input type='submit' value='$Lang::tr{'reset'}' /><input type='hidden' name='ACTION' value='resetoutgoing' /></tr>";
        print "</table></form>";
        &Header::closebox();
 }
index 7ec3274170ec896756529a49d053f4c798f53404..03d7505ec428bde43274a454c5084f3a4019c1e5 100644 (file)
@@ -227,7 +227,7 @@ case "$1" in
        /sbin/iptables -N WIRELESSINPUT
        /sbin/iptables -A INPUT -m state --state NEW -j WIRELESSINPUT
        /sbin/iptables -N WIRELESSFORWARD
-       /sbin/iptables -A FORWARD -m state --state NEW -j WIRELESSFORWARD
+       /sbin/iptables -A FORWARDFW -m state --state NEW -j WIRELESSFORWARD
        
        # PORTFWACCESS chain, used for portforwarding
        /sbin/iptables -N PORTFWACCESS
@@ -300,9 +300,9 @@ case "$1" in
        /sbin/iptables -A FORWARD -j POLICYFWD
        /sbin/iptables -N POLICYOUT
        /sbin/iptables -A OUTPUT -j POLICYOUT
-       
-       
+
        /usr/sbin/firewall-policy
+       
        ;;
   startovpn)  
        # run openvpn