The unified diff between revisions [29abc3f7..] and [9bba4294..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'src/cf.data.pre'

#
#
# patch "src/cf.data.pre"
#  from [24672c7abf763392eb043e472141391a4824175c]
#    to [5aeb62e462b3aff61a10ad72b2eb7c212572573b]
#
============================================================
--- src/cf.data.pre	24672c7abf763392eb043e472141391a4824175c
+++ src/cf.data.pre	5aeb62e462b3aff61a10ad72b2eb7c212572573b
@@ -3498,6 +3498,62 @@ DOC_END
 	option is set to GRE.
 DOC_END

+NAME: wccp2_service
+TYPE: wccp2_service
+LOC: Config.Wccp2.info
+DEFAULT: none
+IFDEF: USE_WCCPv2
+DOC_START
+	WCCP2 allows for multiple traffic services. There are two
+	types: "standard" and "dynamic". The standard type defines
+	one service id - http (id 0). The dynamic service ids can be from
+	51 to 255 inclusive.  In order to use a dynamic service id
+	one must define the type of traffic to be redirected; this is done
+	using the wccp2_service_info option.
+
+	The "standard" type does not require a wccp2_service_info option - just
+	the service id will suffice.
+
+	Examples:
+
+	wccp2_service standard 0	# for the 'web-cache' standard service
+	wccp2_service dynamic 80	# a dynamic service type which will be
+					# fleshed out with subsequent options.
+DOC_END
+
+NAME: wccp2_service_info
+TYPE: wccp2_service_info
+LOC: Config.Wccp2.info
+DEFAULT: none
+IFDEF: USE_WCCPv2
+DOC_START
+	Dynamic WCCPv2 services require further information to define the
+	traffic you wish to have diverted.
+
+	The format is:
+
+	wccp2_service_info <id> proto=<protocol> flags=<flag>,<flag>..
+	    priority=<priority> ports=<port>,<port>..
+
+	The relevant WCCPv2 flags:
+	+ src_ip_hash, dst_ip_hash
+	+ source_port_hash, dest_port_hash
+	+ ports_defined, ports_source
+	+ src_ip_alt_hash, dst_ip_alt_hash
+	+ src_port_alt_hash, dst_port_alt_hash
+
+	The port list can be one to eight entries. Specifying no ports is
+	currently valid but may result in a confused router.
+
+	Example:
+
+	wccp2_service_info 80 proto=tcp flags=src_ip_hash,ports_source
+	    priority=240 ports=80
+
+	Note: the service id must have been defined by a previous
+	'wccp2_service dynamic <id> entry.
+DOC_END
+
 NAME: wccp_incoming_address
 TYPE: address
 LOC: Config.Wccp.incoming