From: Source Maintenance Date: Thu, 23 Apr 2015 03:31:40 +0000 (+0000) Subject: Docs: clarify Squid masking of TOS ECN bits X-Git-Tag: merge-candidate-3-v1~154 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f53baab6529cee59409167085a08da72fd98581;p=thirdparty%2Fsquid.git Docs: clarify Squid masking of TOS ECN bits --- diff --git a/src/cf.data.pre b/src/cf.data.pre index 7f1c921a02..642ca00cc4 100644 --- a/src/cf.data.pre +++ b/src/cf.data.pre @@ -2238,9 +2238,10 @@ DOC_START RFC2475, and RFC3260. The TOS/DSCP byte must be exactly that - a octet value 0 - 255, or - "default" to use whatever default your host has. Note that in - practice often only multiples of 4 is usable as the two rightmost bits - have been redefined for use by ECN (RFC 3168 section 23.1). + "default" to use whatever default your host has. + Note that only multiples of 4 are usable as the two rightmost bits have + been redefined for use by ECN (RFC 3168 section 23.1). + The squid parser will enforce this by masking away the ECN bits. Processing proceeds in the order specified, and stops at first fully matching line. @@ -2253,7 +2254,7 @@ TYPE: acl_tos DEFAULT: none LOC: Ip::Qos::TheConfig.tosToClient DOC_START - Allows you to select a TOS/Diffserv value for packets being transmitted + Allows you to select a TOS/DSCP value for packets being transmitted on the client-side, based on an ACL. clientside_tos ds-field [!]aclname ... @@ -2268,6 +2269,13 @@ DOC_START Note: This feature is incompatible with qos_flows. Any TOS values set here will be overwritten by TOS values in qos_flows. + + The TOS/DSCP byte must be exactly that - a octet value 0 - 255, or + "default" to use whatever default your host has. + Note that only multiples of 4 are usable as the two rightmost bits have + been redefined for use by ECN (RFC 3168 section 23.1). + The squid parser will enforce this by masking away the ECN bits. + DOC_END NAME: tcp_outgoing_mark @@ -2339,9 +2347,10 @@ DOC_START know what you're specifying. For more information, see RFC2474, RFC2475, and RFC3260. - The TOS/DSCP byte must be exactly that - a octet value 0 - 255. Note that - in practice often only multiples of 4 is usable as the two rightmost bits - have been redefined for use by ECN (RFC 3168 section 23.1). + The TOS/DSCP byte must be exactly that - a octet value 0 - 255. + Note that only multiples of 4 are usable as the two rightmost bits have + been redefined for use by ECN (RFC 3168 section 23.1). + The squid parser will enforce this by masking away the ECN bits. Mark values can be any unsigned 32-bit integer value.