diff options
| author | John Crispin <john@openwrt.org> | 2008-08-26 07:23:29 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2008-08-26 07:23:29 +0000 |
| commit | aa6c019c11e77e34e02fe4884016a82fa37ab5ed (patch) | |
| tree | 5b08dd4fe93b32317e0023459e2d648c923cd70d /package | |
| parent | a4ad20d76b10f90164a5be20de4e1584899031e9 (diff) | |
| download | upstream-aa6c019c11e77e34e02fe4884016a82fa37ab5ed.tar.gz upstream-aa6c019c11e77e34e02fe4884016a82fa37ab5ed.tar.bz2 upstream-aa6c019c11e77e34e02fe4884016a82fa37ab5ed.zip | |
use proto instead of protocol in uci firewall
SVN-Revision: 12391
Diffstat (limited to 'package')
| -rwxr-xr-x | package/firewall/files/firewall.config | 2 | ||||
| -rwxr-xr-x | package/firewall/files/uci_firewall.sh | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/package/firewall/files/firewall.config b/package/firewall/files/firewall.config index 073169013d..fe5d38d2b9 100755 --- a/package/firewall/files/firewall.config +++ b/package/firewall/files/firewall.config @@ -50,7 +50,7 @@ config forwarding # option dest lan # option dest_ip 192.168.16.235 # option dest_port 80 -# option protocol tcp +# option proto tcp # include a file with users custom iptables rules #config include diff --git a/package/firewall/files/uci_firewall.sh b/package/firewall/files/uci_firewall.sh index ff82f8bf0b..e1c4d4d673 100755 --- a/package/firewall/files/uci_firewall.sh +++ b/package/firewall/files/uci_firewall.sh @@ -211,7 +211,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 @@ -220,20 +220,20 @@ 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 "$protocol" ] && { \ + [ -n "$dest_port" -a -z "$proto" ] && { \ echo "dport may only be used it proto is defined"; return; } $IPTABLES -A zone_${src}_prerouting -t nat \ - ${protocol:+-p $protocol} \ + ${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} $IPTABLES -I zone_${src}_forward 1 \ - ${protocol:+-p $protocol} \ + ${proto:+-p $proto} \ -d $dest_ip \ ${src_ip:+-s $src_ip} \ ${src_port:+--sport $src_port} \ |