From 60a93c5167b548641d5d363ee7b65f601687b6de Mon Sep 17 00:00:00 2001 From: teastep Date: Tue, 29 Nov 2005 16:51:53 +0000 Subject: [PATCH] Apply Tuomo's patch to clean up tc4shorewall formatting git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3091 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall/changelog.txt | 2 ++ Shorewall/releasenotes.txt | 3 +++ Shorewall/tcclasses | 48 ++++++++++++++++++++------------------ Shorewall/tcdevices | 28 ++++++++++++---------- 4 files changed, 46 insertions(+), 35 deletions(-) diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index 09ae529ac..ff8f3886b 100755 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -4,6 +4,8 @@ Changes in 3.0.3 2) Comments regarding bridge configuration were improved. +3) Applied Tuomo Soini's patch to pretty up the tc4shorewall files. + Changes in 3.0.2 1) Typos in the Samples corrected. diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index 327eb022a..6da5c8293 100755 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -6,6 +6,9 @@ Problems Corrected in 3.0.3 /etc/shorewall/hosts files have been changed to clarify when BRIDGING=Yes is required when dealing with bridges. +2) Thanks to Tuomo Soini, formatting of the comments in the tcdevices + and tcclasses files has been cleaned up. + New Features in 3.0.3 1) A "shorewall show macros" command has been added. This command displays diff --git a/Shorewall/tcclasses b/Shorewall/tcclasses index 29c70d402..b6035e8fe 100644 --- a/Shorewall/tcclasses +++ b/Shorewall/tcclasses @@ -1,5 +1,7 @@ -# tc4shorewall Version 0.5 # +# Shorewall version 3.0 - Tcclasses File +# +# Based on tc4shorewall version 0.5 by Arne Bernin # # /etc/shorewall/tcclasses # @@ -12,11 +14,11 @@ # # - you can use one of the following units: # -# kbps Kilobytes per second -# mbps Megabytes per second -# kbit Kilobits per second -# mbit Megabits per second -# bps or a +# kbps Kilobytes per second +# mbps Megabytes per second +# kbit Kilobits per second +# mbit Megabits per second +# bps or a # bare number Bytes per second # # - if you want the values to be calculated for you depending @@ -59,8 +61,7 @@ # that first the classes which equal or a lesser priority # value are served. # -# You can use the following -#Use kbit or kbps(for Kilobytes per second) for +# Use kbit or kbps(for Kilobytes per second) for # speed, and make sure there is NO space between the # number and the unit. # @@ -73,17 +74,18 @@ # the maximum bandwidth to the defined output bandwidth # of that interface # -# Use kbit or kbps(for Kilobytes per second) for +# Use kbit or kbps (for Kilobytes per second) for # speed, and make sure there is NO space between the # number and the unit. # # PRIORITY you have to define a priority for the class -# Packages in a class with a higher priority (=lesser value) -# are handled before lesser priority onces. -# You can just define the mark value here also, if you are -# increasing the mark values with lesser priority. +# Packages in a class with a higher priority +# (=lesser value) are handled before lesser priority +# onces. +# You can just define the mark value here also, if you +# are increasing the mark values with lesser priority. # -# OPTIONS A comma-separated list of options including the +# OPTIONS A comma-separated list of options including the # following: # # default - this is the default class for that @@ -106,11 +108,11 @@ # You can use the following # for this option # -# tos-minimize-delay (16) -# tos-maximize-throughput (8) -# tos-maximize-reliability (4) -# tos-minimize-cost (2) -# tos-normal-service (0) +# tos-minimize-delay (16) +# tos-maximize-throughput (8) +# tos-maximize-reliability (4) +# tos-minimize-cost (2) +# tos-normal-service (0) # # NOTE: each of this options is only # valid for ONE class per interface. @@ -143,10 +145,10 @@ # bandwidth of 100kbit upstream, but 1 and 3 can get # full speed if link is idle, 2 is limited to 200kbit # -# ppp0 1 100kbit full 1 tcp-ack,tos-minimize-delay -# ppp0 2 100kbit 200kbit 2 -# ppp0 3 full/3 full 3 default +# ppp0 1 100kbit full 1 tcp-ack,tos-minimize-delay +# ppp0 2 100kbit 200kbit 2 +# ppp0 3 full/3 full 3 default # -################################################################################ +############################################################################### #INTERFACE MARK RATE CEIL PRIORITY OPTIONS #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/tcdevices b/Shorewall/tcdevices index 8a6b4b569..d805583a9 100644 --- a/Shorewall/tcdevices +++ b/Shorewall/tcdevices @@ -1,9 +1,13 @@ -# tc4shorewall Version 0.5 +# +# Shorewall version 3.0 - Tcdevices File +# +# Based on tc4shorewall version 0.5 by Arne Bernin # # /etc/shorewall/tcdevices # # Entries in this file define the bandwidth for interfaces # on which you want traffic shaping to be enabled. +# # If you do not plan to use traffic shaping for a device, # don't put it in here as it limits the troughput of that # device to the limits you set here. @@ -12,9 +16,9 @@ # # # INTERFACE Name of interface. Each interface may be listed only -# once in this file. You may NOT specify the name of -# an alias (e.g., eth0:0) here; see -# http://www.shorewall.net/FAQ.htm#faq18 +# once in this file. You may NOT specify the name of +# an alias (e.g., eth0:0) here; see +# http://www.shorewall.net/FAQ.htm#faq18 # # You man NOT specify wildcards here, e.g. if you # have multiple ppp interfaces, you need to put @@ -26,12 +30,12 @@ # received before you could do so. But this allows # you to define the maximum traffic allowed for # this interface in total, if the rate is exceeded, -# the packets are dropped. +# the packets are dropped. # You want this mainly if you have a DSL or Cable -# Connection to avoid queuing at your providers side. +# connection to avoid queuing at your providers side. # # If you don't want any traffic to be dropped set this -# to a value faster than your interface +# to a value faster than your interface. # # Use kbit or kbps(for Kilobytes per second) for # speed, and make sure there is NO space between the @@ -41,19 +45,19 @@ # This is the maximum speed you connection can handle. # It is also the speed you can refer as "full" if # you define the tc classes. -# Outgoing traffic above this rate will be dropped +# Outgoing traffic above this rate will be dropped. # # Use kbit or kbps(for Kilobytes per second) for # speed, and make sure there is NO space between the # number and the unit. # # Example 1: Suppose you are using PPP over Ethernet (DSL) -# and ppp0 is the interface for this. The -# device has an outgoing bandwidth of 500kbit and an +# and ppp0 is the interface for this. The +# device has an outgoing bandwidth of 500kbit and an # incoming bandwidth of 6000kbit # ppp0 6000kbit 500kbit # # -################################################################################# -#INTERFACE IN-BANDWITH OUT-BANDWIDTH +############################################################################### +#INTERFACE IN-BANDWITH OUT-BANDWIDTH #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE