* Fixed firewall scripts

diff --git a/contrib/init.d/luci_fw b/contrib/init.d/luci_fw
index f393719ab9565818395bd013314dfcf75a70f6d6..4cb9c4799e5ed16c01f44e4b7195e0861a12d9e0 100644 (file)
--- a/contrib/init.d/luci_fw
+++ b/contrib/init.d/luci_fw
@@ -15,12 +15,14 @@ apply_portfw() {
        
        if ([ "$proto" == "tcpudp" ] || [ "$proto" == "tcp" ]); then
                iptables -t nat -A luci_prerouting -i "$iface" -p tcp --dport "$dport" -j DNAT --to "$to"
-               iptables -A luci_forward -i "$iface" -p tcp -d "$ip" "$ports" -j ACCEPT
+               iptables -t nat -A luci_postrouting -p tcp -d "$ip" $ports -j MASQUERADE
+               iptables -A luci_forward -i "$iface" -p tcp -d "$ip" $ports -j ACCEPT
        fi
 
        if ([ "$proto" == "tcpudp" ] || [ "$proto" == "udp" ]); then
                iptables -t nat -A luci_prerouting -i "$iface" -p udp --dport "$dport" -j DNAT --to "$to"
-               iptables -A luci_forward -i "$iface" -p udp -d "$ip" "$ports" -j ACCEPT
+               iptables -t nat -A luci_postrouting -p udp -d "$ip" $ports -j MASQUERADE
+               iptables -A luci_forward -i "$iface" -p udp -d "$ip" $ports -j ACCEPT
        fi
 }
 
@@ -66,9 +68,6 @@ apply_rule() {
        config_get jump "$cfg" jump
        [ -n "$jump" ] && cmd="$cmd -j $jump"   
 
-       config_get state "$cfg" state
-       [ -n "$state" ] && cmd="$cmd -m state --state $state"   
-
        config_get command "$cfg" command
        [ -n "$command" ] && cmd="$cmd $command"        
 

diff --git a/contrib/uci/luci b/contrib/uci/luci
index 640faf170392bd979c86dc2d5e8f8e91c48d66d9..ba9ad47458f343a0bbc2dd97632f351035bb9ca3 100644 (file)
--- a/contrib/uci/luci
+++ b/contrib/uci/luci
@@ -19,4 +19,5 @@ config event uci_oncommit
         option network "/etc/init.d/network restart"
         option wireless        "/etc/init.d/network restart"
         option olsrd   "/etc/init.d/olsrd restart"
-        option dhcp            "/etc/init.d/dhcp restart"
\ No newline at end of file
+        option dhcp            "/etc/init.d/dhcp restart"
+        option luci_fw  "/etc/init.d/luci_fw restart"
\ No newline at end of file

diff --git a/src/ffluci/model/cbi/admin_network/firewall.lua b/src/ffluci/model/cbi/admin_network/firewall.lua
index a30bac7106df5a1288f53b158dd18fe24652ebbd..aa56328a0b203d47a7a4f4c5fbbeea5f2e688139 100644 (file)
--- a/src/ffluci/model/cbi/admin_network/firewall.lua
+++ b/src/ffluci/model/cbi/admin_network/firewall.lua
@@ -41,15 +41,6 @@ tosrc = s:option(Value, "todest", "Neue Zieladresse [DNAT]")
 tosrc.optional = true
 tosrc:depends("jump", "DNAT")
 
-
-state = s:option(MultiValue, "state", "Status")
-state.optional  = true
-state.delimiter = ","
-state:value("NEW", "neu")
-state:value("ESTABLISHED", "etabliert")
-state:value("RELATED", "zugehörig")
-state:value("INVALID", "ungültig")
-
 jump = s:option(ListValue, "jump", "Aktion")
 jump.rmempty = true
 jump:value("", "")