holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Allow degenerate rules; replace 'chain_exists' with 'havechain' in accounting code

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@701 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2003-08-11 17:44:23 +00:00
parent 8080d002b7
commit a1c1785048
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Shorewall/changelog.txt
View File

@ -33,3 +33,8 @@ Changes since 1.4.6
15) Add ACTION column to accounting file.
16) Add CHAIN declarations to accounting file.
17) Replace calls to chain_exists with calls to havechain in
accounting code.
18) Allow degenerate DONE and COUNT rules.

15
Shorewall/firewall
View File

@ -1776,7 +1776,7 @@ add_accounting_chain() {
return
fi
if chain_exists $source; then
if havechain $source; then
error_message "Warning: Chain $source already exists - CHAIN declaration $source $dest Ignored"
return
fi
@ -1808,7 +1808,7 @@ process_accounting_rule() {
}
jump_to_chain() {
if ! chain_exists $chain; then
if ! havechain $chain; then
if createchain2 $chain No; then
run_iptables -A $chain -j RETURN
else
@ -1830,12 +1830,7 @@ process_accounting_rule() {
-|all|any)
;;
*)
if [ -n "$source" ]; then
rule="-i $source"
else
accounting_error
return
fi
[ -n "$source" ] && rule="-i $source"
;;
esac
@ -1894,7 +1889,7 @@ process_accounting_rule() {
;;
esac
chain_exists accounting || createchain accounting No
havechain accounting || createchain accounting No
if iptables -A accounting $rule ; then
[ "x$rule2" != x ] && run_iptables -A accounting $rule2
@ -1925,7 +1920,7 @@ setup_accounting() # $1 = Name of accounting file
esac
done < $TMP_DIR/accounting
if chain_exists accounting; then
if havechain accounting; then
for chain in INPUT FORWARD OUTPUT; do
run_iptables -A $chain -j accounting
done