From aac343b47638658f6b6b2aecd87a6789c432b12f Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Tue, 27 Jul 2010 08:05:54 -0700 Subject: [PATCH] Document mark geometry capability --- docs/PacketMarking.xml | 91 +++++++++++++++++++++++++++++++++++ docs/images/MarkGeometry.dia | Bin 0 -> 1835 bytes docs/images/MarkGeometry.png | Bin 0 -> 12400 bytes manpages/shorewall.conf.xml | 16 ++---- 4 files changed, 94 insertions(+), 13 deletions(-) create mode 100644 docs/images/MarkGeometry.dia create mode 100644 docs/images/MarkGeometry.png diff --git a/docs/PacketMarking.xml b/docs/PacketMarking.xml index eb30ad4d1..b71caec69 100644 --- a/docs/PacketMarking.xml +++ b/docs/PacketMarking.xml @@ -267,6 +267,97 @@ tcp 6 19 TIME_WAIT src=206.124.146.176 dst=192.136.34.98 sport=58597 dport= Connection marking rules use a mask value of 0xff. + + Shorewall actually allows you to have complete control over the + layout of the 32-bit mark using the following options in shorewall.conf (5): + + + + TC_BITS + + + The number of bits at the low end of the mark to be used for + traffic shaping marking. May be zero. + + + + + PROVIDER_BITS + + + The number of bits in the mark to be used for provider + numbers. May be zero. + + + + + PROVIDER_OFFSET + + + The offset from the right (low-order end) of the provider + number field. If non-zero, must be >= TC_BITS (Shorewall + automatically adjusts PROVIDER_OFFSET's value). PROVIDER_OFFSET + + PROVIDER_BITS must be <= 32. + + + + + MASK_BITS + + + Number of bits on the right of the mark to be masked when + clearing the traffic shaping mark. Must be >= TC_BITS and <= + PROVIDER_OFFSET (if PROVIDER_OFFSET > 0) + + + + + The relationship between these options is shown in this + diagram. + + + + + + The default values of these options are determined by the settings + of other options as follows: + + + Default Values + + + + + WIDE_TC_MARKS=No, HIGH_ROUTE_MARKS=No + + TC_BITS=8, PROVIDER_BITS=0, PROVIDER_OFFSET=0, + MASK_BITS=8 + + + + WIDE_TC_MARKS=No, HIGH_ROUTE_MARKS=Yes + + TC_BITS=8, PROVIDER_BITS=8, PROVIDER_OFFSET=8, + MASK_BITS=8 + + + + WIDE_TC_MARKS=Yes, HIGH_ROUTE_MARKS=No + + TC_BITS=14, PROVIDER_BITS=8, PROVIDER_OFFSET=0, + MASK_BITS=16 + + + + WIDE_TC_MARKS=Yes, HIGH_ROUTE_MARKS=Yes + + TC_BITS=14, PROVIDER_BITS=8, PROVIDER_OFFSET=16, + MASK_BITS=16 + + + +
diff --git a/docs/images/MarkGeometry.dia b/docs/images/MarkGeometry.dia new file mode 100644 index 0000000000000000000000000000000000000000..9242cbfdbe2b409d6efcb4850792303f3fd469ca GIT binary patch literal 1835 zcmV+`2h{i?Ak&WW8 z#oz(u_OicyCBXF!5*v&YQh6qsfhgZW^7kE`BLr{X-AzO5MkHwvM<+c5V9yfKIQD~R za?<;8@$t3Wdv|*D)(`j_^)pHM)KdQurTXZkcO~WQO}~G8dkez*l*>2)VQ>vn(f^N! zA@8e3{od)3Wi1Erx#ap>ah6M&1fy#ytcXv=NpHl*KPO3i9r?YyRncx7hjC)v@bIMf z>N5NE`bC)jN}LB`&-g@)62X5~hlc9od38e1M6w=sI*ZdlHIetTjV2Xw^zWrMMXOXb ziYBM8J_{*D@+!Zq;^ZP;*~L}@$th1JL9~gb#wW}N!v++4`ooY*F|-{#AD7+XMu&w9 z4-1zZ7A{DKvpA6n59B7~D2_wHqa0Nx*P=d7I_9BDv4^^a>PNo}q>LZA{!1RF+jJm5 z{j1`3t=>rz_zxHFN{fmpw}CIOhIcIuS04SorRX<78jM0wcJ)Cd_ZI$sKjGKEos7X3 z|K2bg@@SP)gzpL}=l>ny(OEp&)dA%TC=`wCYFYrT6a znBu{W(VE4Jl)`|~V@Lg3AA?N>sX`cy)&UaL1s+X8u>jE+1B?Nr$H)P0Jv0%D>2Mq; z(WXq;W1ljVj7&EB^@~V6fGJ%1paxi1BA8ss2f!ex8GaNezDOSHj0!*R1@Rz44B7SI zf=GQc!&P=Dm5`U05Y~f8uj1Qbi3EOpZZGGd{-Wr%sKN_zCzr|)6=jH;mZ6OSwpC@= zz-h4#Z3H|AI~oQ-I*AfTgwveE91gmkSxKC zYmot)7IOe3cdv9gWX}iz1St% zn2WS|$&E~#WTa3s??TytINB>YtW~env{%L}nI+tvL;-7Bhy()yb2-}T$_23jqzG#q z$moD5>qN1eE#e}xh-*yJR#|CGQfEvOeUfEdr!gI>*|ks%ZIU4aUZxW$8c+gIwv6kv zx{TYnV@8^oW!#;liQBXmDO6^$m;~B%3B&`8IQgQ5$MAq6K(ZUm7*KDqXY~1MlZ*Fe z1^0mBq#`ekIO&Wyah_%c*Xs%+Y8_kDQ4i`+M1Izt-8)%Qhw7?e-p;AH zjHa?}JX^n%vfcYTSrW+;Ipj$a-&Uu$Z8r`+3`I0~*vHZ4Adh;*x_h=GzpXL)6}r6< zT0k@&pFM48ZoH#ed%>)nymp^0Si*sn4yX+X%@1AJh2`*z_rtSK7w5)u9%wzhJS~md zdd|1bs{~Nvy~aebh0X@M_7do}x9l+0Dd#}uY57ASWg3)F&uv@&lyY_W_#~x~y zi-g*@q_=fva~zbrv-zQC+?jD_)tP8`sf+H+-NP$-7^EcIQd9e0(YCMYp_FEuatIsb zPocW{PMU3F+OkEf>}BcWstzrhB6IW1__W{Lr#0T6jWM9bHjP%5&k_#OK1~%eA`I(e zuUkIN+(J9x%Qwoi)2N{ix-`4-E^173&#tn8w#rp=99KW{I#_~rj7u{vtvVA8FFh$Q Z<;U4;;ZKiN-Wz{<^gqJ5Zl_;n001Z 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 literal 0 HcmV?d00001 diff --git a/manpages/shorewall.conf.xml b/manpages/shorewall.conf.xml index 5eacd4271..211fa6379 100644 --- a/manpages/shorewall.conf.xml +++ b/manpages/shorewall.conf.xml @@ -589,11 +589,6 @@ net all DROP infothen the chain name is 'net2all' You may set HIGH_ROUTE_MARKS=Yes in to effectively divide the packet mark and connection mark into two mark fields. - - From Shorewall 2.5.0 onward, this option is deprecated in - favor of the PROVIDER_OFFSET option. - - The width of the fields are determined by the setting of WIDE_TC_MARKS. If WIDE_TC_MARKS=No (the default): @@ -948,11 +943,11 @@ net all DROP infothen the chain name is 'net2all' If the value starts with 's:' then logging is limited per source IP. If the value starts with 'd:', then logging is limited - per destination IP. Otherwise, the overall logging rate is limited. - + per destination IP. Otherwise, the overall logging rate is + limited. If burst is not specified, then a - value of 5 is assumed. + value of 5 is assumed. @@ -1834,11 +1829,6 @@ net all DROP infothen the chain name is 'net2all' traffic shaping marks are 14 bytes wide (values 1-16383). The setting of WIDE_TC_MARKS also has an effect on the HIGH_ROUTE_MARKS option (see above). - - - From Shorewall 2.5.0 onware, this option is deprecated in - favor of the TC_BITS option. -