From 0820b94a8326b3e8cc75d0078f93c7626ccf8147 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Thu, 25 Feb 2021 09:10:55 +0100 Subject: package/busybox: Update stored config files When updating busybox, these files must be updated - otherwise the config written to busybox source tree when building may be incomplete, causing the build to hang. Fixes: e4800c73e63e5 ("busybox: update to latest") Signed-off-by: Phil Sutter --- package/busybox/config/networking/udhcp/Config.in | 251 +++++++++++++--------- 1 file changed, 144 insertions(+), 107 deletions(-) (limited to 'package/busybox/config/networking/udhcp/Config.in') diff --git a/package/busybox/config/networking/udhcp/Config.in b/package/busybox/config/networking/udhcp/Config.in index 02e56c3ef..9edb9a214 100644 --- a/package/busybox/config/networking/udhcp/Config.in +++ b/package/busybox/config/networking/udhcp/Config.in @@ -1,148 +1,168 @@ # DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, -# see scripts/kbuild/config-language.txt. +# see docs/Kconfig-language.txt. # -config BUSYBOX_UDHCPC6 - bool "udhcp client for DHCPv6 (udhcpc6)" - default n # not yet ready - help - udhcpc6 is a DHCPv6 client - config BUSYBOX_UDHCPD - bool "udhcp server (udhcpd)" - default n + bool "udhcpd (21 kb)" + default y select BUSYBOX_PLATFORM_LINUX help - udhcpd is a DHCP server geared primarily toward embedded systems, - while striving to be fully functional and RFC compliant. + udhcpd is a DHCP server geared primarily toward embedded systems, + while striving to be fully functional and RFC compliant. -config BUSYBOX_DHCPRELAY - bool "dhcprelay" +config BUSYBOX_FEATURE_UDHCPD_BASE_IP_ON_MAC + bool "Select IP address based on client MAC" default n + depends on BUSYBOX_UDHCPD help - dhcprelay listens for dhcp requests on one or more interfaces - and forwards these requests to a different interface or dhcp - server. + If selected, udhcpd will base its selection of BUSYBOX_IP address to offer + on the client's hardware address. Otherwise udhcpd uses the next + consecutive free address. -config BUSYBOX_DUMPLEASES - bool "Lease display utility (dumpleases)" - default n - help - dumpleases displays the leases written out by the udhcpd server. - Lease times are stored in the file by time remaining in lease, or - by the absolute time that it expires in seconds from epoch. + This reduces the frequency of IP address changes for clients + which let their lease expire, and makes consecutive DHCPOFFERS + for the same client to (almost always) contain the same + IP address. config BUSYBOX_FEATURE_UDHCPD_WRITE_LEASES_EARLY - bool "Rewrite the lease file at every new acknowledge" + bool "Rewrite lease file at every new acknowledge" default y depends on BUSYBOX_UDHCPD help - If selected, udhcpd will write a new file with leases every - time a new lease has been accepted, thus eliminating the need - to send SIGUSR1 for the initial writing or updating. Any timed - rewriting remains undisturbed. - -config BUSYBOX_FEATURE_UDHCPD_BASE_IP_ON_MAC - bool "Select IP address based on client MAC" - default n - depends on BUSYBOX_UDHCPD - help - If selected, udhcpd will base its selection of IP address to offer - on the client's hardware address. Otherwise udhcpd uses the next - consecutive free address. - - This reduces the frequency of IP address changes for clients - which let their lease expire, and makes consecutive DHCPOFFERS - for the same client to (almost always) contain the same - IP address. + If selected, udhcpd will write a new file with leases every + time a new lease has been accepted, thus eliminating the need + to send SIGUSR1 for the initial writing or updating. Any timed + rewriting remains undisturbed. config BUSYBOX_DHCPD_LEASES_FILE string "Absolute path to lease file" default "/var/lib/misc/udhcpd.leases" depends on BUSYBOX_UDHCPD help - udhcpd stores addresses in a lease file. This is the absolute path - of the file. Normally it is safe to leave it untouched. + udhcpd stores addresses in a lease file. This is the absolute path + of the file. Normally it is safe to leave it untouched. + +config BUSYBOX_DUMPLEASES + bool "dumpleases (5.1 kb)" + default y + help + dumpleases displays the leases written out by the udhcpd. + Lease times are stored in the file by time remaining in lease, or + by the absolute time that it expires in seconds from epoch. + +config BUSYBOX_DHCPRELAY + bool "dhcprelay (5.2 kb)" + default y + help + dhcprelay listens for DHCP requests on one or more interfaces + and forwards these requests to a different interface or DHCP + server. config BUSYBOX_UDHCPC - bool "udhcp client (udhcpc)" + bool "udhcpc (24 kb)" default y select BUSYBOX_PLATFORM_LINUX help - udhcpc is a DHCP client geared primarily toward embedded systems, - while striving to be fully functional and RFC compliant. + udhcpc is a DHCP client geared primarily toward embedded systems, + while striving to be fully functional and RFC compliant. - The udhcp client negotiates a lease with the DHCP server and - runs a script when a lease is obtained or lost. + The udhcp client negotiates a lease with the DHCP server and + runs a script when a lease is obtained or lost. config BUSYBOX_FEATURE_UDHCPC_ARPING bool "Verify that the offered address is free, using ARP ping" default y depends on BUSYBOX_UDHCPC help - If selected, udhcpc will send ARP probes and make sure - the offered address is really not in use by anyone. The client - will DHCPDECLINE the offer if the address is in use, - and restart the discover process. + If selected, udhcpc will send BUSYBOX_ARP probes and make sure + the offered address is really not in use by anyone. The client + will DHCPDECLINE the offer if the address is in use, + and restart the discover process. config BUSYBOX_FEATURE_UDHCPC_SANITIZEOPT bool "Do not pass malformed host and domain names" default y depends on BUSYBOX_UDHCPC help - If selected, udhcpc will check some options (such as option 12 - - hostname) and if they don't look like valid hostnames - (for example, if they start with dash or contain spaces), - they will be replaced with string "bad" when exporting - to the environment. + If selected, udhcpc will check some options (such as option 12 - + hostname) and if they don't look like valid hostnames + (for example, if they start with dash or contain spaces), + they will be replaced with string "bad" when exporting + to the environment. -config BUSYBOX_FEATURE_UDHCP_PORT - bool "Enable '-P port' option for udhcpd and udhcpc" - default n - depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC +config BUSYBOX_UDHCPC_DEFAULT_SCRIPT + string "Absolute path to config script" + default "/usr/share/udhcpc/default.script" + depends on BUSYBOX_UDHCPC || BUSYBOX_UDHCPC6 help - At the cost of ~300 bytes, enables -P port option. - This feature is typically not needed. + This script is called after udhcpc receives an answer. See + examples/udhcp for a working example. Normally it is safe + to leave this untouched. -config BUSYBOX_UDHCP_DEBUG - int "Maximum verbosity level for udhcp applets (0..9)" - default 0 - range 0 9 - depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC || BUSYBOX_DHCPRELAY +# udhcpc6 config is inserted here: +config BUSYBOX_UDHCPC6 + bool "udhcpc6 (21 kb)" + default y + depends on BUSYBOX_FEATURE_IPV6 help - Verbosity can be increased with multiple -v options. - This option controls how high it can be cranked up. + udhcpc6 is a DHCPv6 client - Bigger values result in bigger code. Levels above 1 - are very verbose and useful for debugging only. +config BUSYBOX_FEATURE_UDHCPC6_RFC3646 + bool "Support RFC 3646 (DNS server and search list)" + default y + depends on BUSYBOX_UDHCPC6 + help + List of DNS servers and domain search list can be requested with + "-O dns" and "-O search". If server gives these values, + they will be set in environment variables "dns" and "search". -config BUSYBOX_FEATURE_UDHCP_RFC3397 - bool "Support for RFC3397 domain search (experimental)" +config BUSYBOX_FEATURE_UDHCPC6_RFC4704 + bool "Support RFC 4704 (Client FQDN)" default y - depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC + depends on BUSYBOX_UDHCPC6 help - If selected, both client and server will support passing of domain - search lists via option 119, specified in RFC 3397, - and SIP servers option 120, specified in RFC 3361. + You can request FQDN to be given by server using "-O fqdn". -config BUSYBOX_FEATURE_UDHCP_8021Q - bool "Support for 802.1Q VLAN parameters" +config BUSYBOX_FEATURE_UDHCPC6_RFC4833 + bool "Support RFC 4833 (Timezones)" default y - depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC + depends on BUSYBOX_UDHCPC6 help - If selected, both client and server will support passing of VLAN - ID and priority via options 132 and 133 as per 802.1Q. + You can request POSIX timezone with "-O tz" and timezone name + with "-O timezone". -config BUSYBOX_UDHCPC_DEFAULT_SCRIPT - string "Absolute path to config script" - default "/usr/share/udhcpc/default.script" - depends on BUSYBOX_UDHCPC +config BUSYBOX_FEATURE_UDHCPC6_RFC5970 + bool "Support RFC 5970 (Network Boot)" + default y + depends on BUSYBOX_UDHCPC6 + help + You can request bootfile-url with "-O bootfile_url" and + bootfile-params with "-O bootfile_params". + +comment "Common options for DHCP applets" + depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC || BUSYBOX_UDHCPC6 || BUSYBOX_DHCPRELAY + +config BUSYBOX_FEATURE_UDHCP_PORT + bool "Enable '-P port' option for udhcpd and udhcpc" + default n + depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC || BUSYBOX_UDHCPC6 help - This script is called after udhcpc receives an answer. See - examples/udhcp for a working example. Normally it is safe - to leave this untouched. + At the cost of ~300 bytes, enables -P port option. + This feature is typically not needed. + +config BUSYBOX_UDHCP_DEBUG + int "Maximum verbosity level (0..9)" + default 2 + range 0 9 + depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC || BUSYBOX_UDHCPC6 || BUSYBOX_DHCPRELAY + help + Verbosity can be increased with multiple -v options. + This option controls how high it can be cranked up. + + Bigger values result in bigger code. Levels above 1 + are very verbose and useful for debugging only. config BUSYBOX_UDHCPC_SLACK_FOR_BUGGY_SERVERS int "DHCP options slack buffer size" @@ -150,19 +170,36 @@ config BUSYBOX_UDHCPC_SLACK_FOR_BUGGY_SERVERS range 0 924 depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC help - Some buggy DHCP servers send DHCP offer packets with option - field larger than we expect (which might also be considered a - buffer overflow attempt). These packets are normally discarded. - If circumstances beyond your control force you to support such - servers, this may help. The upper limit (924) makes dhcpc accept - even 1500 byte packets (maximum-sized ethernet packets). - - This option does not make dhcp[cd] emit non-standard - sized packets. - - Known buggy DHCP servers: - 3Com OfficeConnect Remote 812 ADSL Router: - seems to confuse maximum allowed UDP packet size with - maximum size of entire IP packet, and sends packets which are - 28 bytes too large. - Seednet (ISP) VDSL: sends packets 2 bytes too large. + Some buggy DHCP servers send DHCP offer packets with option + field larger than we expect (which might also be considered a + buffer overflow attempt). These packets are normally discarded. + If circumstances beyond your control force you to support such + servers, this may help. The upper limit (924) makes udhcpc accept + even 1500 byte packets (maximum-sized ethernet packets). + + This option does not make udhcp[cd] emit non-standard + sized packets. + + Known buggy DHCP servers: + 3Com OfficeConnect Remote 812 ADSL Router: + seems to confuse maximum allowed UDP packet size with + maximum size of entire IP packet, and sends packets + which are 28 bytes too large. + Seednet (ISP) VDSL: sends packets 2 bytes too large. + +config BUSYBOX_FEATURE_UDHCP_RFC3397 + bool "Support RFC 3397 domain search options" + default y + depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC + help + If selected, both client and server will support passing of domain + search lists via option 119, specified in RFC 3397, + and SIP servers option 120, specified in RFC 3361. + +config BUSYBOX_FEATURE_UDHCP_8021Q + bool "Support 802.1Q VLAN parameters options" + default y + depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC + help + If selected, both client and server will support passing of VLAN + ID and priority via options 132 and 133 as per 802.1Q. -- cgit v1.2.3