[package] dnsmasq: remove redundant code introduced with r20074

[openwrt.git] / 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 65462ef..2215623 100644 (file)
--- a/package/busybox/config/networking/udhcp/Config.in
+++ b/package/busybox/config/networking/udhcp/Config.in
@@ -4,14 +4,12 @@
 #
 
 config BUSYBOX_CONFIG_APP_UDHCPD
 #
 
 config BUSYBOX_CONFIG_APP_UDHCPD

-       bool "udhcp Server (udhcpd)"
+       bool "udhcp server (udhcpd)"

        default n
        help
        default n
        help

-         uDHCPd is a DHCP server geared primarily toward embedded systems,
+         udhcpd is a DHCP server geared primarily toward embedded systems,

          while striving to be fully functional and RFC compliant.
 
          while striving to be fully functional and RFC compliant.
 

-         See http://udhcp.busybox.net for further details.
-

 config BUSYBOX_CONFIG_APP_DHCPRELAY
        bool "dhcprelay"
        default n
 config BUSYBOX_CONFIG_APP_DHCPRELAY
        bool "dhcprelay"
        default n


@@ -30,45 +28,100 @@ config BUSYBOX_CONFIG_APP_DUMPLEASES
          Lease times are stored in the file by time remaining in lease, or
          by the absolute time that it expires in seconds from epoch.
 
          Lease times are stored in the file by time remaining in lease, or
          by the absolute time that it expires in seconds from epoch.
 

-         See http://udhcp.busybox.net for further details.
-

 config BUSYBOX_CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY
        bool "Rewrite the lease file at every new acknowledge"
        default n
        depends on BUSYBOX_CONFIG_APP_UDHCPD
        help
          If selected, udhcpd will write a new file with leases every
 config BUSYBOX_CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY
        bool "Rewrite the lease file at every new acknowledge"
        default n
        depends on BUSYBOX_CONFIG_APP_UDHCPD
        help
          If selected, udhcpd will write a new file with leases every

-         time a new lease has been accepted, thus eleminating the need
-         to send SIGUSR1 for the initial writing, or updating. Any timed
+         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
 
          rewriting remains undisturbed
 

+config BUSYBOX_CONFIG_DHCPD_LEASES_FILE
+       string "Absolute path to lease file"
+       default "/var/run/udhcpd.leases"
+       depends on BUSYBOX_CONFIG_APP_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.
+

 config BUSYBOX_CONFIG_APP_UDHCPC
 config BUSYBOX_CONFIG_APP_UDHCPC

-       bool "udhcp Client (udhcpc)"
+       bool "udhcp client (udhcpc)"

        default y
        help
        default y
        help

-         uDHCPc is a DHCP client geared primarily toward embedded systems,
+         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
          while striving to be fully functional and RFC compliant.
 
          The udhcp client negotiates a lease with the DHCP server and

-         notifies a set of scripts when a lease is obtained or lost.
+         runs a script when a lease is obtained or lost.

 
 

-         See http://udhcp.busybox.net for further details.
+config BUSYBOX_CONFIG_FEATURE_UDHCPC_ARPING
+       bool "Verify that the offered address is free, using ARP ping"
+       default n
+       depends on BUSYBOX_CONFIG_APP_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.

 
 

-config BUSYBOX_CONFIG_FEATURE_UDHCP_DEBUG
-       bool "Compile udhcp with noisy debugging messages"
+config BUSYBOX_CONFIG_FEATURE_UDHCP_PORT
+       bool "Enable '-P port' option for udhcpd and udhcpc"

        default n
        depends on BUSYBOX_CONFIG_APP_UDHCPD || BUSYBOX_CONFIG_APP_UDHCPC
        help
        default n
        depends on BUSYBOX_CONFIG_APP_UDHCPD || BUSYBOX_CONFIG_APP_UDHCPC
        help

-         If selected, udhcpd will output extra debugging output.  If using
-         this option, compile uDHCP with "-g", and do not fork the daemon to
-         the background.
+         At the cost of ~300 bytes, enables -P port option.
+         This feature is typically not needed.
+
+config BUSYBOX_CONFIG_UDHCP_DEBUG
+       int "Maximum verbosity level for udhcp applets (0..9)"
+       default 0
+       range 0 9
+       depends on BUSYBOX_CONFIG_APP_UDHCPD || BUSYBOX_CONFIG_APP_UDHCPC || BUSYBOX_CONFIG_APP_DHCPRELAY
+       help
+         Verbosity can be increased with multiple -v options.
+         This options controls how high it can be cranked up.

 
 

-         See http://udhcp.busybox.net for further details.
+         Bigger values result in bigger code. Levels above 1
+         are very verbose and useful for debugging only.

 
 

-config BUSYBOX_CONFIG_FEATURE_RFC3397
+config BUSYBOX_CONFIG_FEATURE_UDHCP_RFC3397

        bool "Support for RFC3397 domain search (experimental)"
        default y
        depends on BUSYBOX_CONFIG_APP_UDHCPD || BUSYBOX_CONFIG_APP_UDHCPC
        help
          If selected, both client and server will support passing of domain
          search lists via option 119, specified in RFC3397.
        bool "Support for RFC3397 domain search (experimental)"
        default y
        depends on BUSYBOX_CONFIG_APP_UDHCPD || BUSYBOX_CONFIG_APP_UDHCPC
        help
          If selected, both client and server will support passing of domain
          search lists via option 119, specified in RFC3397.

+
+config BUSYBOX_CONFIG_UDHCPC_DEFAULT_SCRIPT
+       string "Absolute path to config script"
+       default "/usr/share/udhcpc/default.script"
+       depends on BUSYBOX_CONFIG_APP_UDHCPC
+       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.
+
+config BUSYBOX_CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS
+       int "DHCP options slack buffer size"
+       default 80
+       range 0 924
+       depends on BUSYBOX_CONFIG_APP_UDHCPD || BUSYBOX_CONFIG_APP_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.