diff --git a/Shorewall/configfiles/accounting b/Shorewall/configfiles/accounting index 37f3fc3d9..90151d03d 100644 --- a/Shorewall/configfiles/accounting +++ b/Shorewall/configfiles/accounting @@ -1,5 +1,5 @@ # -# Shorewall - Accounting File +# Shorewall -- /etc/shorewall/accounting # # For information about entries in this file, type "man shorewall-accounting" # diff --git a/Shorewall/configfiles/actions b/Shorewall/configfiles/actions index 8509d9a9f..dd6b810cb 100644 --- a/Shorewall/configfiles/actions +++ b/Shorewall/configfiles/actions @@ -1,7 +1,5 @@ # -# Shorewall - Actions File -# -# /etc/shorewall/actions +# Shorewall -- /etc/shorewall/actions # # For information about entries in this file, type "man shorewall-actions" # diff --git a/Shorewall/configfiles/arprules b/Shorewall/configfiles/arprules index 249de2b38..8a7576307 100644 --- a/Shorewall/configfiles/arprules +++ b/Shorewall/configfiles/arprules @@ -1,5 +1,5 @@ # -# Shorewall - Arprules File +# Shorewall -- /etc/shorewall/arprules # # For information about entries in this file, type "man shorewall-arprules" # diff --git a/Shorewall/configfiles/blrules b/Shorewall/configfiles/blrules index 7353edfaa..5108cd01e 100644 --- a/Shorewall/configfiles/blrules +++ b/Shorewall/configfiles/blrules @@ -1,5 +1,5 @@ # -# Shorewall - Blrules File +# Shorewall -- /etc/shorewall/blrules # # For information about entries in this file, type "man shorewall-blrules" # diff --git a/Shorewall/configfiles/clear b/Shorewall/configfiles/clear index d477aea64..8bf025cc7 100644 --- a/Shorewall/configfiles/clear +++ b/Shorewall/configfiles/clear @@ -1,7 +1,5 @@ # -# Shorewall - Clear File -# -# /etc/shorewall/clear +# Shorewall -- /etc/shorewall/clear # # Add commands below that you want to be executed after Shorewall has # processed the 'clear' command. diff --git a/Shorewall/configfiles/conntrack b/Shorewall/configfiles/conntrack index 02f80fb19..fb9529762 100644 --- a/Shorewall/configfiles/conntrack +++ b/Shorewall/configfiles/conntrack @@ -1,10 +1,11 @@ # -# Shorewall - Conntrack File +# Shorewall -- /etc/shorewall/conntrack # # 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 ?if $AUTOHELPERS && __CT_TARGET diff --git a/Shorewall/configfiles/ecn b/Shorewall/configfiles/ecn index ebe557108..81aaa1899 100644 --- a/Shorewall/configfiles/ecn +++ b/Shorewall/configfiles/ecn @@ -1,5 +1,5 @@ # -# Shorewall - Ecn File +# Shorewall -- /etc/shorewall/ecn # # For information about entries in this file, type "man shorewall-ecn" # diff --git a/Shorewall/configfiles/findgw b/Shorewall/configfiles/findgw index 9581001e1..e855125e8 100644 --- a/Shorewall/configfiles/findgw +++ b/Shorewall/configfiles/findgw @@ -1,7 +1,5 @@ # -# Shorewall - Findgw File -# -# /etc/shorewall/findgw +# Shorewall -- /etc/shorewall/findgw # # The code in this file is executed when Shorewall is trying to detect the # gateway through an interface in /etc/shorewall/providers that has GATEWAY diff --git a/Shorewall/configfiles/hosts b/Shorewall/configfiles/hosts index 493afaff1..6303d0671 100644 --- a/Shorewall/configfiles/hosts +++ b/Shorewall/configfiles/hosts @@ -1,5 +1,5 @@ # -# Shorewall - Hosts file +# Shorewall -- /etc/shorewall/hosts # # For information about entries in this file, type "man shorewall-hosts" # diff --git a/Shorewall/configfiles/init b/Shorewall/configfiles/init index 96a3db293..417c3f2c0 100644 --- a/Shorewall/configfiles/init +++ b/Shorewall/configfiles/init @@ -1,10 +1,8 @@ # -# Shorewall - Init File +# Shorewall -- /etc/shorewall/init # -# /etc/shorewall/init -# -# Add commands below that you want to be executed at the beginning of -# a "shorewall start", "shorewall-reload" or "shorewall restart" command. +# Add commands below that you want to be executed at the beginning of +# a "shorewall start", "shorewall-reload" or "shorewall restart" command. # # For additional information, see # http://shorewall.net/shorewall_extension_scripts.htm diff --git a/Shorewall/configfiles/initdone b/Shorewall/configfiles/initdone index f73782dd6..5ad859ab0 100644 --- a/Shorewall/configfiles/initdone +++ b/Shorewall/configfiles/initdone @@ -1,12 +1,10 @@ # -# Shorewall - Initdone File +# Shorewall -- /etc/shorewall/initdone # -# /etc/shorewall/initdone -# -# Add commands below that you want to be executed during -# "shorewall start", "shorewall reload" or "shorewall restart" commands -# at the point where Shorewall has not yet added any permanent rules to -# the builtin chains. +# Add commands below that you want to be executed during +# "shorewall start", "shorewall reload" or "shorewall restart" commands +# at the point where Shorewall has not yet added any permanent rules to +# the builtin chains. # # For additional information, see # http://shorewall.net/shorewall_extension_scripts.htm diff --git a/Shorewall/configfiles/interfaces b/Shorewall/configfiles/interfaces index 5e5dd87a6..2f2d70e42 100644 --- a/Shorewall/configfiles/interfaces +++ b/Shorewall/configfiles/interfaces @@ -1,5 +1,5 @@ # -# Shorewall - Interfaces File +# Shorewall -- /etc/shorewall/interfaces # # For information about entries in this file, type "man shorewall-interfaces" # diff --git a/Shorewall/configfiles/isusable b/Shorewall/configfiles/isusable index 0bf72e7f8..24777d25b 100644 --- a/Shorewall/configfiles/isusable +++ b/Shorewall/configfiles/isusable @@ -1,15 +1,13 @@ # -# Shorewall - Isusable File +# Shorewall -- /etc/shorewall/isusable # -# /etc/shorewall/isusable +# This script is called when Shorewall is attempting to determine +# if an interface named in /etc/shorewall/providers is usable. # -# This script is called when Shorewall is attempting to determine -# if an interface named in /etc/shorewall/providers is usable. -# -# The script is invoked inside a function that accepts an interface -# name as a single argument. The file below is designed to work with -# both swping and lsm as described at -# http://www.shorewall.net/MultiISP.html +# The script is invoked inside a function that accepts an interface +# name as a single argument. The file below is designed to work with +# both swping and lsm as described at +# http://www.shorewall.net/MultiISP.html # # See http://shorewall.net/shorewall_extension_scripts.htm for additional # information. diff --git a/Shorewall/configfiles/lib.private b/Shorewall/configfiles/lib.private index 76c738e49..1b617643f 100644 --- a/Shorewall/configfiles/lib.private +++ b/Shorewall/configfiles/lib.private @@ -1,7 +1,5 @@ # -# Shorewall - Lib.private File -# -# /etc/shorewall/lib.private +# Shorewall -- /etc/shorewall/lib.private # # Use this file to declare shell functions to be called in the other # run-time extension scripts. The file will be copied into the generated diff --git a/Shorewall/configfiles/maclist b/Shorewall/configfiles/maclist index c8ff98ff9..8b71e65b2 100644 --- a/Shorewall/configfiles/maclist +++ b/Shorewall/configfiles/maclist @@ -1,5 +1,5 @@ # -# Shorewall - Maclist file +# Shorewall -- /etc/shorewall/maclist # # For information about entries in this file, type "man shorewall-maclist" # diff --git a/Shorewall/configfiles/mangle b/Shorewall/configfiles/mangle index 76e402e58..af0d9c37e 100644 --- a/Shorewall/configfiles/mangle +++ b/Shorewall/configfiles/mangle @@ -1,5 +1,5 @@ # -# Shorewall - Mangle File +# Shorewall -- /etc/shorewall/mangle # # For information about entries in this file, type "man shorewall-mangle" # @@ -9,6 +9,7 @@ # # See http://shorewall.net/PacketMarking.html for a detailed description of # the Netfilter/Shorewall packet marking mechanism. +# #################################################################################################################################################### #ACTION SOURCE DEST PROTO DEST SOURCE USER TEST LENGTH TOS CONNBYTES HELPER PROBABILITY DSCP # PORT(S) PORT(S) diff --git a/Shorewall/configfiles/masq b/Shorewall/configfiles/masq index 3510312ae..a60df5437 100644 --- a/Shorewall/configfiles/masq +++ b/Shorewall/configfiles/masq @@ -1,5 +1,5 @@ # -# Shorewall - Masq file +# Shorewall -- /etc/shorewall/masq # # For information about entries in this file, type "man shorewall-masq" # diff --git a/Shorewall/configfiles/nat b/Shorewall/configfiles/nat index 66a481843..fa9645b60 100644 --- a/Shorewall/configfiles/nat +++ b/Shorewall/configfiles/nat @@ -1,5 +1,5 @@ # -# Shorewall - Nat File +# Shorewall -- /etc/shorewall/nat # # For information about entries in this file, type "man shorewall-nat" # diff --git a/Shorewall/configfiles/netmap b/Shorewall/configfiles/netmap index 5dadf204d..62e5dd369 100644 --- a/Shorewall/configfiles/netmap +++ b/Shorewall/configfiles/netmap @@ -1,5 +1,5 @@ # -# Shorewall - Netmap File +# Shorewall -- /etc/shorewall/netmap # # For information about entries in this file, type "man shorewall-netmap" # diff --git a/Shorewall/configfiles/params b/Shorewall/configfiles/params index abaa0fbce..bd471a3c7 100644 --- a/Shorewall/configfiles/params +++ b/Shorewall/configfiles/params @@ -1,27 +1,25 @@ # -# Shorewall - Params File +# Shorewall -- /etc/shorewall/params # -# /etc/shorewall/params +# Assign any variables that you need here. # -# Assign any variables that you need here. +# It is suggested that variable names begin with an upper case letter +# to distinguish them from variables used internally within the +# Shorewall programs # -# It is suggested that variable names begin with an upper case letter -# to distinguish them from variables used internally within the -# Shorewall programs +# Example: # -# Example: +# NET_IF=eth0 +# NET_BCAST=130.252.100.255 +# NET_OPTIONS=routefilter,norfc1918 # -# NET_IF=eth0 -# NET_BCAST=130.252.100.255 -# NET_OPTIONS=routefilter,norfc1918 +# Example (/etc/shorewall/interfaces record): # -# Example (/etc/shorewall/interfaces record): +# net $NET_IF $NET_BCAST $NET_OPTIONS # -# net $NET_IF $NET_BCAST $NET_OPTIONS +# The result will be the same as if the record had been written # -# The result will be the same as if the record had been written -# -# net eth0 130.252.100.255 routefilter,norfc1918 +# net eth0 130.252.100.255 routefilter,norfc1918 # ############################################################################### diff --git a/Shorewall/configfiles/policy b/Shorewall/configfiles/policy index d8a2f4e10..6f99c762f 100644 --- a/Shorewall/configfiles/policy +++ b/Shorewall/configfiles/policy @@ -1,5 +1,5 @@ # -# Shorewall - Policy File +# Shorewall -- /etc/shorewall/policy # # For information about entries in this file, type "man shorewall-policy" # diff --git a/Shorewall/configfiles/providers b/Shorewall/configfiles/providers index 0b6113da7..0dfb950cb 100644 --- a/Shorewall/configfiles/providers +++ b/Shorewall/configfiles/providers @@ -1,5 +1,5 @@ # -# Shorewall - Providers File +# Shorewall -- /etc/shorewall/providers # # For information about entries in this file, type "man shorewall-providers" # diff --git a/Shorewall/configfiles/proxyarp b/Shorewall/configfiles/proxyarp index f79fac53d..4249e03e7 100644 --- a/Shorewall/configfiles/proxyarp +++ b/Shorewall/configfiles/proxyarp @@ -1,5 +1,5 @@ # -# Shorewall - Proxyarp File +# Shorewall -- /etc/shorewall/proxyarp # # For information about entries in this file, type "man shorewall-proxyarp" # diff --git a/Shorewall/configfiles/refresh b/Shorewall/configfiles/refresh index 20dfe0392..77d0d8fd3 100644 --- a/Shorewall/configfiles/refresh +++ b/Shorewall/configfiles/refresh @@ -1,7 +1,5 @@ # -# Shorewall - Refresh File -# -# /etc/shorewall/refresh +# Shorewall -- /etc/shorewall/refresh # # Add commands below that you want to be executed before Shorewall # has processed the 'refresh' command. diff --git a/Shorewall/configfiles/refreshed b/Shorewall/configfiles/refreshed index 08ebaebc0..86d76fbfa 100644 --- a/Shorewall/configfiles/refreshed +++ b/Shorewall/configfiles/refreshed @@ -1,7 +1,5 @@ # -# Shorewall - Refreshed File -# -# /etc/shorewall/refreshed +# Shorewall -- /etc/shorewall/refreshed # # Add commands below that you want to be executed after Shorewall has # processed the 'refresh' command. diff --git a/Shorewall/configfiles/restored b/Shorewall/configfiles/restored index 226f076d0..4df2d0e04 100644 --- a/Shorewall/configfiles/restored +++ b/Shorewall/configfiles/restored @@ -1,10 +1,8 @@ # -# Shorewall - Restored File +# Shorewall -- /etc/shorewall/restored # -# /etc/shorewall/restored -# -# Add commands below that you want to be executed after shorewall has -# completed a 'restore' command. +# Add commands below that you want to be executed after shorewall has +# completed a 'restore' command. # # See http://shorewall.net/shorewall_extension_scripts.htm for additional # information. diff --git a/Shorewall/configfiles/routes b/Shorewall/configfiles/routes index 90f036f0f..8389b0a8c 100644 --- a/Shorewall/configfiles/routes +++ b/Shorewall/configfiles/routes @@ -1,8 +1,9 @@ # -# Shorewall - Routes File +# Shorewall -- /etc/shorewall/routes # # For information about entries in this file, type "man shorewall-routes" # # For additional information, see http://www.shorewall.net/MultiISP.html +# ############################################################################### #PROVIDER DEST GATEWAY DEVICE OPTIONS diff --git a/Shorewall/configfiles/routestopped b/Shorewall/configfiles/routestopped index b271ba683..792d30150 100644 --- a/Shorewall/configfiles/routestopped +++ b/Shorewall/configfiles/routestopped @@ -1,6 +1,8 @@ # # Shorewall - Routestopped File # +# /etc/shorewall/routestopped +# # This file is deprecated in favor of the stoppedrules file # # For information about entries in this file, type "man shorewall-routestopped" diff --git a/Shorewall/configfiles/rtrules b/Shorewall/configfiles/rtrules index 0b31d54cb..77008163d 100644 --- a/Shorewall/configfiles/rtrules +++ b/Shorewall/configfiles/rtrules @@ -1,8 +1,9 @@ # -# Shorewall - Rtrules File +# Shorewall -- /etc/shorewall/rtrules # # For information about entries in this file, type "man shorewall-rtrules" # # For additional information, see http://www.shorewall.net/MultiISP.html +# #################################################################################### #SOURCE DEST PROVIDER PRIORITY MASK diff --git a/Shorewall/configfiles/rules b/Shorewall/configfiles/rules index 8f6c72187..cd6ef0159 100644 --- a/Shorewall/configfiles/rules +++ b/Shorewall/configfiles/rules @@ -1,5 +1,5 @@ # -# Shorewall - Rules File +# Shorewall -- /etc/shorewall/rules # # For information on the settings in this file, type "man shorewall-rules" # diff --git a/Shorewall/configfiles/scfilter b/Shorewall/configfiles/scfilter index 73da56d63..771d24218 100644 --- a/Shorewall/configfiles/scfilter +++ b/Shorewall/configfiles/scfilter @@ -1,7 +1,5 @@ # -# Shorewall - Scfilter Filter -# -# /etc/shorewall/scfilter +# Shorewall -- /etc/shorewall/scfilter # # Replace the 'cat' command below to filter the output of # 'show connections'. diff --git a/Shorewall/configfiles/secmarks b/Shorewall/configfiles/secmarks index b560923d3..6a3372170 100644 --- a/Shorewall/configfiles/secmarks +++ b/Shorewall/configfiles/secmarks @@ -1,5 +1,5 @@ # -# Shorewall - Secmarks File +# Shorewall -- /etc/shorewall/secmarks # # For information about entries in this file, type "man shorewall-secmarks" # diff --git a/Shorewall/configfiles/start b/Shorewall/configfiles/start index aca286a40..eaff0640a 100644 --- a/Shorewall/configfiles/start +++ b/Shorewall/configfiles/start @@ -1,10 +1,8 @@ # -# Shorewall - Start File +# Shorewall -- /etc/shorewall/start # -# /etc/shorewall/start -# -# Add commands below that you want to be executed after shorewall has -# been started, reloaded or restarted. +# Add commands below that you want to be executed after shorewall has +# been started, reloaded or restarted. # # See http://shorewall.net/shorewall_extension_scripts.htm for additional # information. diff --git a/Shorewall/configfiles/started b/Shorewall/configfiles/started index 5baac968f..7b6adac40 100644 --- a/Shorewall/configfiles/started +++ b/Shorewall/configfiles/started @@ -1,17 +1,15 @@ # -# Shorewall - Started File +# Shorewall -- /etc/shorewall/started # -# /etc/shorewall/started +# Add commands below that you want to be executed after shorewall has +# been completely started, reloaded or restarted. The difference between +# this extension script and /etc/shorewall/start is that this one is +# invoked after the 'shorewall' chain has been created (thus +# signaling that the firewall is completely up). # -# Add commands below that you want to be executed after shorewall has -# been completely started, reloaded or restarted. The difference between -# this extension script and /etc/shorewall/start is that this one is -# invoked after the 'shorewall' chain has been created (thus -# signaling that the firewall is completely up). -# -# This script should not change the firewall configuration directly but -# may do so indirectly by running /sbin/shorewall with the 'nolock' -# option. +# This script should not change the firewall configuration directly but +# may do so indirectly by running /sbin/shorewall with the 'nolock' +# option. # # See http://shorewall.net/shorewall_extension_scripts.htm for additional # information. diff --git a/Shorewall/configfiles/stop b/Shorewall/configfiles/stop index 7d69b07e6..27a993b08 100644 --- a/Shorewall/configfiles/stop +++ b/Shorewall/configfiles/stop @@ -1,10 +1,8 @@ # -# Shorewall - Stop File +# Shorewall -- /etc/shorewall/stop # -# /etc/shorewall/stop -# -# Add commands below that you want to be executed at the beginning of a -# "shorewall stop" command. +# Add commands below that you want to be executed at the beginning of a +# "shorewall stop" command. # # See http://shorewall.net/shorewall_extension_scripts.htm for additional # information. diff --git a/Shorewall/configfiles/stopped b/Shorewall/configfiles/stopped index 13defd8a0..8cc6bc604 100644 --- a/Shorewall/configfiles/stopped +++ b/Shorewall/configfiles/stopped @@ -1,10 +1,8 @@ # -# Shorewall - Stopped File +# Shorewall -- /etc/shorewall/stopped # -# /etc/shorewall/stopped -# -# Add commands below that you want to be executed at the completion of a -# "shorewall stop" command. +# Add commands below that you want to be executed at the completion of a +# "shorewall stop" command. # # See http://shorewall.net/shorewall_extension_scripts.htm for additional # information. diff --git a/Shorewall/configfiles/stoppedrules b/Shorewall/configfiles/stoppedrules index 395553a17..09792af28 100644 --- a/Shorewall/configfiles/stoppedrules +++ b/Shorewall/configfiles/stoppedrules @@ -1,5 +1,5 @@ # -# Shorewall - Stoppedrules File +# Shorewall -- /etc/shorewall/stoppedrules # # For information about entries in this file, type "man shorewall-stoppedrules" # diff --git a/Shorewall/configfiles/tcclasses b/Shorewall/configfiles/tcclasses index c6ccf100d..8776b1aa0 100644 --- a/Shorewall/configfiles/tcclasses +++ b/Shorewall/configfiles/tcclasses @@ -1,5 +1,5 @@ # -# Shorewall - Tcclasses File +# Shorewall -- /etc/shorewall/tcclasses # # For information about entries in this file, type "man shorewall-tcclasses" # diff --git a/Shorewall/configfiles/tcclear b/Shorewall/configfiles/tcclear index 0436b813f..0d902b6c3 100644 --- a/Shorewall/configfiles/tcclear +++ b/Shorewall/configfiles/tcclear @@ -1,7 +1,5 @@ # -# Shorewall - Tcclear File -# -# /etc/shorewall/tcclear +# Shorewall -- /etc/shorewall/tcclear # # Add commands below that you want to be executed before Shorewall clears # the traffic shaping configuration. diff --git a/Shorewall/configfiles/tcdevices b/Shorewall/configfiles/tcdevices index 4afe83215..78fbc8ae1 100644 --- a/Shorewall/configfiles/tcdevices +++ b/Shorewall/configfiles/tcdevices @@ -1,5 +1,5 @@ # -# Shorewall - Tcdevices File +# Shorewall -- /etc/shorewall/tcdevices # # For information about entries in this file, type "man shorewall-tcdevices" # diff --git a/Shorewall/configfiles/tcfilters b/Shorewall/configfiles/tcfilters index e2952deba..1d7e1fb75 100644 --- a/Shorewall/configfiles/tcfilters +++ b/Shorewall/configfiles/tcfilters @@ -1,5 +1,5 @@ # -# Shorewall - Tcfilters File +# Shorewall -- /etc/shorewall/tcfilters # # For information about entries in this file, type "man shorewall-tcfilters" # diff --git a/Shorewall/configfiles/tcinterfaces b/Shorewall/configfiles/tcinterfaces index b3161c4a6..4026bc242 100644 --- a/Shorewall/configfiles/tcinterfaces +++ b/Shorewall/configfiles/tcinterfaces @@ -1,5 +1,5 @@ # -# Shorewall - Tcinterfaces File +# Shorewall -- /etc/shorewall/tcinterfaces # # For information about entries in this file, type "man shorewall-tcinterfaces" # diff --git a/Shorewall/configfiles/tcpri b/Shorewall/configfiles/tcpri index ab70d77b3..c3d9acc9c 100644 --- a/Shorewall/configfiles/tcpri +++ b/Shorewall/configfiles/tcpri @@ -1,5 +1,5 @@ # -# Shorewall - Tcpri File +# Shorewall -- /etc/shorewall/tcpri # # For information about entries in this file, type "man shorewall-tcpri" # diff --git a/Shorewall/configfiles/tunnels b/Shorewall/configfiles/tunnels index a313bbe91..73eed6a57 100644 --- a/Shorewall/configfiles/tunnels +++ b/Shorewall/configfiles/tunnels @@ -1,5 +1,5 @@ # -# Shorewall - Tunnels File +# Shorewall -- /etc/shorewall/tunnels # # For information about entries in this file, type "man shorewall-tunnels" # diff --git a/Shorewall/configfiles/zones b/Shorewall/configfiles/zones index e42e8020b..7cdc765f8 100644 --- a/Shorewall/configfiles/zones +++ b/Shorewall/configfiles/zones @@ -1,5 +1,5 @@ # -# Shorewall - Zones File +# Shorewall -- /etc/shorewall/zones # # For information about this file, type "man shorewall-zones" # diff --git a/Shorewall6/configfiles/accounting b/Shorewall6/configfiles/accounting index 2d7bd2cdc..341d10cb6 100644 --- a/Shorewall6/configfiles/accounting +++ b/Shorewall6/configfiles/accounting @@ -1,5 +1,5 @@ # -# Shorewall6 - Accounting File +# Shorewall6 -- /etc/shorewall6/accounting # # For information about entries in this file, type "man shorewall6-accounting" # diff --git a/Shorewall6/configfiles/actions b/Shorewall6/configfiles/actions index aeea3c6d1..490af22b0 100644 --- a/Shorewall6/configfiles/actions +++ b/Shorewall6/configfiles/actions @@ -1,7 +1,5 @@ # -# Shorewall6 - Actions File -# -# /etc/shorewall6/actions +# Shorewall6 -- /etc/shorewall6/actions # # For information about entries in this file, type "man shorewall6-actions" # diff --git a/Shorewall6/configfiles/blrules b/Shorewall6/configfiles/blrules index f1d1c8d1c..580cf9ff4 100644 --- a/Shorewall6/configfiles/blrules +++ b/Shorewall6/configfiles/blrules @@ -1,5 +1,5 @@ # -# Shorewall6 - Blrules File +# Shorewall6 -- /etc/shorewall6/blrules # # For information about entries in this file, type "man shorewall6-blrules" # diff --git a/Shorewall6/configfiles/clear b/Shorewall6/configfiles/clear index 349c2b737..d14c9ad6b 100644 --- a/Shorewall6/configfiles/clear +++ b/Shorewall6/configfiles/clear @@ -1,7 +1,5 @@ # -# Shorewall6 - Clear File -# -# /etc/shorewall6/clear +# Shorewall6 -- /etc/shorewall6/clear # # Add commands below that you want to be executed after Shorewall6 has # processed the 'clear' command. diff --git a/Shorewall6/configfiles/conntrack b/Shorewall6/configfiles/conntrack index 067b03ee5..fa68823d7 100644 --- a/Shorewall6/configfiles/conntrack +++ b/Shorewall6/configfiles/conntrack @@ -1,53 +1,54 @@ # -# Shorewall6 - Conntrack File +# Shorewall6 -- /etc/shorewall6/conntrack # # For information about entries in this file, type "man shorewall6-conntrack" # ############################################################################################################## -?FORMAT 2 +?FORMAT 3 +############################################################################################################## #ACTION SOURCE DESTINATION PROTO DEST SOURCE USER/ SWITCH # PORT(S) PORT(S) GROUP -?if __CT_TARGET +?if $AUTOHELPERS && __CT_TARGET ?if __AMANDA_HELPER -CT:helper:amanda all - udp 10080 +CT:helper:amanda:PO - - udp 10080 ?endif ?if __FTP_HELPER -CT:helper:ftp all - tcp 21 +CT:helper:ftp:PO - - tcp 21 ?endif ?if __H323_HELPER -CT:helper:RAS all - udp 1719 -CT:helper:Q.931 all - tcp 1720 +CT:helper:RAS:PO - - udp 1719 +CT:helper:Q.931:PO - - tcp 1720 ?endif ?if __IRC_HELPER -CT:helper:irc all - tcp 6667 +CT:helper:irc:PO - - tcp 6667 ?endif ?if __NETBIOS_NS_HELPER -CT:helper:netbios-ns all - udp 137 +CT:helper:netbios-ns:PO - - udp 137 ?endif ?if __PPTP_HELPER -CT:helper:pptp all - tcp 1723 +CT:helper:pptp:PO - - tcp 1723 ?endif ?if __SANE_HELPER -CT:helper:sane all - tcp 6566 +CT:helper:sane:PO - - tcp 6566 ?endif ?if __SIP_HELPER -CT:helper:sip all - udp 5060 +CT:helper:sip:PO - - udp 5060 ?endif ?if __SNMP_HELPER -CT:helper:snmp all - udp 161 +CT:helper:snmp:PO - - udp 161 ?endif ?if __TFTP_HELPER -CT:helper:tftp all - udp 69 +CT:helper:tftp:PO - - udp 69 ?endif ?endif diff --git a/Shorewall6/configfiles/findgw b/Shorewall6/configfiles/findgw index 80325f968..e35549e63 100644 --- a/Shorewall6/configfiles/findgw +++ b/Shorewall6/configfiles/findgw @@ -1,7 +1,5 @@ # -# Shorewall - Findgw File -# -# /etc/shorewall6/findgw +# Shorewall6 -- /etc/shorewall6/findgw # # The code in this file is executed when Shorewall is trying to detect the # gateway through an interface in /etc/shorewall6/providers that has GATEWAY diff --git a/Shorewall6/configfiles/hosts b/Shorewall6/configfiles/hosts index 2388e1951..17ec5e201 100644 --- a/Shorewall6/configfiles/hosts +++ b/Shorewall6/configfiles/hosts @@ -1,5 +1,5 @@ # -# Shorewall6 - Hosts file +# Shorewall6 -- /etc/shorewall6/hosts # # For information about entries in this file, type "man shorewall6-hosts" # diff --git a/Shorewall6/configfiles/init b/Shorewall6/configfiles/init index 723dcea0f..eaeb3105b 100644 --- a/Shorewall6/configfiles/init +++ b/Shorewall6/configfiles/init @@ -1,10 +1,8 @@ # -# Shorewall6 - Init File +# Shorewall6 -- /etc/shorewall6/init # -# /etc/shorewall6/init -# -# Add commands below that you want to be executed at the beginning of -# a "shorewall6 start" or "shorewall6 restart" command. +# Add commands below that you want to be executed at the beginning of +# a "shorewall6 start" or "shorewall6 restart" command. # # For additional information, see # http://shorewall.net/shorewall_extension_scripts.htm diff --git a/Shorewall6/configfiles/interfaces b/Shorewall6/configfiles/interfaces index 5bee50c7d..75b82e71f 100644 --- a/Shorewall6/configfiles/interfaces +++ b/Shorewall6/configfiles/interfaces @@ -1,5 +1,5 @@ # -# Shorewall6 - Interfaces File +# Shorewall6 -- /etc/shorewall6/interfaces # # For information about entries in this file, type "man shorewall6-interfaces" # diff --git a/Shorewall6/configfiles/isusable b/Shorewall6/configfiles/isusable index 4ab9f9157..fdfacfeee 100644 --- a/Shorewall6/configfiles/isusable +++ b/Shorewall6/configfiles/isusable @@ -1,15 +1,13 @@ # -# Shorewall6 - Isusable File +# Shorewall6 -- /etc/shorewall6/isusable # -# /etc/shorewall6/isusable +# This script is called when Shorewall6 is attempting to determine +# if an interface named in /etc/shorewall6/providers is usable. # -# This script is called when Shorewall6 is attempting to determine -# if an interface named in /etc/shorewall6/providers is usable. -# -# The script is invoked inside a function that accepts an interface -# name as a single argument. The file below is designed to work with -# both swping and lsm as described at -# http://www.shorewall.net/MultiISP.html +# The script is invoked inside a function that accepts an interface +# name as a single argument. The file below is designed to work with +# both swping and lsm as described at +# http://www.shorewall.net/MultiISP.html # # See http://shorewall.net/shorewall_extension_scripts.htm for additional # information. diff --git a/Shorewall6/configfiles/lib.private b/Shorewall6/configfiles/lib.private index 4848af382..4df3fd9dd 100644 --- a/Shorewall6/configfiles/lib.private +++ b/Shorewall6/configfiles/lib.private @@ -1,7 +1,5 @@ # -# Shorewall6 - Lib.private File -# -# /etc/shorewall6/lib.private +# Shorewall6 -- /etc/shorewall6/lib.private # # Use this file to declare shell functions to be called in the other # run-time extension scripts. The file will be copied into the generated diff --git a/Shorewall6/configfiles/maclist b/Shorewall6/configfiles/maclist index a071328b3..78080e721 100644 --- a/Shorewall6/configfiles/maclist +++ b/Shorewall6/configfiles/maclist @@ -1,5 +1,5 @@ # -# Shorewall6 - Maclist file +# Shorewall6 -- /etc/shorewall6/maclist # # For information about entries in this file, type "man shorewall6-maclist" # diff --git a/Shorewall6/configfiles/mangle b/Shorewall6/configfiles/mangle index 19d42313f..175e5165f 100644 --- a/Shorewall6/configfiles/mangle +++ b/Shorewall6/configfiles/mangle @@ -1,5 +1,5 @@ # -# Shorewall6 - Mangle File +# Shorewall6 -- /etc/shorewall6/mangle # # For information about entries in this file, type "man shorewall6-mangle" # @@ -9,6 +9,7 @@ # # See http://shorewall.net/PacketMarking.html for a detailed description of # 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) diff --git a/Shorewall6/configfiles/masq b/Shorewall6/configfiles/masq index f0997a366..130b2743a 100644 --- a/Shorewall6/configfiles/masq +++ b/Shorewall6/configfiles/masq @@ -1,5 +1,5 @@ # -# Shorewall6 - Masq file +# Shorewall6 -- /etc/shorewall6/masq # # For information about entries in this file, type "man shorewall6-masq" # diff --git a/Shorewall6/configfiles/nat b/Shorewall6/configfiles/nat index f45896436..f790be45a 100644 --- a/Shorewall6/configfiles/nat +++ b/Shorewall6/configfiles/nat @@ -1,5 +1,5 @@ # -# Shorewall6 - Nat File +# Shorewall6 -- /etc/shorewall6/nat # # For information about entries in this file, type "man shorewall6-nat" # diff --git a/Shorewall6/configfiles/netmap b/Shorewall6/configfiles/netmap index c93d978a1..d055c98d3 100644 --- a/Shorewall6/configfiles/netmap +++ b/Shorewall6/configfiles/netmap @@ -1,5 +1,5 @@ # -# Shorewall6 - Netmap File +# Shorewall6 -- /etc/shorewall6/netmap # # For information about entries in this file, type "man shorewall-netmap" # diff --git a/Shorewall6/configfiles/params b/Shorewall6/configfiles/params index 2e0c1a696..96481e186 100644 --- a/Shorewall6/configfiles/params +++ b/Shorewall6/configfiles/params @@ -1,26 +1,24 @@ # -# Shorewall6 - Params File +# Shorewall6 -- /etc/shorewall6/params # -# /etc/shorewall6/params +# Assign any variables that you need here. # -# Assign any variables that you need here. +# It is suggested that variable names begin with an upper case letter +# to distinguish them from variables used internally within the +# Shorewall6 programs # -# It is suggested that variable names begin with an upper case letter -# to distinguish them from variables used internally within the -# Shorewall6 programs +# Example: # -# Example: +# NET_IF=eth0 +# NET_OPTIONS=dhcp,nosmurfs # -# NET_IF=eth0 -# NET_OPTIONS=dhcp,nosmurfs +# Example (/etc/shorewall6/interfaces record): # -# Example (/etc/shorewall6/interfaces record): +# net $NET_IF - $NET_OPTIONS # -# net $NET_IF - $NET_OPTIONS +# The result will be the same as if the record had been written # -# The result will be the same as if the record had been written -# -# net eth0 - dhcp,nosmurfs +# net eth0 - dhcp,nosmurfs # ############################################################################### diff --git a/Shorewall6/configfiles/policy b/Shorewall6/configfiles/policy index 1bd333fdd..23121180c 100644 --- a/Shorewall6/configfiles/policy +++ b/Shorewall6/configfiles/policy @@ -1,5 +1,5 @@ # -# Shorewall6 - Policy File +# Shorewall6 -- /etc/shorewall6/policy # # For information about entries in this file, type "man shorewall6-policy" # diff --git a/Shorewall6/configfiles/providers b/Shorewall6/configfiles/providers index 0970a7fe4..8d503f26f 100644 --- a/Shorewall6/configfiles/providers +++ b/Shorewall6/configfiles/providers @@ -1,5 +1,5 @@ # -# Shorewall6 - Providers File +# Shorewall6 -- /etc/shorewall6/providers # # For information about entries in this file, type "man shorewall6-providers" # diff --git a/Shorewall6/configfiles/proxyndp b/Shorewall6/configfiles/proxyndp index a179c1fb7..9fd002c98 100644 --- a/Shorewall6/configfiles/proxyndp +++ b/Shorewall6/configfiles/proxyndp @@ -1,5 +1,5 @@ # -# Shorewall - Proxyndp File +# Shorewall6 -- /etc/shorewall6/proxyndp # # For information about entries in this file, type "man shorewall6-proxyndp" # diff --git a/Shorewall6/configfiles/refresh b/Shorewall6/configfiles/refresh index be74a17ef..f89afe40e 100644 --- a/Shorewall6/configfiles/refresh +++ b/Shorewall6/configfiles/refresh @@ -1,7 +1,5 @@ # -# Shorewall6 - Refresh File -# -# /etc/shorewall6/refresh +# Shorewall6 -- /etc/shorewall6/refresh # # Add commands below that you want to be executed before Shorewall6 has # processed the 'refresh' command. diff --git a/Shorewall6/configfiles/refreshed b/Shorewall6/configfiles/refreshed index 070941dc9..f7f453c2e 100644 --- a/Shorewall6/configfiles/refreshed +++ b/Shorewall6/configfiles/refreshed @@ -1,7 +1,5 @@ # -# Shorewall6 - Refreshed File -# -# /etc/shorewall6/refreshed +# Shorewall6 -- /etc/shorewall6/refreshed # # Add commands below that you want to be executed after Shorewall6 has # processed the 'refresh' command. diff --git a/Shorewall6/configfiles/restored b/Shorewall6/configfiles/restored index 10adb2982..d098e1a92 100644 --- a/Shorewall6/configfiles/restored +++ b/Shorewall6/configfiles/restored @@ -1,10 +1,8 @@ # -# Shorewall6 - Restored File +# Shorewall6 -- /etc/shorewall6/restored # -# /etc/shorewall6/restored -# -# Add commands below that you want to be executed after shorewall6 has -# completed a 'restore' command. +# Add commands below that you want to be executed after shorewall6 has +# completed a 'restore' command. # # See http://shorewall.net/shorewall_extension_scripts.htm for additional # information. diff --git a/Shorewall6/configfiles/routes b/Shorewall6/configfiles/routes index 3d9e48ba9..564f6c5b3 100644 --- a/Shorewall6/configfiles/routes +++ b/Shorewall6/configfiles/routes @@ -1,8 +1,9 @@ # -# Shorewall6 - Routes File +# Shorewall6 -- /etc/shorewall6/routes # # For information about entries in this file, type "man shorewall6-routes" # # For additional information, see http://www.shorewall.net/MultiISP.html +# ############################################################################### #PROVIDER DEST GATEWAY DEVICE OPTIONS diff --git a/Shorewall6/configfiles/routestopped b/Shorewall6/configfiles/routestopped index a075fbef1..8a908042f 100644 --- a/Shorewall6/configfiles/routestopped +++ b/Shorewall6/configfiles/routestopped @@ -1,6 +1,8 @@ # # Shorewall6 - Routestopped File # +# /etc/shorewall6/routestopped +# # This file is deprecated in favor of the stoppedrules file. # # For information about entries in this file, type "man shorewall6-routestopped" diff --git a/Shorewall6/configfiles/rtrules b/Shorewall6/configfiles/rtrules index f1f94d6cb..8edcb6300 100644 --- a/Shorewall6/configfiles/rtrules +++ b/Shorewall6/configfiles/rtrules @@ -1,8 +1,9 @@ # -# Shorewall6 - Rtrules File +# Shorewall6 -- /etc/shorewall6/rtrules # # For information about entries in this file, type "man shorewall6-rtrules" # # For additional information, see http://www.shorewall.net/MultiISP.html +# #################################################################################### #SOURCE DEST PROVIDER PRIORITY MASK diff --git a/Shorewall6/configfiles/rules b/Shorewall6/configfiles/rules index 7a2f0049d..d813661e3 100644 --- a/Shorewall6/configfiles/rules +++ b/Shorewall6/configfiles/rules @@ -1,5 +1,5 @@ # -# Shorewall6 - Rules File +# Shorewall6 -- /etc/shorewall6/rules # # For information on the settings in this file, type "man shorewall6-rules" # diff --git a/Shorewall6/configfiles/scfilter b/Shorewall6/configfiles/scfilter index 16ead3684..ae890bce7 100644 --- a/Shorewall6/configfiles/scfilter +++ b/Shorewall6/configfiles/scfilter @@ -1,7 +1,5 @@ # -# Shorewall - Scfilter File -# -# /etc/shorewall/scfilter +# Shorewall6 -- /etc/shorewall6/scfilter # # Replace the 'cat' command below to filter the output of # 'show connections'. diff --git a/Shorewall6/configfiles/secmarks b/Shorewall6/configfiles/secmarks index 8e091288f..6c2108695 100644 --- a/Shorewall6/configfiles/secmarks +++ b/Shorewall6/configfiles/secmarks @@ -1,5 +1,5 @@ # -# Shorewall6 - Secmarks File +# Shorewall6 -- /etc/shorewall6/secmarks # # For information about entries in this file, type "man shorewall-secmarks" # diff --git a/Shorewall6/configfiles/start b/Shorewall6/configfiles/start index 8e6d8b030..6007330d6 100644 --- a/Shorewall6/configfiles/start +++ b/Shorewall6/configfiles/start @@ -1,10 +1,8 @@ # -# Shorewall6 - Start File +# Shorewall6 -- /etc/shorewall6/start # -# /etc/shorewall6/start -# -# Add commands below that you want to be executed after shorewall6 has -# been started or restarted. +# Add commands below that you want to be executed after shorewall6 has +# been started or restarted. # # See http://shorewall.net/shorewall_extension_scripts.htm for additional # information. diff --git a/Shorewall6/configfiles/started b/Shorewall6/configfiles/started index 8bca48bc1..1c2f9c694 100644 --- a/Shorewall6/configfiles/started +++ b/Shorewall6/configfiles/started @@ -1,17 +1,15 @@ # -# Shorewall6 - Started File +# Shorewall6 -- /etc/shorewall6/started # -# /etc/shorewall6/started +# Add commands below that you want to be executed after shorewall6 has +# been completely started or restarted. The difference between this +# extension script and /etc/shorewall6/start is that this one is invoked +# after the 'shorewall' chain has been created (thus signaling that the +# firewall is completely up). # -# Add commands below that you want to be executed after shorewall6 has -# been completely started or restarted. The difference between this -# extension script and /etc/shorewall6/start is that this one is invoked -# after the 'shorewall' chain has been created (thus signaling that the -# firewall is completely up). -# -# This script should not change the firewall configuration directly but -# may do so indirectly by running /sbin/shorewall6 with the 'nolock' -# option. +# This script should not change the firewall configuration directly but +# may do so indirectly by running /sbin/shorewall6 with the 'nolock' +# option. # # See http://shorewall.net/shorewall_extension_scripts.htm for additional # information. diff --git a/Shorewall6/configfiles/stop b/Shorewall6/configfiles/stop index d13d8ed96..87bf2ac71 100644 --- a/Shorewall6/configfiles/stop +++ b/Shorewall6/configfiles/stop @@ -1,10 +1,8 @@ # -# Shorewall6 - Stop File +# Shorewall6 -- /etc/shorewall6/stop # -# /etc/shorewall6/stop -# -# Add commands below that you want to be executed at the beginning of a -# "shorewall6 stop" command. +# Add commands below that you want to be executed at the beginning of a +# "shorewall6 stop" command. # # See http://shorewall.net/shorewall_extension_scripts.htm for additional # information. diff --git a/Shorewall6/configfiles/stopped b/Shorewall6/configfiles/stopped index 9ab1a9083..91fde2624 100644 --- a/Shorewall6/configfiles/stopped +++ b/Shorewall6/configfiles/stopped @@ -1,10 +1,8 @@ # -# Shorewall6 - Stopped File +# Shorewall6 -- /etc/shorewall6/stopped # -# /etc/shorewall6/stopped -# -# Add commands below that you want to be executed at the completion of a -# "shorewal6l stop" command. +# Add commands below that you want to be executed at the completion of a +# "shorewall6 stop" command. # # See http://shorewall.net/shorewall_extension_scripts.htm for additional # information. diff --git a/Shorewall6/configfiles/stoppedrules b/Shorewall6/configfiles/stoppedrules index f566a4437..f68cb0738 100644 --- a/Shorewall6/configfiles/stoppedrules +++ b/Shorewall6/configfiles/stoppedrules @@ -1,5 +1,5 @@ # -# Shorewall6 - Stoppedrules File +# Shorewall6 -- /etc/shorewall6/stoppedrules # # For information about entries in this file, # type "man shorewall6-stoppedrules" diff --git a/Shorewall6/configfiles/tcclasses b/Shorewall6/configfiles/tcclasses index 34359d6a1..e461fbb15 100644 --- a/Shorewall6/configfiles/tcclasses +++ b/Shorewall6/configfiles/tcclasses @@ -1,5 +1,5 @@ # -# Shorewall6 - Tcclasses File +# Shorewall6 -- /etc/shorewall6/tcclasses # # For information about entries in this file, type "man shorewall6-tcclasses" # diff --git a/Shorewall6/configfiles/tcclear b/Shorewall6/configfiles/tcclear index e75b48c16..2fdd8a63a 100644 --- a/Shorewall6/configfiles/tcclear +++ b/Shorewall6/configfiles/tcclear @@ -1,7 +1,5 @@ # -# Shorewall6 - tcclear File -# -# /etc/shorewall6/tcclear +# Shorewall6 -- /etc/shorewall6/tcclear # # Add commands below that you want to be executed before Shorewall6 clears # the traffic shaping configuration. diff --git a/Shorewall6/configfiles/tcdevices b/Shorewall6/configfiles/tcdevices index fcded3e27..517ff4193 100644 --- a/Shorewall6/configfiles/tcdevices +++ b/Shorewall6/configfiles/tcdevices @@ -1,5 +1,5 @@ # -# Shorewall6 - Tcdevices File +# Shorewall6 -- /etc/shorewall6/tcdevices # # For information about entries in this file, type "man shorewall6-tcdevices" # diff --git a/Shorewall6/configfiles/tcfilters b/Shorewall6/configfiles/tcfilters index 70b22e103..6f82a51ad 100644 --- a/Shorewall6/configfiles/tcfilters +++ b/Shorewall6/configfiles/tcfilters @@ -1,5 +1,5 @@ # -# Shorewall6 - Tcfilters File +# Shorewall6 -- /etc/shorewall6/tcfilters # # For information about entries in this file, type "man shorewall6-tcfilters" # diff --git a/Shorewall6/configfiles/tcinterfaces b/Shorewall6/configfiles/tcinterfaces index 02345c0aa..d9079888d 100644 --- a/Shorewall6/configfiles/tcinterfaces +++ b/Shorewall6/configfiles/tcinterfaces @@ -1,5 +1,5 @@ # -# Shorewall6 - Tcinterfaces File +# Shorewall6 -- /etc/shorewall6/tcinterfaces # # For information about entries in this file, # type "man shorewall6-tcinterfaces" diff --git a/Shorewall6/configfiles/tcpri b/Shorewall6/configfiles/tcpri index 472dfc9e9..c4ee6e075 100644 --- a/Shorewall6/configfiles/tcpri +++ b/Shorewall6/configfiles/tcpri @@ -1,5 +1,5 @@ # -# Shorewall6 - Tcpri File +# Shorewall6 -- /etc/shorewall6/tcpri # # For information about entries in this file, type "man shorewall6-tcpri" # diff --git a/Shorewall6/configfiles/tunnels b/Shorewall6/configfiles/tunnels index 316f63ac4..a74c51891 100644 --- a/Shorewall6/configfiles/tunnels +++ b/Shorewall6/configfiles/tunnels @@ -1,5 +1,5 @@ # -# Shorewall6 - Tunnels File +# Shorewall6 -- /etc/shorewall6/tunnels # # For information about entries in this file, type "man shorewall6-tunnels" # diff --git a/Shorewall6/configfiles/zones b/Shorewall6/configfiles/zones index 40b129d0f..7a1e40670 100644 --- a/Shorewall6/configfiles/zones +++ b/Shorewall6/configfiles/zones @@ -1,5 +1,5 @@ # -# Shorewall6 - Zones File +# Shorewall6 -- /etc/shorewall6/zones # # For information about this file, type "man shorewall6-zones" #