[package] firewall:

[openwrt/svn-archive/archive.git] / package / firewall / files / lib / core_rule.sh

diff --git a/package/firewall/files/lib/core_rule.sh b/package/firewall/files/lib/core_rule.sh
index 1dc3f1cde6ff756997f924058db4a7111adae9ae..1e4afe5aff498e181c0d2ca07af09e8bdb611abd 100644 (file)
--- a/package/firewall/files/lib/core_rule.sh
+++ b/package/firewall/files/lib/core_rule.sh
@@ -11,7 +11,6 @@ fw_config_get_rule() {
                string src_port "" \
                string dest "" \
                ipaddr dest_ip "" \
-               string dest_mac "" \
                string dest_port "" \
                string icmp_type "" \
                string proto "tcpudp" \
@@ -27,9 +26,9 @@ fw_load_rule() {
 
        fw_callback pre rule
 
-       rule_src_port=$(fw_get_port_range $rule_src_port)
-       rule_dest_port=$(fw_get_port_range $rule_dest_port)
-       
+       fw_get_port_range rule_src_port $rule_src_port
+       fw_get_port_range rule_dest_port $rule_dest_port
+
        local chain=input
        [ -n "$rule_src" ] && {
                [ -z "$rule_dest" ] && {
@@ -47,19 +46,20 @@ fw_load_rule() {
                target=zone_${rule_dest}_${target}
        }
 
-       local rule_pos
-       eval 'rule_pos=$((++FW__RULE_COUNT_'$chain'))'
+       local mode
+       fw_get_family_mode mode ${rule_family:-x} $rule_src I
 
-       local mode=$(fw_get_family_mode ${rule_family:-x} $rule_src I)
+       local rule_pos
+       eval 'rule_pos=$((++FW__RULE_COUNT_'$mode'_'$chain'))'
 
        [ "$rule_proto" == "tcpudp" ] && rule_proto="tcp udp"
        for rule_proto in $rule_proto; do
                fw add $mode f $chain $target $rule_pos { $rule_src_ip $rule_dest_ip } { \
                        ${rule_proto:+-p $rule_proto} \
-                       ${rule_src_ip:+-s $rule_src_ip} \
+                       ${rule_src_ip:+-s $rule_src_ip/$rule_src_ip_prefixlen} \
                        ${rule_src_port:+--sport $rule_src_port} \
                        ${rule_src_mac:+-m mac --mac-source $rule_src_mac} \
-                       ${rule_dest_ip:+-d $rule_dest_ip} \
+                       ${rule_dest_ip:+-d $rule_dest_ip/$rule_dest_ip_prefixlen} \
                        ${rule_dest_port:+--dport $rule_dest_port} \
                        ${rule_icmp_type:+--icmp-type $rule_icmp_type} \
                }