=================================================================== RCS file: /home/cvsd/home/cvs/scripts/shell/firewall/fw-universal.sh,v retrieving revision 2.38 retrieving revision 2.39 diff -u -p -r2.38 -r2.39 --- scripts/shell/firewall/fw-universal.sh 2006/01/15 15:07:45 2.38 +++ scripts/shell/firewall/fw-universal.sh 2006/02/28 17:50:00 2.39 @@ -109,7 +109,7 @@ load_cache() fi config=`cat $DEFAULT_FIREWALL_CONFIG`; - md5key=`echo "config = '$config' parsed_interfaces ='$parsed_interfaces' parsed_routes='$parsed_routes'" | md5sum | awk '{ print $1; }'`; + md5key=`echo "config = '$config' parsed_interfaces ='$parsed_interfaces' parsed_routes='$parsed_routes'" | md5sum | $AWK '{ print $1; }'`; CACHE_FILE="$DEFAULT_CACHE_DIR/$md5key" #echo "CACHE_FILE=$CACHE_FILE" @@ -360,7 +360,7 @@ masquerade() done for redirect in $NAT_TCP_PORT_REDIRECT; do - eval `echo $redirect | awk -v FS=: '{ printf "remote_port=%s; local_port=%s;", $1, $2; }'` + eval `echo $redirect | $AWK -v FS=: '{ printf "remote_port=%s; local_port=%s;", $1, $2; }'` echo -en " $remote_port:$local_port" $IPTABLES -t nat -A PREROUTING -p TCP \ -i ! $NAT_LAN_IFACE -d ! $lan_ip \ @@ -414,7 +414,7 @@ masquerade() if [ ! -z "$NAT_TCP_PORT_FORWARD" ]; then echo -en "\tForwarding ports to local machines:" for redirect in $NAT_TCP_PORT_FORWARD; do - eval `echo $redirect | awk -v FS=: '{ printf "src_port=%s; local_machine=%s; dest_port=%s;", $1, $2, $3; }'` + eval `echo $redirect | $AWK -v FS=: '{ printf "src_port=%s; local_machine=%s; dest_port=%s;", $1, $2, $3; }'` echo -en " $src_port -> $local_machine:$dest_port" $IPTABLES -t nat -A PREROUTING -p TCP -i $NAT_LAN_IFACE -d $lan_ip \ --dport $src_port -j DNAT --to $local_machine:$dest_port @@ -572,7 +572,7 @@ allow_input() ip="`get_first_ip_addr IP_$iface`"; for redirect in $REDIRECT_TCP; do eval `echo $redirect | \ - awk -v FS=: ' (NF == 2) { remote_ip = "0.0.0.0/0"; from_port = $1; to_port = $2; } \ + $AWK -v FS=: ' (NF == 2) { remote_ip = "0.0.0.0/0"; from_port = $1; to_port = $2; } \ (NF == 3) { remote_ip = $1; from_port = $2; to_port = $3; } \ END { printf "remote_ip=%s; from_port=%s; to_port=%s;", remote_ip, from_port, to_port; }'` echo -en " $remote_ip:$from_port->$to_port" @@ -586,7 +586,7 @@ allow_input() ip="`get_first_ip_addr IP_$iface`"; for redirect in $REDIRECT_UDP; do eval `echo $redirect | \ - awk -v FS=: ' (NF == 2) { remote_ip = "0.0.0.0/0"; from_port = $1; to_port = $2; } \ + $AWK -v FS=: ' (NF == 2) { remote_ip = "0.0.0.0/0"; from_port = $1; to_port = $2; } \ (NF == 3) { remote_ip = $1; from_port = $2; to_port = $3; } \ END { printf "remote_ip=%s; from_port=%s; to_port=%s;", remote_ip, from_port, to_port; }'` echo -en " $remote_ip:$from_port->$to_port" @@ -743,7 +743,7 @@ do_ip_accounting() done if [ ! "x$DO_LOCAL_IP_ACCOUNTING" = "xno" ]; then - accountig_ports=`echo "$NAT_TCP_PORT_REDIRECT " | awk -v RS=' ' -v FS=: '{ print $2; }' | sort -u -r -g ` + accountig_ports=`echo "$NAT_TCP_PORT_REDIRECT " | $AWK -v RS=' ' -v FS=: '{ print $2; }' | sort -u -r -g ` for port in $accountig_ports; do $IPTABLES -I INPUT -i $NAT_SUBNET_IFACE -p TCP --dport $port -j $IPACCT_NAME $IPTABLES -I INPUT -i $NAT_SUBNET_IFACE -p UDP --dport $port -j $IPACCT_NAME @@ -810,6 +810,8 @@ BEGIN { split($0, fields, "[ \t:]+"); ip[iface, ipcount[iface]] = fields[4]; bcast[iface] = fields[6]; # bad for loopback interface, but we don t need this + # try to upgrade gawk (3.1.4-2.0.1 => 3.1.5-1) if you experience problem on the next line + # awk: cmd. line:17: (FILENAME=- FNR=2) fatal: attempt to use array "fields" in a scalar context idx = length(fields); mask[iface] = fields[idx]; }