Add a sixth parameter to Drop and Reject

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2016-04-08 09:10:45 -07:00
parent be58d530c4
commit 76c8917aa7
2 changed files with 12 additions and 8 deletions

View File

@ -10,7 +10,7 @@
# b) Ensure that certain ICMP packets that are necessary for successful # b) Ensure that certain ICMP packets that are necessary for successful
# internet operation are always ACCEPTed. # internet operation are always ACCEPTed.
# #
# The action accepts five optional parameters: # The action accepts six optional parameters:
# #
# 1 - 'audit' or '-'. Default is '-' which means don't audit in builtin # 1 - 'audit' or '-'. Default is '-' which means don't audit in builtin
# actions. # actions.
@ -22,6 +22,8 @@
# A_ACCEPT depending on the first parameter. # A_ACCEPT depending on the first parameter.
# 5 - Action to take with late UDP replies (UDP source port 53). Default # 5 - Action to take with late UDP replies (UDP source port 53). Default
# is DROP or A_DROP depending on the first parameter. # is DROP or A_DROP depending on the first parameter.
# 6 - Action to take with UPnP packets. Default is DROP or A_DROP
# depending on the first parameter.
# #
# IF YOU ARE HAVING CONNECTION PROBLEMS, CHANGING THIS FILE WON'T HELP!!!!!!!!! # IF YOU ARE HAVING CONNECTION PROBLEMS, CHANGING THIS FILE WON'T HELP!!!!!!!!!
# #
@ -29,12 +31,12 @@
?if passed(@1) ?if passed(@1)
?if @1 eq 'audit' ?if @1 eq 'audit'
DEFAULTS -,-,A_DROP,A_ACCEPT,A_DROP DEFAULTS -,-,A_DROP,A_ACCEPT,A_DROP,A_DROP
?else ?else
?error The first parameter to Drop must be 'audit' or '-' ?error The first parameter to Drop must be 'audit' or '-'
?endif ?endif
?else ?else
DEFAULTS -,-,DROP,ACCEPT,DROP DEFAULTS -,-,DROP,ACCEPT,DROP,DROP
?endif ?endif
#ACTION SOURCE DEST PROTO DPORT SPORT #ACTION SOURCE DEST PROTO DPORT SPORT
@ -65,7 +67,7 @@ Invalid(DROP,@1)
# Drop Microsoft noise so that it doesn't clutter up the log. # Drop Microsoft noise so that it doesn't clutter up the log.
# #
SMB(@3) SMB(@3)
DropUPnP DropUPnP(@6)
# #
# Drop 'newnotsyn' traffic so that it doesn't get logged. # Drop 'newnotsyn' traffic so that it doesn't get logged.
# #

View File

@ -10,7 +10,7 @@
# b) Ensure that certain ICMP packets that are necessary for successful # b) Ensure that certain ICMP packets that are necessary for successful
# internet operation are always ACCEPTed. # internet operation are always ACCEPTed.
# #
# The action accepts five optional parameters: # The action accepts six optional parameters:
# #
# 1 - 'audit' or '-'. Default is '-' which means don't audit in builtin # 1 - 'audit' or '-'. Default is '-' which means don't audit in builtin
# actions. # actions.
@ -22,18 +22,20 @@
# A_ACCEPT depending on the first parameter. # A_ACCEPT depending on the first parameter.
# 5 - Action to take with late UDP replies (UDP source port 53). Default # 5 - Action to take with late UDP replies (UDP source port 53). Default
# is DROP or A_DROP depending on the first parameter. # is DROP or A_DROP depending on the first parameter.
# 6 - Action to take with UPnP packets. Default is DROP or A_DROP
# depending on the first parameter.
# #
# IF YOU ARE HAVING CONNECTION PROBLEMS, CHANGING THIS FILE WON'T HELP!!!!!!!!! # IF YOU ARE HAVING CONNECTION PROBLEMS, CHANGING THIS FILE WON'T HELP!!!!!!!!!
############################################################################### ###############################################################################
?if passed(@1) ?if passed(@1)
?if @1 eq 'audit' ?if @1 eq 'audit'
DEFAULTS -,-,A_REJECT,A_ACCEPT,A_DROP DEFAULTS -,-,A_REJECT,A_ACCEPT,A_DROP,A_DROP
?else ?else
?error The first parameter to Reject must be 'audit' or '-' ?error The first parameter to Reject must be 'audit' or '-'
?endif ?endif
?else ?else
DEFAULTS -,-,REJECT,ACCEPT,DROP DEFAULTS -,-,REJECT,ACCEPT,DROP,DROP
?endif ?endif
#ACTION SOURCE DEST PROTO #ACTION SOURCE DEST PROTO
@ -66,7 +68,7 @@ Invalid(DROP,@1)
# Reject Microsoft noise so that it doesn't clutter up the log. # Reject Microsoft noise so that it doesn't clutter up the log.
# #
SMB(@3) SMB(@3)
DropUPnP(@5) DropUPnP(@6)
# #
# Drop 'newnotsyn' traffic so that it doesn't get logged. # Drop 'newnotsyn' traffic so that it doesn't get logged.
# #