aboutsummaryrefslogtreecommitdiffstats
path: root/package/busybox/config/networking
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-08-20 14:00:34 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-08-20 14:00:34 +0000
commit1e82faaa5e835b00676421b1c63bef541f8ca0d3 (patch)
treeabda8ea9d70f7d10c897cf214028b9037b17f784 /package/busybox/config/networking
parente3d9bc5779a012df82e2c48af3bef81bb011257a (diff)
downloadupstream-1e82faaa5e835b00676421b1c63bef541f8ca0d3.tar.gz
upstream-1e82faaa5e835b00676421b1c63bef541f8ca0d3.tar.bz2
upstream-1e82faaa5e835b00676421b1c63bef541f8ca0d3.zip
upgrade busybox to v1.11.1 and add current upstream fixes
SVN-Revision: 12348
Diffstat (limited to 'package/busybox/config/networking')
-rw-r--r--package/busybox/config/networking/Config.in154
-rw-r--r--package/busybox/config/networking/udhcp/Config.in82
2 files changed, 191 insertions, 45 deletions
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index 0dbe42d8b7..3da608d9b4 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -12,6 +12,21 @@ config BUSYBOX_CONFIG_FEATURE_IPV6
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
@@ -32,6 +47,32 @@ config BUSYBOX_CONFIG_ARPING
help
Ping hosts by ARP packets.
+config BUSYBOX_CONFIG_BRCTL
+ bool "brctl"
+ default n
+ help
+ Manage ethernet bridges.
+ Supports addbr/delbr and addif/delif.
+
+config BUSYBOX_CONFIG_FEATURE_BRCTL_FANCY
+ bool "Fancy options"
+ default n
+ 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 n
+ 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"
default n
@@ -101,7 +142,7 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_USE_SENDFILE
instead of read/write loop.
config BUSYBOX_CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP
- bool "Support reloading the global config file using hup signal"
+ bool "Support reloading of global config file on HUP signal"
default y
depends on BUSYBOX_CONFIG_HTTPD
help
@@ -151,7 +192,7 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_CGI
when specific URLs are requested.
config BUSYBOX_CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
- bool "Enable support for running scripts through an interpreter"
+ bool "Support for running scripts through an interpreter"
default y
depends on BUSYBOX_CONFIG_FEATURE_HTTPD_CGI
help
@@ -162,7 +203,7 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
*.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
@@ -170,17 +211,17 @@ 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
- 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
- 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".
config BUSYBOX_CONFIG_FEATURE_HTTPD_ERROR_PAGES
- bool "Enable support for custom error pages"
+ bool "Support for custom error pages"
default y
depends on BUSYBOX_CONFIG_HTTPD
help
@@ -193,7 +234,7 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_ERROR_PAGES
message.
config BUSYBOX_CONFIG_FEATURE_HTTPD_PROXY
- bool "Enable support for reverse proxy"
+ bool "Support for reverse proxy"
default n
depends on BUSYBOX_CONFIG_HTTPD
help
@@ -251,6 +292,13 @@ config BUSYBOX_CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS
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
@@ -315,14 +363,14 @@ config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN
work.
config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IPV4
- bool "Enable support for IPv4"
+ bool "Support for IPv4"
default n
depends on BUSYBOX_CONFIG_IFUPDOWN
help
If you want ifup/ifdown to talk IPv4, leave this on.
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
@@ -330,7 +378,7 @@ config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IPV6
### UNUSED
###config FEATURE_IFUPDOWN_IPX
-### bool "Enable support for IPX"
+### bool "Support for IPX"
### default n
### depends on IFUPDOWN
### help
@@ -346,7 +394,7 @@ config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_MAPPING
a weird network setup you don't need it.
config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP
- bool "Enable support for external dhcp clients"
+ bool "Support for external dhcp clients"
default n
depends on BUSYBOX_CONFIG_IFUPDOWN
help
@@ -449,7 +497,7 @@ config BUSYBOX_CONFIG_FEATURE_IP_RULE
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
@@ -528,19 +576,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.
- 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
+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_NETMSG
bool "netmsg"
default y
@@ -570,7 +631,7 @@ config BUSYBOX_CONFIG_NETSTAT
netstat prints information about the Linux networking subsystem.
config BUSYBOX_CONFIG_FEATURE_NETSTAT_WIDE
- bool " Enable wide netstat output"
+ bool "Enable wide netstat output"
default y
depends on BUSYBOX_CONFIG_NETSTAT
help
@@ -597,12 +658,6 @@ config BUSYBOX_CONFIG_PING6
help
This will give you a ping that can talk IPv6.
-config BUSYBOX_CONFIG_PSCAN
- bool "pscan"
- default n
- help
- Simple network port scanner.
-
config BUSYBOX_CONFIG_FEATURE_FANCY_PING
bool "Enable fancy ping output"
default y
@@ -611,12 +666,30 @@ config BUSYBOX_CONFIG_FEATURE_FANCY_PING
Make the output from the ping applet include statistics, and at the
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_SENDMAIL
+ bool "sendmail"
+ default n
+ help
+ Barebones sendmail.
+
+config BUSYBOX_CONFIG_FETCHMAIL
+ bool "fetchmail"
+ default n
+ help
+ Barebones fetchmail.
+
config BUSYBOX_CONFIG_SLATTACH
bool "slattach"
default n
@@ -707,28 +780,41 @@ config BUSYBOX_CONFIG_TFTP
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
- depends on BUSYBOX_CONFIG_TFTP
+ depends on BUSYBOX_CONFIG_TFTP || BUSYBOX_CONFIG_TFTPD
help
Add support for the GET command within the TFTP client. This allows
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
- depends on BUSYBOX_CONFIG_TFTP
+ depends on BUSYBOX_CONFIG_TFTP || BUSYBOX_CONFIG_TFTPD
help
Add support for the PUT command within the TFTP client. This allows
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
- bool "Enable \"blocksize\" command"
+ bool "Enable \"blksize\" protocol option"
default n
- depends on BUSYBOX_CONFIG_TFTP
+ depends on BUSYBOX_CONFIG_TFTP || BUSYBOX_CONFIG_TFTPD
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
bool "Enable debug"
@@ -816,4 +902,16 @@ config BUSYBOX_CONFIG_ZCIP
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
diff --git a/package/busybox/config/networking/udhcp/Config.in b/package/busybox/config/networking/udhcp/Config.in
index 65462efee7..891dcf8d83 100644
--- 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
- bool "udhcp Server (udhcpd)"
+ bool "udhcp server (udhcpd)"
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.
- See http://udhcp.busybox.net for further details.
-
config BUSYBOX_CONFIG_APP_DHCPRELAY
bool "dhcprelay"
default n
@@ -30,40 +28,58 @@ 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.
- 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
- 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
+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
- bool "udhcp Client (udhcpc)"
+ bool "udhcp client (udhcpc)"
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
- 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_PORT
+ bool "Enable '-P port' option for udhcpd and udhcpc"
+ default n
+ depends on BUSYBOX_CONFIG_APP_UDHCPD || BUSYBOX_CONFIG_APP_UDHCPC
+ help
+ At the cost of ~300 bytes, enables -P port option.
+ This feature is typically not needed.
config BUSYBOX_CONFIG_FEATURE_UDHCP_DEBUG
bool "Compile udhcp with noisy debugging messages"
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.
-
- See http://udhcp.busybox.net for further details.
+ If selected, udhcpd will output extra debugging output.
config BUSYBOX_CONFIG_FEATURE_RFC3397
bool "Support for RFC3397 domain search (experimental)"
@@ -72,3 +88,35 @@ config BUSYBOX_CONFIG_FEATURE_RFC3397
help
If selected, both client and server will support passing of domain
search lists via option 119, specified in RFC3397.
+
+config BUSYBOX_CONFIG_DHCPC_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.