[scripts] getver: get svn rev from last commit so that we have consistent revision...

[openwrt.git] / package / busybox / config / networking / Config.in

diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index 8df502e..de7484a 100644 (file)
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -12,17 +12,66 @@ config BUSYBOX_CONFIG_FEATURE_IPV6
          Enable IPv6 support in busybox.
          This adds IPv6 support in the networking applets.
 
          Enable IPv6 support in busybox.
          This adds IPv6 support in the networking applets.
 

+config BUSYBOX_CONFIG_FEATURE_PREFER_IPV4_ADDRESS
+       bool "Preferentially use IPv4 addresses from DNS queries"
+       default y
+       depends on BUSYBOX_CONFIG_FEATURE_IPV6
+       help
+         Use IPv4 address of network host if it has one.
+
+         If this option is off, the first returned address will be used.
+         This may cause problems when your DNS server is IPv6-capable and
+         is returning IPv6 host addresses too. If IPv6 address
+         precedes IPv4 one in DNS reply, busybox network applets
+         (e.g. wget) will use IPv6 address. On an IPv6-incapable host
+         or network applets will fail to connect to the host
+         using IPv6 address.
+
+config BUSYBOX_CONFIG_VERBOSE_RESOLUTION_ERRORS
+       bool "Verbose resolution errors"
+       default y
+       help
+         Enable if you are not satisfied with simplistic
+         "can't resolve 'hostname.com'" and want to know more.
+         This may increase size of your executable a bit.
+

 config BUSYBOX_CONFIG_ARP
        bool "arp"
        default n
        help
 config BUSYBOX_CONFIG_ARP
        bool "arp"
        default n
        help

-         Manipulate the system ARP cache
+         Manipulate the system ARP cache.

 
 config BUSYBOX_CONFIG_ARPING
        bool "arping"
        default y
        help
 
 config BUSYBOX_CONFIG_ARPING
        bool "arping"
        default y
        help

-         Ping hosts by ARP packets
+         Ping hosts by ARP packets.
+
+config BUSYBOX_CONFIG_BRCTL
+       bool "brctl"
+       default y
+       help
+         Manage ethernet bridges.
+         Supports addbr/delbr and addif/delif.
+
+config BUSYBOX_CONFIG_FEATURE_BRCTL_FANCY
+       bool "Fancy options"
+       default y
+       depends on BUSYBOX_CONFIG_BRCTL
+       help
+         Add support for extended option like:
+           setageing, setfd, sethello, setmaxage,
+           setpathcost, setportprio, setbridgeprio,
+           stp
+         This adds about 600 bytes.
+
+config BUSYBOX_CONFIG_FEATURE_BRCTL_SHOW
+       bool "Support show, showmac and showstp"
+       default y
+       depends on BUSYBOX_CONFIG_BRCTL && BUSYBOX_CONFIG_FEATURE_BRCTL_FANCY
+       help
+         Add support for option which prints the current config:
+           showmacs, showstp, show

 
 config BUSYBOX_CONFIG_DNSD
        bool "dnsd"
 
 config BUSYBOX_CONFIG_DNSD
        bool "dnsd"


@@ -67,7 +116,7 @@ config BUSYBOX_CONFIG_HOSTNAME
        bool "hostname"
        default n
        help
        bool "hostname"
        default n
        help

-         Show or set the system's host name
+         Show or set the system's host name.

 
 config BUSYBOX_CONFIG_HTTPD
        bool "httpd"
 
 config BUSYBOX_CONFIG_HTTPD
        bool "httpd"


@@ -75,10 +124,27 @@ config BUSYBOX_CONFIG_HTTPD
        help
          Serve web pages via an HTTP server.
 
        help
          Serve web pages via an HTTP server.
 

-config BUSYBOX_CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP
-       bool "Support reloading the global config file using hup signal"
+config BUSYBOX_CONFIG_FEATURE_HTTPD_RANGES
+       bool "Support 'Ranges:' header"
+       default y
+       depends on BUSYBOX_CONFIG_HTTPD
+       help
+         Makes httpd emit "Accept-Ranges: bytes" header and understand
+         "Range: bytes=NNN-[MMM]" header. Allows for resuming interrupted
+         downloads, seeking in multimedia players etc.
+
+config BUSYBOX_CONFIG_FEATURE_HTTPD_USE_SENDFILE
+       bool "Use sendfile system call"

        default n
        depends on BUSYBOX_CONFIG_HTTPD
        default n
        depends on BUSYBOX_CONFIG_HTTPD

+       help
+         When enabled, httpd will use the kernel sendfile() function
+         instead of read/write loop.
+
+config BUSYBOX_CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP
+       bool "Support reloading of global config file on HUP signal"
+       default y
+       depends on BUSYBOX_CONFIG_HTTPD

        help
          This option enables processing of SIGHUP to reload cached
          configuration settings.
        help
          This option enables processing of SIGHUP to reload cached
          configuration settings.


@@ -126,18 +192,18 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_CGI
          when specific URLs are requested.
 
 config BUSYBOX_CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
          when specific URLs are requested.
 
 config BUSYBOX_CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR

-       bool "Enable support for running scripts through an interpreter"
-       default n
+       bool "Support for running scripts through an interpreter"
+       default y

        depends on BUSYBOX_CONFIG_FEATURE_HTTPD_CGI
        help
          This option enables support for running scripts through an
          interpreter. Turn this on if you want PHP scripts to work
        depends on BUSYBOX_CONFIG_FEATURE_HTTPD_CGI
        help
          This option enables support for running scripts through an
          interpreter. Turn this on if you want PHP scripts to work

-         properly. You need to supply an addition line in your httpd
+         properly. You need to supply an additional line in your httpd

          config file:
          *.php:/path/to/your/php
 
 config BUSYBOX_CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
          config file:
          *.php:/path/to/your/php
 
 config BUSYBOX_CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV

-       bool "Support the REMOTE_PORT environment variable for CGI"
+       bool "Set REMOTE_PORT environment variable for CGI"

        default y
        depends on BUSYBOX_CONFIG_FEATURE_HTTPD_CGI
        help
        default y
        depends on BUSYBOX_CONFIG_FEATURE_HTTPD_CGI
        help


@@ -145,15 +211,40 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
          references that contain a unique port number.
 
 config BUSYBOX_CONFIG_FEATURE_HTTPD_ENCODE_URL_STR
          references that contain a unique port number.
 
 config BUSYBOX_CONFIG_FEATURE_HTTPD_ENCODE_URL_STR

-       bool "Enable the -e option for shell script CGI simplification."
+       bool "Enable -e option (useful for CGIs written as shell scripts)"

        default y
        depends on BUSYBOX_CONFIG_HTTPD
        help
        default y
        depends on BUSYBOX_CONFIG_HTTPD
        help

-         This option allows html encoding arbitrary
-         strings for display of the browser.  Output goes to stdout.
-         For example, httpd -e "<Hello World>" as
+         This option allows html encoding of arbitrary strings for display
+         by the browser. Output goes to stdout.
+         For example, httpd -e "<Hello World>" produces

          "&#60Hello&#32World&#62".
 
          "&#60Hello&#32World&#62".
 

+config BUSYBOX_CONFIG_FEATURE_HTTPD_ERROR_PAGES
+       bool "Support for custom error pages"
+       default y
+       depends on BUSYBOX_CONFIG_HTTPD
+       help
+         This option allows you to define custom error pages in
+         the configuration file instead of the default HTTP status
+         error pages. For instance, if you add the line:
+               E404:/path/e404.html
+         in the config file, the server will respond the specified
+         '/path/e404.html' file instead of the terse '404 NOT FOUND'
+         message.
+
+config BUSYBOX_CONFIG_FEATURE_HTTPD_PROXY
+       bool "Support for reverse proxy"
+       default y
+       depends on BUSYBOX_CONFIG_HTTPD
+       help
+         This option allows you to define URLs that will be forwarded
+         to another HTTP server. To setup add the following line to the
+         configuration file
+               P:/url/:http://hostname[:port]/new/path/
+         Then a request to /url/myfile will be forwarded to
+         http://hostname[:port]/new/path/myfile.
+

 config BUSYBOX_CONFIG_IFCONFIG
        bool "ifconfig"
        default y
 config BUSYBOX_CONFIG_IFCONFIG
        bool "ifconfig"
        default y


@@ -173,7 +264,7 @@ config BUSYBOX_CONFIG_FEATURE_IFCONFIG_SLIP
        default n
        depends on BUSYBOX_CONFIG_IFCONFIG
        help
        default n
        depends on BUSYBOX_CONFIG_IFCONFIG
        help

-         Allow "keepalive" and "outfill" support for SLIP.  If you're not
+         Allow "keepalive" and "outfill" support for SLIP. If you're not

          planning on using serial lines, leave this unchecked.
 
 config BUSYBOX_CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
          planning on using serial lines, leave this unchecked.
 
 config BUSYBOX_CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ


@@ -190,7 +281,7 @@ config BUSYBOX_CONFIG_FEATURE_IFCONFIG_HW
        depends on BUSYBOX_CONFIG_IFCONFIG
        help
          Set the hardware address of this interface, if the device driver
        depends on BUSYBOX_CONFIG_IFCONFIG
        help
          Set the hardware address of this interface, if the device driver

-         supports  this  operation.  Currently, we only support the 'ether'
+         supports  this  operation. Currently, we only support the 'ether'

          class.
 
 config BUSYBOX_CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS
          class.
 
 config BUSYBOX_CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS


@@ -201,22 +292,39 @@ config BUSYBOX_CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS
          Setting this will make ifconfig attempt to find the broadcast
          automatically if the value '+' is used.
 
          Setting this will make ifconfig attempt to find the broadcast
          automatically if the value '+' is used.
 

+config BUSYBOX_CONFIG_IFENSLAVE
+       bool "ifenslave"
+       default n
+       help
+         Userspace application to bind several interfaces
+         to a logical interface (use with kernel bonding driver).
+

 config BUSYBOX_CONFIG_IFUPDOWN
        bool "ifupdown"
        default n
 config BUSYBOX_CONFIG_IFUPDOWN
        bool "ifupdown"
        default n

-       select BUSYBOX_CONFIG_RUN_PARTS

        help
        help

-         Activate or deactivate the specified interfaces.  This applet makes
+         Activate or deactivate the specified interfaces. This applet makes

          use of either "ifconfig" and "route" or the "ip" command to actually
          use of either "ifconfig" and "route" or the "ip" command to actually

-         configure network interfaces.  Therefore, you will probably also want
+         configure network interfaces. Therefore, you will probably also want

          to enable either IFCONFIG and ROUTE, or enable
          to enable either IFCONFIG and ROUTE, or enable

-         FEATURE_IFUPDOWN_IP and the various IP options.  Of
+         FEATURE_IFUPDOWN_IP and the various IP options. Of

          course you could use non-busybox versions of these programs, so
          against my better judgement (since this will surely result in plenty
          of support questions on the mailing list), I do not force you to
          course you could use non-busybox versions of these programs, so
          against my better judgement (since this will surely result in plenty
          of support questions on the mailing list), I do not force you to

-         enable these additional options.  It is up to you to supply either
-         "ifconfig" and "route" or the "ip" command, either via busybox or via
-         standalone utilities.
+         enable these additional options. It is up to you to supply either
+         "ifconfig", "route" and "run-parts" or the "ip" command, either
+         via busybox or via standalone utilities.
+
+config BUSYBOX_CONFIG_IFUPDOWN_IFSTATE_PATH
+       string "Absolute path to ifstate file"
+       default n
+       depends on BUSYBOX_CONFIG_IFUPDOWN
+       help
+         ifupdown keeps state information in a file called ifstate.
+         Typically it is located in /var/run/ifstate, however
+         some distributions tend to put it in other places
+         (debian, for example, uses /etc/network/run/ifstate).
+         This config option defines location of ifstate.

 
 config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP
        bool "Use ip applet"
 
 config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP
        bool "Use ip applet"


@@ -255,26 +363,27 @@ config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN
          work.
 
 config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IPV4
          work.
 
 config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IPV4

-       bool "Enable support for IPv4"
+       bool "Support for IPv4"

        default n
        depends on BUSYBOX_CONFIG_IFUPDOWN
        help
        default n
        depends on BUSYBOX_CONFIG_IFUPDOWN
        help

-         If you want busybox to talk IPv4, leave this on.
+         If you want ifup/ifdown to talk IPv4, leave this on.

 
 config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IPV6
 
 config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IPV6

-       bool "Enable support for IPv6"
+       bool "Support for IPv6"

        default n
        depends on BUSYBOX_CONFIG_IFUPDOWN && BUSYBOX_CONFIG_FEATURE_IPV6
        help
          If you need support for IPv6, turn this option on.
 
        default n
        depends on BUSYBOX_CONFIG_IFUPDOWN && BUSYBOX_CONFIG_FEATURE_IPV6
        help
          If you need support for IPv6, turn this option on.
 

-config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IPX
-       bool "Enable support for IPX"
-       default n
-       depends on BUSYBOX_CONFIG_IFUPDOWN
-       help
-         If this option is selected you can use busybox to work with IPX
-         networks.
+### UNUSED
+###config FEATURE_IFUPDOWN_IPX
+###    bool "Support for IPX"
+###    default n
+###    depends on IFUPDOWN
+###    help
+###      If this option is selected you can use busybox to work with IPX
+###      networks.

 
 config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_MAPPING
        bool "Enable mapping support"
 
 config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_MAPPING
        bool "Enable mapping support"


@@ -284,6 +393,16 @@ config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_MAPPING
          This enables support for the "mapping" stanza, unless you have
          a weird network setup you don't need it.
 
          This enables support for the "mapping" stanza, unless you have
          a weird network setup you don't need it.
 

+config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP
+       bool "Support for external dhcp clients"
+       default n
+       depends on BUSYBOX_CONFIG_IFUPDOWN
+       help
+         This enables support for the external dhcp clients. Clients are
+         tried in the following order: dhcpcd, dhclient, pump and udhcpc.
+         Otherwise, if udhcpc applet is enabled, it is used.
+         Otherwise, ifup/ifdown will have no support for DHCP.
+

 config BUSYBOX_CONFIG_INETD
        bool "inetd"
        default n
 config BUSYBOX_CONFIG_INETD
        bool "inetd"
        default n


@@ -330,7 +449,7 @@ config BUSYBOX_CONFIG_FEATURE_INETD_RPC
        bool "Support RPC services"
        default n
        depends on BUSYBOX_CONFIG_INETD
        bool "Support RPC services"
        default n
        depends on BUSYBOX_CONFIG_INETD

-       depends on BUSYBOX_CONFIG_FEATURE_HAVE_RPC
+       select BUSYBOX_CONFIG_FEATURE_HAVE_RPC

        help
          Support Sun-RPC based services
 
        help
          Support Sun-RPC based services
 


@@ -339,7 +458,7 @@ config BUSYBOX_CONFIG_IP
        default n
        help
          The "ip" applet is a TCP/IP interface configuration and routing
        default n
        help
          The "ip" applet is a TCP/IP interface configuration and routing

-         utility.  You generally don't need "ip" to use busybox with
+         utility. You generally don't need "ip" to use busybox with

          TCP/IP.
 
 config BUSYBOX_CONFIG_FEATURE_IP_ADDRESS
          TCP/IP.
 
 config BUSYBOX_CONFIG_FEATURE_IP_ADDRESS


@@ -378,7 +497,7 @@ config BUSYBOX_CONFIG_FEATURE_IP_RULE
          Add support for rule commands to "ip".
 
 config BUSYBOX_CONFIG_FEATURE_IP_SHORT_FORMS
          Add support for rule commands to "ip".
 
 config BUSYBOX_CONFIG_FEATURE_IP_SHORT_FORMS

-       bool "Support short forms of ip commands."
+       bool "Support short forms of ip commands"

        default n
        depends on BUSYBOX_CONFIG_IP
        help
        default n
        depends on BUSYBOX_CONFIG_IP
        help


@@ -387,10 +506,21 @@ config BUSYBOX_CONFIG_FEATURE_IP_SHORT_FORMS
          ip link   -> iplink
          ip route  -> iproute
          ip tunnel -> iptunnel
          ip link   -> iplink
          ip route  -> iproute
          ip tunnel -> iptunnel

+         ip rule   -> iprule

 
          Say N unless you desparately need the short form of the ip
          object commands.
 
 
          Say N unless you desparately need the short form of the ip
          object commands.
 

+config BUSYBOX_CONFIG_FEATURE_IP_RARE_PROTOCOLS
+       bool "Support displaying rarely used link types"
+       default n
+       depends on BUSYBOX_CONFIG_IP
+       help
+         If you are not going to use links of type "frad", "econet",
+         "bif" etc, you probably don't need to enable this.
+         Ethernet, wireless, infrared, ppp/slip, ip tunnelling
+         link types are supported without this option selected.
+

 config BUSYBOX_CONFIG_IPADDR
        bool
        default n
 config BUSYBOX_CONFIG_IPADDR
        bool
        default n


@@ -428,7 +558,8 @@ config BUSYBOX_CONFIG_FEATURE_IPCALC_FANCY
        default n
        depends on BUSYBOX_CONFIG_IPCALC
        help
        default n
        depends on BUSYBOX_CONFIG_IPCALC
        help

-         Adds the options hostname, prefix and silent to the output of "ipcalc".
+         Adds the options hostname, prefix and silent to the output of
+         "ipcalc".

 
 config BUSYBOX_CONFIG_FEATURE_IPCALC_LONG_OPTIONS
        bool "Enable long options"
 
 config BUSYBOX_CONFIG_FEATURE_IPCALC_LONG_OPTIONS
        bool "Enable long options"


@@ -446,19 +577,32 @@ config BUSYBOX_CONFIG_NAMEIF
          Renamed interfaces MUST be in the down state.
          It is possible to use a file (default: /etc/mactab)
          with list of new interface names and MACs.
          Renamed interfaces MUST be in the down state.
          It is possible to use a file (default: /etc/mactab)
          with list of new interface names and MACs.

-         Maximum interface name length: IF_NAMESIZE = 16
+         Maximum interface name length: IFNAMSIZ = 16

          File fields are separated by space or tab.
          File format:
          # Comment
          new_interface_name    XX:XX:XX:XX:XX:XX
 
          File fields are separated by space or tab.
          File format:
          # Comment
          new_interface_name    XX:XX:XX:XX:XX:XX
 

+config BUSYBOX_CONFIG_FEATURE_NAMEIF_EXTENDED
+       bool "Extended nameif"
+       default n
+       depends on BUSYBOX_CONFIG_NAMEIF
+       help
+         This extends the nameif syntax to support the bus_info and driver
+         checks. The syntax is compatible to the normal nameif.
+         File format:
+           new_interface_name  driver=asix bus=usb-0000:00:08.2-3
+           new_interface_name  bus=usb-0000:00:08.2-3 00:80:C8:38:91:B5
+           new_interface_name  mac=00:80:C8:38:91:B5
+           new_interface_name  00:80:C8:38:91:B5
+

 config BUSYBOX_CONFIG_NC
        bool "nc"
        default y
        help
          A simple Unix utility which reads and writes data across network
          connections.
 config BUSYBOX_CONFIG_NC
        bool "nc"
        default y
        help
          A simple Unix utility which reads and writes data across network
          connections.

-         
+

 config BUSYBOX_CONFIG_NETMSG
        bool "netmsg"
        default y
 config BUSYBOX_CONFIG_NETMSG
        bool "netmsg"
        default y


@@ -466,7 +610,7 @@ config BUSYBOX_CONFIG_NETMSG
          simple program for sending udp broadcast messages
 
 config BUSYBOX_CONFIG_NC_SERVER
          simple program for sending udp broadcast messages
 
 config BUSYBOX_CONFIG_NC_SERVER

-       bool "Netcat server options (-lp)"
+       bool "Netcat server options (-l)"

        default n
        depends on BUSYBOX_CONFIG_NC
        help
        default n
        depends on BUSYBOX_CONFIG_NC
        help


@@ -487,6 +631,22 @@ config BUSYBOX_CONFIG_NETSTAT
        help
          netstat prints information about the Linux networking subsystem.
 
        help
          netstat prints information about the Linux networking subsystem.
 

+config BUSYBOX_CONFIG_FEATURE_NETSTAT_WIDE
+       bool "Enable wide netstat output"
+       default y
+       depends on BUSYBOX_CONFIG_NETSTAT
+       help
+         Add support for wide columns. Useful when displaying IPv6 addresses
+         (-W option).
+
+config BUSYBOX_CONFIG_FEATURE_NETSTAT_PRG
+       bool "Enable PID/Program name output"
+       default y
+       depends on BUSYBOX_CONFIG_NETSTAT
+       help
+         Add support for -p flag to print out PID and program name.
+         +700 bytes of code.
+

 config BUSYBOX_CONFIG_NSLOOKUP
        bool "nslookup"
        default y
 config BUSYBOX_CONFIG_NSLOOKUP
        bool "nslookup"
        default y


@@ -500,35 +660,50 @@ config BUSYBOX_CONFIG_PING
          ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to
          elicit an ICMP ECHO_RESPONSE from a host or gateway.
 
          ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to
          elicit an ICMP ECHO_RESPONSE from a host or gateway.
 

-config BUSYBOX_CONFIG_FEATURE_FANCY_PING
-       bool "Enable fancy ping output"
-       default y
-       depends on BUSYBOX_CONFIG_PING
-       help
-         Make the output from the ping applet include statistics, and at the
-         same time provide full support for ICMP packets.
-

 config BUSYBOX_CONFIG_PING6
        bool "ping6"
        default y
 config BUSYBOX_CONFIG_PING6
        bool "ping6"
        default y

-       depends on BUSYBOX_CONFIG_FEATURE_IPV6
+       depends on BUSYBOX_CONFIG_FEATURE_IPV6 && BUSYBOX_CONFIG_PING

        help
          This will give you a ping that can talk IPv6.
 
        help
          This will give you a ping that can talk IPv6.
 

-config BUSYBOX_CONFIG_FEATURE_FANCY_PING6
-       bool "Enable fancy ping6 output"
+config BUSYBOX_CONFIG_FEATURE_FANCY_PING
+       bool "Enable fancy ping output"

        default y
        default y

-       depends on BUSYBOX_CONFIG_PING6
+       depends on BUSYBOX_CONFIG_PING

        help
        help

-         Make the output from the ping6 applet include statistics, and at the
+         Make the output from the ping applet include statistics, and at the

          same time provide full support for ICMP packets.
 
          same time provide full support for ICMP packets.
 

+config BUSYBOX_CONFIG_PSCAN
+       bool "pscan"
+       default n
+       help
+         Simple network port scanner.
+

 config BUSYBOX_CONFIG_ROUTE
        bool "route"
        default y
        help
          Route displays or manipulates the kernel's IP routing tables.
 
 config BUSYBOX_CONFIG_ROUTE
        bool "route"
        default y
        help
          Route displays or manipulates the kernel's IP routing tables.
 

+config BUSYBOX_CONFIG_SLATTACH
+       bool "slattach"
+       default n
+       help
+         slattach is a small utility to attach network interfaces to serial
+         lines.
+
+#config TC
+#      bool "tc"
+#      default n
+#      help
+#        show / manipulate traffic control settings
+#
+#config FEATURE_TC_INGRESS
+#      def_bool n
+#      depends on TC
+

 config BUSYBOX_CONFIG_TELNET
        bool "telnet"
        default y
 config BUSYBOX_CONFIG_TELNET
        bool "telnet"
        default y


@@ -542,7 +717,7 @@ config BUSYBOX_CONFIG_FEATURE_TELNET_TTYPE
        depends on BUSYBOX_CONFIG_TELNET
        help
          Setting this option will forward the TERM environment variable to the
        depends on BUSYBOX_CONFIG_TELNET
        help
          Setting this option will forward the TERM environment variable to the

-         remote host you are connecting to.  This is useful to make sure that
+         remote host you are connecting to. This is useful to make sure that

          things like ANSI colors and other control sequences behave.
 
 config BUSYBOX_CONFIG_FEATURE_TELNET_AUTOLOGIN
          things like ANSI colors and other control sequences behave.
 
 config BUSYBOX_CONFIG_FEATURE_TELNET_AUTOLOGIN


@@ -561,9 +736,9 @@ config BUSYBOX_CONFIG_TELNETD
        select BUSYBOX_CONFIG_FEATURE_SYSLOG
        help
          A daemon for the TELNET protocol, allowing you to log onto the host
        select BUSYBOX_CONFIG_FEATURE_SYSLOG
        help
          A daemon for the TELNET protocol, allowing you to log onto the host

-         running the daemon.  Please keep in mind that the TELNET protocol
-         sends passwords in plain text.  If you can't afford the space for an
-         SSH daemon and you trust your network, you may say 'y' here.  As a
+         running the daemon. Please keep in mind that the TELNET protocol
+         sends passwords in plain text. If you can't afford the space for an
+         SSH daemon and you trust your network, you may say 'y' here. As a

          more secure alternative, you should seriously consider installing the
          very small Dropbear SSH daemon instead:
                http://matt.ucc.asn.au/dropbear/dropbear.html
          more secure alternative, you should seriously consider installing the
          very small Dropbear SSH daemon instead:
                http://matt.ucc.asn.au/dropbear/dropbear.html


@@ -589,7 +764,7 @@ config BUSYBOX_CONFIG_TELNETD
                  mount -t devpts devpts /dev/pts
 
          You need to be sure that Busybox has LOGIN and
                  mount -t devpts devpts /dev/pts
 
          You need to be sure that Busybox has LOGIN and

-         FEATURE_SUID enabled.  And finally, you should make
+         FEATURE_SUID enabled. And finally, you should make

          certain that Busybox has been installed setuid root:
 
                chown root.root /bin/busybox
          certain that Busybox has been installed setuid root:
 
                chown root.root /bin/busybox


@@ -609,39 +784,52 @@ config BUSYBOX_CONFIG_TFTP
        bool "tftp"
        default n
        help
        bool "tftp"
        default n
        help

-         This enables the Trivial File Transfer Protocol client program.  TFTP
+         This enables the Trivial File Transfer Protocol client program. TFTP

          is usually used for simple, small transfers such as a root image
          for a network-enabled bootloader.
 
          is usually used for simple, small transfers such as a root image
          for a network-enabled bootloader.
 

+config BUSYBOX_CONFIG_TFTPD
+       bool "tftpd"
+       default n
+       help
+         This enables the Trivial File Transfer Protocol server program.
+         It expects that stdin is a datagram socket and a packet
+         is already pending on it. It will exit after one transfer.
+         In other words: it should be run from inetd in nowait mode,
+         or from udpsvd. Example: "udpsvd -E 0 69 tftpd DIR"
+

 config BUSYBOX_CONFIG_FEATURE_TFTP_GET
        bool "Enable \"get\" command"
        default n
 config BUSYBOX_CONFIG_FEATURE_TFTP_GET
        bool "Enable \"get\" command"
        default n

-       depends on BUSYBOX_CONFIG_TFTP
+       depends on BUSYBOX_CONFIG_TFTP || BUSYBOX_CONFIG_TFTPD

        help
        help

-         Add support for the GET command within the TFTP client.  This allows
+         Add support for the GET command within the TFTP client. This allows

          a client to retrieve a file from a TFTP server.
          a client to retrieve a file from a TFTP server.

+         Also enable upload support in tftpd, if tftpd is selected.

 
 config BUSYBOX_CONFIG_FEATURE_TFTP_PUT
        bool "Enable \"put\" command"
        default n
 
 config BUSYBOX_CONFIG_FEATURE_TFTP_PUT
        bool "Enable \"put\" command"
        default n

-       depends on BUSYBOX_CONFIG_TFTP
+       depends on BUSYBOX_CONFIG_TFTP || BUSYBOX_CONFIG_TFTPD

        help
        help

-         Add support for the PUT command within the TFTP client.  This allows
+         Add support for the PUT command within the TFTP client. This allows

          a client to transfer a file to a TFTP server.
          a client to transfer a file to a TFTP server.

+         Also enable download support in tftpd, if tftpd is selected.

 
 config BUSYBOX_CONFIG_FEATURE_TFTP_BLOCKSIZE
 
 config BUSYBOX_CONFIG_FEATURE_TFTP_BLOCKSIZE

-       bool "Enable \"blocksize\" command"
+       bool "Enable \"blksize\" protocol option"

        default n
        default n

-       depends on BUSYBOX_CONFIG_TFTP
+       depends on BUSYBOX_CONFIG_TFTP || BUSYBOX_CONFIG_TFTPD

        help
        help

-         Allow the client to specify the desired block size for transfers.
+         Allow tftp to specify block size, and tftpd to understand
+         "blksize" option.

 
 

-config BUSYBOX_CONFIG_DEBUG_TFTP
+config BUSYBOX_CONFIG_TFTP_DEBUG

        bool "Enable debug"
        default n
        depends on BUSYBOX_CONFIG_TFTP
        help
        bool "Enable debug"
        default n
        depends on BUSYBOX_CONFIG_TFTP
        help

-         Enable debug settings for tftp.  This is useful if you're running
+         Enable debug settings for tftp. This is useful if you're running

          into problems with tftp as the protocol doesn't help you much when
          you run into problems.
 
          into problems with tftp as the protocol doesn't help you much when
          you run into problems.
 


@@ -656,7 +844,7 @@ config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_VERBOSE
        default y
        depends on BUSYBOX_CONFIG_TRACEROUTE
        help
        default y
        depends on BUSYBOX_CONFIG_TRACEROUTE
        help

-         Add some verbosity to traceroute.  This includes amongst other things
+         Add some verbosity to traceroute. This includes amongst other things

          hostnames and ICMP response types.
 
 config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE
          hostnames and ICMP response types.
 
 config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE


@@ -703,13 +891,6 @@ config BUSYBOX_CONFIG_FEATURE_WGET_AUTHENTICATION
        help
          Support authenticated HTTP transfers.
 
        help
          Support authenticated HTTP transfers.
 

-config BUSYBOX_CONFIG_FEATURE_WGET_IP6_LITERAL
-       bool "Enable IPv6 literal addresses"
-       default y
-       depends on BUSYBOX_CONFIG_WGET && BUSYBOX_CONFIG_FEATURE_IPV6
-       help
-         Support IPv6 address literal notation in URLs.
-

 config BUSYBOX_CONFIG_FEATURE_WGET_LONG_OPTIONS
        bool "Enable long options"
        default y
 config BUSYBOX_CONFIG_FEATURE_WGET_LONG_OPTIONS
        bool "Enable long options"
        default y


@@ -729,4 +910,18 @@ config BUSYBOX_CONFIG_ZCIP
          See http://www.zeroconf.org for further details, and "zcip.script"
          in the busybox examples.
 
          See http://www.zeroconf.org for further details, and "zcip.script"
          in the busybox examples.
 

+config BUSYBOX_CONFIG_TCPSVD
+       bool "tcpsvd"
+       default n
+       help
+         tcpsvd listens on a TCP port and runs a program for each new
+         connection.
+
+config BUSYBOX_CONFIG_UDPSVD
+       bool "udpsvd"
+       default n
+       help
+         udpsvd listens on an UDP port and runs a program for each new
+         connection.
+

 endmenu
 endmenu