ramips: set cp0_perfcount_irq for RT305X

[openwrt.git] / package / firewall / files / lib / core_init.sh

diff --git a/package/firewall/files/lib/core_init.sh b/package/firewall/files/lib/core_init.sh
index c7e41e7..185fffb 100644 (file)
--- a/package/firewall/files/lib/core_init.sh
+++ b/package/firewall/files/lib/core_init.sh
@@ -245,9 +245,17 @@ fw_load_zone() {
        if [ "$zone_masq" == 1 ]; then
                local msrc mdst
                for msrc in ${zone_masq_src:-0.0.0.0/0}; do
        if [ "$zone_masq" == 1 ]; then
                local msrc mdst
                for msrc in ${zone_masq_src:-0.0.0.0/0}; do

-                       fw_get_negation msrc '-s' "$msrc"
+                       case "$msrc" in
+                               *.*) fw_get_negation msrc '-s' "$msrc" ;;
+                               *)   fw_get_subnet4 msrc '-s' "$msrc" ;;
+                       esac
+

                        for mdst in ${zone_masq_dest:-0.0.0.0/0}; do
                        for mdst in ${zone_masq_dest:-0.0.0.0/0}; do

-                               fw_get_negation mdst '-d' "$mdst"
+                               case "$mdst" in
+                                       *.*) fw_get_negation mdst '-d' "$mdst" ;;
+                                       *)   fw_get_subnet4 mdst '-d' "$mdst" ;;
+                               esac
+

                                fw add $mode n ${chain}_nat MASQUERADE $ { $msrc $mdst }
                        done
                done
                                fw add $mode n ${chain}_nat MASQUERADE $ { $msrc $mdst }
                        done
                done


@@ -271,8 +279,10 @@ fw_load_notrack_zone() {
 fw_load_include() {
        local name="$1"
 
 fw_load_include() {
        local name="$1"
 

-       local path; config_get path ${name} path
-       [ -e $path ] && . $path
+       local path
+       config_get path ${name} path
+
+       [ -e $path ] && ( . $path )

 }
 
 
 }