fixes uci firewall init order, Signed-off-by: Roberto Riggio

[openwrt-10.03/.git] / package / firewall / files / uci_firewall.sh

diff --git a/package/firewall/files/uci_firewall.sh b/package/firewall/files/uci_firewall.sh
index e1683e9cf0bf25c1bcae68d80b2951966c6264d0..ca5d51267e6568e3d8c3d18fc656eae91e08e25e 100755 (executable)
--- a/package/firewall/files/uci_firewall.sh
+++ b/package/firewall/files/uci_firewall.sh
@@ -163,6 +163,7 @@ fw_rule() {
        local dest_port
        local proto
        local target
+       local ruleset
 
        config_get src $1 src
        config_get src_ip $1 src_ip
@@ -178,6 +179,10 @@ fw_rule() {
        [ -z "$target" ] && target=DROP
        [ -n "$src" ] && ZONE=zone_$src || ZONE=INPUT
        [ -n "$dest" ] && TARGET=zone_${dest}_$target || TARGET=$target
+       [ -n "$dest_port" -a -z "$proto" ] && { \
+               echo "dport may only be used it proto is defined"; return; }
+       [ -n "$src_port" -a -z "$proto" ] && { \
+               echo "sport may only be used it proto is defined"; return; }
        $IPTABLES -I $ZONE 1 \
                ${proto:+-p $proto} \
                ${src_ip:+-s $src_ip} \
@@ -208,7 +213,7 @@ fw_redirect() {
        local src_mac
        local dest_ip
        local dest_port
-       local protocol
+       local proto
        
        config_get src $1 src
        config_get src_ip $1 src_ip
@@ -217,20 +222,41 @@ fw_redirect() {
        config_get src_mac $1 src_mac
        config_get dest_ip $1 dest_ip
        config_get dest_port $1 dest_port
-       config_get protocol $1 protocol
+       config_get proto $1 proto
        [ -z "$src" -o -z "$dest_ip" ] && { \
                echo "redirect needs src and dest_ip"; return ; }
+       [ -n "$dest_port" -a -z "$proto" ] && { \
+               echo "dport may only be used it proto is defined"; return; }
+       [ -n "$src_port" -a -z "$proto" ] && { \
+               echo "sport may only be used it proto is defined"; return; }
+
+       src_port_first=${src_port%-*}
+       src_port_last=${src_port#*-}
+       [ "$src_port_first" -ne "$src_port_last" ] && { \
+               src_port="$src_port_first:$src_port_last"; }
+
+       src_dport_first=${src_dport%-*}
+       src_dport_last=${src_dport#*-}
+       [ "$src_dport_first" -ne "$src_dport_last" ] && { \
+               src_dport="$src_dport_first:$src_dport_last"; }
+
        $IPTABLES -A zone_${src}_prerouting -t nat \
-               ${protocol:+-p $protocol} \
-               ${src_ip:+-s $srcdip} \
+               ${proto:+-p $proto} \
+               ${src_ip:+-s $src_ip} \
                ${src_port:+--sport $src_port} \
                ${src_dport:+--dport $src_dport} \
                ${src_mac:+-m mac --mac-source $src_mac} \
                -j DNAT --to-destination $dest_ip${dest_port:+:$dest_port}
+
+       dest_port_first=${dest_port%-*}
+       dest_port_last=${dest_port#*-}
+       [ "$dest_port_first" -ne "$dest_port_last" ] && { \
+               dest_port="$dest_port_first:$dest_port_last"; }
+
        $IPTABLES -I zone_${src}_forward 1 \
-               ${protocol:+-p $protocol} \
+               ${proto:+-p $proto} \
                -d $dest_ip \
-               ${src_ip:+-s $srcdip} \
+               ${src_ip:+-s $src_ip} \
                ${src_port:+--sport $src_port} \
                ${dest_port:+--dport $dest_port} \
                ${src_mac:+-m mac --mac-source $src_mac} \
@@ -252,6 +278,19 @@ fw_addif() {
        (ACTION="ifup" INTERFACE="$1" . /etc/hotplug.d/iface/20-firewall)
 }
 
+fw_custom_chains() {
+       $IPTABLES -N input_rule
+       $IPTABLES -N output_rule
+       $IPTABLES -N forward_rule
+       $IPTABLES -N prerouting_rule -t nat
+       $IPTABLES -N postrouting_rule -t nat
+       $IPTABLES -A INPUT -j input_rule
+       $IPTABLES -A OUTPUT -j output_rule
+       $IPTABLES -A FORWARD -j forward_rule
+       $IPTABLES -A PREROUTING -t nat -j prerouting_rule
+       $IPTABLES -A POSTROUTING -t nat -j postrouting_rule
+}
+
 fw_init() {
        echo "Loading defaults"
        config_foreach fw_defaults defaults
@@ -263,9 +302,11 @@ fw_init() {
        config_foreach fw_forwarding forwarding
        echo "Loading redirects"
        config_foreach fw_redirect redirect
+       echo "Adding custom chains"
+       fw_custom_chains
        echo "Loading includes"
        config_foreach fw_include include
-       
+
        uci_set_state firewall core "" firewall_state 
        uci_set_state firewall core loaded 1
        unset CONFIG_APPEND