extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-20 01:37:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Apply Tuomo's patch to clean up tc4shorewall formatting

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3091 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2005-11-29 16:51:53 +00:00
parent 577389464f
commit 60a93c5167
4 changed files with 46 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall/changelog.txt
View File

@ -4,6 +4,8 @@ Changes in 3.0.3
2) Comments regarding bridge configuration were improved. 2) Comments regarding bridge configuration were improved.
3) Applied Tuomo Soini's patch to pretty up the tc4shorewall files.
Changes in 3.0.2 Changes in 3.0.2
1) Typos in the Samples corrected. 1) Typos in the Samples corrected.

3
Shorewall/releasenotes.txt
View File

@ -6,6 +6,9 @@ Problems Corrected in 3.0.3
/etc/shorewall/hosts files have been changed to clarify when /etc/shorewall/hosts files have been changed to clarify when
BRIDGING=Yes is required when dealing with bridges. 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 New Features in 3.0.3
1) A "shorewall show macros" command has been added. This command displays 1) A "shorewall show macros" command has been added. This command displays

48
Shorewall/tcclasses
View File

@ -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 # /etc/shorewall/tcclasses
# #
@ -12,11 +14,11 @@
# #
# - you can use one of the following units: # - you can use one of the following units:
# #
# kbps Kilobytes per second # kbps Kilobytes per second
# mbps Megabytes per second # mbps Megabytes per second
# kbit Kilobits per second # kbit Kilobits per second
# mbit Megabits per second # mbit Megabits per second
# bps or a # bps or a
# bare number Bytes per second # bare number Bytes per second
# #
# - if you want the values to be calculated for you depending # - 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 # that first the classes which equal or a lesser priority
# value are served. # 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 # speed, and make sure there is NO space between the
# number and the unit. # number and the unit.
# #
@ -73,17 +74,18 @@
# the maximum bandwidth to the defined output bandwidth # the maximum bandwidth to the defined output bandwidth
# of that interface # 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 # speed, and make sure there is NO space between the
# number and the unit. # number and the unit.
# #
# PRIORITY you have to define a priority for the class # PRIORITY you have to define a priority for the class
# Packages in a class with a higher priority (=lesser value) # Packages in a class with a higher priority
# are handled before lesser priority onces. # (=lesser value) are handled before lesser priority
# You can just define the mark value here also, if you are # onces.
# increasing the mark values with lesser priority. # 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: # following:
# #
# default - this is the default class for that # default - this is the default class for that
@ -106,11 +108,11 @@
# You can use the following # You can use the following
# for this option # for this option
# #
# tos-minimize-delay (16) # tos-minimize-delay (16)
# tos-maximize-throughput (8) # tos-maximize-throughput (8)
# tos-maximize-reliability (4) # tos-maximize-reliability (4)
# tos-minimize-cost (2) # tos-minimize-cost (2)
# tos-normal-service (0) # tos-normal-service (0)
# #
# NOTE: each of this options is only # NOTE: each of this options is only
# valid for ONE class per interface. # valid for ONE class per interface.
@ -143,10 +145,10 @@
# bandwidth of 100kbit upstream, but 1 and 3 can get # bandwidth of 100kbit upstream, but 1 and 3 can get
# full speed if link is idle, 2 is limited to 200kbit # full speed if link is idle, 2 is limited to 200kbit
# #
# ppp0 1 100kbit full 1 tcp-ack,tos-minimize-delay # ppp0 1 100kbit full 1 tcp-ack,tos-minimize-delay
# ppp0 2 100kbit 200kbit 2 # ppp0 2 100kbit 200kbit 2
# ppp0 3 full/3 full 3 default # ppp0 3 full/3 full 3 default
# #
################################################################################ ###############################################################################
#INTERFACE MARK RATE CEIL PRIORITY OPTIONS #INTERFACE MARK RATE CEIL PRIORITY OPTIONS
#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE

28
Shorewall/tcdevices
View File

@ -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 # /etc/shorewall/tcdevices
# #
# Entries in this file define the bandwidth for interfaces # Entries in this file define the bandwidth for interfaces
# on which you want traffic shaping to be enabled. # on which you want traffic shaping to be enabled.
#
# If you do not plan to use traffic shaping for a device, # 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 # don't put it in here as it limits the troughput of that
# device to the limits you set here. # device to the limits you set here.
@ -12,9 +16,9 @@
# #
# #
# INTERFACE Name of interface. Each interface may be listed only # INTERFACE Name of interface. Each interface may be listed only
# once in this file. You may NOT specify the name of # once in this file. You may NOT specify the name of
# an alias (e.g., eth0:0) here; see # an alias (e.g., eth0:0) here; see
# http://www.shorewall.net/FAQ.htm#faq18 # http://www.shorewall.net/FAQ.htm#faq18
# #
# You man NOT specify wildcards here, e.g. if you # You man NOT specify wildcards here, e.g. if you
# have multiple ppp interfaces, you need to put # have multiple ppp interfaces, you need to put
@ -26,12 +30,12 @@
# received before you could do so. But this allows # received before you could do so. But this allows
# you to define the maximum traffic allowed for # you to define the maximum traffic allowed for
# this interface in total, if the rate is exceeded, # 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 # 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 # 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 # Use kbit or kbps(for Kilobytes per second) for
# speed, and make sure there is NO space between the # speed, and make sure there is NO space between the
@ -41,19 +45,19 @@
# This is the maximum speed you connection can handle. # This is the maximum speed you connection can handle.
# It is also the speed you can refer as "full" if # It is also the speed you can refer as "full" if
# you define the tc classes. # 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 # Use kbit or kbps(for Kilobytes per second) for
# speed, and make sure there is NO space between the # speed, and make sure there is NO space between the
# number and the unit. # number and the unit.
# #
# Example 1: Suppose you are using PPP over Ethernet (DSL) # Example 1: Suppose you are using PPP over Ethernet (DSL)
# and ppp0 is the interface for this. The # and ppp0 is the interface for this. The
# device has an outgoing bandwidth of 500kbit and an # device has an outgoing bandwidth of 500kbit and an
# incoming bandwidth of 6000kbit # incoming bandwidth of 6000kbit
# ppp0 6000kbit 500kbit # ppp0 6000kbit 500kbit
# #
# #
################################################################################# ###############################################################################
#INTERFACE IN-BANDWITH OUT-BANDWIDTH #INTERFACE IN-BANDWITH OUT-BANDWIDTH
#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE