From: Marcin Siodelski Date: Tue, 30 Jun 2015 16:45:43 +0000 (+0200) Subject: [master] Merge branch 'trac3578' X-Git-Tag: trac3771_base~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b361b28ce53729a5f2d59f79670a36cf1a4a0352;p=thirdparty%2Fkea.git [master] Merge branch 'trac3578' --- b361b28ce53729a5f2d59f79670a36cf1a4a0352 diff --cc doc/guide/dhcp4-srv.xml index ab353edd63,00aab6db77..889f1540d5 --- a/doc/guide/dhcp4-srv.xml +++ b/doc/guide/dhcp4-srv.xml @@@ -765,12 -713,31 +765,31 @@@ temporarily override a list of interfac Standard DHCPv4 options One of the major features of the DHCPv4 server is to provide configuration - options to clients. Although there are several options that require - special behavior, most options are sent by the server only if the client - explicitly requests them. The following example shows how to - configure the addresses of DNS servers, which is one of the most frequently used - options. Options specified in this way are considered global and apply - to all configured subnets. + options to clients. Most of the options are sent by the server, only if the + client explicitly requests them using the Parameter Request List option. + Those that do not require being requested using the Parameter Request List - option are commonly used options, e.g. "Name Server", and options which ++ option are commonly used options, e.g. "Domain Server", and options which + require special behavior, e.g. "Client FQDN" is returned to the client + if the client has included this option in its message to the server. + + + + The comprises the list of the + standard DHCPv4 options, whose values can be configured using the + configuration structures described in this section. This table excludes + the options which require special processing and thus cannot be configured + with some fixed values. The last column of this table specifies which + options can be sent by the server even when they are not requested in + the Parameter Request list option, and which are sent only when + explicitly requested. These options are marked with the values + 'true' and 'false' respectively. + + + + The following example shows how to configure the addresses of DNS + servers, which is one of the most frequently used options. Options + specified in this way are considered global and apply to all + configured subnets. "Dhcp4": { @@@ -917,45 -886,50 +938,50 @@@ - subnet-mask1ipv4-addressfalse - time-offset2int32false - routers3ipv4-addresstrue - time-servers4ipv4-addresstrue - name-servers5ipv4-addresstrue - domain-name-servers6ipv4-addresstrue - log-servers7ipv4-addresstrue - cookie-servers8ipv4-addresstrue - lpr-servers9ipv4-addresstrue - impress-servers10ipv4-addresstrue - resource-location-servers11ipv4-addresstrue - host-name12stringfalse - boot-size13uint16false - merit-dump14stringfalse - domain-name15fqdnfalse - swap-server16ipv4-addressfalse - root-path17stringfalse - extensions-path18stringfalse - ip-forwarding19booleanfalse - non-local-source-routing20booleanfalse - policy-filter21ipv4-addresstrue - max-dgram-reassembly22uint16false - default-ip-ttl23uint8false - path-mtu-aging-timeout24uint32false - path-mtu-plateau-table25uint16true - interface-mtu26uint16false - all-subnets-local27booleanfalse - broadcast-address28ipv4-addressfalse - perform-mask-discovery29booleanfalse - mask-supplier30booleanfalse - router-discovery31booleanfalse - router-solicitation-address32ipv4-addressfalse - static-routes33ipv4-addresstrue - trailer-encapsulation34booleanfalse - arp-cache-timeout35uint32false - ieee802-3-encapsulation36booleanfalse - default-tcp-ttl37uint8false - tcp-keepalive-interval38uint32false - tcp-keepalive-garbage39booleanfalse + + time-offset2int32falsefalse + routers3ipv4-addresstruetrue + time-servers4ipv4-addresstruefalse -name-servers5ipv4-addressfalsefalse ++name-servers5ipv4-addresstruefalse + domain-name-servers6ipv4-addresstruetrue + log-servers7ipv4-addresstruefalse + cookie-servers8ipv4-addresstruefalse + lpr-servers9ipv4-addresstruefalse + impress-servers10ipv4-addresstruefalse + resource-location-servers11ipv4-addresstruefalse + + boot-size13uint16falsefalse + merit-dump14stringfalsefalse + domain-name15fqdnfalsetrue + swap-server16ipv4-addressfalsefalse + root-path17stringfalsefalse + extensions-path18stringfalsefalse + ip-forwarding19booleanfalsefalse + non-local-source-routing20booleanfalsefalse + policy-filter21ipv4-addresstruefalse + max-dgram-reassembly22uint16falsefalse + default-ip-ttl23uint8falsefalse + path-mtu-aging-timeout24uint32falsefalse + path-mtu-plateau-table25uint16truefalse + interface-mtu26uint16falsefalse + all-subnets-local27booleanfalsefalse + broadcast-address28ipv4-addressfalsefalse + perform-mask-discovery29booleanfalsefalse + mask-supplier30booleanfalsefalse + router-discovery31booleanfalsefalse + router-solicitation-address32ipv4-addressfalsefalse + static-routes33ipv4-addresstruefalse + trailer-encapsulation34booleanfalsefalse + arp-cache-timeout35uint32falsefalse + ieee802-3-encapsulation36booleanfalsefalse + default-tcp-ttl37uint8falsefalse + tcp-keepalive-interval38uint32falsefalse + tcp-keepalive-garbage39booleanfalsefalse