trigger error if dport is used when no proto is defined

SVN-Revision: 12317
This commit is contained in:
John Crispin 2008-08-15 20:18:13 +00:00
parent e7c9479ae4
commit 7681547293

View File

@ -178,6 +178,8 @@ fw_rule() {
[ -z "$target" ] && target=DROP [ -z "$target" ] && target=DROP
[ -n "$src" ] && ZONE=zone_$src || ZONE=INPUT [ -n "$src" ] && ZONE=zone_$src || ZONE=INPUT
[ -n "$dest" ] && TARGET=zone_${dest}_$target || TARGET=$target [ -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; }
$IPTABLES -I $ZONE 1 \ $IPTABLES -I $ZONE 1 \
${proto:+-p $proto} \ ${proto:+-p $proto} \
${src_ip:+-s $src_ip} \ ${src_ip:+-s $src_ip} \
@ -220,6 +222,8 @@ fw_redirect() {
config_get protocol $1 protocol config_get protocol $1 protocol
[ -z "$src" -o -z "$dest_ip" ] && { \ [ -z "$src" -o -z "$dest_ip" ] && { \
echo "redirect needs src and dest_ip"; return ; } 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; }
$IPTABLES -A zone_${src}_prerouting -t nat \ $IPTABLES -A zone_${src}_prerouting -t nat \
${protocol:+-p $protocol} \ ${protocol:+-p $protocol} \
${src_ip:+-s $srcdip} \ ${src_ip:+-s $srcdip} \