From b25a8e4b2d81f835f60de431cc8ede8a8f7172fe Mon Sep 17 00:00:00 2001 From: Tuomo Soini Date: Mon, 16 Nov 2015 18:16:17 +0200 Subject: [PATCH] shorewall: use real field names in config file headers Signed-off-by: Tuomo Soini --- Shorewall/configfiles/accounting | 5 ++--- Shorewall/configfiles/actions | 8 +++++--- Shorewall/configfiles/arprules | 5 ++--- Shorewall/configfiles/blrules | 5 ++--- Shorewall/configfiles/conntrack | 7 +++---- Shorewall/configfiles/ecn | 2 +- Shorewall/configfiles/hosts | 2 +- Shorewall/configfiles/interfaces | 1 - Shorewall/configfiles/isusable | 1 + Shorewall/configfiles/maclist | 2 +- Shorewall/configfiles/mangle | 3 +-- Shorewall/configfiles/masq | 5 ++--- Shorewall/configfiles/nat | 3 +-- Shorewall/configfiles/netmap | 5 ++--- Shorewall/configfiles/params | 2 -- Shorewall/configfiles/policy | 3 +-- Shorewall/configfiles/rules | 6 +++--- Shorewall/configfiles/scfilter | 1 + Shorewall/configfiles/secmarks | 5 ++--- Shorewall/configfiles/start | 1 + Shorewall/configfiles/stoppedrules | 3 +-- Shorewall/configfiles/tcclasses | 3 +-- Shorewall/configfiles/tcdevices | 3 +-- Shorewall/configfiles/tcfilters | 5 ++--- Shorewall/configfiles/tcinterfaces | 2 +- Shorewall/configfiles/tcpri | 2 +- Shorewall/configfiles/tunnels | 3 +-- Shorewall/configfiles/zones | 6 +++--- Shorewall6/configfiles/accounting | 5 ++--- Shorewall6/configfiles/actions | 8 +++++--- Shorewall6/configfiles/blrules | 5 ++--- Shorewall6/configfiles/conntrack | 7 +++---- Shorewall6/configfiles/hosts | 2 +- Shorewall6/configfiles/interfaces | 1 - Shorewall6/configfiles/isusable | 1 + Shorewall6/configfiles/maclist | 2 +- Shorewall6/configfiles/mangle | 3 +-- Shorewall6/configfiles/masq | 5 ++--- Shorewall6/configfiles/nat | 3 +-- Shorewall6/configfiles/netmap | 5 ++--- Shorewall6/configfiles/params | 2 -- Shorewall6/configfiles/policy | 3 +-- Shorewall6/configfiles/rules | 6 +++--- Shorewall6/configfiles/scfilter | 1 + Shorewall6/configfiles/secmarks | 5 ++--- Shorewall6/configfiles/stoppedrules | 3 +-- Shorewall6/configfiles/tcclasses | 2 +- Shorewall6/configfiles/tcdevices | 3 +-- Shorewall6/configfiles/tcfilters | 5 ++--- Shorewall6/configfiles/tcinterfaces | 2 +- Shorewall6/configfiles/tcpri | 2 +- Shorewall6/configfiles/tunnels | 3 +-- Shorewall6/configfiles/zones | 6 +++--- 53 files changed, 82 insertions(+), 107 deletions(-) diff --git a/Shorewall/configfiles/accounting b/Shorewall/configfiles/accounting index 90151d03d..0963e477b 100644 --- a/Shorewall/configfiles/accounting +++ b/Shorewall/configfiles/accounting @@ -6,6 +6,5 @@ # Please see http://shorewall.net/Accounting.html for examples and # additional information about how to use this file. # -################################################################################################################# -#ACTION CHAIN SOURCE DESTINATION PROTO DEST SOURCE USER/ MARK IPSEC -# PORT(S) PORT(S) GROUP +############################################################################### +#ACTION CHAIN SOURCE DEST PROTO DPORT SPORT USER MARK IPSEC diff --git a/Shorewall/configfiles/actions b/Shorewall/configfiles/actions index dd6b810cb..05741ecd9 100644 --- a/Shorewall/configfiles/actions +++ b/Shorewall/configfiles/actions @@ -5,6 +5,8 @@ # # Please see http://shorewall.net/Actions.html for additional information. # -######################################################################################## -#ACTION OPTIONS COMMENT (place '# ' below the 'C' in comment followed by -# v a comment describing the action) +# Place '# ' below the 'C' in COMMENT followed by a comment describing +# the action. +# +############################################################################### +#ACTION OPTIONS COMMENT diff --git a/Shorewall/configfiles/arprules b/Shorewall/configfiles/arprules index 8a7576307..dba725348 100644 --- a/Shorewall/configfiles/arprules +++ b/Shorewall/configfiles/arprules @@ -3,6 +3,5 @@ # # For information about entries in this file, type "man shorewall-arprules" # -############################################################################################################## -#ACTION SOURCE DEST ARP -# OPCODE +############################################################################### +#ACTION SOURCE DEST OPCODE diff --git a/Shorewall/configfiles/blrules b/Shorewall/configfiles/blrules index 5108cd01e..d1e361606 100644 --- a/Shorewall/configfiles/blrules +++ b/Shorewall/configfiles/blrules @@ -6,6 +6,5 @@ # Please see http://shorewall.net/blacklisting_support.htm for additional # information. # -################################################################################################################################################################################################ -#ACTION SOURCE DEST PROTO DEST SOURCE ORIGINAL RATE USER/ MARK CONNLIMIT TIME HEADERS SWITCH -# PORT PORT(S) DEST LIMIT GROUP +############################################################################################################################################################## +#ACTION SOURCE DEST PROTO DPORT SPORT ORIGDEST RATE USER MARK CONNLIMIT TIME HEADERS SWITCH HELPER diff --git a/Shorewall/configfiles/conntrack b/Shorewall/configfiles/conntrack index fb9529762..5fea6b94f 100644 --- a/Shorewall/configfiles/conntrack +++ b/Shorewall/configfiles/conntrack @@ -3,11 +3,10 @@ # # For information about entries in this file, type "man shorewall-conntrack" # -############################################################################################################## ?FORMAT 3 -############################################################################################################## -#ACTION SOURCE DESTINATION PROTO DEST SOURCE USER/ SWITCH -# PORT(S) PORT(S) GROUP +###################################################################################################### +#ACTION SOURCE DEST PROTO DPORT SPORT USER SWITCH + ?if $AUTOHELPERS && __CT_TARGET ?if __AMANDA_HELPER diff --git a/Shorewall/configfiles/ecn b/Shorewall/configfiles/ecn index 81aaa1899..15aed396e 100644 --- a/Shorewall/configfiles/ecn +++ b/Shorewall/configfiles/ecn @@ -7,4 +7,4 @@ # http://www.shorewall.net/manpages/shorewall-ecn.html # ############################################################################### -#INTERFACE HOST(S) +#INTERFACE HOSTS diff --git a/Shorewall/configfiles/hosts b/Shorewall/configfiles/hosts index 6303d0671..99bfa0263 100644 --- a/Shorewall/configfiles/hosts +++ b/Shorewall/configfiles/hosts @@ -7,4 +7,4 @@ # http://www.shorewall.net/manpages/shorewall-hosts.html # ############################################################################### -#ZONE HOST(S) OPTIONS +#ZONE HOSTS OPTIONS diff --git a/Shorewall/configfiles/interfaces b/Shorewall/configfiles/interfaces index 2f2d70e42..c9a8bd922 100644 --- a/Shorewall/configfiles/interfaces +++ b/Shorewall/configfiles/interfaces @@ -6,7 +6,6 @@ # The manpage is also online at # http://www.shorewall.net/manpages/shorewall-interfaces.html # -############################################################################### ?FORMAT 2 ############################################################################### #ZONE INTERFACE OPTIONS diff --git a/Shorewall/configfiles/isusable b/Shorewall/configfiles/isusable index 24777d25b..775973966 100644 --- a/Shorewall/configfiles/isusable +++ b/Shorewall/configfiles/isusable @@ -13,6 +13,7 @@ # information. # ############################################################################### + local status status=0 diff --git a/Shorewall/configfiles/maclist b/Shorewall/configfiles/maclist index 8b71e65b2..592fa10bf 100644 --- a/Shorewall/configfiles/maclist +++ b/Shorewall/configfiles/maclist @@ -6,4 +6,4 @@ # For additional information, see http://shorewall.net/MAC_Validation.html # ############################################################################### -#DISPOSITION INTERFACE MAC IP ADDRESSES (Optional) +#DISPOSITION INTERFACE MAC ADDRESSES diff --git a/Shorewall/configfiles/mangle b/Shorewall/configfiles/mangle index af0d9c37e..d5d285e85 100644 --- a/Shorewall/configfiles/mangle +++ b/Shorewall/configfiles/mangle @@ -11,5 +11,4 @@ # the Netfilter/Shorewall packet marking mechanism. # #################################################################################################################################################### -#ACTION SOURCE DEST PROTO DEST SOURCE USER TEST LENGTH TOS CONNBYTES HELPER PROBABILITY DSCP -# PORT(S) PORT(S) +#ACTION SOURCE DEST PROTO DPORT SPORT USER TEST LENGTH TOS CONNBYTES HELPER PROBABILITY DSCP diff --git a/Shorewall/configfiles/masq b/Shorewall/configfiles/masq index a60df5437..6d80f66ce 100644 --- a/Shorewall/configfiles/masq +++ b/Shorewall/configfiles/masq @@ -6,6 +6,5 @@ # The manpage is also online at # http://www.shorewall.net/manpages/shorewall-masq.html # -################################################################################################################################### -#INTERFACE:DEST SOURCE ADDRESS PROTO PORT(S) IPSEC MARK USER/ SWITCH ORIGINAL PROBABILITY -# GROUP DEST +###################################################################################################### +#INTERFACE SOURCE ADDRESS PROTO PORT IPSEC MARK USER SWITCH diff --git a/Shorewall/configfiles/nat b/Shorewall/configfiles/nat index fa9645b60..5d0871f75 100644 --- a/Shorewall/configfiles/nat +++ b/Shorewall/configfiles/nat @@ -6,5 +6,4 @@ # For additional information, see http://shorewall.net/NAT.htm # ############################################################################### -#EXTERNAL INTERFACE INTERNAL ALL LOCAL -# INTERFACES +#EXTERNAL INTERFACE INTERNAL ALLINTS LOCAL diff --git a/Shorewall/configfiles/netmap b/Shorewall/configfiles/netmap index 62e5dd369..b114bccb3 100644 --- a/Shorewall/configfiles/netmap +++ b/Shorewall/configfiles/netmap @@ -6,6 +6,5 @@ # See http://shorewall.net/netmap.html for an example and usage # information. # -############################################################################################## -#TYPE NET1 INTERFACE NET2 NET3 PROTO DEST SOURCE -# PORT(S) PORT(S) +############################################################################################# +#TYPE NET1 INTERFACE NET2 NET3 PROTO DPORT SPORT diff --git a/Shorewall/configfiles/params b/Shorewall/configfiles/params index bd471a3c7..0c50d5810 100644 --- a/Shorewall/configfiles/params +++ b/Shorewall/configfiles/params @@ -22,5 +22,3 @@ # net eth0 130.252.100.255 routefilter,norfc1918 # ############################################################################### - -#LAST LINE -- DO NOT REMOVE diff --git a/Shorewall/configfiles/policy b/Shorewall/configfiles/policy index 6f99c762f..8e9d0325c 100644 --- a/Shorewall/configfiles/policy +++ b/Shorewall/configfiles/policy @@ -7,5 +7,4 @@ # http://www.shorewall.net/manpages/shorewall-policy.html # ############################################################################### -#SOURCE DEST POLICY LOG LIMIT: CONNLIMIT: -# LEVEL BURST MASK +#SOURCE DEST POLICY LOGLEVEL LIMIT CONNLIMIT diff --git a/Shorewall/configfiles/rules b/Shorewall/configfiles/rules index cd6ef0159..c980af859 100644 --- a/Shorewall/configfiles/rules +++ b/Shorewall/configfiles/rules @@ -6,9 +6,9 @@ # The manpage is also online at # http://www.shorewall.net/manpages/shorewall-rules.html # -###################################################################################################################################################################################################### -#ACTION SOURCE DEST PROTO DEST SOURCE ORIGINAL RATE USER/ MARK CONNLIMIT TIME HEADERS SWITCH HELPER -# PORT(S) PORT(S) DEST LIMIT GROUP +############################################################################################################################################################## +#ACTION SOURCE DEST PROTO DPORT SPORT ORIGDEST RATE USER MARK CONNLIMIT TIME HEADERS SWITCH HELPER + ?SECTION ALL ?SECTION ESTABLISHED ?SECTION RELATED diff --git a/Shorewall/configfiles/scfilter b/Shorewall/configfiles/scfilter index 771d24218..a903f1c6c 100644 --- a/Shorewall/configfiles/scfilter +++ b/Shorewall/configfiles/scfilter @@ -8,4 +8,5 @@ # information. # ############################################################################### + cat - diff --git a/Shorewall/configfiles/secmarks b/Shorewall/configfiles/secmarks index 6a3372170..0e73ff9ad 100644 --- a/Shorewall/configfiles/secmarks +++ b/Shorewall/configfiles/secmarks @@ -3,6 +3,5 @@ # # For information about entries in this file, type "man shorewall-secmarks" # -############################################################################################################ -#SECMARK CHAIN: SOURCE DEST PROTO DEST SOURCE USER/ MARK -# STATE PORT(S) PORT(S) GROUP +############################################################################################ +#SECMARK CHAIN SOURCE DEST PROTO DPORT SPORT USER MARK diff --git a/Shorewall/configfiles/start b/Shorewall/configfiles/start index eaff0640a..c61c54eeb 100644 --- a/Shorewall/configfiles/start +++ b/Shorewall/configfiles/start @@ -8,4 +8,5 @@ # information. # ############################################################################### + return 0 diff --git a/Shorewall/configfiles/stoppedrules b/Shorewall/configfiles/stoppedrules index 09792af28..94f4d0c3b 100644 --- a/Shorewall/configfiles/stoppedrules +++ b/Shorewall/configfiles/stoppedrules @@ -10,5 +10,4 @@ # information. # ############################################################################### -#ACTION SOURCE DEST PROTO DEST SOURCE -# PORT(S) PORT(S) +#ACTION SOURCE DEST PROTO DPORT SPORT diff --git a/Shorewall/configfiles/tcclasses b/Shorewall/configfiles/tcclasses index 8776b1aa0..b31b684d5 100644 --- a/Shorewall/configfiles/tcclasses +++ b/Shorewall/configfiles/tcclasses @@ -6,5 +6,4 @@ # See http://shorewall.net/traffic_shaping.htm for additional information. # ############################################################################### -#INTERFACE:CLASS MARK RATE: CEIL PRIORITY OPTIONS -# DMAX:UMAX +#INTERFACE MARK RATE CEIL PRIO OPTIONS diff --git a/Shorewall/configfiles/tcdevices b/Shorewall/configfiles/tcdevices index 78fbc8ae1..226192e8b 100644 --- a/Shorewall/configfiles/tcdevices +++ b/Shorewall/configfiles/tcdevices @@ -6,5 +6,4 @@ # See http://shorewall.net/traffic_shaping.htm for additional information. # ############################################################################### -#NUMBER: IN-BANDWITH OUT-BANDWIDTH OPTIONS REDIRECTED -#INTERFACE INTERFACES +#INTERFACE IN_BANDWITH OUT_BANDWIDTH OPTIONS REDIRECT diff --git a/Shorewall/configfiles/tcfilters b/Shorewall/configfiles/tcfilters index 1d7e1fb75..60a44108e 100644 --- a/Shorewall/configfiles/tcfilters +++ b/Shorewall/configfiles/tcfilters @@ -5,6 +5,5 @@ # # See http://shorewall.net/traffic_shaping.htm for additional information. # -######################################################################################################## -#INTERFACE: SOURCE DEST PROTO DEST SOURCE TOS LENGTH PRIORITY -#CLASS PORT(S) PORT(S) +###################################################################################### +#CLASS SOURCE DEST PROTO DPORT SPORT TOS LENGTH diff --git a/Shorewall/configfiles/tcinterfaces b/Shorewall/configfiles/tcinterfaces index 4026bc242..88f6e4ba3 100644 --- a/Shorewall/configfiles/tcinterfaces +++ b/Shorewall/configfiles/tcinterfaces @@ -7,4 +7,4 @@ # information. # ############################################################################### -#INTERFACE TYPE IN-BANDWIDTH OUT-BANDWIDTH +#INTERFACE TYPE IN_BANDWIDTH OUT_BANDWIDTH diff --git a/Shorewall/configfiles/tcpri b/Shorewall/configfiles/tcpri index c3d9acc9c..4bf0929aa 100644 --- a/Shorewall/configfiles/tcpri +++ b/Shorewall/configfiles/tcpri @@ -7,4 +7,4 @@ # information. # ############################################################################### -#BAND PROTO PORT(S) ADDRESS IN-INTERFACE HELPER +#BAND PROTO PORT ADDRESS INTERFACE HELPER diff --git a/Shorewall/configfiles/tunnels b/Shorewall/configfiles/tunnels index 73eed6a57..7bfd9667d 100644 --- a/Shorewall/configfiles/tunnels +++ b/Shorewall/configfiles/tunnels @@ -7,5 +7,4 @@ # http://www.shorewall.net/manpages/shorewall-tunnels.html # ############################################################################### -#TYPE ZONE GATEWAY(S) GATEWAY -# ZONE(S) +#TYPE ZONE GATEWAY GATEWAY_ZONE diff --git a/Shorewall/configfiles/zones b/Shorewall/configfiles/zones index 7cdc765f8..d4b8cbc38 100644 --- a/Shorewall/configfiles/zones +++ b/Shorewall/configfiles/zones @@ -7,6 +7,6 @@ # http://www.shorewall.net/manpages/shorewall-zones.html # ############################################################################### -#ZONE TYPE OPTIONS IN OUT -# OPTIONS OPTIONS -fw firewall +#ZONE TYPE OPTIONS IN_OPTIONS OUT_OPTIONS + +fw firewall diff --git a/Shorewall6/configfiles/accounting b/Shorewall6/configfiles/accounting index 341d10cb6..815e78d5f 100644 --- a/Shorewall6/configfiles/accounting +++ b/Shorewall6/configfiles/accounting @@ -6,6 +6,5 @@ # Please see http://shorewall.net/Accounting.html for examples and # additional information about how to use this file. # -############################################################################################################### -#ACTION CHAIN SOURCE DESTINATION PROTO DEST SOURCE USER/ MARK IPSEC HEADERS -# PORT(S) PORT(S) GROUP +####################################################################################### +#ACTION CHAIN SOURCE DEST PROTO DPORT SPORT USER MARK IPSEC HEADERS diff --git a/Shorewall6/configfiles/actions b/Shorewall6/configfiles/actions index 490af22b0..42cdedd16 100644 --- a/Shorewall6/configfiles/actions +++ b/Shorewall6/configfiles/actions @@ -5,6 +5,8 @@ # # Please see http://shorewall.net/Actions.html for additional information. # -######################################################################################## -#ACTION OPTIONS COMMENT (place '# ' below the 'C' in comment followed by -# v a comment describing the action) +# Place '# ' below the 'C' in COMMENT followed by a comment describing +# the action. +# +############################################################################### +#ACTION OPTIONS COMMENT diff --git a/Shorewall6/configfiles/blrules b/Shorewall6/configfiles/blrules index 580cf9ff4..55c1f81d3 100644 --- a/Shorewall6/configfiles/blrules +++ b/Shorewall6/configfiles/blrules @@ -6,6 +6,5 @@ # Please see http://shorewall.net/blacklisting_support.htm for additional # information. # -######################################################################################################################################################################## -#ACTION SOURCE DEST PROTO DEST SOURCE ORIGINAL RATE USER/ MARK CONNLIMIT TIME HEADERS SWITCH -# PORT PORT(S) DEST LIMIT GROUP +############################################################################################################################################################## +#ACTION SOURCE DEST PROTO DPORT SPORT ORIGDEST RATE USER MARK CONNLIMIT TIME HEADERS SWITCH HELPER diff --git a/Shorewall6/configfiles/conntrack b/Shorewall6/configfiles/conntrack index fa68823d7..7e67ea29a 100644 --- a/Shorewall6/configfiles/conntrack +++ b/Shorewall6/configfiles/conntrack @@ -3,11 +3,10 @@ # # For information about entries in this file, type "man shorewall6-conntrack" # -############################################################################################################## ?FORMAT 3 -############################################################################################################## -#ACTION SOURCE DESTINATION PROTO DEST SOURCE USER/ SWITCH -# PORT(S) PORT(S) GROUP +############################################################################################## +#ACTION SOURCE DEST PROTO DPORT SPORT USER SWITCH + ?if $AUTOHELPERS && __CT_TARGET ?if __AMANDA_HELPER diff --git a/Shorewall6/configfiles/hosts b/Shorewall6/configfiles/hosts index 17ec5e201..89f6e2886 100644 --- a/Shorewall6/configfiles/hosts +++ b/Shorewall6/configfiles/hosts @@ -7,4 +7,4 @@ # http://www.shorewall.net/manpages6/shorewall6-hosts.html # ############################################################################### -#ZONE HOST(S) OPTIONS +#ZONE HOSTS OPTIONS diff --git a/Shorewall6/configfiles/interfaces b/Shorewall6/configfiles/interfaces index 75b82e71f..be9874403 100644 --- a/Shorewall6/configfiles/interfaces +++ b/Shorewall6/configfiles/interfaces @@ -6,7 +6,6 @@ # The manpage is also online at # http://www.shorewall.net/manpages6/shorewall6-interfaces.html # -############################################################################### ?FORMAT 2 ############################################################################### #ZONE INTERFACE OPTIONS diff --git a/Shorewall6/configfiles/isusable b/Shorewall6/configfiles/isusable index fdfacfeee..1fea21c29 100644 --- a/Shorewall6/configfiles/isusable +++ b/Shorewall6/configfiles/isusable @@ -13,6 +13,7 @@ # information. # ############################################################################### + local status status=0 diff --git a/Shorewall6/configfiles/maclist b/Shorewall6/configfiles/maclist index 78080e721..2eecee1f5 100644 --- a/Shorewall6/configfiles/maclist +++ b/Shorewall6/configfiles/maclist @@ -6,4 +6,4 @@ # For additional information, see http://shorewall.net/MAC_Validation.html # ############################################################################### -#DISPOSITION INTERFACE MAC IP ADDRESSES (Optional) +#DISPOSITION INTERFACE MAC ADDRESSES diff --git a/Shorewall6/configfiles/mangle b/Shorewall6/configfiles/mangle index 175e5165f..82bf8d72a 100644 --- a/Shorewall6/configfiles/mangle +++ b/Shorewall6/configfiles/mangle @@ -11,5 +11,4 @@ # the Netfilter/Shorewall packet marking mechanism. # ############################################################################################################################################################ -#ACTION SOURCE DEST PROTO DEST SOURCE USER TEST LENGTH TOS CONNBYTES HELPER HEADERS PROBABILITY DSCP -# PORT(S) PORT(S) +#ACTION SOURCE DEST PROTO DPORT SPORT USER TEST LENGTH TOS CONNBYTES HELPER HEADERS PROBABILITY DSCP diff --git a/Shorewall6/configfiles/masq b/Shorewall6/configfiles/masq index 130b2743a..d9270cc1b 100644 --- a/Shorewall6/configfiles/masq +++ b/Shorewall6/configfiles/masq @@ -6,6 +6,5 @@ # The manpage is also online at # http://www.shorewall.net/manpages6/shorewall6-masq.html # -######################################################################################################################## -#INTERFACE SOURCE ADDRESS PROTO PORT(S) IPSEC MARK USER/ SWITCH ORIGINAL -# GROUP DEST +###################################################################################################### +#INTERFACE SOURCE ADDRESS PROTO PORT IPSEC MARK USER SWITCH diff --git a/Shorewall6/configfiles/nat b/Shorewall6/configfiles/nat index f790be45a..97991b2cf 100644 --- a/Shorewall6/configfiles/nat +++ b/Shorewall6/configfiles/nat @@ -7,5 +7,4 @@ # http://www.shorewall.net/manpages6/shorewall6-nat.html # ############################################################################### -#EXTERNAL INTERFACE INTERNAL ALL LOCAL -# INTERFACES +#EXTERNAL INTERFACE INTERNAL ALLINTS LOCAL diff --git a/Shorewall6/configfiles/netmap b/Shorewall6/configfiles/netmap index d055c98d3..9dee37f1b 100644 --- a/Shorewall6/configfiles/netmap +++ b/Shorewall6/configfiles/netmap @@ -6,6 +6,5 @@ # See http://shorewall.net/netmap.html for an example and usage # information. # -############################################################################################## -#TYPE NET1 INTERFACE NET2 NET3 PROTO DEST SOURCE -# PORT(S) PORT(S) +############################################################################################# +#TYPE NET1 INTERFACE NET2 NET3 PROTO DPORT SPORT diff --git a/Shorewall6/configfiles/params b/Shorewall6/configfiles/params index 96481e186..cf40b5341 100644 --- a/Shorewall6/configfiles/params +++ b/Shorewall6/configfiles/params @@ -21,5 +21,3 @@ # net eth0 - dhcp,nosmurfs # ############################################################################### - -#LAST LINE -- DO NOT REMOVE diff --git a/Shorewall6/configfiles/policy b/Shorewall6/configfiles/policy index 23121180c..aee2ff02c 100644 --- a/Shorewall6/configfiles/policy +++ b/Shorewall6/configfiles/policy @@ -7,5 +7,4 @@ # http://www.shorewall.net/manpages6/shorewall6-policy.html # ############################################################################### -#SOURCE DEST POLICY LOG LIMIT: CONNLIMIT: -# LEVEL BURST MASK +#SOURCE DEST POLICY LOGLEVEL LIMIT CONNLIMIT diff --git a/Shorewall6/configfiles/rules b/Shorewall6/configfiles/rules index d813661e3..f127c2807 100644 --- a/Shorewall6/configfiles/rules +++ b/Shorewall6/configfiles/rules @@ -6,9 +6,9 @@ # The manpage is also online at # http://www.shorewall.net/manpages6/shorewall6-rules.html # -###################################################################################################################################################################################################### -#ACTION SOURCE DEST PROTO DEST SOURCE ORIGINAL RATE USER/ MARK CONNLIMIT TIME HEADERS SWITCH HELPER -# PORT(S) PORT(S) DEST LIMIT GROUP +############################################################################################################################################################## +#ACTION SOURCE DEST PROTO DPORT SPORT ORIGDEST RATE USER MARK CONNLIMIT TIME HEADERS SWITCH HELPER + ?SECTION ALL ?SECTION ESTABLISHED ?SECTION RELATED diff --git a/Shorewall6/configfiles/scfilter b/Shorewall6/configfiles/scfilter index ae890bce7..c96b3f414 100644 --- a/Shorewall6/configfiles/scfilter +++ b/Shorewall6/configfiles/scfilter @@ -8,4 +8,5 @@ # information. # ############################################################################### + cat - diff --git a/Shorewall6/configfiles/secmarks b/Shorewall6/configfiles/secmarks index 6c2108695..d65bb3c37 100644 --- a/Shorewall6/configfiles/secmarks +++ b/Shorewall6/configfiles/secmarks @@ -3,6 +3,5 @@ # # For information about entries in this file, type "man shorewall-secmarks" # -############################################################################################################ -#SECMARK CHAIN SOURCE DEST PROTO DEST SOURCE MARK -# PORT(S) PORT(S) +#################################################################################################### +#SECMARK CHAIN SOURCE DEST PROTO DPORT SPORT USER MARK diff --git a/Shorewall6/configfiles/stoppedrules b/Shorewall6/configfiles/stoppedrules index f68cb0738..d1ea728aa 100644 --- a/Shorewall6/configfiles/stoppedrules +++ b/Shorewall6/configfiles/stoppedrules @@ -11,5 +11,4 @@ # information. # ############################################################################### -#ACTION SOURCE DEST PROTO DEST SOURCE -# PORT(S) PORT(S) +#ACTION SOURCE DEST PROTO DPORT SPORT diff --git a/Shorewall6/configfiles/tcclasses b/Shorewall6/configfiles/tcclasses index e461fbb15..0eec44d19 100644 --- a/Shorewall6/configfiles/tcclasses +++ b/Shorewall6/configfiles/tcclasses @@ -6,4 +6,4 @@ # See http://shorewall.net/traffic_shaping.htm for additional information. # ############################################################################### -#INTERFACE:CLASS MARK RATE CEIL PRIORITY OPTIONS +#INTERFACE MARK RATE CEIL PRIO OPTIONS diff --git a/Shorewall6/configfiles/tcdevices b/Shorewall6/configfiles/tcdevices index 517ff4193..beb36c36a 100644 --- a/Shorewall6/configfiles/tcdevices +++ b/Shorewall6/configfiles/tcdevices @@ -6,5 +6,4 @@ # See http://shorewall.net/traffic_shaping.htm for additional information. # ############################################################################### -#NUMBER: IN-BANDWITH OUT-BANDWIDTH OPTIONS REDIRECTED -#INTERFACE INTERFACES +#INTERFACE IN_BANDWITH OUT_BANDWIDTH OPTIONS REDIRECT diff --git a/Shorewall6/configfiles/tcfilters b/Shorewall6/configfiles/tcfilters index 6f82a51ad..ef9d0fb74 100644 --- a/Shorewall6/configfiles/tcfilters +++ b/Shorewall6/configfiles/tcfilters @@ -5,6 +5,5 @@ # # See http://shorewall.net/traffic_shaping.htm for additional information. # -######################################################################################################## -#INTERFACE: SOURCE DEST PROTO DEST SOURCE TOS LENGTH PRIORITY -#CLASS PORT(S) PORT(S) +###################################################################################### +#CLASS SOURCE DEST PROTO DPORT SPORT TOS LENGTH diff --git a/Shorewall6/configfiles/tcinterfaces b/Shorewall6/configfiles/tcinterfaces index d9079888d..df5ea108c 100644 --- a/Shorewall6/configfiles/tcinterfaces +++ b/Shorewall6/configfiles/tcinterfaces @@ -8,4 +8,4 @@ # information. # ############################################################################### -#INTERFACE TYPE IN-BANDWIDTH OUT-INTERFACE +#INTERFACE TYPE IN_BANDWIDTH OUT_BANDWIDTH diff --git a/Shorewall6/configfiles/tcpri b/Shorewall6/configfiles/tcpri index c4ee6e075..b274ddc7b 100644 --- a/Shorewall6/configfiles/tcpri +++ b/Shorewall6/configfiles/tcpri @@ -7,4 +7,4 @@ # information. # ############################################################################### -#BAND PROTO PORT(S) ADDRESS IN-INTERFACE HELPER +#BAND PROTO PORT ADDRESS INTERFACE HELPER diff --git a/Shorewall6/configfiles/tunnels b/Shorewall6/configfiles/tunnels index a74c51891..09ea85007 100644 --- a/Shorewall6/configfiles/tunnels +++ b/Shorewall6/configfiles/tunnels @@ -7,5 +7,4 @@ # http://www.shorewall.net/manpages6/shorewall6-tunnels.html # ############################################################################### -#TYPE ZONE GATEWAY(S) GATEWAY -# ZONE(S) +#TYPE ZONE GATEWAY GATEWAY_ZONE diff --git a/Shorewall6/configfiles/zones b/Shorewall6/configfiles/zones index 7a1e40670..6ebe49b96 100644 --- a/Shorewall6/configfiles/zones +++ b/Shorewall6/configfiles/zones @@ -7,6 +7,6 @@ # http://www.shorewall.net/manpages6/shorewall6-zones.html # ############################################################################### -#ZONE TYPE OPTIONS IN OUT -# OPTIONS OPTIONS -fw firewall +#ZONE TYPE OPTIONS IN_OPTIONS OUT_OPTIONS + +fw firewall