From: Francis Dupont Date: Tue, 10 Apr 2018 14:42:38 +0000 (+0200) Subject: [5374] Addressed comments X-Git-Tag: trac5458a_base~14^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44f874d62668affec952a2cac723577412fc0f3c;p=thirdparty%2Fkea.git [5374] Addressed comments --- diff --git a/doc/examples/kea4/classify2.json b/doc/examples/kea4/classify2.json index 626d5c9ffb..fca82e2ab8 100644 --- a/doc/examples/kea4/classify2.json +++ b/doc/examples/kea4/classify2.json @@ -104,7 +104,8 @@ "hw-address": "1a:1b:1c:1d:1e:1f", "client-classes": [ "VoIP" ] } ], - "interface": "ethX" + "interface": "ethX", + "require-client-classes": [ "second_subnet" ] }, // The following list defines a subnet with pools. For some pools diff --git a/doc/examples/kea6/classify.json b/doc/examples/kea6/classify.json index b6e184b618..2fd3256c21 100644 --- a/doc/examples/kea6/classify.json +++ b/doc/examples/kea6/classify.json @@ -1,4 +1,4 @@ -// This is an example configuration file for the DHCPv4 server in Kea. +// This is an example configuration file for the DHCPv6 server in Kea. // The purpose of this example is to showcase how clients can be classified. { "Dhcp6": diff --git a/doc/examples/kea6/classify2.json b/doc/examples/kea6/classify2.json index aa6a7bd4df..f931ecbfd1 100644 --- a/doc/examples/kea6/classify2.json +++ b/doc/examples/kea6/classify2.json @@ -1,4 +1,4 @@ -// This is an example configuration file for the DHCPv4 server in Kea. +// This is an example configuration file for the DHCPv6 server in Kea. // The purpose of this example is to showcase how clients can be classified. { "Dhcp6": @@ -83,7 +83,8 @@ "duid": "01:02:03:04:05:0A:0B:0C:0D:0E", "client-classes": [ "cable-modems" ] } ], - "interface": "ethX" + "interface": "ethX", + "require-client-classes": [ "second_subnet" ] }, // The following subnet contains a pool with a class constraint: only // clients which belong to the class are allowed to use this pool. diff --git a/doc/guide/classify.xml b/doc/guide/classify.xml index 4e800f327f..49f58a7a05 100644 --- a/doc/guide/classify.xml +++ b/doc/guide/classify.xml @@ -75,10 +75,10 @@ Classes with matching expressions and not marked for later ("on - request") evaluation are processed in the order they are defined - in the configuration: the boolean expression is evaluated and - when it returns true ("match") the incoming packet is associated - to the class. + request" or depending on the KNOWN builtin class) evaluation are + processed in the order they are defined in the configuration: + the boolean expression is evaluated and when it returns true + ("match") the incoming packet is associated to the class. If a private or code 43 DHCPv4 option is received, decoding it @@ -101,16 +101,17 @@ of the host reservation. - Classes with matching expressions using directly or indirectly on - the KNOWN builtin class and not marked for only when required + Classes with matching expressions using directly or indirectly + the KNOWN builtin class and not marked for later ("on request") evaluation are processed in the order they are defined in the configuration: the boolean expression is evaluated and when it returns true ("match") the incoming packet is associated to the class. - If needed, resources from pools are assigned, possibly based on the - class information when some pools are reserved to class members. + If needed, addresses and prefixes from pools are assigned, + possibly based on the class information when some pools are + reserved to class members. Evaluate classes marked as "required" in the order in which they diff --git a/doc/guide/dhcp4-srv.xml b/doc/guide/dhcp4-srv.xml index 2429651262..54b285af5c 100644 --- a/doc/guide/dhcp4-srv.xml +++ b/doc/guide/dhcp4-srv.xml @@ -2312,7 +2312,7 @@ It is merely echoed by the server precedence: if you set an option-data in a subnet it takes precedence over an option-data in a class. When you move the option-data to a required class and require it in - the subnet, a class evaluted earlier may take precedence. + the subnet, a class evaluated earlier may take precedence. @@ -3466,7 +3466,7 @@ It is merely echoed by the server Static class assignments, as shown above, can be used in conjunction with classification using expressions. The "KNOWN" builtin class is added to the packet and any class depending on it directly or indirectly - and not only-if-required is evaluted. + and not only-if-required is evaluated. diff --git a/doc/guide/dhcp6-srv.xml b/doc/guide/dhcp6-srv.xml index 50c59aefed..16ef42e1e7 100644 --- a/doc/guide/dhcp6-srv.xml +++ b/doc/guide/dhcp6-srv.xml @@ -2107,7 +2107,7 @@ should include options from the isc option space: precedence: if you set an option-data in a subnet it takes precedence over an option-data in a class. When you move the option-data to a required class and require it in - the subnet, a class evaluted earlier may take precedence. + the subnet, a class evaluated earlier may take precedence. @@ -2986,7 +2986,7 @@ should include options from the isc option space: Static class assignments, as shown above, can be used in conjunction with classification using expressions. The "KNOWN" builtin class is added to the packet and any class depending on it directly or indirectly - and not only-if-required is evaluted. + and not only-if-required is evaluated.