Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/networking

Timestamp:

Feb 25, 2011, 9:26:54 PM (14 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

Location:

branches/2.2.9/mindi-busybox/networking

Files:

• Config.in (modified) (51 diffs)
• Config.src (added)
• Kbuild (modified) (4 diffs)
• Kbuild.src (added)
• arp.c (modified) (8 diffs)
• arping.c (modified) (21 diffs)
• brctl.c (added)
• dnsd.c (modified) (6 diffs)
• ether-wake.c (modified) (8 diffs)
• ftpd.c (added)
• ftpgetput.c (modified) (11 diffs)
• hostname.c (modified) (2 diffs)
• httpd.c (modified) (79 diffs)
• httpd_indexcgi.c (modified) (8 diffs)
• httpd_post_upload.txt (added)
• httpd_ssi.c (added)
• ifconfig.c (modified) (15 diffs)
• ifenslave.c (added)
• ifplugd.c (added)
• ifupdown.c (modified) (50 diffs)
• inetd.c (modified) (22 diffs)
• interface.c (modified) (47 diffs)
• ip.c (modified) (2 diffs)
• ipcalc.c (modified) (7 diffs)
• isrv.c (modified) (1 diff)
• isrv.h (modified) (2 diffs)
• isrv_identd.c (modified) (6 diffs)
• libiproute/Kbuild (modified) (2 diffs)
• libiproute/Kbuild.src (added)
• libiproute/ip_common.h (modified) (2 diffs)
• libiproute/ip_parse_common_args.c (modified) (2 diffs)
• libiproute/ipaddress.c (modified) (28 diffs)
• libiproute/iplink.c (modified) (16 diffs)
• libiproute/iproute.c (modified) (36 diffs)
• libiproute/iprule.c (modified) (19 diffs)
• libiproute/iptunnel.c (modified) (26 diffs)
• libiproute/libnetlink.c (modified) (26 diffs)
• libiproute/libnetlink.h (modified) (2 diffs)
• libiproute/ll_addr.c (modified) (4 diffs)
• libiproute/ll_map.c (modified) (12 diffs)
• libiproute/ll_map.h (modified) (1 diff)
• libiproute/ll_proto.c (modified) (4 diffs)
• libiproute/ll_types.c (modified) (2 diffs)
• libiproute/rt_names.c (modified) (8 diffs)
• libiproute/rt_names.h (modified) (1 diff)
• libiproute/rtm_map.c (modified) (6 diffs)
• libiproute/rtm_map.h (modified) (1 diff)
• libiproute/utils.c (modified) (10 diffs)
• libiproute/utils.h (modified) (7 diffs)
• nameif.c (modified) (3 diffs)
• nbd-client.c (added)
• nc.c (modified) (10 diffs)
• nc_bloaty.c (modified) (36 diffs)
• netstat.c (modified) (15 diffs)
• nslookup.c (modified) (7 diffs)
• ntpd.c (added)
• ntpd_simple.c (added)
• ping.c (modified) (38 diffs)
• pscan.c (modified) (7 diffs)
• route.c (modified) (17 diffs)
• slattach.c (modified) (11 diffs)
• tc.c (added)
• tcpudp.c (added)
• tcpudp_perhost.c (added)
• tcpudp_perhost.h (added)
• telnet.c (modified) (25 diffs)
• telnetd.c (modified) (6 diffs)
• telnetd.ctrlSQ.patch (added)
• tftp.c (modified) (14 diffs)
• traceroute.c (modified) (18 diffs)
• tunctl.c (added)
• udhcp/Config.in (modified) (4 diffs)
• udhcp/Config.src (added)
• udhcp/Kbuild (modified) (1 diff)
• udhcp/Kbuild.src (added)
• udhcp/arpping.c (modified) (5 diffs)
• udhcp/common.c (modified) (1 diff)
• udhcp/common.h (modified) (1 diff)
• udhcp/dhcpc.c (modified) (8 diffs)
• udhcp/dhcpc.h (modified) (1 diff)
• udhcp/dhcpd.c (modified) (9 diffs)
• udhcp/dhcpd.h (modified) (2 diffs)
• udhcp/dhcprelay.c (modified) (12 diffs)
• udhcp/domain_codec.c (modified) (9 diffs)
• udhcp/dumpleases.c (modified) (3 diffs)
• udhcp/files.c (modified) (5 diffs)
• udhcp/leases.c (modified) (2 diffs)
• udhcp/packet.c (modified) (7 diffs)
• udhcp/signalpipe.c (modified) (2 diffs)
• udhcp/socket.c (modified) (7 diffs)
• udhcp/static_leases.c (modified) (1 diff)
• vconfig.c (modified) (5 diffs)
• wget.c (modified) (11 diffs)
• zcip.c (modified) (35 diffs)

branches/2.2.9/mindi-busybox/networking/Config.in

@@ +1 @@
+# DO NOT EDIT. This file is generated from Config.src
 #
 # For a description of the syntax of this configuration file,
@@ -6 +7 @@
 menu "Networking Utilities"
 
+config NBDCLIENT
+    bool "nbd-client"
+    default y
+    help
+      Network block device client
+config NC
+    bool "nc"
+    default y
+    help
+      A simple Unix utility which reads and writes data across network
+      connections.
+
+config NC_SERVER
+    bool "Netcat server options (-l)"
+    default y
+    depends on NC
+    help
+      Allow netcat to act as a server.
+
+config NC_EXTRA
+    bool "Netcat extensions (-eiw and filename)"
+    default y
+    depends on NC
+    help
+      Add -e (support for executing the rest of the command line after
+      making or receiving a successful connection), -i (delay interval for
+      lines sent), -w (timeout for initial connection).
+
+config NC_110_COMPAT
+    bool "Netcat 1.10 compatibility (+2.5k)"
+    default n  # off specially for Rob
+    depends on NC
+    help
+      This option makes nc closely follow original nc-1.10.
+      The code is about 2.5k bigger. It enables
+      -s ADDR, -n, -u, -v, -o FILE, -z options, but loses
+      busybox-specific extensions: -f FILE and -ll.
+
 config FEATURE_IPV6
     bool "Enable IPv6 support"
-    default n
+    default y
     help
       Enable IPv6 support in busybox.
       This adds IPv6 support in the networking applets.
+
+config FEATURE_UNIX_LOCAL
+    bool "Enable Unix domain socket support (usually not needed)"
+    default n
+    help
+      Enable Unix domain socket support in all busybox networking
+      applets.  Address of the form local:/path/to/unix/socket
+      will be recognized.
+
+      This extension is almost never used in real world usage.
+      You most likely want to say N.
+
+config FEATURE_PREFER_IPV4_ADDRESS
+    bool "Prefer IPv4 addresses from DNS queries"
+    default y
+    depends on 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 VERBOSE_RESOLUTION_ERRORS
@@ -23 +88 @@
 config ARP
     bool "arp"
-    default n
+    default y
+    depends on PLATFORM_LINUX
     help
       Manipulate the system ARP cache.
@@ -29 +95 @@
 config ARPING
     bool "arping"
-    default n
+    default y
+    depends on PLATFORM_LINUX
     help
       Ping hosts by ARP packets.
+
+config BRCTL
+    bool "brctl"
+    default y
+    depends on PLATFORM_LINUX
+    help
+      Manage ethernet bridges.
+      Supports addbr/delbr and addif/delif.
+
+config FEATURE_BRCTL_FANCY
+    bool "Fancy options"
+    default y
+    depends on BRCTL
+    help
+      Add support for extended option like:
+        setageing, setfd, sethello, setmaxage,
+        setpathcost, setportprio, setbridgeprio,
+        stp
+      This adds about 600 bytes.
+
+config FEATURE_BRCTL_SHOW
+    bool "Support show, showmac and showstp"
+    default y
+    depends on BRCTL && FEATURE_BRCTL_FANCY
+    help
+      Add support for option which prints the current config:
+        showmacs, showstp, show
 
 config DNSD
     bool "dnsd"
-    default n
+    default y
     help
       Small and static DNS server daemon.
@@ -41 +135 @@
 config ETHER_WAKE
     bool "ether-wake"
-    default n
+    default y
+    depends on PLATFORM_LINUX
     help
       Send a magic packet to wake up sleeping machines.
@@ -47 +142 @@
 config FAKEIDENTD
     bool "fakeidentd"
-    default n
+    default y
     select FEATURE_SYSLOG
     help
@@ -53 +148 @@
       fake value on any query.
 
+config FTPD
+    bool "ftpd"
+    default y
+    help
+      simple FTP daemon. You have to run it via inetd.
+
+config FEATURE_FTP_WRITE
+    bool "Enable upload commands"
+    default y
+    depends on FTPD
+    help
+      Enable all kinds of FTP upload commands (-w option)
+
+config FEATURE_FTPD_ACCEPT_BROKEN_LIST
+    bool "Enable workaround for RFC-violating clients"
+    default y
+    depends on FTPD
+    help
+      Some ftp clients (among them KDE's Konqueror) issue illegal
+      "LIST -l" requests. This option works around such problems.
+      It might prevent you from listing files starting with "-" and
+      it increases the code size by ~40 bytes.
+      Most other ftp servers seem to behave similar to this.
+
 config FTPGET
     bool "ftpget"
-    default n
+    default y
     help
       Retrieve a remote file via FTP.
@@ -61 +180 @@
 config FTPPUT
     bool "ftpput"
-    default n
+    default y
     help
       Store a remote file via FTP.
@@ -67 +186 @@
 config FEATURE_FTPGETPUT_LONG_OPTIONS
     bool "Enable long options in ftpget/ftpput"
-    default n
-    depends on GETOPT_LONG && (FTPGET || FTPPUT)
+    default y
+    depends on LONG_OPTS && (FTPGET || FTPPUT)
     help
       Support long options for the ftpget/ftpput applet.
@@ -74 +193 @@
 config HOSTNAME
     bool "hostname"
-    default n
+    default y
     help
       Show or set the system's host name.
@@ -80 +199 @@
 config HTTPD
     bool "httpd"
-    default n
+    default y
     help
       Serve web pages via an HTTP server.
+
+config FEATURE_HTTPD_RANGES
+    bool "Support 'Ranges:' header"
+    default y
+    depends on 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 FEATURE_HTTPD_USE_SENDFILE
     bool "Use sendfile system call"
-    default n
+    default y
     depends on HTTPD
     help
@@ -92 +220 @@
       instead of read/write loop.
 
-config FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP
-    bool "Support reloading the global config file using hup signal"
-    default n
-    depends on HTTPD
-    help
-      This option enables processing of SIGHUP to reload cached
-      configuration settings.
-
 config FEATURE_HTTPD_SETUID
     bool "Enable -u <user> option"
-    default n
+    default y
     depends on HTTPD
     help
@@ -120 +240 @@
 config FEATURE_HTTPD_AUTH_MD5
     bool "Support MD5 crypted passwords for http Authentication"
-    default n
+    default y
     depends on FEATURE_HTTPD_BASIC_AUTH
     help
@@ -126 +246 @@
       using md5 passwords.
 
-config FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES
-    bool "Support loading additional MIME types at run-time"
-    default n
-    depends on HTTPD
-    help
-      This option enables support for additional MIME types at
-      run-time to be specified in the configuration file.
-
 config FEATURE_HTTPD_CGI
     bool "Support Common Gateway Interface (CGI)"
@@ -143 +255 @@
 
 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 FEATURE_HTTPD_CGI
     help
@@ -154 +266 @@
 
 config FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
-    bool "Support the REMOTE_PORT environment variable for CGI"
-    default n
+    bool "Set REMOTE_PORT environment variable for CGI"
+    default y
     depends on FEATURE_HTTPD_CGI
     help
@@ -162 +274 @@
 
 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 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 FEATURE_HTTPD_ERROR_PAGES
-    bool "Enable support for custom error pages"
-    default n
+    bool "Support for custom error pages"
+    default y
     depends on HTTPD
     help
@@ -184 +296 @@
       message.
 
+config FEATURE_HTTPD_PROXY
+    bool "Support for reverse proxy"
+    default y
+    depends on 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 FEATURE_HTTPD_GZIP
+    bool "Support for GZIP content encoding"
+    default y
+    depends on HTTPD
+    help
+      Makes httpd send files using GZIP content encoding if the
+      client supports it and a pre-compressed <file>.gz exists.
+
 config IFCONFIG
     bool "ifconfig"
-    default n
+    default y
+    depends on PLATFORM_LINUX
     help
       Ifconfig is used to configure the kernel-resident network interfaces.
@@ -200 +333 @@
 config FEATURE_IFCONFIG_SLIP
     bool "Enable slip-specific options \"keepalive\" and \"outfill\""
-    default n
+    default y
     depends on 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 FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
     bool "Enable options \"mem_start\", \"io_addr\", and \"irq\""
-    default n
+    default y
     depends on IFCONFIG
     help
@@ -220 +353 @@
     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 FEATURE_IFCONFIG_BROADCAST_PLUS
     bool "Set the broadcast automatically"
-    default n
+    default y
     depends on IFCONFIG
     help
@@ -231 +364 @@
       automatically if the value '+' is used.
 
+config IFENSLAVE
+    bool "ifenslave"
+    default y
+    depends on PLATFORM_LINUX
+    help
+      Userspace application to bind several interfaces
+      to a logical interface (use with kernel bonding driver).
+
+config IFPLUGD
+    bool "ifplugd"
+    default y
+    depends on PLATFORM_LINUX
+    help
+      Network interface plug detection daemon.
+
 config IFUPDOWN
     bool "ifupdown"
-    default n
-    help
-      Activate or deactivate the specified interfaces.  This applet makes
+    default y
+    help
+      Activate or deactivate the specified interfaces. This applet makes
       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
-      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
-      enable these additional options.  It is up to you to supply either
+      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.
@@ -250 +398 @@
     string "Absolute path to ifstate file"
     default "/var/run/ifstate"
+    depends on IFUPDOWN
     help
       ifupdown keeps state information in a file called ifstate.
@@ -259 +408 @@
 config FEATURE_IFUPDOWN_IP
     bool "Use ip applet"
-    default n
+    default y
     depends on IFUPDOWN
     help
@@ -268 +417 @@
     bool "Use busybox ip applet"
     default y
-    depends on FEATURE_IFUPDOWN_IP
+    depends on FEATURE_IFUPDOWN_IP && PLATFORM_LINUX
     select IP
     select FEATURE_IP_ADDRESS
@@ -281 +430 @@
 config FEATURE_IFUPDOWN_IFCONFIG_BUILTIN
     bool "Use busybox ifconfig and route applets"
-    default y
+    default n
     depends on IFUPDOWN && !FEATURE_IFUPDOWN_IP
     select IFCONFIG
@@ -294 +443 @@
 
 config FEATURE_IFUPDOWN_IPV4
-    bool "Enable support for IPv4"
+    bool "Support for IPv4"
     default y
     depends on IFUPDOWN
@@ -301 +450 @@
 
 config FEATURE_IFUPDOWN_IPV6
-    bool "Enable support for IPv6"
-    default n
+    bool "Support for IPv6"
+    default y
     depends on IFUPDOWN && FEATURE_IPV6
     help
@@ -308 +457 @@
 
 ### UNUSED
-### config FEATURE_IFUPDOWN_IPX
-###     bool "Enable support for IPX"
-###     default n
-###     depends on IFUPDOWN
-###     help
-###       If this option is selected you can use busybox to work with IPX
-###       networks.
+###config FEATURE_IFUPDOWN_IPX
+### bool "Support for IPX"
+### default y
+### depends on IFUPDOWN
+### help
+###   If this option is selected you can use busybox to work with IPX
+###   networks.
 
 config FEATURE_IFUPDOWN_MAPPING
     bool "Enable mapping support"
-    default n
+    default y
     depends on IFUPDOWN
     help
@@ -325 +474 @@
 
 config FEATURE_IFUPDOWN_EXTERNAL_DHCP
-    bool "Enable support for external dhcp clients"
+    bool "Support for external dhcp clients"
     default n
     depends on IFUPDOWN
@@ -336 +485 @@
 config INETD
     bool "inetd"
-    default n
+    default y
     select FEATURE_SYSLOG
     help
@@ -378 +527 @@
 config FEATURE_INETD_RPC
     bool "Support RPC services"
-    default n
+    default y
     depends on INETD
     select FEATURE_HAVE_RPC
@@ -386 +535 @@
 config IP
     bool "ip"
-    default n
+    default y
+    depends on PLATFORM_LINUX
     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.
 
@@ -415 +565 @@
 config FEATURE_IP_TUNNEL
     bool "ip tunnel"
-    default n
+    default y
     depends on IP
     help
@@ -422 +572 @@
 config FEATURE_IP_RULE
     bool "ip rule"
-    default n
+    default y
     depends on IP
     help
@@ -428 +578 @@
 
 config FEATURE_IP_SHORT_FORMS
-    bool "Support short forms of ip commands."
-    default n
+    bool "Support short forms of ip commands"
+    default y
     depends on IP
     help
@@ -442 +592 @@
       object commands.
 
+config FEATURE_IP_RARE_PROTOCOLS
+    bool "Support displaying rarely used link types"
+    default n
+    depends on 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 IPADDR
     bool
@@ -469 +629 @@
 config IPCALC
     bool "ipcalc"
-    default n
+    default y
     help
       ipcalc takes an IP address and netmask and calculates the
@@ -479 +639 @@
     depends on 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 FEATURE_IPCALC_LONG_OPTIONS
     bool "Enable long options"
-    default n
-    depends on IPCALC && GETOPT_LONG
+    default y
+    depends on IPCALC && LONG_OPTS
     help
       Support long options for the ipcalc applet.
@@ -490 +651 @@
 config NAMEIF
     bool "nameif"
-    default n
+    default y
+    depends on PLATFORM_LINUX
     select FEATURE_SYSLOG
     help
@@ -497 +659 @@
       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:
@@ -503 +665 @@
       new_interface_name    XX:XX:XX:XX:XX:XX
 
-config NC
-    bool "nc"
-    default n
-    help
-      A simple Unix utility which reads and writes data across network
-      connections.
-
-config NC_SERVER
-    bool "Netcat server options (-l)"
-    default n
-    depends on NC
-    help
-      Allow netcat to act as a server.
-
-config NC_EXTRA
-    bool "Netcat extensions (-eiw and filename)"
-    default n
-    depends on NC
-    help
-      Add -e (support for executing the rest of the command line after
-      making or receiving a successful connection), -i (delay interval for
-      lines sent), -w (timeout for initial connection).
+config FEATURE_NAMEIF_EXTENDED
+    bool "Extended nameif"
+    default y
+    depends on 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 NETSTAT
     bool "netstat"
-    default n
+    default y
+    depends on PLATFORM_LINUX
     help
       netstat prints information about the Linux networking subsystem.
 
 config FEATURE_NETSTAT_WIDE
-    bool "  Enable wide netstat output"
-    default n
+    bool "Enable wide netstat output"
+    default y
     depends on NETSTAT
     help
@@ -540 +693 @@
       (-W option).
 
+config FEATURE_NETSTAT_PRG
+    bool "Enable PID/Program name output"
+    default y
+    depends on NETSTAT
+    help
+      Add support for -p flag to print out PID and program name.
+      +700 bytes of code.
+
 config NSLOOKUP
     bool "nslookup"
-    default n
+    default y
     help
       nslookup is a tool to query Internet name servers.
+
+config NTPD
+    bool "ntpd"
+    default y
+    depends on PLATFORM_LINUX
+    help
+      The NTP client/server daemon.
+
+config FEATURE_NTPD_SERVER
+    bool "Make ntpd usable as a NTP server"
+    default y
+    depends on NTPD
+    help
+      Make ntpd usable as a NTP server. If you disable this option
+      ntpd will be usable only as a NTP client.
 
 config PING
     bool "ping"
-    default n
+    default y
+    depends on PLATFORM_LINUX
     help
       ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to
@@ -555 +732 @@
 config PING6
     bool "ping6"
-    default n
+    default y
     depends on FEATURE_IPV6 && PING
     help
       This will give you a ping that can talk IPv6.
+
+config FEATURE_FANCY_PING
+    bool "Enable fancy ping output"
+    default y
+    depends on PING
+    help
+      Make the output from the ping applet include statistics, and at the
+      same time provide full support for ICMP packets.
 
 config PSCAN
     bool "pscan"
-    default n
+    default y
     help
       Simple network port scanner.
-
-config FEATURE_FANCY_PING
-    bool "Enable fancy ping output"
-    default y
-    depends on PING
-    help
-      Make the output from the ping applet include statistics, and at the
-      same time provide full support for ICMP packets.
 
 config ROUTE
     bool "route"
-    default n
+    default y
+    depends on PLATFORM_LINUX
     help
       Route displays or manipulates the kernel's IP routing tables.
@@ -582 +760 @@
 config SLATTACH
     bool "slattach"
-    default n
-    help
-      slattach is a small utility to attach network interfaces to serial lines.
+    default y
+    depends on PLATFORM_LINUX
+    help
+      slattach is a small utility to attach network interfaces to serial
+      lines.
+
+#config TC
+#   bool "tc"
+#   default y
+#   help
+#     show / manipulate traffic control settings
+#
+#config FEATURE_TC_INGRESS
+#   def_bool n
+#   depends on TC
+
+config TCPSVD
+    bool "tcpsvd"
+    default y
+    help
+      tcpsvd listens on a TCP port and runs a program for each new
+      connection.
 
 config TELNET
     bool "telnet"
-    default n
+    default y
     help
       Telnet is an interface to the TELNET protocol, but is also commonly
@@ -599 +796 @@
     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.
 
@@ -614 +811 @@
 config TELNETD
     bool "telnetd"
-    default n
+    default y
     select 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:
@@ -645 +842 @@
           mount -t devpts devpts /dev/pts
 
-      You need to be sure that Busybox has LOGIN and
-      FEATURE_SUID enabled.  And finally, you should make
+      You need to be sure that busybox has LOGIN and
+      FEATURE_SUID enabled. And finally, you should make
       certain that Busybox has been installed setuid root:
 
@@ -657 +854 @@
 config FEATURE_TELNETD_STANDALONE
     bool "Support standalone telnetd (not inetd only)"
-    default n
+    default y
     depends on TELNETD
     help
       Selecting this will make telnetd able to run standalone.
+
+config FEATURE_TELNETD_INETD_WAIT
+    bool "Support -w SEC option (inetd wait mode)"
+    default y
+    depends on FEATURE_TELNETD_STANDALONE
+    help
+      This option allows you to run telnetd in "inet wait" mode.
+      Example inetd.conf line (note "wait", not usual "nowait"):
+
+      telnet stream tcp wait root /bin/telnetd telnetd -w10
+
+      In this example, inetd passes _listening_ socket_ as fd 0
+      to telnetd when connection appears.
+      telnetd will wait for connections until all existing
+      connections are closed, and no new connections
+      appear during 10 seconds. Then it exits, and inetd continues
+      to listen for new connections.
+
+      This option is rarely used. "tcp nowait" is much more usual
+      way of running tcp services, including telnetd.
+      You most probably want to say N here.
 
 config TFTP
     bool "tftp"
-    default n
-    help
-      This enables the Trivial File Transfer Protocol client program.  TFTP
+    default y
+    help
+      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.
 
+config TFTPD
+    bool "tftpd"
+    default y
+    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"
+
+comment "Common options for tftp/tftpd"
+    depends on TFTP || TFTPD
+
 config FEATURE_TFTP_GET
-    bool "Enable \"get\" command"
-    default y
-    depends on TFTP
-    help
-      Add support for the GET command within the TFTP client.  This allows
+    bool "Enable 'tftp get' and/or tftpd upload code"
+    default y
+    depends on TFTP || 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.
+
+      Note: this option does _not_ make tftpd capable of download
+      (the usual operation people need from it)!
 
 config FEATURE_TFTP_PUT
-    bool "Enable \"put\" command"
-    default y
-    depends on TFTP
-    help
-      Add support for the PUT command within the TFTP client.  This allows
+    bool "Enable 'tftp put' and/or tftpd download code"
+    default y
+    depends on TFTP || 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 FEATURE_TFTP_BLOCKSIZE
-    bool "Enable \"blocksize\" command"
-    default n
-    depends on TFTP
-    help
-      Allow the client to specify the desired block size for transfers.
-
-config DEBUG_TFTP
+    bool "Enable 'blksize' and 'tsize' protocol options"
+    default y
+    depends on TFTP || TFTPD
+    help
+      Allow tftp to specify block size, and tftpd to understand
+      "blksize" and "tsize" options.
+
+config FEATURE_TFTP_PROGRESS_BAR
+    bool "Enable tftp progress meter"
+    default y
+    depends on TFTP && FEATURE_TFTP_BLOCKSIZE
+    help
+      Show progress bar.
+
+config TFTP_DEBUG
     bool "Enable debug"
     default n
-    depends on TFTP
-    help
-      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.
+    depends on TFTP || TFTPD
+    help
+      Make tftp[d] print debugging messages on stderr.
+      This is useful if you are diagnosing a bug in tftp[d].
 
 config TRACEROUTE
     bool "traceroute"
-    default n
-    help
-      Utility to trace the route of IP packets
+    default y
+    depends on PLATFORM_LINUX
+    help
+      Utility to trace the route of IP packets.
+
+config TRACEROUTE6
+    bool "traceroute6"
+    default y
+    depends on FEATURE_IPV6 && TRACEROUTE
+    help
+      Utility to trace the route of IPv6 packets.
 
 config FEATURE_TRACEROUTE_VERBOSE
     bool "Enable verbose output"
-    default n
+    default y
     depends on TRACEROUTE
     help
-      Add some verbosity to traceroute.  This includes amongst other things
+      Add some verbosity to traceroute. This includes among other things
       hostnames and ICMP response types.
 
@@ -729 +980 @@
     depends on TRACEROUTE
     help
-      Add feature to allow for ICMP ECHO instead of UDP datagrams.
+      Add option -I to use ICMP ECHO instead of UDP datagrams.
+
+config TUNCTL
+    bool "tunctl"
+    default y
+    depends on PLATFORM_LINUX
+    help
+      tunctl creates or deletes tun devices.
+
+config FEATURE_TUNCTL_UG
+    bool "Support owner:group assignment"
+    default y
+    depends on TUNCTL
+    help
+      Allow to specify owner and group of newly created interface.
+      340 bytes of pure bloat. Say no here.
 
 source networking/udhcp/Config.in
+
+config IFUPDOWN_UDHCPC_CMD_OPTIONS
+    string "ifup udhcpc command line options"
+    default "-R -n"
+    depends on IFUPDOWN && UDHCPC
+    help
+      Command line options to pass to udhcpc from ifup.
+      Intended to alter options not available in /etc/network/interfaces.
+      (IE: --syslog --background etc...)
+
+config UDPSVD
+    bool "udpsvd"
+    default y
+    help
+      udpsvd listens on an UDP port and runs a program for each new
+      connection.
 
 config VCONFIG
     bool "vconfig"
-    default n
+    default y
+    depends on PLATFORM_LINUX
     help
       Creates, removes, and configures VLAN interfaces
@@ -741 +1024 @@
 config WGET
     bool "wget"
-    default n
+    default y
     help
       wget is a utility for non-interactive download of files from HTTP,
@@ -762 +1045 @@
 config FEATURE_WGET_LONG_OPTIONS
     bool "Enable long options"
-    default n
-    depends on WGET && GETOPT_LONG
+    default y
+    depends on WGET && LONG_OPTS
     help
       Support long options for the wget applet.
+
+config FEATURE_WGET_TIMEOUT
+    bool "Enable read timeout option -T SEC"
+    default y
+    depends on WGET
+    help
+      Supports network read timeout for wget, so that wget will give
+      up and timeout when reading network data, through the -T command
+      line option.  Currently only network data read timeout is
+      supported (i.e., timeout is not applied to the DNS nor TCP
+      connection initialization).  When FEATURE_WGET_LONG_OPTIONS is
+      also enabled, the --timeout option will work in addition to -T.
 
 config ZCIP
     bool "zcip"
-    default n
+    default y
+    depends on PLATFORM_LINUX
     select FEATURE_SYSLOG
     help

branches/2.2.9/mindi-busybox/networking/Kbuild

@@ +1 @@
+# DO NOT EDIT. This file is generated from Kbuild.src
 # Makefile for busybox
 #
 # Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
 #
-# Licensed under the GPL v2, see the file LICENSE in this tarball.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 
 lib-y:=
+
+lib-$(CONFIG_NBDCLIENT) += nbd-client.o
 lib-$(CONFIG_ARP)          += arp.o interface.o
 lib-$(CONFIG_ARPING)       += arping.o
+lib-$(CONFIG_BRCTL)        += brctl.o
 lib-$(CONFIG_DNSD)         += dnsd.o
 lib-$(CONFIG_ETHER_WAKE)   += ether-wake.o
 lib-$(CONFIG_FAKEIDENTD)   += isrv_identd.o isrv.o
+lib-$(CONFIG_FTPD)         += ftpd.o
 lib-$(CONFIG_FTPGET)       += ftpgetput.o
 lib-$(CONFIG_FTPPUT)       += ftpgetput.o
@@ -16 +21 @@
 lib-$(CONFIG_HTTPD)        += httpd.o
 lib-$(CONFIG_IFCONFIG)     += ifconfig.o interface.o
+lib-$(CONFIG_IFENSLAVE)    += ifenslave.o interface.o
+lib-$(CONFIG_IFPLUGD)      += ifplugd.o
 lib-$(CONFIG_IFUPDOWN)     += ifupdown.o
 lib-$(CONFIG_INETD)        += inetd.o
@@ -24 +31 @@
 lib-$(CONFIG_NETSTAT)      += netstat.o
 lib-$(CONFIG_NSLOOKUP)     += nslookup.o
+lib-$(CONFIG_NTPD)         += ntpd.o
 lib-$(CONFIG_PING)         += ping.o
 lib-$(CONFIG_PING6)        += ping.o
@@ -29 +37 @@
 lib-$(CONFIG_ROUTE)        += route.o
 lib-$(CONFIG_SLATTACH)     += slattach.o
+lib-$(CONFIG_TC)           += tc.o
 lib-$(CONFIG_TELNET)       += telnet.o
 lib-$(CONFIG_TELNETD)      += telnetd.o
 lib-$(CONFIG_TFTP)         += tftp.o
+lib-$(CONFIG_TFTPD)        += tftp.o
 lib-$(CONFIG_TRACEROUTE)   += traceroute.o
+lib-$(CONFIG_TUNCTL)       += tunctl.o
 lib-$(CONFIG_VCONFIG)      += vconfig.o
 lib-$(CONFIG_WGET)         += wget.o
 lib-$(CONFIG_ZCIP)         += zcip.o
+
+lib-$(CONFIG_TCPSVD)       += tcpudp.o tcpudp_perhost.o
+lib-$(CONFIG_UDPSVD)       += tcpudp.o tcpudp_perhost.o

branches/2.2.9/mindi-busybox/networking/arp.c

@@ -28 +28 @@
 #define DFLT_HW "ether"
 
-#define ARP_OPT_A (0x1)
-#define ARP_OPT_p (0x2)
-#define ARP_OPT_H (0x4)
-#define ARP_OPT_t (0x8)
-#define ARP_OPT_i (0x10)
-#define ARP_OPT_a (0x20)
-#define ARP_OPT_d (0x40)
-#define ARP_OPT_n (0x80)    /* do not resolve addresses     */
-#define ARP_OPT_D (0x100)   /* HW-address is devicename     */
-#define ARP_OPT_s (0x200)
-#define ARP_OPT_v (0x400 * DEBUG)   /* debugging output flag        */
-
-
-static const struct aftype *ap; /* current address family       */
-static const struct hwtype *hw; /* current hardware type        */
-static int sockfd;              /* active socket descriptor     */
-static smallint hw_set;         /* flag if hw-type was set (-H) */
-static const char *device = ""; /* current device               */
+enum {
+    ARP_OPT_A = (1 << 0),
+    ARP_OPT_p = (1 << 1),
+    ARP_OPT_H = (1 << 2),
+    ARP_OPT_t = (1 << 3),
+    ARP_OPT_i = (1 << 4),
+    ARP_OPT_a = (1 << 5),
+    ARP_OPT_d = (1 << 6),
+    ARP_OPT_n = (1 << 7), /* do not resolve addresses */
+    ARP_OPT_D = (1 << 8), /* HW-address is devicename */
+    ARP_OPT_s = (1 << 9),
+    ARP_OPT_v = (1 << 10) * DEBUG, /* debugging output flag */
+};
+
+enum {
+    sockfd = 3, /* active socket descriptor */
+};
+
+struct globals {
+    const struct aftype *ap; /* current address family */
+    const struct hwtype *hw; /* current hardware type */
+    const char *device;      /* current device */
+    smallint hw_set;         /* flag if hw-type was set (-H) */
+
+} FIX_ALIASING;
+#define G (*(struct globals*)&bb_common_bufsiz1)
+#define ap         (G.ap        )
+#define hw         (G.hw        )
+#define device     (G.device    )
+#define hw_set     (G.hw_set    )
+#define INIT_G() do { \
+    device = ""; \
+} while (0)
+
 
 static const char options[] ALIGN1 =
@@ -201 +217 @@
         bb_error_msg("device '%s' has HW address %s '%s'",
                      ifname, xhw->name,
-                     xhw->print((char *) &ifr.ifr_hwaddr.sa_data));
+                     xhw->print((unsigned char *) &ifr.ifr_hwaddr.sa_data));
     }
 }
@@ -314 +330 @@
          char *hwa, char *mask, char *dev)
 {
+    static const int arp_masks[] = {
+        ATF_PERM, ATF_PUBL,
+#ifdef HAVE_ATF_MAGIC
+        ATF_MAGIC,
+#endif
+#ifdef HAVE_ATF_DONTPUB
+        ATF_DONTPUB,
+#endif
+        ATF_USETRAILERS,
+    };
+    static const char arp_labels[] ALIGN1 = "PERM\0""PUP\0"
+#ifdef HAVE_ATF_MAGIC
+        "AUTO\0"
+#endif
+#ifdef HAVE_ATF_DONTPUB
+        "DONTPUB\0"
+#endif
+        "TRAIL\0"
+    ;
+
     const struct hwtype *xhw;
 
@@ -334 +370 @@
         printf("netmask %s ", mask);
 
-    if (arp_flags & ATF_PERM)
-        printf("PERM ");
-    if (arp_flags & ATF_PUBL)
-        printf("PUP ");
-#ifdef HAVE_ATF_MAGIC
-    if (arp_flags & ATF_MAGIC)
-        printf("AUTO ");
-#endif
-#ifdef HAVE_ATF_DONTPUB
-    if (arp_flags & ATF_DONTPUB)
-        printf("DONTPUB ");
-#endif
-    if (arp_flags & ATF_USETRAILERS)
-        printf("TRAIL ");
-
-    printf("on %s\n", dev);
+    print_flags_separated(arp_masks, arp_labels, arp_flags, " ");
+    printf(" on %s\n", dev);
 }
 
@@ -377 +399 @@
         host = xstrdup(ap->sprint(&sa, 1));
     }
-    fp = xfopen("/proc/net/arp", "r");
+    fp = xfopen_for_read("/proc/net/arp");
     /* Bypass header -- read one line */
     fgets(line, sizeof(line), fp);
@@ -435 +457 @@
 }
 
-int arp_main(int argc, char **argv);
-int arp_main(int argc, char **argv)
+int arp_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int arp_main(int argc UNUSED_PARAM, char **argv)
 {
-    char *hw_type;
-    char *protocol;
-
-    /* Initialize variables... */
+    const char *hw_type = "ether";
+    const char *protocol;
+    unsigned opts;
+
+    INIT_G();
+
+    xmove_fd(xsocket(AF_INET, SOCK_DGRAM, 0), sockfd);
     ap = get_aftype(DFLT_AF);
     if (!ap)
         bb_error_msg_and_die("%s: %s not supported", DFLT_AF, "address family");
 
-    getopt32(argv, "A:p:H:t:i:adnDsv", &protocol, &protocol,
+    opts = getopt32(argv, "A:p:H:t:i:adnDsv", &protocol, &protocol,
                  &hw_type, &hw_type, &device);
     argv += optind;
-    if (option_mask32 & ARP_OPT_A || option_mask32 & ARP_OPT_p) {
+    if (opts & (ARP_OPT_A | ARP_OPT_p)) {
         ap = get_aftype(protocol);
         if (ap == NULL)
             bb_error_msg_and_die("%s: unknown %s", protocol, "address family");
     }
-    if (option_mask32 & ARP_OPT_A || option_mask32 & ARP_OPT_p) {
+    if (opts & (ARP_OPT_A | ARP_OPT_p)) {
         hw = get_hwtype(hw_type);
         if (hw == NULL)
@@ -460 +485 @@
         hw_set = 1;
     }
-    //if (option_mask32 & ARP_OPT_i)... -i
+    //if (opts & ARP_OPT_i)... -i
 
     if (ap->af != AF_INET) {
@@ -477 +502 @@
                              hw->name, "hardware type");
     }
-    sockfd = xsocket(AF_INET, SOCK_DGRAM, 0);
 
     /* Now see what we have to do here... */
-    if (option_mask32 & (ARP_OPT_d|ARP_OPT_s)) {
+    if (opts & (ARP_OPT_d | ARP_OPT_s)) {
         if (argv[0] == NULL)
             bb_error_msg_and_die("need host name");
-        if (option_mask32 & ARP_OPT_s)
+        if (opts & ARP_OPT_s)
             return arp_set(argv);
         return arp_del(argv);
     }
-    //if (option_mask32 & ARP_OPT_a) - default
+    //if (opts & ARP_OPT_a) - default
     return arp_show(argv[0]);
 }

branches/2.2.9/mindi-busybox/networking/arping.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * arping.c - Ping hosts by ARP requests/replies
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
- *
- * Author:  Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
+ * Author: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
  * Busybox port: Nick Fedchik <nick@fedchik.org.ua>
  */
@@ -18 +16 @@
 /* We don't expect to see 1000+ seconds delay, unsigned is enough */
 #define MONOTONIC_US() ((unsigned)monotonic_us())
-
-static struct in_addr src;
-static struct in_addr dst;
-static struct sockaddr_ll me;
-static struct sockaddr_ll he;
-static unsigned last;
 
 enum {
@@ -35 +27 @@
 };
 
-static int sock;
-static unsigned count = UINT_MAX;
-static unsigned timeout_us;
-static unsigned sent;
-static unsigned brd_sent;
-static unsigned received;
-static unsigned brd_recv;
-static unsigned req_recv;
+struct globals {
+    struct in_addr src;
+    struct in_addr dst;
+    struct sockaddr_ll me;
+    struct sockaddr_ll he;
+    int sock_fd;
+
+    int count; // = -1;
+    unsigned last;
+    unsigned timeout_us;
+    unsigned start;
+
+    unsigned sent;
+    unsigned brd_sent;
+    unsigned received;
+    unsigned brd_recv;
+    unsigned req_recv;
+} FIX_ALIASING;
+#define G (*(struct globals*)&bb_common_bufsiz1)
+#define src        (G.src       )
+#define dst        (G.dst       )
+#define me         (G.me        )
+#define he         (G.he        )
+#define sock_fd    (G.sock_fd   )
+#define count      (G.count     )
+#define last       (G.last      )
+#define timeout_us (G.timeout_us)
+#define start      (G.start     )
+#define sent       (G.sent      )
+#define brd_sent   (G.brd_sent  )
+#define received   (G.received  )
+#define brd_recv   (G.brd_recv  )
+#define req_recv   (G.req_recv  )
+#define INIT_G() do { \
+    count = -1; \
+} while (0)
+
+// If GNUisms are not available...
+//static void *mempcpy(void *_dst, const void *_src, int n)
+//{
+//  memcpy(_dst, _src, n);
+//  return (char*)_dst + n;
+//}
 
 static int send_pack(struct in_addr *src_addr,
@@ -49 +76 @@
 {
     int err;
-    unsigned now;
     unsigned char buf[256];
     struct arphdr *ah = (struct arphdr *) buf;
     unsigned char *p = (unsigned char *) (ah + 1);
 
-    ah->ar_hrd = htons(ME->sll_hatype);
     ah->ar_hrd = htons(ARPHRD_ETHER);
     ah->ar_pro = htons(ETH_P_IP);
@@ -61 +86 @@
     ah->ar_op = option_mask32 & ADVERT ? htons(ARPOP_REPLY) : htons(ARPOP_REQUEST);
 
-    memcpy(p, &ME->sll_addr, ah->ar_hln);
-    p += ME->sll_halen;
-
-    memcpy(p, src_addr, 4);
-    p += 4;
+    p = mempcpy(p, &ME->sll_addr, ah->ar_hln);
+    p = mempcpy(p, src_addr, 4);
 
     if (option_mask32 & ADVERT)
-        memcpy(p, &ME->sll_addr, ah->ar_hln);
+        p = mempcpy(p, &ME->sll_addr, ah->ar_hln);
     else
-        memcpy(p, &HE->sll_addr, ah->ar_hln);
-    p += ah->ar_hln;
-
-    memcpy(p, dst_addr, 4);
-    p += 4;
-
-    now = MONOTONIC_US();
-    err = sendto(sock, buf, p - buf, 0, (struct sockaddr *) HE, sizeof(*HE));
+        p = mempcpy(p, &HE->sll_addr, ah->ar_hln);
+
+    p = mempcpy(p, dst_addr, 4);
+
+    err = sendto(sock_fd, buf, p - buf, 0, (struct sockaddr *) HE, sizeof(*HE));
     if (err == p - buf) {
-        last = now;
+        last = MONOTONIC_US();
         sent++;
         if (!(option_mask32 & UNICASTING))
@@ -87 +106 @@
 }
 
-static void finish(void) ATTRIBUTE_NORETURN;
+static void finish(void) NORETURN;
 static void finish(void)
 {
@@ -101 +120 @@
         exit(!!received);
     if (option_mask32 & UNSOLICITED)
-        exit(0);
+        exit(EXIT_SUCCESS);
     exit(!received);
 }
@@ -107 +126 @@
 static void catcher(void)
 {
-    static unsigned start;
-
     unsigned now;
 
@@ -115 +132 @@
         start = now;
 
-    if (count == 0 || (timeout_us && (now - start) > (timeout_us + 500000)))
+    if (count == 0 || (timeout_us && (now - start) > timeout_us))
         finish();
 
-    count--;
+    /* count < 0 means "infinite count" */
+    if (count > 0)
+        count--;
 
     if (last == 0 || (now - last) > 500000) {
@@ -128 +147 @@
 }
 
-static int recv_pack(unsigned char *buf, int len, struct sockaddr_ll *FROM)
+static bool recv_pack(unsigned char *buf, int len, struct sockaddr_ll *FROM)
 {
     struct arphdr *ah = (struct arphdr *) buf;
     unsigned char *p = (unsigned char *) (ah + 1);
     struct in_addr src_ip, dst_ip;
+    /* moves below assume in_addr is 4 bytes big, ensure that */
+    struct BUG_in_addr_must_be_4 {
+        char BUG_in_addr_must_be_4[
+            sizeof(struct in_addr) == 4 ? 1 : -1
+        ];
+        char BUG_s_addr_must_be_4[
+            sizeof(src_ip.s_addr) == 4 ? 1 : -1
+        ];
+    };
 
     /* Filter out wild packets */
@@ -138 +166 @@
      && FROM->sll_pkttype != PACKET_BROADCAST
      && FROM->sll_pkttype != PACKET_MULTICAST)
-        return 0;
-
-    /* Only these types are recognised */
+        return false;
+
+    /* Only these types are recognized */
     if (ah->ar_op != htons(ARPOP_REQUEST) && ah->ar_op != htons(ARPOP_REPLY))
-        return 0;
+        return false;
 
     /* ARPHRD check and this darned FDDI hack here :-( */
     if (ah->ar_hrd != htons(FROM->sll_hatype)
      && (FROM->sll_hatype != ARPHRD_FDDI || ah->ar_hrd != htons(ARPHRD_ETHER)))
-        return 0;
+        return false;
 
     /* Protocol must be IP. */
-    if (ah->ar_pro != htons(ETH_P_IP))
-        return 0;
-    if (ah->ar_pln != 4)
-        return 0;
-    if (ah->ar_hln != me.sll_halen)
-        return 0;
-    if (len < sizeof(*ah) + 2 * (4 + ah->ar_hln))
-        return 0;
-    memcpy(&src_ip, p + ah->ar_hln, 4);
-    memcpy(&dst_ip, p + ah->ar_hln + 4 + ah->ar_hln, 4);
+    if (ah->ar_pro != htons(ETH_P_IP)
+     || (ah->ar_pln != 4)
+     || (ah->ar_hln != me.sll_halen)
+     || (len < (int)(sizeof(*ah) + 2 * (4 + ah->ar_hln))))
+        return false;
+
+    move_from_unaligned32(src_ip.s_addr, p + ah->ar_hln);
+    move_from_unaligned32(dst_ip.s_addr, p + ah->ar_hln + 4 + ah->ar_hln);
+
+    if (dst.s_addr != src_ip.s_addr)
+        return false;
     if (!(option_mask32 & DAD)) {
-        if (src_ip.s_addr != dst.s_addr)
-            return 0;
-        if (src.s_addr != dst_ip.s_addr)
-            return 0;
-        if (memcmp(p + ah->ar_hln + 4, &me.sll_addr, ah->ar_hln))
-            return 0;
+        if ((src.s_addr != dst_ip.s_addr)
+            || (memcmp(p + ah->ar_hln + 4, &me.sll_addr, ah->ar_hln)))
+            return false;
     } else {
         /* DAD packet was:
@@ -181 +207 @@
            dst_ip/dst_hw do not matter.
          */
-        if (src_ip.s_addr != dst.s_addr)
-            return 0;
-        if (memcmp(p, &me.sll_addr, me.sll_halen) == 0)
-            return 0;
-        if (src.s_addr && src.s_addr != dst_ip.s_addr)
-            return 0;
+        if ((memcmp(p, &me.sll_addr, me.sll_halen) == 0)
+         || (src.s_addr && src.s_addr != dst_ip.s_addr))
+            return false;
     }
     if (!(option_mask32 & QUIET)) {
@@ -208 +231 @@
 
         if (last) {
-            printf(" %u.%03ums\n", last / 1000, last % 1000);
+            unsigned diff = MONOTONIC_US() - last;
+            printf(" %u.%03ums\n", diff / 1000, diff % 1000);
         } else {
             printf(" UNSOLICITED?\n");
         }
-        fflush(stdout);
+        fflush_all();
     }
     received++;
@@ -225 +249 @@
         option_mask32 |= UNICASTING;
     }
-    return 1;
+    return true;
 }
 
-int arping_main(int argc, char **argv);
-int arping_main(int argc, char **argv)
+int arping_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int arping_main(int argc UNUSED_PARAM, char **argv)
 {
     const char *device = "eth0";
-    int ifindex;
     char *source = NULL;
     char *target;
     unsigned char *packet;
-
-    sock = xsocket(PF_PACKET, SOCK_DGRAM, 0);
+    char *err_str;
+
+    INIT_G();
+
+    sock_fd = xsocket(AF_PACKET, SOCK_DGRAM, 0);
 
     // Drop suid root privileges
-    xsetuid(getuid());
-
+    // Need to remove SUID_NEVER from applets.h for this to work
+    //xsetuid(getuid());
+
+    err_str = xasprintf("interface %s %%s", device);
     {
         unsigned opt;
-        char *str_count, *str_timeout;
+        char *str_timeout;
 
         /* Dad also sets quit_on_reply.
          * Advert also sets unsolicited.
          */
-        opt_complementary = "=1:Df:AU";
+        opt_complementary = "=1:Df:AU:c+";
         opt = getopt32(argv, "DUAqfbc:w:I:s:",
-                &str_count, &str_timeout, &device, &source);
-        if (opt & 0x40) /* -c: count */
-            count = xatou(str_count);
+                &count, &str_timeout, &device, &source);
         if (opt & 0x80) /* -w: timeout */
-            timeout_us = xatou_range(str_timeout, 0, INT_MAX/2000000) * 1000000;
-        //if (opt & 0x100) /* -I: interface */
-        if (strlen(device) >= IF_NAMESIZE) {
-            bb_error_msg_and_die("interface name '%s' is too long",
-                            device);
-        }
+            timeout_us = xatou_range(str_timeout, 0, INT_MAX/2000000) * 1000000 + 500000;
         //if (opt & 0x200) /* -s: source */
         option_mask32 &= 0x3f; /* set respective flags */
@@ -273 +294 @@
 
         memset(&ifr, 0, sizeof(ifr));
-        strncpy(ifr.ifr_name, device, IFNAMSIZ - 1);
-        ioctl_or_perror_and_die(sock, SIOCGIFINDEX, &ifr, "interface %s not found", device);
-        ifindex = ifr.ifr_ifindex;
-
-        xioctl(sock, SIOCGIFFLAGS, (char *) &ifr);
+        strncpy_IFNAMSIZ(ifr.ifr_name, device);
+        /* We use ifr.ifr_name in error msg so that problem
+         * with truncated name will be visible */
+        ioctl_or_perror_and_die(sock_fd, SIOCGIFINDEX, &ifr, err_str, "not found");
+        me.sll_ifindex = ifr.ifr_ifindex;
+
+        xioctl(sock_fd, SIOCGIFFLAGS, (char *) &ifr);
 
         if (!(ifr.ifr_flags & IFF_UP)) {
-            bb_error_msg_and_die("interface %s is down", device);
+            bb_error_msg_and_die(err_str, "is down");
         }
         if (ifr.ifr_flags & (IFF_NOARP | IFF_LOOPBACK)) {
-            bb_error_msg("interface %s is not ARPable", device);
+            bb_error_msg(err_str, "is not ARPable");
             return (option_mask32 & DAD ? 0 : 2);
         }
     }
 
-    if (!inet_aton(target, &dst)) {
+    /* if (!inet_aton(target, &dst)) - not needed */ {
         len_and_sockaddr *lsa;
         lsa = xhost_and_af2sockaddr(target, 0, AF_INET);
-        memcpy(&dst, &lsa->sin.sin_addr.s_addr, 4);
+        dst = lsa->u.sin.sin_addr;
         if (ENABLE_FEATURE_CLEAN_UP)
             free(lsa);
@@ -300 +323 @@
     }
 
-    if (!(option_mask32 & DAD) && (option_mask32 & UNSOLICITED) && src.s_addr == 0)
+    if ((option_mask32 & (DAD|UNSOLICITED)) == UNSOLICITED && src.s_addr == 0)
         src = dst;
 
@@ -307 +330 @@
         int probe_fd = xsocket(AF_INET, SOCK_DGRAM, 0);
 
-        if (device) {
-            if (setsockopt(probe_fd, SOL_SOCKET, SO_BINDTODEVICE, device, strlen(device) + 1) == -1)
-                bb_error_msg("warning: interface %s is ignored", device);
-        }
+        setsockopt_bindtodevice(probe_fd, device);
         memset(&saddr, 0, sizeof(saddr));
         saddr.sin_family = AF_INET;
         if (src.s_addr) {
+            /* Check that this is indeed our IP */
             saddr.sin_addr = src;
             xbind(probe_fd, (struct sockaddr *) &saddr, sizeof(saddr));
-        } else if (!(option_mask32 & DAD)) {
+        } else { /* !(option_mask32 & DAD) case */
+            /* Find IP address on this iface */
             socklen_t alen = sizeof(saddr);
 
@@ -323 +345 @@
 
             if (setsockopt(probe_fd, SOL_SOCKET, SO_DONTROUTE, &const_int_1, sizeof(const_int_1)) == -1)
-                bb_perror_msg("warning: setsockopt(SO_DONTROUTE)");
+                bb_perror_msg("setsockopt(SO_DONTROUTE)");
             xconnect(probe_fd, (struct sockaddr *) &saddr, sizeof(saddr));
-            if (getsockname(probe_fd, (struct sockaddr *) &saddr, &alen) == -1) {
-                bb_error_msg_and_die("getsockname");
-            }
+            getsockname(probe_fd, (struct sockaddr *) &saddr, &alen);
+            //never happens:
+            //if (getsockname(probe_fd, (struct sockaddr *) &saddr, &alen) == -1)
+            //  bb_perror_msg_and_die("getsockname");
+            if (saddr.sin_family != AF_INET)
+                bb_error_msg_and_die("no IP address configured");
             src = saddr.sin_addr;
         }
@@ -334 +359 @@
 
     me.sll_family = AF_PACKET;
-    me.sll_ifindex = ifindex;
+    //me.sll_ifindex = ifindex; - done before
     me.sll_protocol = htons(ETH_P_ARP);
-    xbind(sock, (struct sockaddr *) &me, sizeof(me));
+    xbind(sock_fd, (struct sockaddr *) &me, sizeof(me));
 
     {
         socklen_t alen = sizeof(me);
-
-        if (getsockname(sock, (struct sockaddr *) &me, &alen) == -1) {
-            bb_error_msg_and_die("getsockname");
-        }
+        getsockname(sock_fd, (struct sockaddr *) &me, &alen);
+        //never happens:
+        //if (getsockname(sock_fd, (struct sockaddr *) &me, &alen) == -1)
+        //  bb_perror_msg_and_die("getsockname");
     }
     if (me.sll_halen == 0) {
-        bb_error_msg("interface \"%s\" is not ARPable (no ll address)", device);
+        bb_error_msg(err_str, "is not ARPable (no ll address)");
         return (option_mask32 & DAD ? 0 : 2);
     }
@@ -353 +378 @@
 
     if (!(option_mask32 & QUIET)) {
-        printf("ARPING to %s from %s via %s\n",
-            inet_ntoa(dst), inet_ntoa(src),
-            device ? device : "unknown");
-    }
-
-    if (!src.s_addr && !(option_mask32 & DAD)) {
-        bb_error_msg_and_die("no src address in the non-DAD mode");
-    }
-
-    {
-        struct sigaction sa;
-
-        memset(&sa, 0, sizeof(sa));
-        sa.sa_flags = SA_RESTART;
-
-        sa.sa_handler = (void (*)(int)) finish;
-        sigaction(SIGINT, &sa, NULL);
-
-        sa.sa_handler = (void (*)(int)) catcher;
-        sigaction(SIGALRM, &sa, NULL);
-    }
+        /* inet_ntoa uses static storage, can't use in same printf */
+        printf("ARPING to %s", inet_ntoa(dst));
+        printf(" from %s via %s\n", inet_ntoa(src), device);
+    }
+
+    signal_SA_RESTART_empty_mask(SIGINT,  (void (*)(int))finish);
+    signal_SA_RESTART_empty_mask(SIGALRM, (void (*)(int))catcher);
 
     catcher();
@@ -384 +395 @@
         int cc;
 
-        cc = recvfrom(sock, packet, 4096, 0, (struct sockaddr *) &from, &alen);
+        cc = recvfrom(sock_fd, packet, 4096, 0, (struct sockaddr *) &from, &alen);
         if (cc < 0) {
             bb_perror_msg("recvfrom");

branches/2.2.9/mindi-busybox/networking/dnsd.c

@@ -7 +7 @@
  * Copyright (C) 2003 Paul Sheer
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  * Odd Arild Olsen started out with the sheerdns [1] of Paul Sheer and rewrote
@@ -18 +18 @@
  */
 
+#include "libbb.h"
 #include <syslog.h>
-#include "libbb.h"
 
 //#define DEBUG 1
@@ -25 +25 @@
 
 enum {
-    MAX_HOST_LEN = 16,      // longest host name allowed is 15
-    IP_STRING_LEN = 18,     // .xxx.xxx.xxx.xxx\0
-
-//must be strlen('.in-addr.arpa') larger than IP_STRING_LEN
-    MAX_NAME_LEN = (IP_STRING_LEN + 13),
-
-/* Cannot get bigger packets than 512 per RFC1035
-   In practice this can be set considerably smaller:
-   Length of response packet is  header (12B) + 2*type(4B) + 2*class(4B) +
-   ttl(4B) + rlen(2B) + r (MAX_NAME_LEN =21B) +
-   2*querystring (2 MAX_NAME_LEN= 42B), all together 90 Byte
-*/
-    MAX_PACK_LEN = 512 + 1,
-
-    DEFAULT_TTL = 30,       // increase this when not testing?
-
+    /* can tweak this */
+    DEFAULT_TTL = 120,
+
+    /* cannot get bigger packets than 512 per RFC1035. */
+    MAX_PACK_LEN = 512,
+    IP_STRING_LEN = sizeof(".xxx.xxx.xxx.xxx"),
+    MAX_NAME_LEN = IP_STRING_LEN - 1 + sizeof(".in-addr.arpa"),
     REQ_A = 1,
-    REQ_PTR = 12
+    REQ_PTR = 12,
 };
 
-struct dns_repl {       // resource record, add 0 or 1 to accepted dns_msg in resp
-    uint16_t rlen;
-    uint8_t *r;     // resource
-    uint16_t flags;
-};
-
-struct dns_head {       // the message from client and first part of response mag
+/* the message from client and first part of response msg */
+struct dns_head {
     uint16_t id;
     uint16_t flags;
-    uint16_t nquer;     // accepts 0
-    uint16_t nansw;     // 1 in response
-    uint16_t nauth;     // 0
-    uint16_t nadd;      // 0
+    uint16_t nquer;
+    uint16_t nansw;
+    uint16_t nauth;
+    uint16_t nadd;
 };
-struct dns_prop {
-    uint16_t type;
-    uint16_t class;
+/* Structure used to access type and class fields.
+ * They are totally unaligned, but gcc 4.3.4 thinks that pointer of type uint16_t*
+ * is 16-bit aligned and replaces 16-bit memcpy (in move_from_unaligned16 macro)
+ * with aligned halfword access on arm920t!
+ * Oh well. Slapping PACKED everywhere seems to help: */
+struct type_and_class {
+    uint16_t type PACKED;
+    uint16_t class PACKED;
+} PACKED;
+/* element of known name, ip address and reversed ip address */
+struct dns_entry {
+    struct dns_entry *next;
+    uint32_t ip;
+    char rip[IP_STRING_LEN]; /* length decimal reversed IP */
+    char name[1];
 };
-struct dns_entry {      // element of known name, ip address and reversed ip address
-    struct dns_entry *next;
-    char ip[IP_STRING_LEN];     // dotted decimal IP
-    char rip[IP_STRING_LEN];    // length decimal reversed IP
-    char name[MAX_HOST_LEN];
-};
-
-static struct dns_entry *dnsentry;
-static uint32_t ttl = DEFAULT_TTL;
-
-static const char *fileconf = "/etc/dnsd.conf";
-
-// Must match getopt32 call
-#define OPT_daemon  (option_mask32 & 0x10)
-#define OPT_verbose (option_mask32 & 0x20)
-
-
-/*
- * Convert host name from C-string to dns length/string.
- */
-static void convname(char *a, uint8_t *q)
-{
-    int i = (q[0] == '.') ? 0 : 1;
-    for (; i < MAX_HOST_LEN-1 && *q; i++, q++)
-        a[i] = tolower(*q);
-    a[0] = i - 1;
-    a[i] = 0;
-}
+
+#define OPT_verbose (option_mask32 & 1)
+#define OPT_silent  (option_mask32 & 2)
+
 
 /*
  * Insert length of substrings instead of dots
  */
-static void undot(uint8_t * rip)
+static void undot(char *rip)
 {
-    int i = 0, s = 0;
+    int i = 0;
+    int s = 0;
+
     while (rip[i])
         i++;
@@ -104 +80 @@
             rip[i] = s;
             s = 0;
-        } else s++;
-    }
-}
-
-/*
- * Read one line of hostname/IP from file
- * Returns 0 for each valid entry read, -1 at EOF
- * Assumes all host names are lower case only
- * Hostnames with more than one label are not handled correctly.
- * Presently the dot is copied into name without
- * converting to a length/string substring for that label.
- */
-static int getfileentry(FILE * fp, struct dns_entry *s)
-{
-    unsigned int a,b,c,d;
-    char *line, *r, *name;
-
- restart:
-    line = r = xmalloc_fgets(fp);
-    if (!r)
-        return -1;
-    while (*r == ' ' || *r == '\t') {
-        r++;
-        if (!*r || *r == '#' || *r == '\n') {
-            free(line);
-            goto restart; /* skipping empty/blank and commented lines  */
+        } else {
+            s++;
         }
     }
-    name = r;
-    while (*r != ' ' && *r != '\t')
-        r++;
-    *r++ = '\0';
-    if (sscanf(r, ".%u.%u.%u.%u"+1, &a, &b, &c, &d) != 4) {
-        free(line);
-        goto restart; /* skipping wrong lines */
-    }
-
-    sprintf(s->ip, ".%u.%u.%u.%u"+1, a, b, c, d);
-    sprintf(s->rip, ".%u.%u.%u.%u", d, c, b, a);
-    undot((uint8_t*)s->rip);
-    convname(s->name, (uint8_t*)name);
-
-    if (OPT_verbose)
-        fprintf(stderr, "\tname:%s, ip:%s\n", &(s->name[1]),s->ip);
-
-    free(line);
-    return 0;
 }
 
@@ -156 +89 @@
  * Read hostname/IP records from file
  */
-static void dnsentryinit(void)
+static struct dns_entry *parse_conf_file(const char *fileconf)
 {
-    FILE *fp;
-    struct dns_entry *m, *prev;
-
-    prev = dnsentry = NULL;
-    fp = xfopen(fileconf, "r");
-
-    while (1) {
-        m = xzalloc(sizeof(*m));
+    char *token[2];
+    parser_t *parser;
+    struct dns_entry *m, *conf_data;
+    struct dns_entry **nextp;
+
+    conf_data = NULL;
+    nextp = &conf_data;
+
+    parser = config_open(fileconf);
+    while (config_read(parser, token, 2, 2, "# \t", PARSE_NORMAL)) {
+        struct in_addr ip;
+        uint32_t v32;
+
+        if (inet_aton(token[1], &ip) == 0) {
+            bb_error_msg("error at line %u, skipping", parser->lineno);
+            continue;
+        }
+
+        if (OPT_verbose)
+            bb_error_msg("name:%s, ip:%s", token[0], token[1]);
+
+        /* sizeof(*m) includes 1 byte for m->name[0] */
+        m = xzalloc(sizeof(*m) + strlen(token[0]) + 1);
         /*m->next = NULL;*/
-        if (getfileentry(fp, m))
-            break;
-
-        if (prev == NULL)
-            dnsentry = m;
-        else
-            prev->next = m;
-        prev = m;
-    }
-    fclose(fp);
+        *nextp = m;
+        nextp = &m->next;
+
+        m->name[0] = '.';
+        strcpy(m->name + 1, token[0]);
+        undot(m->name);
+        m->ip = ip.s_addr; /* in network order */
+        v32 = ntohl(m->ip);
+        /* inverted order */
+        sprintf(m->rip, ".%u.%u.%u.%u",
+            (uint8_t)(v32),
+            (uint8_t)(v32 >> 8),
+            (uint8_t)(v32 >> 16),
+            (v32 >> 24)
+        );
+        undot(m->rip);
+    }
+    config_close(parser);
+    return conf_data;
 }
 
 /*
- * Look query up in dns records and return answer if found
- * qs is the query string, first byte the string length
- */
-static int table_lookup(uint16_t type, uint8_t * as, uint8_t * qs)
+ * Look query up in dns records and return answer if found.
+ */
+static char *table_lookup(struct dns_entry *d,
+        uint16_t type,
+        char* query_string)
 {
-    int i;
-    struct dns_entry *d = dnsentry;
-
-    do {
+    while (d) {
+        unsigned len = d->name[0];
+        /* d->name[len] is the last (non NUL) char */
 #if DEBUG
-        char *p,*q;
-        q = (char *)&(qs[1]);
-        p = &(d->name[1]);
-        fprintf(stderr, "\n%s: %d/%d p:%s q:%s %d",
-            __FUNCTION__, (int)strlen(p), (int)(d->name[0]),
-            p, q, (int)strlen(q));
+        char *p, *q;
+        q = query_string + 1;
+        p = d->name + 1;
+        fprintf(stderr, "%d/%d p:%s q:%s %d\n",
+            (int)strlen(p), len,
+            p, q, (int)strlen(q)
+        );
 #endif
-        if (type == REQ_A) { /* search by host name */
-            for (i = 1; i <= (int)(d->name[0]); i++)
-                if (tolower(qs[i]) != d->name[i])
-                    break;
-            if (i > (int)(d->name[0])) {
-                strcpy((char *)as, d->ip);
+        if (type == htons(REQ_A)) {
+            /* search by host name */
+            if (len != 1 || d->name[1] != '*') {
+/* we are lax, hope no name component is ever >64 so that length
+ * (which will be represented as 'A','B'...) matches a lowercase letter.
+ * Actually, I think false matches are hard to construct.
+ * Example.
+ * [31] len is represented as '1', [65] as 'A', [65+32] as 'a'.
+ * [65]   <65 same chars>[31]<31 same chars>NUL
+ * [65+32]<65 same chars>1   <31 same chars>NUL
+ * This example seems to be the minimal case when false match occurs.
+ */
+                if (strcasecmp(d->name, query_string) != 0)
+                    goto next;
+            }
+            return (char *)&d->ip;
 #if DEBUG
-                fprintf(stderr, " OK as:%s\n", as);
+            fprintf(stderr, "Found IP:%x\n", (int)d->ip);
 #endif
-                return 0;
-            }
-        } else if (type == REQ_PTR) { /* search by IP-address */
-            if (!strncmp((char*)&d->rip[1], (char*)&qs[1], strlen(d->rip)-1)) {
-                strcpy((char *)as, d->name);
-                return 0;
-            }
+            return 0;
         }
+        /* search by IP-address */
+        if ((len != 1 || d->name[1] != '*')
+        /* we assume (do not check) that query_string
+         * ends in ".in-addr.arpa" */
+         && strncmp(d->rip, query_string, strlen(d->rip)) == 0
+        ) {
+#if DEBUG
+            fprintf(stderr, "Found name:%s\n", d->name);
+#endif
+            return d->name;
+        }
+ next:
         d = d->next;
-    } while (d);
-    return -1;
+    }
+
+    return NULL;
 }
-
 
 /*
  * Decode message and generate answer
  */
-static int process_packet(uint8_t * buf)
+/* RFC 1035
+...
+Whenever an octet represents a numeric quantity, the left most bit
+in the diagram is the high order or most significant bit.
+That is, the bit labeled 0 is the most significant bit.
+...
+
+4.1.1. Header section format
+      0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15
+    +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+    |                      ID                       |
+    +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+    |QR|   OPCODE  |AA|TC|RD|RA| 0  0  0|   RCODE   |
+    +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+    |                    QDCOUNT                    |
+    +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+    |                    ANCOUNT                    |
+    +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+    |                    NSCOUNT                    |
+    +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+    |                    ARCOUNT                    |
+    +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+ID      16 bit random identifier assigned by querying peer.
+        Used to match query/response.
+QR      message is a query (0), or a response (1).
+OPCODE  0   standard query (QUERY)
+        1   inverse query (IQUERY)
+        2   server status request (STATUS)
+AA      Authoritative Answer - this bit is valid in responses.
+        Responding name server is an authority for the domain name
+        in question section. Answer section may have multiple owner names
+        because of aliases.  The AA bit corresponds to the name which matches
+        the query name, or the first owner name in the answer section.
+TC      TrunCation - this message was truncated.
+RD      Recursion Desired - this bit may be set in a query and
+        is copied into the response.  If RD is set, it directs
+        the name server to pursue the query recursively.
+        Recursive query support is optional.
+RA      Recursion Available - this be is set or cleared in a
+        response, and denotes whether recursive query support is
+        available in the name server.
+RCODE   Response code.
+        0   No error condition
+        1   Format error
+        2   Server failure - server was unable to process the query
+            due to a problem with the name server.
+        3   Name Error - meaningful only for responses from
+            an authoritative name server. The referenced domain name
+            does not exist.
+        4   Not Implemented.
+        5   Refused.
+QDCOUNT number of entries in the question section.
+ANCOUNT number of records in the answer section.
+NSCOUNT number of records in the authority records section.
+ARCOUNT number of records in the additional records section.
+
+4.1.2. Question section format
+
+The section contains QDCOUNT (usually 1) entries, each of this format:
+      0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15
+    +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+    /                     QNAME                     /
+    /                                               /
+    +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+    |                     QTYPE                     |
+    +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+    |                     QCLASS                    |
+    +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+QNAME   a domain name represented as a sequence of labels, where
+        each label consists of a length octet followed by that
+        number of octets. The domain name terminates with the
+        zero length octet for the null label of the root. Note
+        that this field may be an odd number of octets; no
+        padding is used.
+QTYPE   a two octet type of the query.
+          1 a host address [REQ_A const]
+          2 an authoritative name server
+          3 a mail destination (Obsolete - use MX)
+          4 a mail forwarder (Obsolete - use MX)
+          5 the canonical name for an alias
+          6 marks the start of a zone of authority
+          7 a mailbox domain name (EXPERIMENTAL)
+          8 a mail group member (EXPERIMENTAL)
+          9 a mail rename domain name (EXPERIMENTAL)
+         10 a null RR (EXPERIMENTAL)
+         11 a well known service description
+         12 a domain name pointer [REQ_PTR const]
+         13 host information
+         14 mailbox or mail list information
+         15 mail exchange
+         16 text strings
+       0x1c IPv6?
+        252 a request for a transfer of an entire zone
+        253 a request for mailbox-related records (MB, MG or MR)
+        254 a request for mail agent RRs (Obsolete - see MX)
+        255 a request for all records
+QCLASS  a two octet code that specifies the class of the query.
+          1 the Internet
+        (others are historic only)
+        255 any class
+
+4.1.3. Resource Record format
+
+The answer, authority, and additional sections all share the same format:
+a variable number of resource records, where the number of records
+is specified in the corresponding count field in the header.
+Each resource record has this format:
+      0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15
+    +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+    /                                               /
+    /                      NAME                     /
+    +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+    |                      TYPE                     |
+    +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+    |                     CLASS                     |
+    +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+    |                      TTL                      |
+    |                                               |
+    +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+    |                   RDLENGTH                    |
+    +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--|
+    /                     RDATA                     /
+    /                                               /
+    +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+NAME    a domain name to which this resource record pertains.
+TYPE    two octets containing one of the RR type codes.  This
+        field specifies the meaning of the data in the RDATA field.
+CLASS   two octets which specify the class of the data in the RDATA field.
+TTL     a 32 bit unsigned integer that specifies the time interval
+        (in seconds) that the record may be cached.
+RDLENGTH a 16 bit integer, length in octets of the RDATA field.
+RDATA   a variable length string of octets that describes the resource.
+        The format of this information varies according to the TYPE
+        and CLASS of the resource record.
+        If the TYPE is A and the CLASS is IN, it's a 4 octet IP address.
+
+4.1.4. Message compression
+
+In order to reduce the size of messages, domain names coan be compressed.
+An entire domain name or a list of labels at the end of a domain name
+is replaced with a pointer to a prior occurance of the same name.
+
+The pointer takes the form of a two octet sequence:
+    +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+    | 1  1|                OFFSET                   |
+    +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+The first two bits are ones.  This allows a pointer to be distinguished
+from a label, since the label must begin with two zero bits because
+labels are restricted to 63 octets or less.  The OFFSET field specifies
+an offset from the start of the message (i.e., the first octet
+of the ID field in the domain header).
+A zero offset specifies the first byte of the ID field, etc.
+Domain name in a message can be represented as either:
+   - a sequence of labels ending in a zero octet
+   - a pointer
+   - a sequence of labels ending with a pointer
+ */
+static int process_packet(struct dns_entry *conf_data,
+        uint32_t conf_ttl,
+        uint8_t *buf)
 {
     struct dns_head *head;
-    struct dns_prop *qprop;
-    struct dns_repl outr;
-    void *next, *from, *answb;
-
-    uint8_t answstr[MAX_NAME_LEN + 1];
-    int lookup_result, type, len, packet_len;
-    uint16_t flags;
-
-    answstr[0] = '\0';
+    struct type_and_class *unaligned_type_class;
+    const char *err_msg;
+    char *query_string;
+    char *answstr;
+    uint8_t *answb;
+    uint16_t outr_rlen;
+    uint16_t outr_flags;
+    uint16_t type;
+    uint16_t class;
+    int query_len;
 
     head = (struct dns_head *)buf;
     if (head->nquer == 0) {
-        bb_error_msg("no queries");
-        return -1;
-    }
-
-    if (head->flags & 0x8000) {
-        bb_error_msg("ignoring response packet");
-        return -1;
-    }
-
-    from = (void *)&head[1];    //  start of query string
-    next = answb = from + strlen((char *)from) + 1 + sizeof(struct dns_prop);   // where to append answer block
-
-    outr.rlen = 0;          // may change later
-    outr.r = NULL;
-    outr.flags = 0;
-
-    qprop = (struct dns_prop *)(answb - 4);
-    type = ntohs(qprop->type);
-
-    // only let REQ_A and REQ_PTR pass
-    if (!(type == REQ_A || type == REQ_PTR)) {
-        goto empty_packet;  /* we can't handle the query type */
-    }
-
-    if (ntohs(qprop->class) != 1 /* class INET */ ) {
-        outr.flags = 4; /* not supported */
+        bb_error_msg("packet has 0 queries, ignored");
+        return 0; /* don't reply */
+    }
+    if (head->flags & htons(0x8000)) { /* QR bit */
+        bb_error_msg("response packet, ignored");
+        return 0; /* don't reply */
+    }
+    /* QR = 1 "response", RCODE = 4 "Not Implemented" */
+    outr_flags = htons(0x8000 | 4);
+    err_msg = NULL;
+
+    /* start of query string */
+    query_string = (void *)(head + 1);
+    /* caller guarantees strlen is <= MAX_PACK_LEN */
+    query_len = strlen(query_string) + 1;
+    /* may be unaligned! */
+    unaligned_type_class = (void *)(query_string + query_len);
+    query_len += sizeof(*unaligned_type_class);
+    /* where to append answer block */
+    answb = (void *)(unaligned_type_class + 1);
+
+    /* OPCODE != 0 "standard query"? */
+    if ((head->flags & htons(0x7800)) != 0) {
+        err_msg = "opcode != 0";
         goto empty_packet;
     }
-    /* we only support standard queries */
-
-    if ((ntohs(head->flags) & 0x7800) != 0)
+    move_from_unaligned16(class, &unaligned_type_class->class);
+    if (class != htons(1)) { /* not class INET? */
+        err_msg = "class != 1";
         goto empty_packet;
-
-    // We have a standard query
-    bb_info_msg("%s", (char *)from);
-    lookup_result = table_lookup(type, answstr, (uint8_t*)from);
-    if (lookup_result != 0) {
-        outr.flags = 3 | 0x0400;    //name do not exist and auth
+    }
+    move_from_unaligned16(type, &unaligned_type_class->type);
+    if (type != htons(REQ_A) && type != htons(REQ_PTR)) {
+        /* we can't handle this query type */
+//TODO: happens all the time with REQ_AAAA (0x1c) requests - implement those?
+        err_msg = "type is !REQ_A and !REQ_PTR";
         goto empty_packet;
     }
-    if (type == REQ_A) {    // return an address
-        struct in_addr a;
-        if (!inet_aton((char*)answstr, &a)) {//dotted dec to long conv
-            outr.flags = 1; /* Frmt err */
-            goto empty_packet;
+
+    /* look up the name */
+    answstr = table_lookup(conf_data, type, query_string);
+#if DEBUG
+    /* Shows lengths instead of dots, unusable for !DEBUG */
+    bb_error_msg("'%s'->'%s'", query_string, answstr);
+#endif
+    outr_rlen = 4;
+    if (answstr && type == htons(REQ_PTR)) {
+        /* returning a host name */
+        outr_rlen = strlen(answstr) + 1;
+    }
+    if (!answstr
+     || (unsigned)(answb - buf) + query_len + 4 + 2 + outr_rlen > MAX_PACK_LEN
+    ) {
+        /* QR = 1 "response"
+         * AA = 1 "Authoritative Answer"
+         * RCODE = 3 "Name Error" */
+        err_msg = "name is not found";
+        outr_flags = htons(0x8000 | 0x0400 | 3);
+        goto empty_packet;
+    }
+
+    /* Append answer Resource Record */
+    memcpy(answb, query_string, query_len); /* name, type, class */
+    answb += query_len;
+    move_to_unaligned32((uint32_t *)answb, htonl(conf_ttl));
+    answb += 4;
+    move_to_unaligned16((uint16_t *)answb, htons(outr_rlen));
+    answb += 2;
+    memcpy(answb, answstr, outr_rlen);
+    answb += outr_rlen;
+
+    /* QR = 1 "response",
+     * AA = 1 "Authoritative Answer",
+     * TODO: need to set RA bit 0x80? One user says nslookup complains
+     * "Got recursion not available from SERVER, trying next server"
+     * "** server can't find HOSTNAME"
+     * RCODE = 0 "success"
+     */
+    if (OPT_verbose)
+        bb_error_msg("returning positive reply");
+    outr_flags = htons(0x8000 | 0x0400 | 0);
+    /* we have one answer */
+    head->nansw = htons(1);
+
+ empty_packet:
+    if ((outr_flags & htons(0xf)) != 0) { /* not a positive response */
+        if (OPT_verbose) {
+            bb_error_msg("%s, %s",
+                err_msg,
+                OPT_silent ? "dropping query" : "sending error reply"
+            );
         }
-        memcpy(answstr, &a.s_addr, 4);  // save before a disappears
-        outr.rlen = 4;          // uint32_t IP
-    } else
-        outr.rlen = strlen((char *)answstr) + 1;    // a host name
-    outr.r = answstr;           // 32 bit ip or a host name
-    outr.flags |= 0x0400;           /* authority-bit */
-    // we have an answer
-    head->nansw = htons(1);
-
-    // copy query block to answer block
-    len = answb - from;
-    memcpy(answb, from, len);
-    next += len;
-
-    // and append answer rr
-    *(uint32_t *) next = htonl(ttl);
-    next += 4;
-    *(uint16_t *) next = htons(outr.rlen);
-    next += 2;
-    memcpy(next, (void *)answstr, outr.rlen);
-    next += outr.rlen;
-
- empty_packet:
-
-    flags = ntohs(head->flags);
-    // clear rcode and RA, set responsebit and our new flags
-    flags |= (outr.flags & 0xff80) | 0x8000;
-    head->flags = htons(flags);
-    head->nauth = head->nadd = htons(0);
-    head->nquer = htons(1);
-
-    packet_len = (uint8_t *)next - buf;
-    return packet_len;
+        if (OPT_silent)
+            return 0;
+    }
+    head->flags |= outr_flags;
+    head->nauth = head->nadd = 0;
+    head->nquer = htons(1); // why???
+
+    return answb - buf;
 }
 
-/*
- * Exit on signal
- */
-static void interrupt(int x)
-{
-    /* unlink("/var/run/dnsd.lock"); */
-    bb_error_msg("interrupt, exiting\n");
-    exit(2);
-}
-
-int dnsd_main(int argc, char **argv);
-int dnsd_main(int argc, char **argv)
+int dnsd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int dnsd_main(int argc UNUSED_PARAM, char **argv)
 {
     const char *listen_interface = "0.0.0.0";
+    const char *fileconf = "/etc/dnsd.conf";
+    struct dns_entry *conf_data;
+    uint32_t conf_ttl = DEFAULT_TTL;
     char *sttl, *sport;
-    len_and_sockaddr *lsa;
-    int udps;
+    len_and_sockaddr *lsa, *from, *to;
+    unsigned lsa_size;
+    int udps, opts;
     uint16_t port = 53;
-    uint8_t buf[MAX_PACK_LEN];
-
-    getopt32(argv, "i:c:t:p:dv", &listen_interface, &fileconf, &sttl, &sport);
-    //if (option_mask32 & 0x1) // -i
-    //if (option_mask32 & 0x2) // -c
-    if (option_mask32 & 0x4) // -t
-        ttl = xatou_range(sttl, 1, 0xffffffff);
-    if (option_mask32 & 0x8) // -p
+    /* Ensure buf is 32bit aligned (we need 16bit, but 32bit can't hurt) */
+    uint8_t buf[MAX_PACK_LEN + 1] ALIGN4;
+
+    opts = getopt32(argv, "vsi:c:t:p:d", &listen_interface, &fileconf, &sttl, &sport);
+    //if (opts & (1 << 0)) // -v
+    //if (opts & (1 << 1)) // -s
+    //if (opts & (1 << 2)) // -i
+    //if (opts & (1 << 3)) // -c
+    if (opts & (1 << 4)) // -t
+        conf_ttl = xatou_range(sttl, 1, 0xffffffff);
+    if (opts & (1 << 5)) // -p
         port = xatou_range(sport, 1, 0xffff);
-
-    if (OPT_verbose) {
-        bb_info_msg("listen_interface: %s", listen_interface);
-        bb_info_msg("ttl: %d, port: %d", ttl, port);
-        bb_info_msg("fileconf: %s", fileconf);
-    }
-
-    if (OPT_daemon) {
+    if (opts & (1 << 6)) { // -d
         bb_daemonize_or_rexec(DAEMON_CLOSE_EXTRA_FDS, argv);
         openlog(applet_name, LOG_PID, LOG_DAEMON);
@@ -359 +504 @@
     }
 
-    dnsentryinit();
-
-    signal(SIGINT, interrupt);
-    /* why? signal(SIGPIPE, SIG_IGN); */
-    signal(SIGHUP, SIG_IGN);
-#ifdef SIGTSTP
-    signal(SIGTSTP, SIG_IGN);
-#endif
-#ifdef SIGURG
-    signal(SIGURG, SIG_IGN);
-#endif
+    conf_data = parse_conf_file(fileconf);
 
     lsa = xdotted2sockaddr(listen_interface, port);
-    udps = xsocket(lsa->sa.sa_family, SOCK_DGRAM, 0);
-    xbind(udps, &lsa->sa, lsa->len);
-    /* xlisten(udps, 50); - ?!! DGRAM sockets are never listened on I think? */
-    bb_info_msg("Accepting UDP packets on %s",
-            xmalloc_sockaddr2dotted(&lsa->sa));
+    udps = xsocket(lsa->u.sa.sa_family, SOCK_DGRAM, 0);
+    xbind(udps, &lsa->u.sa, lsa->len);
+    socket_want_pktinfo(udps); /* needed for recv_from_to to work */
+    lsa_size = LSA_LEN_SIZE + lsa->len;
+    from = xzalloc(lsa_size);
+    to = xzalloc(lsa_size);
+
+    {
+        char *p = xmalloc_sockaddr2dotted(&lsa->u.sa);
+        bb_error_msg("accepting UDP packets on %s", p);
+        free(p);
+    }
 
     while (1) {
         int r;
-        socklen_t fromlen = lsa->len;
-// FIXME: need to get *DEST* address (to which of our addresses
-// this query was directed), and reply from the same address.
-// Or else we can exhibit usual UDP ugliness:
-// [ip1.multihomed.ip2] <=  query to ip1  <= peer
-// [ip1.multihomed.ip2] => reply from ip2 => peer (confused)
-        r = recvfrom(udps, buf, sizeof(buf), 0, &lsa->sa, &fromlen);
-        if (OPT_verbose)
-            bb_info_msg("Got UDP packet");
-        if (r < 12 || r > 512) {
-            bb_error_msg("invalid packet size");
+        /* Try to get *DEST* address (to which of our addresses
+         * this query was directed), and reply from the same address.
+         * Or else we can exhibit usual UDP ugliness:
+         * [ip1.multihomed.ip2] <=  query to ip1  <= peer
+         * [ip1.multihomed.ip2] => reply from ip2 => peer (confused) */
+        memcpy(to, lsa, lsa_size);
+        r = recv_from_to(udps, buf, MAX_PACK_LEN + 1, 0, &from->u.sa, &to->u.sa, lsa->len);
+        if (r < 12 || r > MAX_PACK_LEN) {
+            bb_error_msg("packet size %d, ignored", r);
             continue;
         }
-        r = process_packet(buf);
+        if (OPT_verbose)
+            bb_error_msg("got UDP packet");
+        buf[r] = '\0'; /* paranoia */
+        r = process_packet(conf_data, conf_ttl, buf);
         if (r <= 0)
             continue;
-        sendto(udps, buf, r, 0, &lsa->sa, fromlen);
+        send_to_from(udps, buf, r, 0, &from->u.sa, &to->u.sa, lsa->len);
     }
     return 0;

branches/2.2.9/mindi-busybox/networking/ether-wake.c

@@ -3 +3 @@
  * ether-wake.c - Send a magic packet to wake up sleeping machines.
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  * Author:      Donald Becker, http://www.scyld.com/"; http://www.scyld.com/wakeonlan.html
@@ -93 +93 @@
     for (i = 0; i < pktsize; ++i) {
         printf("%2.2x ", outpack[i]);
-        if (i % 20 == 19) puts("");
+        if (i % 20 == 19) bb_putchar('\n');
     }
     printf("\n\n");
@@ -112 +112 @@
     struct ether_addr *eap;
 
-    eap = ether_aton(hostid);
+    eap = ether_aton_r(hostid, eaddr);
     if (eap) {
-        *eaddr = *eap;
-        bb_debug_msg("The target station address is %s\n\n", ether_ntoa(eaddr));
-#if !defined(__UCLIBC__)
+        bb_debug_msg("The target station address is %s\n\n", ether_ntoa(eap));
+#if !defined(__UCLIBC_MAJOR__) \
+ || __UCLIBC_MAJOR__ > 0 \
+ || __UCLIBC_MINOR__ > 9 \
+ || (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ >= 30)
     } else if (ether_hostton(hostid, eaddr) == 0) {
         bb_debug_msg("Station address for hostname %s is %s\n\n", hostid, ether_ntoa(eaddr));
 #endif
-    } else
+    } else {
         bb_show_usage();
+    }
 }
 
@@ -165 +168 @@
                           &passwd[0], &passwd[1], &passwd[2], &passwd[3]);
     if (byte_cnt < 4) {
-        bb_error_msg("cannot read Wake-On-LAN pass");
+        bb_error_msg("can't read Wake-On-LAN pass");
         return 0;
     }
@@ -179 +182 @@
 }
 
-int ether_wake_main(int argc, char **argv);
-int ether_wake_main(int argc, char **argv)
+int ether_wake_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int ether_wake_main(int argc UNUSED_PARAM, char **argv)
 {
     const char *ifname = "eth0";
@@ -187 +190 @@
     unsigned char wol_passwd[6];
     int wol_passwd_sz = 0;
-    int s;                      /* Raw socket */
+    int s;  /* Raw socket */
     int pktsize;
     unsigned char outpack[1000];
 
     struct ether_addr eaddr;
-    struct whereto_t whereto;   /* who to wake up */
+    struct whereto_t whereto;  /* who to wake up */
 
     /* handle misc user options */
@@ -220 +223 @@
         struct ifreq if_hwaddr;
 
-        strncpy(if_hwaddr.ifr_name, ifname, sizeof(if_hwaddr.ifr_name));
+        strncpy_IFNAMSIZ(if_hwaddr.ifr_name, ifname);
         ioctl_or_perror_and_die(s, SIOCGIFHWADDR, &if_hwaddr, "SIOCGIFHWADDR on %s failed", ifname);
 
@@ -256 +259 @@
     {
         struct ifreq ifr;
-        strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+        strncpy_IFNAMSIZ(ifr.ifr_name, ifname);
         xioctl(s, SIOCGIFINDEX, &ifr);
         memset(&whereto, 0, sizeof(whereto));

branches/2.2.9/mindi-busybox/networking/ftpgetput.c

@@ -6 +6 @@
  *
  * Copyright (C) 2002 Jeff Angielski, The PTR Group <jeff@theptrgroup.com>
- * Copyright (C) 2002 Glenn McGrath <bug1@iinet.net.au>
+ * Copyright (C) 2002 Glenn McGrath
  *
  * Based on wget.c by Chip Rosenthal Covad Communications
  * <chip@laserlink.net>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
-#include <getopt.h>
 #include "libbb.h"
 
-typedef struct ftp_host_info_s {
+struct globals {
     const char *user;
     const char *password;
     struct len_and_sockaddr *lsa;
-} ftp_host_info_t;
-
-static smallint verbose_flag;
-static smallint do_continue;
-
-static void ftp_die(const char *msg, const char *remote) ATTRIBUTE_NORETURN;
-static void ftp_die(const char *msg, const char *remote)
-{
+    FILE *control_stream;
+    int verbose_flag;
+    int do_continue;
+    char buf[1]; /* actually [BUFSZ] */
+} FIX_ALIASING;
+#define G (*(struct globals*)&bb_common_bufsiz1)
+enum { BUFSZ = COMMON_BUFSIZE - offsetof(struct globals, buf) };
+struct BUG_G_too_big {
+    char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1];
+};
+#define user           (G.user          )
+#define password       (G.password      )
+#define lsa            (G.lsa           )
+#define control_stream (G.control_stream)
+#define verbose_flag   (G.verbose_flag  )
+#define do_continue    (G.do_continue   )
+#define buf            (G.buf           )
+#define INIT_G() do { } while (0)
+
+
+static void ftp_die(const char *msg) NORETURN;
+static void ftp_die(const char *msg)
+{
+    char *cp = buf; /* buf holds peer's response */
+
     /* Guard against garbage from remote server */
-    const char *cp = remote;
-    while (*cp >= ' ' && *cp < '\x7f') cp++;
-    bb_error_msg_and_die("unexpected server response%s%s: %.*s",
-            msg ? " to " : "", msg ? msg : "",
-            (int)(cp - remote), remote);
-}
-
-
-static int ftpcmd(const char *s1, const char *s2, FILE *stream, char *buf)
+    while (*cp >= ' ' && *cp < '\x7f')
+        cp++;
+    *cp = '\0';
+    bb_error_msg_and_die("unexpected server response%s%s: %s",
+            (msg ? " to " : ""), (msg ? msg : ""), buf);
+}
+
+static int ftpcmd(const char *s1, const char *s2)
 {
     unsigned n;
+
     if (verbose_flag) {
         bb_error_msg("cmd %s %s", s1, s2);
@@ -46 +62 @@
 
     if (s1) {
-        if (s2) {
-            fprintf(stream, "%s %s\r\n", s1, s2);
-        } else {
-            fprintf(stream, "%s\r\n", s1);
-        }
-    }
+        fprintf(control_stream, (s2 ? "%s %s\r\n" : "%s %s\r\n"+3),
+                        s1, s2);
+        fflush(control_stream);
+    }
+
     do {
-        char *buf_ptr;
-
-        if (fgets(buf, 510, stream) == NULL) {
-            bb_perror_msg_and_die("fgets");
-        }
-        buf_ptr = strstr(buf, "\r\n");
-        if (buf_ptr) {
-            *buf_ptr = '\0';
+        strcpy(buf, "EOF");
+        if (fgets(buf, BUFSZ - 2, control_stream) == NULL) {
+            ftp_die(NULL);
         }
     } while (!isdigit(buf[0]) || buf[3] != ' ');
@@ -70 +80 @@
 }
 
-static int xconnect_ftpdata(ftp_host_info_t *server, char *buf)
+static void ftp_login(void)
+{
+    /* Connect to the command socket */
+    control_stream = fdopen(xconnect_stream(lsa), "r+");
+    if (control_stream == NULL) {
+        /* fdopen failed - extremely unlikely */
+        bb_perror_nomsg_and_die();
+    }
+
+    if (ftpcmd(NULL, NULL) != 220) {
+        ftp_die(NULL);
+    }
+
+    /*  Login to the server */
+    switch (ftpcmd("USER", user)) {
+    case 230:
+        break;
+    case 331:
+        if (ftpcmd("PASS", password) != 230) {
+            ftp_die("PASS");
+        }
+        break;
+    default:
+        ftp_die("USER");
+    }
+
+    ftpcmd("TYPE I", NULL);
+}
+
+static int xconnect_ftpdata(void)
 {
     char *buf_ptr;
-    unsigned short port_num;
+    unsigned port_num;
+
+/*
+TODO: PASV command will not work for IPv6. RFC2428 describes
+IPv6-capable "extended PASV" - EPSV.
+
+"EPSV [protocol]" asks server to bind to and listen on a data port
+in specified protocol. Protocol is 1 for IPv4, 2 for IPv6.
+If not specified, defaults to "same as used for control connection".
+If server understood you, it should answer "229 <some text>(|||port|)"
+where "|" are literal pipe chars and "port" is ASCII decimal port#.
+
+There is also an IPv6-capable replacement for PORT (EPRT),
+but we don't need that.
+
+NB: PASV may still work for some servers even over IPv6.
+For example, vsftp happily answers
+"227 Entering Passive Mode (0,0,0,0,n,n)" and proceeds as usual.
+
+TODO2: need to stop ignoring IP address in PASV response.
+*/
+
+    if (ftpcmd("PASV", NULL) != 227) {
+        ftp_die("PASV");
+    }
 
     /* Response is "NNN garbageN1,N2,N3,N4,P1,P2[)garbage]
@@ -89 +152 @@
     port_num += xatoul_range(buf_ptr + 1, 0, 255) * 256;
 
-    set_nport(server->lsa, htons(port_num));
-    return xconnect_stream(server->lsa);
-}
-
-static FILE *ftp_login(ftp_host_info_t *server)
-{
-    FILE *control_stream;
-    char buf[512];
-
-    /* Connect to the command socket */
-    control_stream = fdopen(xconnect_stream(server->lsa), "r+");
-    if (control_stream == NULL) {
-        /* fdopen failed - extremely unlikely */
-        bb_perror_nomsg_and_die();
-    }
-
-    if (ftpcmd(NULL, NULL, control_stream, buf) != 220) {
-        ftp_die(NULL, buf);
-    }
-
-    /*  Login to the server */
-    switch (ftpcmd("USER", server->user, control_stream, buf)) {
-    case 230:
-        break;
-    case 331:
-        if (ftpcmd("PASS", server->password, control_stream, buf) != 230) {
-            ftp_die("PASS", buf);
-        }
-        break;
-    default:
-        ftp_die("USER", buf);
-    }
-
-    ftpcmd("TYPE I", NULL, control_stream, buf);
-
-    return control_stream;
+    set_nport(lsa, htons(port_num));
+    return xconnect_stream(lsa);
+}
+
+static int pump_data_and_QUIT(int from, int to)
+{
+    /* copy the file */
+    if (bb_copyfd_eof(from, to) == -1) {
+        /* error msg is already printed by bb_copyfd_eof */
+        return EXIT_FAILURE;
+    }
+
+    /* close data connection */
+    close(from); /* don't know which one is that, so we close both */
+    close(to);
+
+    /* does server confirm that transfer is finished? */
+    if (ftpcmd(NULL, NULL) != 226) {
+        ftp_die(NULL);
+    }
+    ftpcmd("QUIT", NULL);
+
+    return EXIT_SUCCESS;
 }
 
 #if !ENABLE_FTPGET
-int ftp_receive(ftp_host_info_t *server, FILE *control_stream,
-        const char *local_path, char *server_path);
+int ftp_receive(const char *local_path, char *server_path);
 #else
 static
-int ftp_receive(ftp_host_info_t *server, FILE *control_stream,
-        const char *local_path, char *server_path)
-{
-    char buf[512];
-/* I think 'filesize' usage here is bogus. Let's see... */
-    //off_t filesize = -1;
-#define filesize ((off_t)-1)
+int ftp_receive(const char *local_path, char *server_path)
+{
     int fd_data;
     int fd_local = -1;
     off_t beg_range = 0;
 
-    /* Connect to the data socket */
-    if (ftpcmd("PASV", NULL, control_stream, buf) != 227) {
-        ftp_die("PASV", buf);
-    }
-    fd_data = xconnect_ftpdata(server, buf);
-
-    if (ftpcmd("SIZE", server_path, control_stream, buf) == 213) {
-        //filesize = BB_STRTOOFF(buf + 4, NULL, 10);
-        //if (errno || filesize < 0)
-        //  ftp_die("SIZE", buf);
-    } else {
+    /* connect to the data socket */
+    fd_data = xconnect_ftpdata();
+
+    if (ftpcmd("SIZE", server_path) != 213) {
         do_continue = 0;
     }
@@ -164 +201 @@
     if (do_continue) {
         struct stat sbuf;
-        if (lstat(local_path, &sbuf) < 0) {
-            bb_perror_msg_and_die("lstat");
+        /* lstat would be wrong here! */
+        if (stat(local_path, &sbuf) < 0) {
+            bb_perror_msg_and_die("stat");
         }
         if (sbuf.st_size > 0) {
@@ -175 +213 @@
 
     if (do_continue) {
-        sprintf(buf, "REST %"OFF_FMT"d", beg_range);
-        if (ftpcmd(buf, NULL, control_stream, buf) != 350) {
+        sprintf(buf, "REST %"OFF_FMT"u", beg_range);
+        if (ftpcmd(buf, NULL) != 350) {
             do_continue = 0;
-        } else {
-            //if (filesize != -1)
-            //  filesize -= beg_range;
-        }
-    }
-
-    if (ftpcmd("RETR", server_path, control_stream, buf) > 150) {
-        ftp_die("RETR", buf);
-    }
-
-    /* only make a local file if we know that one exists on the remote server */
+        }
+    }
+
+    if (ftpcmd("RETR", server_path) > 150) {
+        ftp_die("RETR");
+    }
+
+    /* create local file _after_ we know that remote file exists */
     if (fd_local == -1) {
-        if (do_continue) {
-            fd_local = xopen(local_path, O_APPEND | O_WRONLY);
-        } else {
-            fd_local = xopen(local_path, O_CREAT | O_TRUNC | O_WRONLY);
-        }
-    }
-
-    /* Copy the file */
-    if (filesize != -1) {
-        if (bb_copyfd_size(fd_data, fd_local, filesize) == -1)
-            return EXIT_FAILURE;
-    } else {
-        if (bb_copyfd_eof(fd_data, fd_local) == -1)
-            return EXIT_FAILURE;
-    }
-
-    /* close it all down */
-    close(fd_data);
-    if (ftpcmd(NULL, NULL, control_stream, buf) != 226) {
-        ftp_die(NULL, buf);
-    }
-    ftpcmd("QUIT", NULL, control_stream, buf);
-
-    return EXIT_SUCCESS;
+        fd_local = xopen(local_path,
+            do_continue ? (O_APPEND | O_WRONLY)
+                        : (O_CREAT | O_TRUNC | O_WRONLY)
+        );
+    }
+
+    return pump_data_and_QUIT(fd_data, fd_local);
 }
 #endif
 
 #if !ENABLE_FTPPUT
-int ftp_send(ftp_host_info_t *server, FILE *control_stream,
-        const char *server_path, char *local_path);
+int ftp_send(const char *server_path, char *local_path);
 #else
 static
-int ftp_send(ftp_host_info_t *server, FILE *control_stream,
-        const char *server_path, char *local_path)
-{
-    struct stat sbuf;
-    char buf[512];
+int ftp_send(const char *server_path, char *local_path)
+{
     int fd_data;
     int fd_local;
     int response;
 
-    /*  Connect to the data socket */
-    if (ftpcmd("PASV", NULL, control_stream, buf) != 227) {
-        ftp_die("PASV", buf);
-    }
-    fd_data = xconnect_ftpdata(server, buf);
+    /* connect to the data socket */
+    fd_data = xconnect_ftpdata();
 
     /* get the local file */
     fd_local = STDIN_FILENO;
-    if (NOT_LONE_DASH(local_path)) {
+    if (NOT_LONE_DASH(local_path))
         fd_local = xopen(local_path, O_RDONLY);
-        fstat(fd_local, &sbuf);
-
-        sprintf(buf, "ALLO %"OFF_FMT"u", sbuf.st_size);
-        response = ftpcmd(buf, NULL, control_stream, buf);
-        switch (response) {
-        case 200:
-        case 202:
-            break;
-        default:
-            close(fd_local);
-            ftp_die("ALLO", buf);
-            break;
-        }
-    }
-    response = ftpcmd("STOR", server_path, control_stream, buf);
+
+    response = ftpcmd("STOR", server_path);
     switch (response) {
     case 125:
@@ -261 +259 @@
         break;
     default:
-        close(fd_local);
-        ftp_die("STOR", buf);
-    }
-
-    /* transfer the file  */
-    if (bb_copyfd_eof(fd_local, fd_data) == -1) {
-        exit(EXIT_FAILURE);
-    }
-
-    /* close it all down */
-    close(fd_data);
-    if (ftpcmd(NULL, NULL, control_stream, buf) != 226) {
-        ftp_die("close", buf);
-    }
-    ftpcmd("QUIT", NULL, control_stream, buf);
-
-    return EXIT_SUCCESS;
-}
-#endif
-
-#define FTPGETPUT_OPT_CONTINUE  1
-#define FTPGETPUT_OPT_VERBOSE   2
-#define FTPGETPUT_OPT_USER  4
-#define FTPGETPUT_OPT_PASSWORD  8
-#define FTPGETPUT_OPT_PORT  16
+        ftp_die("STOR");
+    }
+
+    return pump_data_and_QUIT(fd_local, fd_data);
+}
+#endif
 
 #if ENABLE_FEATURE_FTPGETPUT_LONG_OPTIONS
@@ -297 +276 @@
 #endif
 
-int ftpgetput_main(int argc, char **argv);
-int ftpgetput_main(int argc, char **argv)
-{
-    /* content-length of the file */
+int ftpgetput_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int ftpgetput_main(int argc UNUSED_PARAM, char **argv)
+{
     unsigned opt;
     const char *port = "ftp";
     /* socket to ftp server */
-    FILE *control_stream;
-    /* continue previous transfer (-c) */
-    ftp_host_info_t *server;
 
 #if ENABLE_FTPPUT && !ENABLE_FTPGET
@@ -313 +288 @@
 # define ftp_action ftp_receive
 #else
-    int (*ftp_action)(ftp_host_info_t *, FILE *, const char *, char *) = ftp_send;
+    int (*ftp_action)(const char *, char *) = ftp_send;
+
     /* Check to see if the command is ftpget or ftput */
     if (applet_name[3] == 'g') {
@@ -320 +296 @@
 #endif
 
+    INIT_G();
     /* Set default values */
-    server = xmalloc(sizeof(*server));
-    server->user = "anonymous";
-    server->password = "busybox@";
+    user = "anonymous";
+    password = "busybox@";
 
     /*
@@ -331 +307 @@
     applet_long_options = ftpgetput_longopts;
 #endif
-    opt_complementary = "=3"; /* must have 3 params */
-    opt = getopt32(argv, "cvu:p:P:", &server->user, &server->password, &port);
+    opt_complementary = "-2:vv:cc"; /* must have 2 to 3 params; -v and -c count */
+    opt = getopt32(argv, "cvu:p:P:", &user, &password, &port,
+                    &verbose_flag, &do_continue);
     argv += optind;
-
-    /* Process the non-option command line arguments */
-    if (opt & FTPGETPUT_OPT_CONTINUE) {
-        do_continue = 1;
-    }
-    if (opt & FTPGETPUT_OPT_VERBOSE) {
-        verbose_flag = 1;
-    }
 
     /* We want to do exactly _one_ DNS lookup, since some
      * sites (i.e. ftp.us.debian.org) use round-robin DNS
      * and we want to connect to only one IP... */
-    server->lsa = xhost2sockaddr(argv[0], bb_lookup_port(port, "tcp", 21));
+    lsa = xhost2sockaddr(argv[0], bb_lookup_port(port, "tcp", 21));
     if (verbose_flag) {
         printf("Connecting to %s (%s)\n", argv[0],
-            xmalloc_sockaddr2dotted(&server->lsa->sa));
-    }
-
-    /*  Connect/Setup/Configure the FTP session */
-    control_stream = ftp_login(server);
-
-    return ftp_action(server, control_stream, argv[1], argv[2]);
-}
+            xmalloc_sockaddr2dotted(&lsa->u.sa));
+    }
+
+    ftp_login();
+    return ftp_action(argv[1], argv[2] ? argv[2] : argv[1]);
+}

branches/2.2.9/mindi-busybox/networking/hostname.c

@@ -5 +5 @@
  * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
  *
- * adjusted by Erik Andersen <andersen@codepoet.org> to remove
+ * Adjusted by Erik Andersen <andersen@codepoet.org> to remove
  * use of long options and GNU getopt.  Improved the usage info.
  *
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 #include "libbb.h"
 
 static void do_sethostname(char *s, int isfile)
 {
-    FILE *f;
-
-    if (!s)
-        return;
-    if (!isfile) {
-        if (sethostname(s, strlen(s)) < 0) {
-            if (errno == EPERM)
-                bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
-            else
-                bb_perror_msg_and_die("sethostname");
-        }
-    } else {
-        f = xfopen(s, "r");
-#define strbuf bb_common_bufsiz1
-        while (fgets(strbuf, sizeof(strbuf), f) != NULL) {
-            if (strbuf[0] == '#') {
-                continue;
-            }
-            chomp(strbuf);
-            do_sethostname(strbuf, 0);
+//  if (!s)
+//      return;
+    if (isfile) {
+        parser_t *parser = config_open2(s, xfopen_for_read);
+        while (config_read(parser, &s, 1, 1, "# \t", PARSE_NORMAL & ~PARSE_GREEDY)) {
+            do_sethostname(s, 0);
         }
         if (ENABLE_FEATURE_CLEAN_UP)
-            fclose(f);
+            config_close(parser);
+    } else if (sethostname(s, strlen(s))) {
+//      if (errno == EPERM)
+//          bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
+        bb_perror_msg_and_die("sethostname");
     }
 }
 
-int hostname_main(int argc, char **argv);
-int hostname_main(int argc, char **argv)
+/* Manpage circa 2009:
+ *
+ * hostname [-v] [-a] [--alias] [-d] [--domain] [-f] [--fqdn] [--long]
+ *      [-i] [--ip-address] [-s] [--short] [-y] [--yp] [--nis]
+ *
+ * hostname [-v] [-F filename] [--file filename] / [hostname]
+ *
+ * domainname [-v] [-F filename] [--file filename]  / [name]
+ *  { bbox: not supported }
+ *
+ * nodename [-v] [-F filename] [--file filename] / [name]
+ *  { bbox: not supported }
+ *
+ * dnsdomainname [-v]
+ *  { bbox: supported: Linux kernel build needs this }
+ * nisdomainname [-v]
+ *  { bbox: not supported }
+ * ypdomainname [-v]
+ *  { bbox: not supported }
+ *
+ * -a, --alias
+ *  Display the alias name of the host (if used).
+ *  { bbox: not supported }
+ * -d, --domain
+ *  Display the name of the DNS domain. Don't use the command
+ *  domainname to get the DNS domain name because it will show the
+ *  NIS domain name and not the DNS domain name. Use dnsdomainname
+ *  instead.
+ * -f, --fqdn, --long
+ *  Display the FQDN (Fully Qualified Domain Name). A FQDN consists
+ *  of a short host name and the DNS domain name. Unless you are
+ *  using bind or NIS for host lookups you can change the FQDN and
+ *  the DNS domain name (which is part of the FQDN) in the
+ *  /etc/hosts file.
+ * -i, --ip-address
+ *  Display the IP address(es) of the host.
+ * -s, --short
+ *  Display the short host name. This is the host name cut at the
+ *  first dot.
+ * -v, --verbose
+ *  Be verbose and tell what's going on.
+ *  { bbox: supported but ignored }
+ * -y, --yp, --nis
+ *  Display the NIS domain name. If a parameter is given (or --file
+ *  name ) then root can also set a new NIS domain.
+ *  { bbox: not supported }
+ * -F, --file filename
+ *  Read the host name from the specified file. Comments (lines
+ *  starting with a `#') are ignored.
+ */
+int hostname_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int hostname_main(int argc UNUSED_PARAM, char **argv)
 {
     enum {
@@ -55 +92 @@
     };
 
-    char buf[256];
+    unsigned opts;
+    char *buf;
     char *hostname_str;
 
-    if (argc < 1)
-        bb_show_usage();
+#if ENABLE_LONG_OPTS
+    applet_long_options =
+        "domain\0"     No_argument "d"
+        "fqdn\0"       No_argument "f"
+    //Enable if seen in active use in some distro:
+    //  "long\0"       No_argument "f"
+    //  "ip-address\0" No_argument "i"
+    //  "short\0"      No_argument "s"
+    //  "verbose\0"    No_argument "v"
+        "file\0"       No_argument "F"
+        ;
 
-    getopt32(argv, "dfisF:", &hostname_str);
+#endif
+    /* dnsdomainname from net-tools 1.60, hostname 1.100 (2001-04-14),
+     * supports hostname's options too (not just -v as manpage says) */
+    opts = getopt32(argv, "dfisF:v", &hostname_str);
+    argv += optind;
+    buf = safe_gethostname();
+    if (applet_name[0] == 'd') /* dnsdomainname? */
+        opts = OPT_d;
 
-    /* Output in desired format */
-    if (option_mask32 & OPT_dfis) {
+    if (opts & OPT_dfis) {
+        /* Cases when we need full hostname (or its part) */
         struct hostent *hp;
         char *p;
-        gethostname(buf, sizeof(buf));
+
         hp = xgethostbyname(buf);
-        p = strchr(hp->h_name, '.');
-        if (option_mask32 & OPT_f) {
+        p = strchrnul(hp->h_name, '.');
+        if (opts & OPT_f) {
             puts(hp->h_name);
-        } else if (option_mask32 & OPT_s) {
-            if (p != NULL) {
-                *p = '\0';
+        } else if (opts & OPT_s) {
+            *p = '\0';
+            puts(hp->h_name);
+        } else if (opts & OPT_d) {
+            if (*p)
+                puts(p + 1);
+        } else /*if (opts & OPT_i)*/ {
+            if (hp->h_length == sizeof(struct in_addr)) {
+                struct in_addr **h_addr_list = (struct in_addr **)hp->h_addr_list;
+                while (*h_addr_list) {
+                    printf("%s ", inet_ntoa(**h_addr_list));
+                    h_addr_list++;
+                }
+                bb_putchar('\n');
             }
-            puts(hp->h_name);
-        } else if (option_mask32 & OPT_d) {
-            if (p)
-                puts(p + 1);
-        } else if (option_mask32 & OPT_i) {
-            while (hp->h_addr_list[0]) {
-                printf("%s ", inet_ntoa(*(struct in_addr *) (*hp->h_addr_list++)));
-            }
-            puts("");
         }
-    }
-    /* Set the hostname */
-    else if (option_mask32 & OPT_F) {
+    } else if (opts & OPT_F) {
+        /* Set the hostname */
         do_sethostname(hostname_str, 1);
-    } else if (optind < argc) {
-        do_sethostname(argv[optind], 0);
-    }
-    /* Or if all else fails,
-     * just print the current hostname */
-    else {
-        gethostname(buf, sizeof(buf));
+    } else if (argv[0]) {
+        /* Set the hostname */
+        do_sethostname(argv[0], 0);
+    } else {
+        /* Just print the current hostname */
         puts(buf);
     }
-    return 0;
+
+    if (ENABLE_FEATURE_CLEAN_UP)
+        free(buf);
+    return EXIT_SUCCESS;
 }

branches/2.2.9/mindi-busybox/networking/httpd.c

@@ -6 +6 @@
  * Copyright (C) 2003-2006 Vladimir Oleynik <dzo@simtreas.ru>
  *
- * simplify patch stolen from libbb without using strdup
- *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  *****************************************************************************
  *
  * Typical usage:
- *   for non root user
- * httpd -p 8080 -h $HOME/public_html
- *   or for daemon start from rc script with uid=0:
- * httpd -u www
- * This is equivalent if www user have uid=80 to
- * httpd -p 80 -u 80 -h /www -c /etc/httpd.conf -r "Web Server Authentication"
- *
- *
- * When a url starts by "/cgi-bin/" it is assumed to be a cgi script.  The
- * server changes directory to the location of the script and executes it
+ * For non root user:
+ *      httpd -p 8080 -h $HOME/public_html
+ * For daemon start from rc script with uid=0:
+ *      httpd -u www
+ * which is equivalent to (assuming user www has uid 80):
+ *      httpd -p 80 -u 80 -h $PWD -c /etc/httpd.conf -r "Web Server Authentication"
+ *
+ * When an url starts with "/cgi-bin/" it is assumed to be a cgi script.
+ * The server changes directory to the location of the script and executes it
  * after setting QUERY_STRING and other environment variables.
  *
@@ -28 +25 @@
  * "CGI Environment Variables": http://hoohoo.ncsa.uiuc.edu/cgi/env.html
  *
- * The server can also be invoked as a url arg decoder and html text encoder
+ * The applet can also be invoked as an url arg decoder and html text encoder
  * as follows:
- *  foo=`httpd -d $foo`           # decode "Hello%20World" as "Hello World"
- *  bar=`httpd -e "<Hello World>"`  # encode as "&#60Hello&#32World&#62"
+ *      foo=`httpd -d $foo`             # decode "Hello%20World" as "Hello World"
+ *      bar=`httpd -e "<Hello World>"`  # encode as "&#60Hello&#32World&#62"
  * Note that url encoding for arguments is not the same as html encoding for
- * presentation.  -d decodes a url-encoded argument while -e encodes in html
+ * presentation.  -d decodes an url-encoded argument while -e encodes in html
  * for page display.
  *
  * httpd.conf has the following format:
  *
+ * H:/serverroot     # define the server root. It will override -h
  * A:172.20.         # Allow address from 172.20.0.0/16
  * A:10.0.0.0/25     # Allow any address from 10.0.0.0-10.0.0.127
@@ -44 +42 @@
  * D:*               # Deny from other IP connections
  * E404:/path/e404.html # /path/e404.html is the 404 (not found) error page
+ * I:index.html      # Show index.html when a directory is requested
+ *
+ * P:/url:[http://]hostname[:port]/new/path
+ *                   # When /urlXXXXXX is requested, reverse proxy
+ *                   # it to http://hostname[:port]/new/pathXXXXXX
+ *
  * /cgi-bin:foo:bar  # Require user foo, pwd bar on urls starting with /cgi-bin/
  * /adm:admin:setup  # Require user admin, pwd setup on urls starting with /adm/
  * /adm:toor:PaSsWd  # or user toor, pwd PaSsWd on urls starting with /adm/
  * .au:audio/basic   # additional mime type for audio.au files
- * *.php:/path/php   # running cgi.php scripts through an interpreter
- *
- * A/D may be as a/d or allow/deny - first char case insensitive
- * Deny IP rules take precedence over allow rules.
- *
- *
- * The Deny/Allow IP logic:
- *
- *  - Default is to allow all.  No addresses are denied unless
- *         denied with a D: rule.
- *  - Order of Deny/Allow rules is significant
+ * *.php:/path/php   # run xxx.php through an interpreter
+ *
+ * A/D may be as a/d or allow/deny - only first char matters.
+ * Deny/Allow IP logic:
+ *  - Default is to allow all (Allow all (A:*) is a no-op).
  *  - Deny rules take precedence over allow rules.
- *  - If a deny all rule (D:*) is used it acts as a catch-all for unmatched
- *       addresses.
- *  - Specification of Allow all (A:*) is a no-op
+ *  - "Deny all" rule (D:*) is applied last.
  *
  * Example:
@@ -96 +92 @@
  *
  */
+ /* TODO: use TCP_CORK, parse_config() */
 
 #include "libbb.h"
 #if ENABLE_FEATURE_HTTPD_USE_SENDFILE
-#include <sys/sendfile.h>
-#endif
-
-//#define DEBUG 1
-#define DEBUG 0
-
+# include <sys/sendfile.h>
+#endif
 /* amount of buffering in a pipe */
 #ifndef PIPE_BUF
@@ -110 +103 @@
 #endif
 
-#define IOBUF_SIZE 8192    /* IO buffer */
+#define DEBUG 0
+
+#define IOBUF_SIZE 8192
+#if PIPE_BUF >= IOBUF_SIZE
+# error "PIPE_BUF >= IOBUF_SIZE"
+#endif
 
 #define HEADER_READ_TIMEOUT 60
 
-static const char default_path_httpd_conf[] ALIGN1 = "/etc";
-static const char httpd_conf[] ALIGN1 = "httpd.conf";
+static const char DEFAULT_PATH_HTTPD_CONF[] ALIGN1 = "/etc";
+static const char HTTPD_CONF[] ALIGN1 = "httpd.conf";
 static const char HTTP_200[] ALIGN1 = "HTTP/1.0 200 OK\r\n";
+static const char index_html[] ALIGN1 = "index.html";
 
 typedef struct has_next_ptr {
@@ -137 +136 @@
 } Htaccess_IP;
 
+/* Must have "next" as a first member */
+typedef struct Htaccess_Proxy {
+    struct Htaccess_Proxy *next;
+    char *url_from;
+    char *host_port;
+    char *url_to;
+} Htaccess_Proxy;
+
 enum {
     HTTP_OK = 200,
+    HTTP_PARTIAL_CONTENT = 206,
     HTTP_MOVED_TEMPORARILY = 302,
     HTTP_BAD_REQUEST = 400,       /* malformed syntax */
@@ -160 +168 @@
     HTTP_BAD_GATEWAY = 502,
     HTTP_SERVICE_UNAVAILABLE = 503, /* overload, maintenance */
-    HTTP_RESPONSE_SETSIZE = 0xffffffff
 #endif
 };
@@ -166 +173 @@
 static const uint16_t http_response_type[] ALIGN2 = {
     HTTP_OK,
+#if ENABLE_FEATURE_HTTPD_RANGES
+    HTTP_PARTIAL_CONTENT,
+#endif
     HTTP_MOVED_TEMPORARILY,
     HTTP_REQUEST_TIMEOUT,
     HTTP_NOT_IMPLEMENTED,
-#if ENABLE_FEATURE_HTTPD_BASIC_AUTH 
+#if ENABLE_FEATURE_HTTPD_BASIC_AUTH
     HTTP_UNAUTHORIZED,
 #endif
@@ -193 +203 @@
 } http_response[ARRAY_SIZE(http_response_type)] = {
     { "OK", NULL },
-    { "Found", "Directories must end with a slash" }, /* ?? */
+#if ENABLE_FEATURE_HTTPD_RANGES
+    { "Partial Content", NULL },
+#endif
+    { "Found", NULL },
     { "Request Timeout", "No request appeared within 60 seconds" },
     { "Not Implemented", "The requested method is not recognized" },
@@ -219 +232 @@
     smallint flg_deny_all;
 
-    unsigned rmt_ip;    /* used for IP-based allow/deny rules */
+    unsigned rmt_ip;        /* used for IP-based allow/deny rules */
     time_t last_mod;
-    off_t ContentLength;    /* -1 - unknown */
     char *rmt_ip_str;       /* for $REMOTE_ADDR and $REMOTE_PORT */
     const char *bind_addr_or_port;
 
     const char *g_query;
-    const char *configFile;
+    const char *opt_c_configFile;
     const char *home_httpd;
+    const char *index_page;
 
     const char *found_mime_type;
@@ -233 +246 @@
     Htaccess_IP *ip_a_d;    /* config allow/deny lines */
 
-    USE_FEATURE_HTTPD_BASIC_AUTH(const char *g_realm;)
-    USE_FEATURE_HTTPD_BASIC_AUTH(char *remoteuser;)
-    USE_FEATURE_HTTPD_CGI(char *referer;)
-    USE_FEATURE_HTTPD_CGI(char *user_agent;)
+    IF_FEATURE_HTTPD_BASIC_AUTH(const char *g_realm;)
+    IF_FEATURE_HTTPD_BASIC_AUTH(char *remoteuser;)
+    IF_FEATURE_HTTPD_CGI(char *referer;)
+    IF_FEATURE_HTTPD_CGI(char *user_agent;)
+    IF_FEATURE_HTTPD_CGI(char *host;)
+    IF_FEATURE_HTTPD_CGI(char *http_accept;)
+    IF_FEATURE_HTTPD_CGI(char *http_accept_language;)
+
+    off_t file_size;        /* -1 - unknown */
+#if ENABLE_FEATURE_HTTPD_RANGES
+    off_t range_start;
+    off_t range_end;
+    off_t range_len;
+#endif
 
 #if ENABLE_FEATURE_HTTPD_BASIC_AUTH
     Htaccess *g_auth;       /* config user:password lines */
 #endif
-#if ENABLE_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES
     Htaccess *mime_a;       /* config mime types */
-#endif
 #if ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
     Htaccess *script_i;     /* config script interpreters */
 #endif
-    char *iobuf;            /* [IOBUF_SIZE] */
+    char *iobuf;            /* [IOBUF_SIZE] */
 #define hdr_buf bb_common_bufsiz1
     char *hdr_ptr;
@@ -253 +274 @@
 #if ENABLE_FEATURE_HTTPD_ERROR_PAGES
     const char *http_error_page[ARRAY_SIZE(http_response_type)];
+#endif
+#if ENABLE_FEATURE_HTTPD_PROXY
+    Htaccess_Proxy *proxy;
+#endif
+#if ENABLE_FEATURE_HTTPD_GZIP
+    /* client can handle gzip / we are going to send gzip */
+    smallint content_gzip;
 #endif
 };
@@ -261 +289 @@
 #define bind_addr_or_port (G.bind_addr_or_port)
 #define g_query           (G.g_query          )
-#define configFile        (G.configFile       )
+#define opt_c_configFile  (G.opt_c_configFile )
 #define home_httpd        (G.home_httpd       )
+#define index_page        (G.index_page       )
 #define found_mime_type   (G.found_mime_type  )
 #define found_moved_temporarily (G.found_moved_temporarily)
-#define ContentLength     (G.ContentLength    )
 #define last_mod          (G.last_mod         )
 #define ip_a_d            (G.ip_a_d           )
@@ -272 +300 @@
 #define referer           (G.referer          )
 #define user_agent        (G.user_agent       )
+#define host              (G.host             )
+#define http_accept       (G.http_accept      )
+#define http_accept_language (G.http_accept_language)
+#define file_size         (G.file_size        )
+#if ENABLE_FEATURE_HTTPD_RANGES
+#define range_start       (G.range_start      )
+#define range_end         (G.range_end        )
+#define range_len         (G.range_len        )
+#else
+enum {
+    range_start = 0,
+    range_end = MAXINT(off_t) - 1,
+    range_len = MAXINT(off_t),
+};
+#endif
 #define rmt_ip_str        (G.rmt_ip_str       )
 #define g_auth            (G.g_auth           )
@@ -280 +323 @@
 #define hdr_cnt           (G.hdr_cnt          )
 #define http_error_page   (G.http_error_page  )
+#define proxy             (G.proxy            )
+#if ENABLE_FEATURE_HTTPD_GZIP
+# define content_gzip     (G.content_gzip     )
+#else
+# define content_gzip     0
+#endif
 #define INIT_G() do { \
-    PTR_TO_GLOBALS = xzalloc(sizeof(G)); \
-    USE_FEATURE_HTTPD_BASIC_AUTH(g_realm = "Web Server Authentication";) \
+    SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
+    IF_FEATURE_HTTPD_BASIC_AUTH(g_realm = "Web Server Authentication";) \
     bind_addr_or_port = "80"; \
-    ContentLength = -1; \
+    index_page = index_html; \
+    file_size = -1; \
 } while (0)
 
@@ -291 +341 @@
 
 /* Prototypes */
-static void send_file_and_exit(const char *url, int headers) ATTRIBUTE_NORETURN;
+enum {
+    SEND_HEADERS     = (1 << 0),
+    SEND_BODY        = (1 << 1),
+    SEND_HEADERS_AND_BODY = SEND_HEADERS + SEND_BODY,
+};
+static void send_file_and_exit(const char *url, int what) NORETURN;
 
 static void free_llist(has_next_ptr **pptr)
@@ -304 +359 @@
 }
 
-#if ENABLE_FEATURE_HTTPD_BASIC_AUTH \
- || ENABLE_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES \
- || ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
 static ALWAYS_INLINE void free_Htaccess_list(Htaccess **pptr)
 {
     free_llist((has_next_ptr**)pptr);
 }
-#endif
 
 static ALWAYS_INLINE void free_Htaccess_IP_list(Htaccess_IP **pptr)
@@ -406 +457 @@
  * Parse configuration file into in-memory linked list.
  *
- * The first non-white character is examined to determine if the config line
- * is one of the following:
- *    .ext:mime/type   # new mime type not compiled into httpd
- *    [adAD]:from      # ip address allow/deny, * for wildcard
- *    /path:user:pass  # username/password
- *    Ennn:error.html  # error page for status nnn
- *
  * Any previous IP rules are discarded.
  * If the flag argument is not SUBDIR_PARSE then all /path and mime rules
@@ -422 +466 @@
  * flag   Type of the parse request.
  */
-/* flag */
-#define FIRST_PARSE          0
-#define SUBDIR_PARSE         1
-#define SIGNALED_PARSE       2
-#define FIND_FROM_HTTPD_ROOT 3
+/* flag param: */
+enum {
+    FIRST_PARSE    = 0, /* path will be "/etc" */
+    SIGNALED_PARSE = 1, /* path will be "/etc" */
+    SUBDIR_PARSE   = 2, /* path will be derived from URL */
+};
 static void parse_conf(const char *path, int flag)
 {
+    /* internally used extra flag state */
+    enum { TRY_CURDIR_PARSE = 3 };
+
     FILE *f;
-#if ENABLE_FEATURE_HTTPD_BASIC_AUTH
-    Htaccess *prev;
-#endif
-#if ENABLE_FEATURE_HTTPD_BASIC_AUTH \
- || ENABLE_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES \
- || ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
-    Htaccess *cur;
-#endif
-    const char *cf = configFile;
+    const char *filename;
     char buf[160];
-    char *p0 = NULL;
-    char *c, *p;
-    Htaccess_IP *pip;
 
     /* discard old rules */
     free_Htaccess_IP_list(&ip_a_d);
     flg_deny_all = 0;
-#if ENABLE_FEATURE_HTTPD_BASIC_AUTH \
- || ENABLE_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES \
- || ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
     /* retain previous auth and mime config only for subdir parse */
     if (flag != SUBDIR_PARSE) {
+        free_Htaccess_list(&mime_a);
 #if ENABLE_FEATURE_HTTPD_BASIC_AUTH
         free_Htaccess_list(&g_auth);
 #endif
-#if ENABLE_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES
-        free_Htaccess_list(&mime_a);
-#endif
 #if ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
         free_Htaccess_list(&script_i);
 #endif
     }
-#endif
-
-    if (flag == SUBDIR_PARSE || cf == NULL) {
-        cf = alloca(strlen(path) + sizeof(httpd_conf) + 2);
-        sprintf((char *)cf, "%s/%s", path, httpd_conf);
-    }
-
-    while ((f = fopen(cf, "r")) == NULL) {
-        if (flag == SUBDIR_PARSE || flag == FIND_FROM_HTTPD_ROOT) {
+
+    filename = opt_c_configFile;
+    if (flag == SUBDIR_PARSE || filename == NULL) {
+        filename = alloca(strlen(path) + sizeof(HTTPD_CONF) + 2);
+        sprintf((char *)filename, "%s/%s", path, HTTPD_CONF);
+    }
+
+    while ((f = fopen_for_read(filename)) == NULL) {
+        if (flag >= SUBDIR_PARSE) { /* SUBDIR or TRY_CURDIR */
             /* config file not found, no changes to config */
             return;
         }
-        if (configFile && flag == FIRST_PARSE) /* if -c option given */
-            bb_perror_msg_and_die("%s", cf);
-        flag = FIND_FROM_HTTPD_ROOT;
-        cf = httpd_conf;
+        if (flag == FIRST_PARSE) {
+            /* -c CONFFILE given, but CONFFILE doesn't exist? */
+            if (opt_c_configFile)
+                bb_simple_perror_msg_and_die(opt_c_configFile);
+            /* else: no -c, thus we looked at /etc/httpd.conf,
+             * and it's not there. try ./httpd.conf: */
+        }
+        flag = TRY_CURDIR_PARSE;
+        filename = HTTPD_CONF;
     }
 
 #if ENABLE_FEATURE_HTTPD_BASIC_AUTH
-    prev = g_auth;
-#endif
-    /* This could stand some work */
-    while ((p0 = fgets(buf, sizeof(buf), f)) != NULL) {
-        c = NULL;
-        for (p = p0; *p0 != '\0' && *p0 != '#'; p0++) {
-            if (!isspace(*p0)) {
-                *p++ = *p0;
-                if (*p0 == ':' && c == NULL)
-                    c = p;
-            }
-        }
-        *p = '\0';
-
-        /* test for empty or strange line */
-        if (c == NULL || *c == '\0')
+    /* in "/file:user:pass" lines, we prepend path in subdirs */
+    if (flag != SUBDIR_PARSE)
+        path = "";
+#endif
+    /* The lines can be:
+     *
+     * I:default_index_file
+     * H:http_home
+     * [AD]:IP[/mask]   # allow/deny, * for wildcard
+     * Ennn:error.html  # error page for status nnn
+     * P:/url:[http://]hostname[:port]/new/path # reverse proxy
+     * .ext:mime/type   # mime type
+     * *.php:/path/php  # run xxx.php through an interpreter
+     * /file:user:pass  # username and password
+     */
+    while (fgets(buf, sizeof(buf), f) != NULL) {
+        unsigned strlen_buf;
+        unsigned char ch;
+        char *after_colon;
+
+        { /* remove all whitespace, and # comments */
+            char *p, *p0;
+
+            p0 = buf;
+            /* skip non-whitespace beginning. Often the whole line
+             * is non-whitespace. We want this case to work fast,
+             * without needless copying, therefore we don't merge
+             * this operation into next while loop. */
+            while ((ch = *p0) != '\0' && ch != '\n' && ch != '#'
+             && ch != ' ' && ch != '\t'
+            ) {
+                p0++;
+            }
+            p = p0;
+            /* if we enter this loop, we have some whitespace.
+             * discard it */
+            while (ch != '\0' && ch != '\n' && ch != '#') {
+                if (ch != ' ' && ch != '\t') {
+                    *p++ = ch;
+                }
+                ch = *++p0;
+            }
+            *p = '\0';
+            strlen_buf = p - buf;
+            if (strlen_buf == 0)
+                continue; /* empty line */
+        }
+
+        after_colon = strchr(buf, ':');
+        /* strange line? */
+        if (after_colon == NULL || *++after_colon == '\0')
+            goto config_error;
+
+        ch = (buf[0] & ~0x20); /* toupper if it's a letter */
+
+        if (ch == 'I') {
+            if (index_page != index_html)
+                free((char*)index_page);
+            index_page = xstrdup(after_colon);
             continue;
-        p0 = buf;
-        if (*p0 == 'd')
-            *p0 = 'D';
-        if (*c == '*') {
-            if (*p0 == 'D') {
-                /* memorize deny all */
-                flg_deny_all = 1;
-            }
-            /* skip default other "word:*" config lines */
+        }
+
+        /* do not allow jumping around using H in subdir's configs */
+        if (flag == FIRST_PARSE && ch == 'H') {
+            home_httpd = xstrdup(after_colon);
+            xchdir(home_httpd);
             continue;
         }
 
-        if (*p0 == 'a')
-            *p0 = 'A';
-        if (*p0 == 'A' || *p0 == 'D') {
-            /* storing current config IP line */
-            pip = xzalloc(sizeof(Htaccess_IP));
-            if (pip) {
-                if (scan_ip_mask(c, &(pip->ip), &(pip->mask))) {
-                    /* syntax IP{/mask} error detected, protect all */
-                    *p0 = 'D';
-                    pip->mask = 0;
+        if (ch == 'A' || ch == 'D') {
+            Htaccess_IP *pip;
+
+            if (*after_colon == '*') {
+                if (ch == 'D') {
+                    /* memorize "deny all" */
+                    flg_deny_all = 1;
                 }
-                pip->allow_deny = *p0;
-                if (*p0 == 'D') {
-                    /* Deny:from_IP move top */
-                    pip->next = ip_a_d;
+                /* skip assumed "A:*", it is a default anyway */
+                continue;
+            }
+            /* store "allow/deny IP/mask" line */
+            pip = xzalloc(sizeof(*pip));
+            if (scan_ip_mask(after_colon, &pip->ip, &pip->mask)) {
+                /* IP{/mask} syntax error detected, protect all */
+                ch = 'D';
+                pip->mask = 0;
+            }
+            pip->allow_deny = ch;
+            if (ch == 'D') {
+                /* Deny:from_IP - prepend */
+                pip->next = ip_a_d;
+                ip_a_d = pip;
+            } else {
+                /* A:from_IP - append (thus all D's precedes A's) */
+                Htaccess_IP *prev_IP = ip_a_d;
+                if (prev_IP == NULL) {
                     ip_a_d = pip;
                 } else {
-                    /* add to bottom A:form_IP config line */
-                    Htaccess_IP *prev_IP = ip_a_d;
-
-                    if (prev_IP == NULL) {
-                        ip_a_d = pip;
-                    } else {
-                        while (prev_IP->next)
-                            prev_IP = prev_IP->next;
-                        prev_IP->next = pip;
-                    }
+                    while (prev_IP->next)
+                        prev_IP = prev_IP->next;
+                    prev_IP->next = pip;
                 }
             }
@@ -543 +625 @@
 
 #if ENABLE_FEATURE_HTTPD_ERROR_PAGES
-        if (flag == FIRST_PARSE && *p0 == 'E') {
-            int i;
-            /* error status code */
-            int status = atoi(++p0);
-            /* c already points at the character following ':' in parse loop */
-            /* c = strchr(p0, ':'); c++; */
+        if (flag == FIRST_PARSE && ch == 'E') {
+            unsigned i;
+            int status = atoi(buf + 1); /* error status code */
+
             if (status < HTTP_CONTINUE) {
-                bb_error_msg("config error '%s' in '%s'", buf, cf);
-                continue;
-            }
-
+                goto config_error;
+            }
             /* then error page; find matching status */
             for (i = 0; i < ARRAY_SIZE(http_response_type); i++) {
                 if (http_response_type[i] == status) {
-                    http_error_page[i] = concat_path_file((*c == '/') ? NULL : home_httpd, c);
+                    /* We chdir to home_httpd, thus no need to
+                     * concat_path_file(home_httpd, after_colon)
+                     * here */
+                    http_error_page[i] = xstrdup(after_colon);
                     break;
                 }
@@ -565 +646 @@
 #endif
 
-#if ENABLE_FEATURE_HTTPD_BASIC_AUTH
-        if (*p0 == '/') {
-            /* make full path from httpd root / current_path / config_line_path */
-            cf = (flag == SUBDIR_PARSE ? path : "");
-            p0 = xmalloc(strlen(cf) + (c - buf) + 2 + strlen(c));
-            c[-1] = '\0';
-            sprintf(p0, "/%s%s", cf, buf);
-
-            /* another call bb_simplify_path */
-            cf = p = p0;
-
-            do {
-                if (*p == '/') {
-                    if (*cf == '/') {    /* skip duplicate (or initial) slash */
-                        continue;
-                    } else if (*cf == '.') {
-                        if (cf[1] == '/' || cf[1] == '\0') { /* remove extra '.' */
-                            continue;
-                        } else if ((cf[1] == '.') && (cf[2] == '/' || cf[2] == '\0')) {
-                            ++cf;
-                            if (p > p0) {
-                                while (*--p != '/') /* omit previous dir */;
-                            }
-                            continue;
-                        }
-                    }
-                }
-                *++p = *cf;
-            } while (*++cf);
-
-            if ((p == p0) || (*p != '/')) {      /* not a trailing slash */
-                ++p;                             /* so keep last character */
-            }
-            *p = '\0';
-            sprintf(p0 + strlen(p0), ":%s", c);
-        }
-#endif
-
-#if ENABLE_FEATURE_HTTPD_BASIC_AUTH \
- || ENABLE_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES \
- || ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
-        /* storing current config line */
-        cur = xzalloc(sizeof(Htaccess) + strlen(p0));
-        if (cur) {
-            cf = strcpy(cur->before_colon, p0);
-            c = strchr(cf, ':');
-            *c++ = 0;
-            cur->after_colon = c;
-#if ENABLE_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES
-            if (*cf == '.') {
-                /* config .mime line move top for overwrite previous */
+#if ENABLE_FEATURE_HTTPD_PROXY
+        if (flag == FIRST_PARSE && ch == 'P') {
+            /* P:/url:[http://]hostname[:port]/new/path */
+            char *url_from, *host_port, *url_to;
+            Htaccess_Proxy *proxy_entry;
+
+            url_from = after_colon;
+            host_port = strchr(after_colon, ':');
+            if (host_port == NULL) {
+                goto config_error;
+            }
+            *host_port++ = '\0';
+            if (strncmp(host_port, "http://", 7) == 0)
+                host_port += 7;
+            if (*host_port == '\0') {
+                goto config_error;
+            }
+            url_to = strchr(host_port, '/');
+            if (url_to == NULL) {
+                goto config_error;
+            }
+            *url_to = '\0';
+            proxy_entry = xzalloc(sizeof(*proxy_entry));
+            proxy_entry->url_from = xstrdup(url_from);
+            proxy_entry->host_port = xstrdup(host_port);
+            *url_to = '/';
+            proxy_entry->url_to = xstrdup(url_to);
+            proxy_entry->next = proxy;
+            proxy = proxy_entry;
+            continue;
+        }
+#endif
+        /* the rest of directives are non-alphabetic,
+         * must avoid using "toupper'ed" ch */
+        ch = buf[0];
+
+        if (ch == '.' /* ".ext:mime/type" */
+#if ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
+         || (ch == '*' && buf[1] == '.') /* "*.php:/path/php" */
+#endif
+        ) {
+            char *p;
+            Htaccess *cur;
+
+            cur = xzalloc(sizeof(*cur) /* includes space for NUL */ + strlen_buf);
+            strcpy(cur->before_colon, buf);
+            p = cur->before_colon + (after_colon - buf);
+            p[-1] = '\0';
+            cur->after_colon = p;
+            if (ch == '.') {
+                /* .mime line: prepend to mime_a list */
                 cur->next = mime_a;
                 mime_a = cur;
-                continue;
-            }
-#endif
+            }
 #if ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
-            if (*cf == '*' && cf[1] == '.') {
-                /* config script interpreter line move top for overwrite previous */
+            else {
+                /* script interpreter line: prepend to script_i list */
                 cur->next = script_i;
                 script_i = cur;
-                continue;
-            }
-#endif
+            }
+#endif
+            continue;
+        }
+
 #if ENABLE_FEATURE_HTTPD_BASIC_AUTH
-            free(p0);
-            if (prev == NULL) {
-                /* first line */
-                g_auth = prev = cur;
-            } else {
-                /* sort path, if current lenght eq or bigger then move up */
-                Htaccess *prev_hti = g_auth;
-                size_t l = strlen(cf);
-                Htaccess *hti;
-
-                for (hti = prev_hti; hti; hti = hti->next) {
-                    if (l >= strlen(hti->before_colon)) {
-                        /* insert before hti */
-                        cur->next = hti;
-                        if (prev_hti != hti) {
-                            prev_hti->next = cur;
-                        } else {
-                            /* insert as top */
-                            g_auth = cur;
-                        }
+        if (ch == '/') { /* "/file:user:pass" */
+            char *p;
+            Htaccess *cur;
+            unsigned file_len;
+
+            /* note: path is "" unless we are in SUBDIR parse,
+             * otherwise it does NOT start with "/" */
+            cur = xzalloc(sizeof(*cur) /* includes space for NUL */
+                + 1 + strlen(path)
+                + strlen_buf
+                );
+            /* form "/path/file" */
+            sprintf(cur->before_colon, "/%s%.*s",
+                path,
+                (int) (after_colon - buf - 1), /* includes "/", but not ":" */
+                buf);
+            /* canonicalize it */
+            p = bb_simplify_abs_path_inplace(cur->before_colon);
+            file_len = p - cur->before_colon;
+            /* add "user:pass" after NUL */
+            strcpy(++p, after_colon);
+            cur->after_colon = p;
+
+            /* insert cur into g_auth */
+            /* g_auth is sorted by decreased filename length */
+            {
+                Htaccess *auth, **authp;
+
+                authp = &g_auth;
+                while ((auth = *authp) != NULL) {
+                    if (file_len >= strlen(auth->before_colon)) {
+                        /* insert cur before auth */
+                        cur->next = auth;
                         break;
                     }
-                    if (prev_hti != hti)
-                        prev_hti = prev_hti->next;
+                    authp = &auth->next;
                 }
-                if (!hti) {       /* not inserted, add to bottom */
-                    prev->next = cur;
-                    prev = cur;
-                }
-            }
-#endif
-        }
-#endif
-     }
+                *authp = cur;
+            }
+            continue;
+        }
+#endif /* BASIC_AUTH */
+
+        /* the line is not recognized */
+ config_error:
+        bb_error_msg("config error '%s' in '%s'", buf, filename);
+     } /* while (fgets) */
+
      fclose(f);
 }
@@ -685 +780 @@
     char ch;
 
-    while ((ch = *string++)) {
+    while ((ch = *string++) != '\0') {
         /* very simple check for what to encode */
         if (isalnum(ch))
@@ -695 +790 @@
     return out;
 }
-#endif          /* FEATURE_HTTPD_ENCODE_URL_STR */
+#endif
 
 /*
  * Given a URL encoded string, convert it to plain ascii.
  * Since decoding always makes strings smaller, the decode is done in-place.
- * Thus, callers should strdup() the argument if they do not want the
+ * Thus, callers should xstrdup() the argument if they do not want the
  * argument modified.  The return is the original pointer, allowing this
  * function to be easily used as arguments to other functions.
@@ -722 +817 @@
         return v + 10;
     return ~0;
-}
 /* For testing:
 void t(char c) { printf("'%c'(%u) %u\n", c, c, hex_to_bin(c)); }
@@ -728 +822 @@
 t('0'-1); t('9'+1); t('A'-1); t('F'+1); t('a'-1); t('f'+1); return 0; }
 */
+}
 static char *decodeString(char *orig, int option_d)
 {
@@ -821 +916 @@
 static int openServer(void)
 {
-    int n = bb_strtou(bind_addr_or_port, NULL, 10);
+    unsigned n = bb_strtou(bind_addr_or_port, NULL, 10);
     if (!errno && n && n <= 0xffff)
         n = create_and_bind_stream_or_die(NULL, n);
@@ -833 +928 @@
  * Log the connection closure and exit.
  */
-static void log_and_exit(void) ATTRIBUTE_NORETURN;
+static void log_and_exit(void) NORETURN;
 static void log_and_exit(void)
 {
@@ -839 +934 @@
      * or be confused by us just exiting without SHUT_WR. Oh well. */
     shutdown(1, SHUT_WR);
+    /* Why??
+    (this also messes up stdin when user runs httpd -i from terminal)
     ndelay_on(0);
-    while (read(0, iobuf, IOBUF_SIZE) > 0)
+    while (read(STDIN_FILENO, iobuf, IOBUF_SIZE) > 0)
         continue;
+    */
 
     if (verbose > 2)
@@ -863 +961 @@
     const char *mime_type;
 #if ENABLE_FEATURE_HTTPD_ERROR_PAGES
-    const char *error_page = 0;
+    const char *error_page = NULL;
 #endif
     unsigned i;
-    time_t timer = time(0);
+    time_t timer = time(NULL);
     char tmp_str[80];
     int len;
@@ -909 +1007 @@
 
 #if ENABLE_FEATURE_HTTPD_ERROR_PAGES
-    if (error_page && !access(error_page, R_OK)) {
+    if (error_page && access(error_page, R_OK) == 0) {
         strcat(iobuf, "\r\n");
         len += 2;
@@ -915 +1013 @@
         if (DEBUG)
             fprintf(stderr, "headers: '%s'\n", iobuf);
-        full_write(1, iobuf, len);
+        full_write(STDOUT_FILENO, iobuf, len);
         if (DEBUG)
             fprintf(stderr, "writing error page: '%s'\n", error_page);
-        return send_file_and_exit(error_page, FALSE);
-    }
-#endif
-
-    if (ContentLength != -1) {    /* file */
+        return send_file_and_exit(error_page, SEND_BODY);
+    }
+#endif
+
+    if (file_size != -1) {    /* file */
         strftime(tmp_str, sizeof(tmp_str), RFC1123FMT, gmtime(&last_mod));
-        len += sprintf(iobuf + len, "Last-Modified: %s\r\n%s %"OFF_FMT"d\r\n",
-            tmp_str, "Content-length:", ContentLength);
-    }
+#if ENABLE_FEATURE_HTTPD_RANGES
+        if (responseNum == HTTP_PARTIAL_CONTENT) {
+            len += sprintf(iobuf + len, "Content-Range: bytes %"OFF_FMT"u-%"OFF_FMT"u/%"OFF_FMT"u\r\n",
+                    range_start,
+                    range_end,
+                    file_size);
+            file_size = range_end - range_start + 1;
+        }
+#endif
+        len += sprintf(iobuf + len,
+#if ENABLE_FEATURE_HTTPD_RANGES
+            "Accept-Ranges: bytes\r\n"
+#endif
+            "Last-Modified: %s\r\n%s %"OFF_FMT"u\r\n",
+                tmp_str,
+                content_gzip ? "Transfer-length:" : "Content-length:",
+                file_size
+        );
+    }
+
+    if (content_gzip)
+        len += sprintf(iobuf + len, "Content-Encoding: gzip\r\n");
+
     iobuf[len++] = '\r';
     iobuf[len++] = '\n';
@@ -938 +1056 @@
     if (DEBUG)
         fprintf(stderr, "headers: '%s'\n", iobuf);
-    if (full_write(1, iobuf, len) != len) {
+    if (full_write(STDOUT_FILENO, iobuf, len) != len) {
         if (verbose > 1)
             bb_perror_msg("error");
@@ -945 +1063 @@
 }
 
-static void send_headers_and_exit(int responseNum) ATTRIBUTE_NORETURN;
+static void send_headers_and_exit(int responseNum) NORETURN;
 static void send_headers_and_exit(int responseNum)
 {
@@ -964 +1082 @@
     char c;
 
+    alarm(HEADER_READ_TIMEOUT);
     while (1) {
         if (hdr_cnt <= 0) {
-            hdr_cnt = safe_read(0, hdr_buf, sizeof(hdr_buf));
+            hdr_cnt = safe_read(STDIN_FILENO, hdr_buf, sizeof(hdr_buf));
             if (hdr_cnt <= 0)
                 break;
@@ -978 +1097 @@
         if (c == '\n') {
             iobuf[count] = '\0';
-            return count;
+            break;
         }
         if (count < (IOBUF_SIZE - 1))      /* check overflow */
@@ -986 +1105 @@
 }
 
+#if ENABLE_FEATURE_HTTPD_CGI || ENABLE_FEATURE_HTTPD_PROXY
+
+/* gcc 4.2.1 fares better with NOINLINE */
+static NOINLINE void cgi_io_loop_and_exit(int fromCgi_rd, int toCgi_wr, int post_len) NORETURN;
+static NOINLINE void cgi_io_loop_and_exit(int fromCgi_rd, int toCgi_wr, int post_len)
+{
+    enum { FROM_CGI = 1, TO_CGI = 2 }; /* indexes in pfd[] */
+    struct pollfd pfd[3];
+    int out_cnt; /* we buffer a bit of initial CGI output */
+    int count;
+
+    /* iobuf is used for CGI -> network data,
+     * hdr_buf is for network -> CGI data (POSTDATA) */
+
+    /* If CGI dies, we still want to correctly finish reading its output
+     * and send it to the peer. So please no SIGPIPEs! */
+    signal(SIGPIPE, SIG_IGN);
+
+    // We inconsistently handle a case when more POSTDATA from network
+    // is coming than we expected. We may give *some part* of that
+    // extra data to CGI.
+
+    //if (hdr_cnt > post_len) {
+    //  /* We got more POSTDATA from network than we expected */
+    //  hdr_cnt = post_len;
+    //}
+    post_len -= hdr_cnt;
+    /* post_len - number of POST bytes not yet read from network */
+
+    /* NB: breaking out of this loop jumps to log_and_exit() */
+    out_cnt = 0;
+    while (1) {
+        memset(pfd, 0, sizeof(pfd));
+
+        pfd[FROM_CGI].fd = fromCgi_rd;
+        pfd[FROM_CGI].events = POLLIN;
+
+        if (toCgi_wr) {
+            pfd[TO_CGI].fd = toCgi_wr;
+            if (hdr_cnt > 0) {
+                pfd[TO_CGI].events = POLLOUT;
+            } else if (post_len > 0) {
+                pfd[0].events = POLLIN;
+            } else {
+                /* post_len <= 0 && hdr_cnt <= 0:
+                 * no more POST data to CGI,
+                 * let CGI see EOF on CGI's stdin */
+                if (toCgi_wr != fromCgi_rd)
+                    close(toCgi_wr);
+                toCgi_wr = 0;
+            }
+        }
+
+        /* Now wait on the set of sockets */
+        count = safe_poll(pfd, toCgi_wr ? TO_CGI+1 : FROM_CGI+1, -1);
+        if (count <= 0) {
+#if 0
+            if (safe_waitpid(pid, &status, WNOHANG) <= 0) {
+                /* Weird. CGI didn't exit and no fd's
+                 * are ready, yet poll returned?! */
+                continue;
+            }
+            if (DEBUG && WIFEXITED(status))
+                bb_error_msg("CGI exited, status=%d", WEXITSTATUS(status));
+            if (DEBUG && WIFSIGNALED(status))
+                bb_error_msg("CGI killed, signal=%d", WTERMSIG(status));
+#endif
+            break;
+        }
+
+        if (pfd[TO_CGI].revents) {
+            /* hdr_cnt > 0 here due to the way pfd[TO_CGI].events set */
+            /* Have data from peer and can write to CGI */
+            count = safe_write(toCgi_wr, hdr_ptr, hdr_cnt);
+            /* Doesn't happen, we dont use nonblocking IO here
+             *if (count < 0 && errno == EAGAIN) {
+             *  ...
+             *} else */
+            if (count > 0) {
+                hdr_ptr += count;
+                hdr_cnt -= count;
+            } else {
+                /* EOF/broken pipe to CGI, stop piping POST data */
+                hdr_cnt = post_len = 0;
+            }
+        }
+
+        if (pfd[0].revents) {
+            /* post_len > 0 && hdr_cnt == 0 here */
+            /* We expect data, prev data portion is eaten by CGI
+             * and there *is* data to read from the peer
+             * (POSTDATA) */
+            //count = post_len > (int)sizeof(hdr_buf) ? (int)sizeof(hdr_buf) : post_len;
+            //count = safe_read(STDIN_FILENO, hdr_buf, count);
+            count = safe_read(STDIN_FILENO, hdr_buf, sizeof(hdr_buf));
+            if (count > 0) {
+                hdr_cnt = count;
+                hdr_ptr = hdr_buf;
+                post_len -= count;
+            } else {
+                /* no more POST data can be read */
+                post_len = 0;
+            }
+        }
+
+        if (pfd[FROM_CGI].revents) {
+            /* There is something to read from CGI */
+            char *rbuf = iobuf;
+
+            /* Are we still buffering CGI output? */
+            if (out_cnt >= 0) {
+                /* HTTP_200[] has single "\r\n" at the end.
+                 * According to http://hoohoo.ncsa.uiuc.edu/cgi/out.html,
+                 * CGI scripts MUST send their own header terminated by
+                 * empty line, then data. That's why we have only one
+                 * <cr><lf> pair here. We will output "200 OK" line
+                 * if needed, but CGI still has to provide blank line
+                 * between header and body */
+
+                /* Must use safe_read, not full_read, because
+                 * CGI may output a few first bytes and then wait
+                 * for POSTDATA without closing stdout.
+                 * With full_read we may wait here forever. */
+                count = safe_read(fromCgi_rd, rbuf + out_cnt, PIPE_BUF - 8);
+                if (count <= 0) {
+                    /* eof (or error) and there was no "HTTP",
+                     * so write it, then write received data */
+                    if (out_cnt) {
+                        full_write(STDOUT_FILENO, HTTP_200, sizeof(HTTP_200)-1);
+                        full_write(STDOUT_FILENO, rbuf, out_cnt);
+                    }
+                    break; /* CGI stdout is closed, exiting */
+                }
+                out_cnt += count;
+                count = 0;
+                /* "Status" header format is: "Status: 302 Redirected\r\n" */
+                if (out_cnt >= 8 && memcmp(rbuf, "Status: ", 8) == 0) {
+                    /* send "HTTP/1.0 " */
+                    if (full_write(STDOUT_FILENO, HTTP_200, 9) != 9)
+                        break;
+                    rbuf += 8; /* skip "Status: " */
+                    count = out_cnt - 8;
+                    out_cnt = -1; /* buffering off */
+                } else if (out_cnt >= 4) {
+                    /* Did CGI add "HTTP"? */
+                    if (memcmp(rbuf, HTTP_200, 4) != 0) {
+                        /* there is no "HTTP", do it ourself */
+                        if (full_write(STDOUT_FILENO, HTTP_200, sizeof(HTTP_200)-1) != sizeof(HTTP_200)-1)
+                            break;
+                    }
+                    /* Commented out:
+                    if (!strstr(rbuf, "ontent-")) {
+                        full_write(s, "Content-type: text/plain\r\n\r\n", 28);
+                    }
+                     * Counter-example of valid CGI without Content-type:
+                     * echo -en "HTTP/1.0 302 Found\r\n"
+                     * echo -en "Location: http://www.busybox.net\r\n"
+                     * echo -en "\r\n"
+                     */
+                    count = out_cnt;
+                    out_cnt = -1; /* buffering off */
+                }
+            } else {
+                count = safe_read(fromCgi_rd, rbuf, PIPE_BUF);
+                if (count <= 0)
+                    break;  /* eof (or error) */
+            }
+            if (full_write(STDOUT_FILENO, rbuf, count) != count)
+                break;
+            if (DEBUG)
+                fprintf(stderr, "cgi read %d bytes: '%.*s'\n", count, count, rbuf);
+        } /* if (pfd[FROM_CGI].revents) */
+    } /* while (1) */
+    log_and_exit();
+}
+#endif
+
 #if ENABLE_FEATURE_HTTPD_CGI
+
 static void setenv1(const char *name, const char *value)
 {
@@ -996 +1293 @@
  *
  * Environment variables are set up and the script is invoked with pipes
- * for stdin/stdout.  If a post is being done the script is fed the POST
+ * for stdin/stdout.  If a POST is being done the script is fed the POST
  * data in addition to setting the QUERY_STRING variable (for GETs or POSTs).
  *
  * Parameters:
  * const char *url              The requested URL (with leading /).
- * int bodyLen                  Length of the post body.
+ * int post_len                 Length of the POST body.
  * const char *cookie           For set HTTP_COOKIE.
  * const char *content_type     For set CONTENT_TYPE.
@@ -1008 +1305 @@
         const char *url,
         const char *request,
-        int bodyLen,
+        int post_len,
         const char *cookie,
-        const char *content_type) ATTRIBUTE_NORETURN;
+        const char *content_type) NORETURN;
 static void send_cgi_and_exit(
         const char *url,
         const char *request,
-        int bodyLen,
+        int post_len,
         const char *cookie,
         const char *content_type)
 {
-    struct { int rd; int wr; } fromCgi;  /* CGI -> httpd pipe */
-    struct { int rd; int wr; } toCgi;    /* httpd -> CGI pipe */
-    char *fullpath;
+    struct fd_pair fromCgi;  /* CGI -> httpd pipe */
+    struct fd_pair toCgi;    /* httpd -> CGI pipe */
     char *script;
-    char *purl;
-    int buf_count;
-    int status;
-    int pid = 0;
+    int pid;
+
+    /* Make a copy. NB: caller guarantees:
+     * url[0] == '/', url[1] != '/' */
+    url = xstrdup(url);
 
     /*
      * We are mucking with environment _first_ and then vfork/exec,
-     * this allows us to use vfork safely. Parent don't care about
+     * this allows us to use vfork safely. Parent doesn't care about
      * these environment changes anyway.
      */
 
-    /*
-     * Find PATH_INFO.
-     */
-    purl = xstrdup(url);
-    script = purl;
+    /* Check for [dirs/]script.cgi/PATH_INFO */
+    script = (char*)url;
     while ((script = strchr(script + 1, '/')) != NULL) {
-        /* have script.cgi/PATH_INFO or dirs/script.cgi[/PATH_INFO] */
-        struct stat sb;
-
         *script = '\0';
-        if (!is_directory(purl + 1, 1, &sb)) {
+        if (!is_directory(url + 1, 1, NULL)) {
             /* not directory, found script.cgi/PATH_INFO */
             *script = '/';
             break;
         }
-        *script = '/';          /* is directory, find next '/' */
-    }
-    setenv1("PATH_INFO", script);   /* set /PATH_INFO or "" */
+        *script = '/'; /* is directory, find next '/' */
+    }
+    setenv1("PATH_INFO", script);   /* set to /PATH_INFO or "" */
     setenv1("REQUEST_METHOD", request);
     if (g_query) {
-        putenv(xasprintf("%s=%s?%s", "REQUEST_URI", purl, g_query));
+        putenv(xasprintf("%s=%s?%s", "REQUEST_URI", url, g_query));
     } else {
-        setenv1("REQUEST_URI", purl);
+        setenv1("REQUEST_URI", url);
     }
     if (script != NULL)
         *script = '\0';         /* cut off /PATH_INFO */
 
-    /* SCRIPT_FILENAME required by PHP in CGI mode */
-    fullpath = concat_path_file(home_httpd, purl);
-    setenv1("SCRIPT_FILENAME", fullpath);
+    /* SCRIPT_FILENAME is required by PHP in CGI mode */
+    if (home_httpd[0] == '/') {
+        char *fullpath = concat_path_file(home_httpd, url);
+        setenv1("SCRIPT_FILENAME", fullpath);
+    }
     /* set SCRIPT_NAME as full path: /cgi-bin/dirs/script.cgi */
-    setenv1("SCRIPT_NAME", purl);
+    setenv1("SCRIPT_NAME", url);
     /* http://hoohoo.ncsa.uiuc.edu/cgi/env.html:
      * QUERY_STRING: The information which follows the ? in the URL
@@ -1096 +1389 @@
     }
     setenv1("HTTP_USER_AGENT", user_agent);
-    if (bodyLen)
-        putenv(xasprintf("CONTENT_LENGTH=%d", bodyLen));
+    if (http_accept)
+        setenv1("HTTP_ACCEPT", http_accept);
+    if (http_accept_language)
+        setenv1("HTTP_ACCEPT_LANGUAGE", http_accept_language);
+    if (post_len)
+        putenv(xasprintf("CONTENT_LENGTH=%d", post_len));
     if (cookie)
         setenv1("HTTP_COOKIE", cookie);
@@ -1110 +1407 @@
     if (referer)
         setenv1("HTTP_REFERER", referer);
-
-    xpipe(&fromCgi.rd);
-    xpipe(&toCgi.rd);
+    setenv1("HTTP_HOST", host); /* set to "" if NULL */
+    /* setenv1("SERVER_NAME", safe_gethostname()); - don't do this,
+     * just run "env SERVER_NAME=xyz httpd ..." instead */
+
+    xpiped_pair(fromCgi);
+    xpiped_pair(toCgi);
 
     pid = vfork();
@@ -1122 +1422 @@
     if (!pid) {
         /* Child process */
+        char *argv[3];
+
         xfunc_error_retval = 242;
 
+        /* NB: close _first_, then move fds! */
+        close(toCgi.wr);
+        close(fromCgi.rd);
         xmove_fd(toCgi.rd, 0);  /* replace stdin with the pipe */
         xmove_fd(fromCgi.wr, 1);  /* replace stdout with the pipe */
-        close(fromCgi.rd);
-        close(toCgi.wr);
         /* User seeing stderr output can be a security problem.
          * If CGI really wants that, it can always do dup itself. */
         /* dup2(1, 2); */
 
-        /* script must have absolute path */
-        script = strrchr(fullpath, '/');
-        if (!script)
-            goto error_execing_cgi;
-        *script = '\0';
-        /* chdiring to script's dir */
-        if (chdir(fullpath) == 0) {
-            char *argv[2];
+        /* Chdiring to script's dir */
+        script = strrchr(url, '/');
+        if (script != url) { /* paranoia */
+            *script = '\0';
+            if (chdir(url + 1) != 0) {
+                bb_perror_msg("chdir(%s)", url + 1);
+                goto error_execing_cgi;
+            }
+            // not needed: *script = '/';
+        }
+        script++;
+
+        /* set argv[0] to name without path */
+        argv[0] = script;
+        argv[1] = NULL;
+
 #if ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
-            char *interpr = NULL;
-            char *suffix = strrchr(purl, '.');
+        {
+            char *suffix = strrchr(script, '.');
 
             if (suffix) {
@@ -1148 +1459 @@
                 for (cur = script_i; cur; cur = cur->next) {
                     if (strcmp(cur->before_colon + 1, suffix) == 0) {
-                        interpr = cur->after_colon;
+                        /* found interpreter name */
+                        argv[0] = cur->after_colon;
+                        argv[1] = script;
+                        argv[2] = NULL;
                         break;
                     }
                 }
             }
-#endif
-            *script = '/';
-            /* set argv[0] to name without path */
-            argv[0] = (char*)bb_basename(purl);
-            argv[1] = NULL;
-#if ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
-            if (interpr)
-                execv(interpr, argv);
-            else
-#endif
-                execv(fullpath, argv);
-        }
+        }
+#endif
+        /* restore default signal dispositions for CGI process */
+        bb_signals(0
+            | (1 << SIGCHLD)
+            | (1 << SIGPIPE)
+            | (1 << SIGHUP)
+            , SIG_DFL);
+
+        /* _NOT_ execvp. We do not search PATH. argv[0] is a filename
+         * without any dir components and will only match a file
+         * in the current directory */
+        execv(argv[0], argv);
+        if (verbose)
+            bb_perror_msg("can't execute '%s'", argv[0]);
  error_execing_cgi:
         /* send to stdout
@@ -1173 +1490 @@
     /* Parent process */
 
-    /* First, restore variables possibly changed by child */
+    /* Restore variables possibly changed by child */
     xfunc_error_retval = 0;
 
-    /* Prepare for pumping data.
-     * iobuf is used for CGI -> network data,
-     * hdr_buf is for network -> CGI data (POSTDATA) */
-    buf_count = 0;
+    /* Pump data */
     close(fromCgi.wr);
     close(toCgi.rd);
-
-    /* If CGI dies, we still want to correctly finish reading its output
-     * and send it to the peer. So please no SIGPIPEs! */
-    signal(SIGPIPE, SIG_IGN);
-
-    /* Accound for POSTDATA already in hdr_buf */
-    bodyLen -= hdr_cnt;
-
-    /* This loop still looks messy. What is an exit criteria?
-     * "CGI's output closed"? Or "CGI has exited"?
-     * What to do if CGI has closed both input and output, but
-     * didn't exit? etc... */
-
-    /* NB: breaking out of this loop jumps to log_and_exit() */
-    while (1) {
-        fd_set readSet;
-        fd_set writeSet;
-        int nfound;
-        int count;
-
-        FD_ZERO(&readSet);
-        FD_ZERO(&writeSet);
-        FD_SET(fromCgi.rd, &readSet);
-        if (bodyLen > 0 || hdr_cnt > 0) {
-            FD_SET(toCgi.wr, &writeSet);
-            nfound = toCgi.wr > fromCgi.rd ? toCgi.wr : fromCgi.rd;
-            if (hdr_cnt <= 0)
-                FD_SET(0, &readSet);
-            /* Now wait on the set of sockets! */
-            nfound = select(nfound + 1, &readSet, &writeSet, NULL, NULL);
-        } else {
-            if (!bodyLen) {
-                close(toCgi.wr); /* no more POST data to CGI */
-                bodyLen = -1;
-            }
-            nfound = select(fromCgi.rd + 1, &readSet, NULL, NULL, NULL);
-        }
-
-        if (nfound <= 0) {
-            if (waitpid(pid, &status, WNOHANG) <= 0) {
-                /* Weird. CGI didn't exit and no fd's
-                 * are ready, yet select returned?! */
-                continue;
-            }
-            close(fromCgi.rd);
-            if (DEBUG && WIFEXITED(status))
-                bb_error_msg("CGI exited, status=%d", WEXITSTATUS(status));
-            if (DEBUG && WIFSIGNALED(status))
-                bb_error_msg("CGI killed, signal=%d", WTERMSIG(status));
-            break;
-        }
-
-        if (hdr_cnt > 0 && FD_ISSET(toCgi.wr, &writeSet)) {
-            /* Have data from peer and can write to CGI */
-            count = safe_write(toCgi.wr, hdr_ptr, hdr_cnt);
-            /* Doesn't happen, we dont use nonblocking IO here
-             *if (count < 0 && errno == EAGAIN) {
-             *  ...
-             *} else */
-            if (count > 0) {
-                hdr_ptr += count;
-                hdr_cnt -= count;
-            } else {
-                hdr_cnt = bodyLen = 0; /* EOF/broken pipe to CGI */
-            }
-        } else if (bodyLen > 0 && hdr_cnt == 0
-         && FD_ISSET(0, &readSet)
-        ) {
-            /* We expect data, prev data portion is eaten by CGI
-             * and there *is* data to read from the peer
-             * (POSTDATA?) */
-            count = bodyLen > (int)sizeof(hdr_buf) ? (int)sizeof(hdr_buf) : bodyLen;
-            count = safe_read(0, hdr_buf, count);
-            if (count > 0) {
-                hdr_cnt = count;
-                hdr_ptr = hdr_buf;
-                bodyLen -= count;
-            } else {
-                bodyLen = 0; /* closed */
-            }
-        }
-
-#define PIPESIZE PIPE_BUF
-#if PIPESIZE >= IOBUF_SIZE
-# error "PIPESIZE >= IOBUF_SIZE"
-#endif
-        if (FD_ISSET(fromCgi.rd, &readSet)) {
-            /* There is something to read from CGI */
-            char *rbuf = iobuf;
-
-            /* Are we still buffering CGI output? */
-            if (buf_count >= 0) {
-                /* HTTP_200[] has single "\r\n" at the end.
-                 * According to http://hoohoo.ncsa.uiuc.edu/cgi/out.html,
-                 * CGI scripts MUST send their own header terminated by
-                 * empty line, then data. That's why we have only one
-                 * <cr><lf> pair here. We will output "200 OK" line
-                 * if needed, but CGI still has to provide blank line
-                 * between header and body */
-
-                /* Must use safe_read, not full_read, because
-                 * CGI may output a few first bytes and then wait
-                 * for POSTDATA without closing stdout.
-                 * With full_read we may wait here forever. */
-                count = safe_read(fromCgi.rd, rbuf + buf_count, PIPESIZE - 8);
-                if (count <= 0) {
-                    /* eof (or error) and there was no "HTTP",
-                     * so write it, then write received data */
-                    if (buf_count) {
-                        full_write(1, HTTP_200, sizeof(HTTP_200)-1);
-                        full_write(1, rbuf, buf_count);
-                    }
-                    break; /* CGI stdout is closed, exiting */
-                }
-                buf_count += count;
-                count = 0;
-                /* "Status" header format is: "Status: 302 Redirected\r\n" */
-                if (buf_count >= 8 && memcmp(rbuf, "Status: ", 8) == 0) {
-                    /* send "HTTP/1.0 " */
-                    if (full_write(1, HTTP_200, 9) != 9)
-                        break;
-                    rbuf += 8; /* skip "Status: " */
-                    count = buf_count - 8;
-                    buf_count = -1; /* buffering off */
-                } else if (buf_count >= 4) {
-                    /* Did CGI add "HTTP"? */
-                    if (memcmp(rbuf, HTTP_200, 4) != 0) {
-                        /* there is no "HTTP", do it ourself */
-                        if (full_write(1, HTTP_200, sizeof(HTTP_200)-1) != sizeof(HTTP_200)-1)
-                            break;
-                    }
-                    /* Commented out:
-                    if (!strstr(rbuf, "ontent-")) {
-                        full_write(s, "Content-type: text/plain\r\n\r\n", 28);
-                    }
-                     * Counter-example of valid CGI without Content-type:
-                     * echo -en "HTTP/1.0 302 Found\r\n"
-                     * echo -en "Location: http://www.busybox.net\r\n"
-                     * echo -en "\r\n"
-                     */
-                    count = buf_count;
-                    buf_count = -1; /* buffering off */
-                }
-            } else {
-                count = safe_read(fromCgi.rd, rbuf, PIPESIZE);
-                if (count <= 0)
-                    break;  /* eof (or error) */
-            }
-            if (full_write(1, rbuf, count) != count)
-                break;
-            if (DEBUG)
-                fprintf(stderr, "cgi read %d bytes: '%.*s'\n", count, count, rbuf);
-        } /* if (FD_ISSET(fromCgi.rd)) */
-    } /* while (1) */
-    log_and_exit();
-}
+    cgi_io_loop_and_exit(fromCgi.rd, toCgi.wr, post_len);
+}
+
 #endif          /* FEATURE_HTTPD_CGI */
 
 /*
  * Send a file response to a HTTP request, and exit
- * 
+ *
  * Parameters:
- * const char *url    The requested URL (with leading /).
- * headers            Don't send headers before if FALSE.
+ * const char *url  The requested URL (with leading /).
+ * what             What to send (headers/body/both).
  */
-static void send_file_and_exit(const char *url, int headers)
-{
-    static const char *const suffixTable[] = {
-    /* Warning: shorter equivalent suffix in one line must be first */
-        ".htm.html", "text/html",
-        ".jpg.jpeg", "image/jpeg",
-        ".gif",      "image/gif",
-        ".png",      "image/png",
-        ".txt.h.c.cc.cpp", "text/plain",
-        ".css",      "text/css",
-        ".wav",      "audio/wav",
-        ".avi",      "video/x-msvideo",
-        ".qt.mov",   "video/quicktime",
-        ".mpe.mpeg", "video/mpeg",
-        ".mid.midi", "audio/midi",
-        ".mp3",      "audio/mpeg",
-#if 0                        /* unpopular */
-        ".au",       "audio/basic",
-        ".pac",      "application/x-ns-proxy-autoconfig",
-        ".vrml.wrl", "model/vrml",
-#endif
-        NULL
-    };
-
+static NOINLINE void send_file_and_exit(const char *url, int what)
+{
     char *suffix;
-    int f;
-    const char *const *table;
-    const char *try_suffix;
+    int fd;
     ssize_t count;
-#if ENABLE_FEATURE_HTTPD_USE_SENDFILE
-    off_t offset = 0;
-#endif
-
+
+    if (content_gzip) {
+        /* does <url>.gz exist? Then use it instead */
+        char *gzurl = xasprintf("%s.gz", url);
+        fd = open(gzurl, O_RDONLY);
+        free(gzurl);
+        if (fd != -1) {
+            struct stat sb;
+            fstat(fd, &sb);
+            file_size = sb.st_size;
+            last_mod = sb.st_mtime;
+        } else {
+            IF_FEATURE_HTTPD_GZIP(content_gzip = 0;)
+            fd = open(url, O_RDONLY);
+        }
+    } else {
+        fd = open(url, O_RDONLY);
+    }
+    if (fd < 0) {
+        if (DEBUG)
+            bb_perror_msg("can't open '%s'", url);
+        /* Error pages are sent by using send_file_and_exit(SEND_BODY).
+         * IOW: it is unsafe to call send_headers_and_exit
+         * if what is SEND_BODY! Can recurse! */
+        if (what != SEND_BODY)
+            send_headers_and_exit(HTTP_NOT_FOUND);
+        log_and_exit();
+    }
+    /* If you want to know about EPIPE below
+     * (happens if you abort downloads from local httpd): */
+    signal(SIGPIPE, SIG_IGN);
+
+    /* If not found, default is "application/octet-stream" */
+    found_mime_type = "application/octet-stream";
     suffix = strrchr(url, '.');
-
-    /* If not found, set default as "application/octet-stream";  */
-    found_mime_type = "application/octet-stream";
     if (suffix) {
-#if ENABLE_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES
+        static const char suffixTable[] ALIGN1 =
+            /* Shorter suffix must be first:
+             * ".html.htm" will fail for ".htm"
+             */
+            ".txt.h.c.cc.cpp\0" "text/plain\0"
+            /* .htm line must be after .h line */
+            ".htm.html\0" "text/html\0"
+            ".jpg.jpeg\0" "image/jpeg\0"
+            ".gif\0"      "image/gif\0"
+            ".png\0"      "image/png\0"
+            /* .css line must be after .c line */
+            ".css\0"      "text/css\0"
+            ".wav\0"      "audio/wav\0"
+            ".avi\0"      "video/x-msvideo\0"
+            ".qt.mov\0"   "video/quicktime\0"
+            ".mpe.mpeg\0" "video/mpeg\0"
+            ".mid.midi\0" "audio/midi\0"
+            ".mp3\0"      "audio/mpeg\0"
+#if 0  /* unpopular */
+            ".au\0"       "audio/basic\0"
+            ".pac\0"      "application/x-ns-proxy-autoconfig\0"
+            ".vrml.wrl\0" "model/vrml\0"
+#endif
+            /* compiler adds another "\0" here */
+        ;
         Htaccess *cur;
-#endif
-        for (table = suffixTable; *table; table += 2) {
-            try_suffix = strstr(table[0], suffix);
-            if (try_suffix) {
-                try_suffix += strlen(suffix);
-                if (*try_suffix == '\0' || *try_suffix == '.') {
-                    found_mime_type = table[1];
-                    break;
-                }
-            }
-        }
-#if ENABLE_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES
+
+        /* Examine built-in table */
+        const char *table = suffixTable;
+        const char *table_next;
+        for (; *table; table = table_next) {
+            const char *try_suffix;
+            const char *mime_type;
+            mime_type  = table + strlen(table) + 1;
+            table_next = mime_type + strlen(mime_type) + 1;
+            try_suffix = strstr(table, suffix);
+            if (!try_suffix)
+                continue;
+            try_suffix += strlen(suffix);
+            if (*try_suffix == '\0' || *try_suffix == '.') {
+                found_mime_type = mime_type;
+                break;
+            }
+            /* Example: strstr(table, ".av") != NULL, but it
+             * does not match ".avi" after all and we end up here.
+             * The table is arranged so that in this case we know
+             * that it can't match anything in the following lines,
+             * and we stop the search: */
+            break;
+        }
+        /* ...then user's table */
         for (cur = mime_a; cur; cur = cur->next) {
             if (strcmp(cur->before_colon, suffix) == 0) {
@@ -1405 +1606 @@
             }
         }
-#endif
     }
 
@@ -1412 +1612 @@
             url, found_mime_type);
 
-    f = open(url, O_RDONLY);
-    if (f < 0) {
-        if (DEBUG)
-            bb_perror_msg("cannot open '%s'", url);
-        if (headers)
-            send_headers_and_exit(HTTP_NOT_FOUND);
-    }
-
-    if (headers)
+#if ENABLE_FEATURE_HTTPD_RANGES
+    if (what == SEND_BODY /* err pages and ranges don't mix */
+     || content_gzip /* we are sending compressed page: can't do ranges */  ///why?
+    ) {
+        range_start = 0;
+    }
+    range_len = MAXINT(off_t);
+    if (range_start) {
+        if (!range_end) {
+            range_end = file_size - 1;
+        }
+        if (range_end < range_start
+         || lseek(fd, range_start, SEEK_SET) != range_start
+        ) {
+            lseek(fd, 0, SEEK_SET);
+            range_start = 0;
+        } else {
+            range_len = range_end - range_start + 1;
+            send_headers(HTTP_PARTIAL_CONTENT);
+            what = SEND_BODY;
+        }
+    }
+#endif
+    if (what & SEND_HEADERS)
         send_headers(HTTP_OK);
-
-    /* If you want to know about EPIPE below
-     * (happens if you abort downloads from local httpd): */
-    signal(SIGPIPE, SIG_IGN);
-
 #if ENABLE_FEATURE_HTTPD_USE_SENDFILE
-    do {
-        /* byte count (3rd arg) is rounded down to 64k */
-        count = sendfile(1, f, &offset, MAXINT(ssize_t) - 0xffff);
-        if (count < 0) {
-            if (offset == 0)
-                goto fallback;
-            goto fin;
-        }
-    } while (count > 0);
-    log_and_exit();
-
- fallback:
-#endif
-    while ((count = safe_read(f, iobuf, IOBUF_SIZE)) > 0) {
-        ssize_t n = count;
-        count = full_write(1, iobuf, count);
+    {
+        off_t offset = range_start;
+        while (1) {
+            /* sz is rounded down to 64k */
+            ssize_t sz = MAXINT(ssize_t) - 0xffff;
+            IF_FEATURE_HTTPD_RANGES(if (sz > range_len) sz = range_len;)
+            count = sendfile(STDOUT_FILENO, fd, &offset, sz);
+            if (count < 0) {
+                if (offset == range_start)
+                    break; /* fall back to read/write loop */
+                goto fin;
+            }
+            IF_FEATURE_HTTPD_RANGES(range_len -= sz;)
+            if (count == 0 || range_len == 0)
+                log_and_exit();
+        }
+    }
+#endif
+    while ((count = safe_read(fd, iobuf, IOBUF_SIZE)) > 0) {
+        ssize_t n;
+        IF_FEATURE_HTTPD_RANGES(if (count > range_len) count = range_len;)
+        n = full_write(STDOUT_FILENO, iobuf, count);
         if (count != n)
             break;
-    }
-#if ENABLE_FEATURE_HTTPD_USE_SENDFILE
- fin:
-#endif
-    if (count < 0 && verbose > 1)
-        bb_perror_msg("error");
+        IF_FEATURE_HTTPD_RANGES(range_len -= count;)
+        if (range_len == 0)
+            break;
+    }
+    if (count < 0) {
+ IF_FEATURE_HTTPD_USE_SENDFILE(fin:)
+        if (verbose > 1)
+            bb_perror_msg("error");
+    }
     log_and_exit();
 }
@@ -1459 +1678 @@
     Htaccess_IP *cur;
 
-    /* This could stand some work */
     for (cur = ip_a_d; cur; cur = cur->next) {
 #if DEBUG
@@ -1476 +1694 @@
 #endif
         if ((rmt_ip & cur->mask) == cur->ip)
-            return cur->allow_deny == 'A';   /* Allow/Deny */
-    }
-
-    /* if unconfigured, return 1 - access from all */
-    return !flg_deny_all;
+            return (cur->allow_deny == 'A'); /* A -> 1 */
+    }
+
+    return !flg_deny_all; /* depends on whether we saw "D:*" */
 }
 
 #if ENABLE_FEATURE_HTTPD_BASIC_AUTH
 /*
- * Check the permission file for access password protected.
- *
- * If config file isn't present, everything is allowed.
- * Entries are of the form you can see example from header source
- *
- * path      The file path.
- * request   User information to validate.
- *
- * Returns 1 if request is OK.
+ * Config file entries are of the form "/<path>:<user>:<passwd>".
+ * If config file has no prefix match for path, access is allowed.
+ *
+ * path                 The file path
+ * user_and_passwd      "user:passwd" to validate
+ *
+ * Returns 1 if user_and_passwd is OK.
  */
-static int checkPerm(const char *path, const char *request)
+static int check_user_passwd(const char *path, const char *user_and_passwd)
 {
     Htaccess *cur;
-    const char *p;
-    const char *p0;
-
     const char *prev = NULL;
 
-    /* This could stand some work */
     for (cur = g_auth; cur; cur = cur->next) {
-        size_t l;
-
-        p0 = cur->before_colon;
-        if (prev != NULL && strcmp(prev, p0) != 0)
-            continue;       /* find next identical */
-        p = cur->after_colon;
+        const char *dir_prefix;
+        size_t len;
+
+        dir_prefix = cur->before_colon;
+
+        /* WHY? */
+        /* If already saw a match, don't accept other different matches */
+        if (prev && strcmp(prev, dir_prefix) != 0)
+            continue;
+
         if (DEBUG)
-            fprintf(stderr, "checkPerm: '%s' ? '%s'\n", p0, request);
-
-        l = strlen(p0);
-        if (strncmp(p0, path, l) == 0
-         && (l == 1 || path[l] == '/' || path[l] == '\0')
+            fprintf(stderr, "checkPerm: '%s' ? '%s'\n", dir_prefix, user_and_passwd);
+
+        /* If it's not a prefix match, continue searching */
+        len = strlen(dir_prefix);
+        if (len != 1 /* dir_prefix "/" matches all, don't need to check */
+         && (strncmp(dir_prefix, path, len) != 0
+            || (path[len] != '/' && path[len] != '\0'))
         ) {
-            char *u;
-            /* path match found.  Check request */
-            /* for check next /path:user:password */
-            prev = p0;
-            u = strchr(request, ':');
-            if (u == NULL) {
-                /* bad request, ':' required */
-                break;
-            }
-
-            if (ENABLE_FEATURE_HTTPD_AUTH_MD5) {
-                char *cipher;
-                char *pp;
-
-                if (strncmp(p, request, u - request) != 0) {
-                    /* user doesn't match */
+            continue;
+        }
+
+        /* Path match found */
+        prev = dir_prefix;
+
+        if (ENABLE_FEATURE_HTTPD_AUTH_MD5) {
+            char *md5_passwd;
+
+            md5_passwd = strchr(cur->after_colon, ':');
+            if (md5_passwd && md5_passwd[1] == '$' && md5_passwd[2] == '1'
+             && md5_passwd[3] == '$' && md5_passwd[4]
+            ) {
+                char *encrypted;
+                int r, user_len_p1;
+
+                md5_passwd++;
+                user_len_p1 = md5_passwd - cur->after_colon;
+                /* comparing "user:" */
+                if (strncmp(cur->after_colon, user_and_passwd, user_len_p1) != 0) {
                     continue;
                 }
-                pp = strchr(p, ':');
-                if (pp && pp[1] == '$' && pp[2] == '1'
-                 && pp[3] == '$' && pp[4]
-                ) {
-                    pp++;
-                    cipher = pw_encrypt(u+1, pp);
-                    if (strcmp(cipher, pp) == 0)
-                        goto set_remoteuser_var;   /* Ok */
-                    /* unauthorized */
-                    continue;
-                }
-            }
-
-            if (strcmp(p, request) == 0) {
+
+                encrypted = pw_encrypt(
+                    user_and_passwd + user_len_p1 /* cleartext pwd from user */,
+                    md5_passwd /*salt */, 1 /* cleanup */);
+                r = strcmp(encrypted, md5_passwd);
+                free(encrypted);
+                if (r == 0)
+                    goto set_remoteuser_var; /* Ok */
+                continue;
+            }
+        }
+
+        /* Comparing plaintext "user:pass" in one go */
+        if (strcmp(cur->after_colon, user_and_passwd) == 0) {
  set_remoteuser_var:
-                remoteuser = strdup(request);
-                if (remoteuser)
-                    remoteuser[u - request] = '\0';
-                return 1;   /* Ok */
-            }
-            /* unauthorized */
+            remoteuser = xstrndup(user_and_passwd,
+                    strchrnul(user_and_passwd, ':') - user_and_passwd);
+            return 1; /* Ok */
         }
     } /* for */
 
-    return prev == NULL;
+    /* 0(bad) if prev is set: matches were found but passwd was wrong */
+    return (prev == NULL);
 }
 #endif  /* FEATURE_HTTPD_BASIC_AUTH */
+
+#if ENABLE_FEATURE_HTTPD_PROXY
+static Htaccess_Proxy *find_proxy_entry(const char *url)
+{
+    Htaccess_Proxy *p;
+    for (p = proxy; p; p = p->next) {
+        if (strncmp(url, p->url_from, strlen(p->url_from)) == 0)
+            return p;
+    }
+    return NULL;
+}
+#endif
 
 /*
  * Handle timeouts
  */
-static void exit_on_signal(int sig) ATTRIBUTE_NORETURN;
-static void exit_on_signal(int sig)
+static void send_REQUEST_TIMEOUT_and_exit(int sig) NORETURN;
+static void send_REQUEST_TIMEOUT_and_exit(int sig UNUSED_PARAM)
 {
     send_headers_and_exit(HTTP_REQUEST_TIMEOUT);
@@ -1576 +1807 @@
  * Handle an incoming http request and exit.
  */
-static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr) ATTRIBUTE_NORETURN;
+static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr) NORETURN;
 static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
 {
     static const char request_GET[] ALIGN1 = "GET";
-
     struct stat sb;
     char *urlcopy;
     char *urlp;
     char *tptr;
-    int http_major_version;
-    int ip_allowed;
 #if ENABLE_FEATURE_HTTPD_CGI
+    static const char request_HEAD[] ALIGN1 = "HEAD";
     const char *prequest;
+    char *cookie = NULL;
+    char *content_type = NULL;
     unsigned long length = 0;
-    char *cookie = 0;
-    char *content_type = 0;
-#endif
-    struct sigaction sa;
+#elif ENABLE_FEATURE_HTTPD_PROXY
+#define prequest request_GET
+    unsigned long length = 0;
+#endif
 #if ENABLE_FEATURE_HTTPD_BASIC_AUTH
-    int credentials = -1;  /* if not required this is Ok */
+    smallint authorized = -1;
+#endif
+    smallint ip_allowed;
+    char http_major_version;
+#if ENABLE_FEATURE_HTTPD_PROXY
+    char http_minor_version;
+    char *header_buf = header_buf; /* for gcc */
+    char *header_ptr = header_ptr;
+    Htaccess_Proxy *proxy_entry;
 #endif
 
@@ -1603 +1842 @@
 
     rmt_ip = 0;
-    if (fromAddr->sa.sa_family == AF_INET) {
-        rmt_ip = ntohl(fromAddr->sin.sin_addr.s_addr);
+    if (fromAddr->u.sa.sa_family == AF_INET) {
+        rmt_ip = ntohl(fromAddr->u.sin.sin_addr.s_addr);
     }
 #if ENABLE_FEATURE_IPV6
-    if (fromAddr->sa.sa_family == AF_INET6
-     && fromAddr->sin6.sin6_addr.s6_addr32[0] == 0
-     && fromAddr->sin6.sin6_addr.s6_addr32[1] == 0
-     && ntohl(fromAddr->sin6.sin6_addr.s6_addr32[2]) == 0xffff)
-        rmt_ip = ntohl(fromAddr->sin6.sin6_addr.s6_addr32[3]);
+    if (fromAddr->u.sa.sa_family == AF_INET6
+     && fromAddr->u.sin6.sin6_addr.s6_addr32[0] == 0
+     && fromAddr->u.sin6.sin6_addr.s6_addr32[1] == 0
+     && ntohl(fromAddr->u.sin6.sin6_addr.s6_addr32[2]) == 0xffff)
+        rmt_ip = ntohl(fromAddr->u.sin6.sin6_addr.s6_addr32[3]);
 #endif
     if (ENABLE_FEATURE_HTTPD_CGI || DEBUG || verbose) {
-        rmt_ip_str = xmalloc_sockaddr2dotted(&fromAddr->sa);
+        /* NB: can be NULL (user runs httpd -i by hand?) */
+        rmt_ip_str = xmalloc_sockaddr2dotted(&fromAddr->u.sa);
     }
     if (verbose) {
         /* this trick makes -v logging much simpler */
-        applet_name = rmt_ip_str;
+        if (rmt_ip_str)
+            applet_name = rmt_ip_str;
         if (verbose > 2)
             bb_error_msg("connected");
     }
 
-    /* Install timeout handler */
-    memset(&sa, 0, sizeof(sa));
-    sa.sa_handler = exit_on_signal;
-    /* sigemptyset(&sa.sa_mask); - memset should be enough */
-    /*sa.sa_flags = 0; - no SA_RESTART */
-    sigaction(SIGALRM, &sa, NULL);
-    alarm(HEADER_READ_TIMEOUT);
+    /* Install timeout handler. get_line() needs it. */
+    signal(SIGALRM, send_REQUEST_TIMEOUT_and_exit);
 
     if (!get_line()) /* EOF or error or empty line */
@@ -1642 +1878 @@
     prequest = request_GET;
     if (strcasecmp(iobuf, prequest) != 0) {
-        prequest = "POST";
-        if (strcasecmp(iobuf, prequest) != 0)
-            send_headers_and_exit(HTTP_NOT_IMPLEMENTED);
+        prequest = request_HEAD;
+        if (strcasecmp(iobuf, prequest) != 0) {
+            prequest = "POST";
+            if (strcasecmp(iobuf, prequest) != 0)
+                send_headers_and_exit(HTTP_NOT_IMPLEMENTED);
+        }
     }
 #else
@@ -1655 +1894 @@
 
     /* Find end of URL and parse HTTP version, if any */
-    http_major_version = -1;
+    http_major_version = '0';
+    IF_FEATURE_HTTPD_PROXY(http_minor_version = '0';)
     tptr = strchrnul(urlp, ' ');
     /* Is it " HTTP/"? */
-    if (tptr[0] && strncmp(tptr + 1, HTTP_200, 5) == 0)
-        http_major_version = (tptr[6] - '0');
+    if (tptr[0] && strncmp(tptr + 1, HTTP_200, 5) == 0) {
+        http_major_version = tptr[6];
+        IF_FEATURE_HTTPD_PROXY(http_minor_version = tptr[8];)
+    }
     *tptr = '\0';
 
     /* Copy URL from after "GET "/"POST " to stack-allocated char[] */
-    urlcopy = alloca((tptr - urlp) + sizeof("/index.html"));
+    urlcopy = alloca((tptr - urlp) + 2 + strlen(index_page));
     /*if (urlcopy == NULL)
      *  send_headers_and_exit(HTTP_INTERNAL_SERVER_ERROR);*/
@@ -1670 +1912 @@
 
     /* Extract url args if present */
+    g_query = NULL;
     tptr = strchr(urlcopy, '?');
-    g_query = NULL;
     if (tptr) {
         *tptr++ = '\0';
@@ -1688 +1930 @@
     /* Canonicalize path */
     /* Algorithm stolen from libbb bb_simplify_path(),
-     * but don't strdup and reducing trailing slash and protect out root */
+     * but don't strdup, retain trailing slash, protect root */
     urlp = tptr = urlcopy;
     do {
@@ -1697 +1939 @@
             }
             if (*tptr == '.') {
-                /* skip extra '.' */
+                /* skip extra "/./" */
                 if (tptr[1] == '/' || !tptr[1]) {
                     continue;
                 }
-                /* '..': be careful */
+                /* "..": be careful */
                 if (tptr[1] == '.' && (tptr[2] == '/' || !tptr[2])) {
                     ++tptr;
@@ -1713 +1955 @@
         *++urlp = *tptr;
     } while (*++tptr);
-    *++urlp = '\0';       /* so keep last character */
-    tptr = urlp;          /* end ptr */
+    *++urlp = '\0';       /* terminate after last character */
 
     /* If URL is a directory, add '/' */
-    if (tptr[-1] != '/') {
-        if (is_directory(urlcopy + 1, 1, &sb)) {
+    if (urlp[-1] != '/') {
+        if (is_directory(urlcopy + 1, 1, NULL)) {
             found_moved_temporarily = urlcopy;
         }
@@ -1732 +1973 @@
         /* have path1/path2 */
         *tptr = '\0';
-        if (is_directory(urlcopy + 1, 1, &sb)) {
-            /* may be having subdir config */
+        if (is_directory(urlcopy + 1, 1, NULL)) {
+            /* may have subdir config */
             parse_conf(urlcopy + 1, SUBDIR_PARSE);
             ip_allowed = checkPermIP();
@@ -1739 +1980 @@
         *tptr = '/';
     }
-    if (http_major_version >= 0) {
+
+#if ENABLE_FEATURE_HTTPD_PROXY
+    proxy_entry = find_proxy_entry(urlcopy);
+    if (proxy_entry)
+        header_buf = header_ptr = xmalloc(IOBUF_SIZE);
+#endif
+
+    if (http_major_version >= '0') {
         /* Request was with "... HTTP/nXXX", and n >= 0 */
 
-        /* Read until blank line for HTTP version specified, else parse immediate */
+        /* Read until blank line */
         while (1) {
-            alarm(HEADER_READ_TIMEOUT);
             if (!get_line())
                 break; /* EOF or error or empty line */
@@ -1750 +1997 @@
                 bb_error_msg("header: '%s'", iobuf);
 
-#if ENABLE_FEATURE_HTTPD_CGI
-            /* try and do our best to parse more lines */
+#if ENABLE_FEATURE_HTTPD_PROXY
+            /* We need 2 more bytes for yet another "\r\n" -
+             * see near fdprintf(proxy_fd...) further below */
+            if (proxy_entry && (header_ptr - header_buf) < IOBUF_SIZE - 2) {
+                int len = strlen(iobuf);
+                if (len > IOBUF_SIZE - (header_ptr - header_buf) - 4)
+                    len = IOBUF_SIZE - (header_ptr - header_buf) - 4;
+                memcpy(header_ptr, iobuf, len);
+                header_ptr += len;
+                header_ptr[0] = '\r';
+                header_ptr[1] = '\n';
+                header_ptr += 2;
+            }
+#endif
+
+#if ENABLE_FEATURE_HTTPD_CGI || ENABLE_FEATURE_HTTPD_PROXY
+            /* Try and do our best to parse more lines */
             if ((STRNCASECMP(iobuf, "Content-length:") == 0)) {
                 /* extra read only for POST */
-                if (prequest != request_GET) {
-                    tptr = iobuf + sizeof("Content-length:") - 1;
+                if (prequest != request_GET
+# if ENABLE_FEATURE_HTTPD_CGI
+                 && prequest != request_HEAD
+# endif
+                ) {
+                    tptr = skip_whitespace(iobuf + sizeof("Content-length:") - 1);
                     if (!tptr[0])
                         send_headers_and_exit(HTTP_BAD_REQUEST);
-                    errno = 0;
                     /* not using strtoul: it ignores leading minus! */
-                    length = strtol(tptr, &tptr, 10);
+                    length = bb_strtou(tptr, NULL, 10);
                     /* length is "ulong", but we need to pass it to int later */
-                    /* so we check for negative or too large values in one go: */
-                    /* (long -> ulong conv caused negatives to be seen as > INT_MAX) */
-                    if (tptr[0] || errno || length > INT_MAX)
+                    if (errno || length > INT_MAX)
                         send_headers_and_exit(HTTP_BAD_REQUEST);
                 }
-            } else if (STRNCASECMP(iobuf, "Cookie:") == 0) {
-                cookie = strdup(skip_whitespace(iobuf + sizeof("Cookie:")-1));
+            }
+#endif
+#if ENABLE_FEATURE_HTTPD_CGI
+            else if (STRNCASECMP(iobuf, "Cookie:") == 0) {
+                cookie = xstrdup(skip_whitespace(iobuf + sizeof("Cookie:")-1));
             } else if (STRNCASECMP(iobuf, "Content-Type:") == 0) {
-                content_type = strdup(skip_whitespace(iobuf + sizeof("Content-Type:")-1));
+                content_type = xstrdup(skip_whitespace(iobuf + sizeof("Content-Type:")-1));
             } else if (STRNCASECMP(iobuf, "Referer:") == 0) {
-                referer = strdup(skip_whitespace(iobuf + sizeof("Referer:")-1));
+                referer = xstrdup(skip_whitespace(iobuf + sizeof("Referer:")-1));
             } else if (STRNCASECMP(iobuf, "User-Agent:") == 0) {
-                user_agent = strdup(skip_whitespace(iobuf + sizeof("User-Agent:")-1));
+                user_agent = xstrdup(skip_whitespace(iobuf + sizeof("User-Agent:")-1));
+            } else if (STRNCASECMP(iobuf, "Host:") == 0) {
+                host = xstrdup(skip_whitespace(iobuf + sizeof("Host:")-1));
+            } else if (STRNCASECMP(iobuf, "Accept:") == 0) {
+                http_accept = xstrdup(skip_whitespace(iobuf + sizeof("Accept:")-1));
+            } else if (STRNCASECMP(iobuf, "Accept-Language:") == 0) {
+                http_accept_language = xstrdup(skip_whitespace(iobuf + sizeof("Accept-Language:")-1));
             }
 #endif
@@ -1780 +2052 @@
             if (STRNCASECMP(iobuf, "Authorization:") == 0) {
                 /* We only allow Basic credentials.
-                 * It shows up as "Authorization: Basic <userid:password>" where
-                 * the userid:password is base64 encoded.
+                 * It shows up as "Authorization: Basic <user>:<passwd>" where
+                 * "<user>:<passwd>" is base64 encoded.
                  */
                 tptr = skip_whitespace(iobuf + sizeof("Authorization:")-1);
@@ -1789 +2061 @@
                 /* decodeBase64() skips whitespace itself */
                 decodeBase64(tptr);
-                credentials = checkPerm(urlcopy, tptr);
-            }
-#endif          /* FEATURE_HTTPD_BASIC_AUTH */
+                authorized = check_user_passwd(urlcopy, tptr);
+            }
+#endif
+#if ENABLE_FEATURE_HTTPD_RANGES
+            if (STRNCASECMP(iobuf, "Range:") == 0) {
+                /* We know only bytes=NNN-[MMM] */
+                char *s = skip_whitespace(iobuf + sizeof("Range:")-1);
+                if (strncmp(s, "bytes=", 6) == 0) {
+                    s += sizeof("bytes=")-1;
+                    range_start = BB_STRTOOFF(s, &s, 10);
+                    if (s[0] != '-' || range_start < 0) {
+                        range_start = 0;
+                    } else if (s[1]) {
+                        range_end = BB_STRTOOFF(s+1, NULL, 10);
+                        if (errno || range_end < range_start)
+                            range_start = 0;
+                    }
+                }
+            }
+#endif
+#if ENABLE_FEATURE_HTTPD_GZIP
+            if (STRNCASECMP(iobuf, "Accept-Encoding:") == 0) {
+                /* Note: we do not support "gzip;q=0"
+                 * method of _disabling_ gzip
+                 * delivery. No one uses that, though */
+                const char *s = strstr(iobuf, "gzip");
+                if (s) {
+                    // want more thorough checks?
+                    //if (s[-1] == ' '
+                    // || s[-1] == ','
+                    // || s[-1] == ':'
+                    //) {
+                        content_gzip = 1;
+                    //}
+                }
+            }
+#endif
         } /* while extra header reading */
     }
 
-    /* We read headers, disable peer timeout */
+    /* We are done reading headers, disable peer timeout */
     alarm(0);
 
-    if (strcmp(bb_basename(urlcopy), httpd_conf) == 0 || ip_allowed == 0) {
-        /* protect listing [/path]/httpd_conf or IP deny */
+    if (strcmp(bb_basename(urlcopy), HTTPD_CONF) == 0 || !ip_allowed) {
+        /* protect listing [/path]/httpd.conf or IP deny */
         send_headers_and_exit(HTTP_FORBIDDEN);
     }
 
 #if ENABLE_FEATURE_HTTPD_BASIC_AUTH
-    if (credentials <= 0 && checkPerm(urlcopy, ":") == 0) {
+    /* Case: no "Authorization:" was seen, but page does require passwd.
+     * Check that with dummy user:pass */
+    if (authorized < 0)
+        authorized = check_user_passwd(urlcopy, ":");
+    if (!authorized)
         send_headers_and_exit(HTTP_UNAUTHORIZED);
-    }
 #endif
 
@@ -1812 +2121 @@
         send_headers_and_exit(HTTP_MOVED_TEMPORARILY);
     }
+
+#if ENABLE_FEATURE_HTTPD_PROXY
+    if (proxy_entry != NULL) {
+        int proxy_fd;
+        len_and_sockaddr *lsa;
+
+        proxy_fd = socket(AF_INET, SOCK_STREAM, 0);
+        if (proxy_fd < 0)
+            send_headers_and_exit(HTTP_INTERNAL_SERVER_ERROR);
+        lsa = host2sockaddr(proxy_entry->host_port, 80);
+        if (lsa == NULL)
+            send_headers_and_exit(HTTP_INTERNAL_SERVER_ERROR);
+        if (connect(proxy_fd, &lsa->u.sa, lsa->len) < 0)
+            send_headers_and_exit(HTTP_INTERNAL_SERVER_ERROR);
+        fdprintf(proxy_fd, "%s %s%s%s%s HTTP/%c.%c\r\n",
+                prequest, /* GET or POST */
+                proxy_entry->url_to, /* url part 1 */
+                urlcopy + strlen(proxy_entry->url_from), /* url part 2 */
+                (g_query ? "?" : ""), /* "?" (maybe) */
+                (g_query ? g_query : ""), /* query string (maybe) */
+                http_major_version, http_minor_version);
+        header_ptr[0] = '\r';
+        header_ptr[1] = '\n';
+        header_ptr += 2;
+        write(proxy_fd, header_buf, header_ptr - header_buf);
+        free(header_buf); /* on the order of 8k, free it */
+        cgi_io_loop_and_exit(proxy_fd, proxy_fd, length);
+    }
+#endif
 
     tptr = urlcopy + 1;      /* skip first '/' */
@@ -1823 +2161 @@
         send_cgi_and_exit(urlcopy, prequest, length, cookie, content_type);
     }
+#endif
+
+    if (urlp[-1] == '/')
+        strcpy(urlp, index_page);
+    if (stat(tptr, &sb) == 0) {
 #if ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
-    {
         char *suffix = strrchr(tptr, '.');
         if (suffix) {
@@ -1834 +2176 @@
             }
         }
-    }
-#endif
-    if (prequest != request_GET) {
-        send_headers_and_exit(HTTP_NOT_IMPLEMENTED);
-    }
-#endif  /* FEATURE_HTTPD_CGI */
-
-    if (urlp[-1] == '/')
-        strcpy(urlp, "index.html");
-    if (stat(tptr, &sb) == 0) {
-        /* It's a dir URL and there is index.html */
-        ContentLength = sb.st_size;
+#endif
+        file_size = sb.st_size;
         last_mod = sb.st_mtime;
     }
@@ -1858 +2190 @@
         }
     }
-#endif
-    /* else {
-     *  fall through to send_file, it errors out if open fails
-     * }
-     */
-
-    send_file_and_exit(tptr, TRUE);
+    /* else fall through to send_file, it errors out if open fails: */
+
+    if (prequest != request_GET && prequest != request_HEAD) {
+        /* POST for files does not make sense */
+        send_headers_and_exit(HTTP_NOT_IMPLEMENTED);
+    }
+    send_file_and_exit(tptr,
+        (prequest != request_HEAD ? SEND_HEADERS_AND_BODY : SEND_HEADERS)
+    );
+#else
+    send_file_and_exit(tptr, SEND_HEADERS_AND_BODY);
+#endif
 }
 
@@ -1874 +2211 @@
  */
 #if BB_MMU
-static void mini_httpd(int server_socket) ATTRIBUTE_NORETURN;
+static void mini_httpd(int server_socket) NORETURN;
 static void mini_httpd(int server_socket)
 {
@@ -1885 +2222 @@
         int n;
         len_and_sockaddr fromAddr;
-        
+
         /* Wait for connections... */
         fromAddr.len = LSA_SIZEOF_SA;
-        n = accept(server_socket, &fromAddr.sa, &fromAddr.len);
-
+        n = accept(server_socket, &fromAddr.u.sa, &fromAddr.len);
         if (n < 0)
             continue;
+
         /* set the KEEPALIVE option to cull dead connections */
         setsockopt(n, SOL_SOCKET, SO_KEEPALIVE, &const_int_1, sizeof(const_int_1));
@@ -1897 +2234 @@
         if (fork() == 0) {
             /* child */
-#if ENABLE_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP
             /* Do not reload config on HUP */
             signal(SIGHUP, SIG_IGN);
-#endif
             close(server_socket);
             xmove_fd(n, 0);
@@ -1913 +2248 @@
 }
 #else
-static void mini_httpd_nommu(int server_socket, int argc, char **argv) ATTRIBUTE_NORETURN;
+static void mini_httpd_nommu(int server_socket, int argc, char **argv) NORETURN;
 static void mini_httpd_nommu(int server_socket, int argc, char **argv)
 {
@@ -1930 +2265 @@
         int n;
         len_and_sockaddr fromAddr;
-        
+
         /* Wait for connections... */
         fromAddr.len = LSA_SIZEOF_SA;
-        n = accept(server_socket, &fromAddr.sa, &fromAddr.len);
-
+        n = accept(server_socket, &fromAddr.u.sa, &fromAddr.len);
         if (n < 0)
             continue;
+
         /* set the KEEPALIVE option to cull dead connections */
         setsockopt(n, SOL_SOCKET, SO_KEEPALIVE, &const_int_1, sizeof(const_int_1));
@@ -1942 +2277 @@
         if (vfork() == 0) {
             /* child */
-#if ENABLE_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP
             /* Do not reload config on HUP */
             signal(SIGHUP, SIG_IGN);
-#endif
             close(server_socket);
             xmove_fd(n, 0);
@@ -1964 +2297 @@
  * Never returns.
  */
-static void mini_httpd_inetd(void) ATTRIBUTE_NORETURN;
+static void mini_httpd_inetd(void) NORETURN;
 static void mini_httpd_inetd(void)
 {
     len_and_sockaddr fromAddr;
 
+    memset(&fromAddr, 0, sizeof(fromAddr));
     fromAddr.len = LSA_SIZEOF_SA;
-    getpeername(0, &fromAddr.sa, &fromAddr.len);
+    /* NB: can fail if user runs it by hand and types in http cmds */
+    getpeername(0, &fromAddr.u.sa, &fromAddr.len);
     handle_incoming_and_exit(&fromAddr);
 }
 
-#if ENABLE_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP
-static void sighup_handler(int sig)
-{
-    struct sigaction sa;
-
-    parse_conf(default_path_httpd_conf, sig == SIGHUP ? SIGNALED_PARSE : FIRST_PARSE);
-
-    memset(&sa, 0, sizeof(sa));
-    sa.sa_handler = sighup_handler;
-    /*sigemptyset(&sa.sa_mask); - memset should be enough */
-    sa.sa_flags = SA_RESTART;
-    sigaction(SIGHUP, &sa, NULL);
-}
-#endif
+static void sighup_handler(int sig UNUSED_PARAM)
+{
+    parse_conf(DEFAULT_PATH_HTTPD_CONF, SIGNALED_PARSE);
+}
 
 enum {
@@ -1993 +2318 @@
     d_opt_decode_url,
     h_opt_home_httpd,
-    USE_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,)
-    USE_FEATURE_HTTPD_BASIC_AUTH(    r_opt_realm     ,)
-    USE_FEATURE_HTTPD_AUTH_MD5(      m_opt_md5       ,)
-    USE_FEATURE_HTTPD_SETUID(        u_opt_setuid    ,)
+    IF_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,)
+    IF_FEATURE_HTTPD_BASIC_AUTH(    r_opt_realm     ,)
+    IF_FEATURE_HTTPD_AUTH_MD5(      m_opt_md5       ,)
+    IF_FEATURE_HTTPD_SETUID(        u_opt_setuid    ,)
     p_opt_port      ,
     p_opt_inetd     ,
@@ -2004 +2329 @@
     OPT_DECODE_URL  = 1 << d_opt_decode_url,
     OPT_HOME_HTTPD  = 1 << h_opt_home_httpd,
-    OPT_ENCODE_URL  = USE_FEATURE_HTTPD_ENCODE_URL_STR((1 << e_opt_encode_url)) + 0,
-    OPT_REALM       = USE_FEATURE_HTTPD_BASIC_AUTH(    (1 << r_opt_realm     )) + 0,
-    OPT_MD5         = USE_FEATURE_HTTPD_AUTH_MD5(      (1 << m_opt_md5       )) + 0,
-    OPT_SETUID      = USE_FEATURE_HTTPD_SETUID(        (1 << u_opt_setuid    )) + 0,
+    OPT_ENCODE_URL  = IF_FEATURE_HTTPD_ENCODE_URL_STR((1 << e_opt_encode_url)) + 0,
+    OPT_REALM       = IF_FEATURE_HTTPD_BASIC_AUTH(    (1 << r_opt_realm     )) + 0,
+    OPT_MD5         = IF_FEATURE_HTTPD_AUTH_MD5(      (1 << m_opt_md5       )) + 0,
+    OPT_SETUID      = IF_FEATURE_HTTPD_SETUID(        (1 << u_opt_setuid    )) + 0,
     OPT_PORT        = 1 << p_opt_port,
     OPT_INETD       = 1 << p_opt_inetd,
@@ -2015 +2340 @@
 
 
-int httpd_main(int argc, char **argv);
-int httpd_main(int argc, char **argv)
+int httpd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int httpd_main(int argc UNUSED_PARAM, char **argv)
 {
     int server_socket = server_socket; /* for gcc */
     unsigned opt;
     char *url_for_decode;
-    USE_FEATURE_HTTPD_ENCODE_URL_STR(const char *url_for_encode;)
-    USE_FEATURE_HTTPD_SETUID(const char *s_ugid = NULL;)
-    USE_FEATURE_HTTPD_SETUID(struct bb_uidgid_t ugid;)
-    USE_FEATURE_HTTPD_AUTH_MD5(const char *pass;)
+    IF_FEATURE_HTTPD_ENCODE_URL_STR(const char *url_for_encode;)
+    IF_FEATURE_HTTPD_SETUID(const char *s_ugid = NULL;)
+    IF_FEATURE_HTTPD_SETUID(struct bb_uidgid_t ugid;)
+    IF_FEATURE_HTTPD_AUTH_MD5(const char *pass;)
 
     INIT_G();
@@ -2037 +2362 @@
     opt_complementary = "vv:if";
     /* We do not "absolutize" path given by -h (home) opt.
-     * If user gives relative path in -h, $SCRIPT_FILENAME can end up
-     * relative too. */
+     * If user gives relative path in -h,
+     * $SCRIPT_FILENAME will not be set. */
     opt = getopt32(argv, "c:d:h:"
-            USE_FEATURE_HTTPD_ENCODE_URL_STR("e:")
-            USE_FEATURE_HTTPD_BASIC_AUTH("r:")
-            USE_FEATURE_HTTPD_AUTH_MD5("m:")
-            USE_FEATURE_HTTPD_SETUID("u:")
+            IF_FEATURE_HTTPD_ENCODE_URL_STR("e:")
+            IF_FEATURE_HTTPD_BASIC_AUTH("r:")
+            IF_FEATURE_HTTPD_AUTH_MD5("m:")
+            IF_FEATURE_HTTPD_SETUID("u:")
             "p:ifv",
-            &configFile, &url_for_decode, &home_httpd
-            USE_FEATURE_HTTPD_ENCODE_URL_STR(, &url_for_encode)
-            USE_FEATURE_HTTPD_BASIC_AUTH(, &g_realm)
-            USE_FEATURE_HTTPD_AUTH_MD5(, &pass)
-            USE_FEATURE_HTTPD_SETUID(, &s_ugid)
+            &opt_c_configFile, &url_for_decode, &home_httpd
+            IF_FEATURE_HTTPD_ENCODE_URL_STR(, &url_for_encode)
+            IF_FEATURE_HTTPD_BASIC_AUTH(, &g_realm)
+            IF_FEATURE_HTTPD_AUTH_MD5(, &pass)
+            IF_FEATURE_HTTPD_SETUID(, &s_ugid)
             , &bind_addr_or_port
             , &verbose
@@ -2065 +2390 @@
 #if ENABLE_FEATURE_HTTPD_AUTH_MD5
     if (opt & OPT_MD5) {
-        puts(pw_encrypt(pass, "$1$"));
+        char salt[sizeof("$1$XXXXXXXX")];
+        salt[0] = '$';
+        salt[1] = '1';
+        salt[2] = '$';
+        crypt_make_salt(salt + 3, 4, 0);
+        puts(pw_encrypt(pass, salt, 1));
         return 0;
     }
@@ -2071 +2401 @@
 #if ENABLE_FEATURE_HTTPD_SETUID
     if (opt & OPT_SETUID) {
-        if (!get_uidgid(&ugid, s_ugid, 1))
-            bb_error_msg_and_die("unrecognized user[:group] "
-                        "name '%s'", s_ugid);
+        xget_uidgid(&ugid, s_ugid);
     }
 #endif
@@ -2100 +2428 @@
     }
 
-#if ENABLE_FEATURE_HTTPD_CGI
+#if 0
+    /* User can do it himself: 'env - PATH="$PATH" httpd'
+     * We don't do it because we don't want to screw users
+     * which want to do
+     * 'env - VAR1=val1 VAR2=val2 httpd'
+     * and have VAR1 and VAR2 values visible in their CGIs.
+     * Besides, it is also smaller. */
     {
         char *p = getenv("PATH");
-        /* env strings themself are not freed, no need to strdup(p): */
+        /* env strings themself are not freed, no need to xstrdup(p): */
         clearenv();
         if (p)
@@ -2112 +2446 @@
 #endif
 
-#if ENABLE_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP
+    parse_conf(DEFAULT_PATH_HTTPD_CONF, FIRST_PARSE);
     if (!(opt & OPT_INETD))
-        sighup_handler(0);
-    else /* do not install HUP handler in inetd mode */
-#endif
-        parse_conf(default_path_httpd_conf, FIRST_PARSE);
+        signal(SIGHUP, sighup_handler);
 
     xfunc_error_retval = 0;

branches/2.2.9/mindi-busybox/networking/httpd_indexcgi.c

@@ -2 +2 @@
  * Copyright (c) 2007 Denys Vlasenko <vda.linux@googlemail.com>
  *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
@@ -29 +29 @@
 /* Currently malloc machinery is the biggest part of libc we pull in. */
 /* We have only one realloc and one strdup, any idea how to do without? */
-/* Size (i386, approximate):
+
+/* Size (i386, static uclibc, approximate):
  *   text    data     bss     dec     hex filename
  *  13036      44    3052   16132    3f04 index.cgi
@@ -126 +127 @@
     if (buffer + (BUFFER_SIZE-HEADROOM) - dst >= size)
         return;
-    write(1, buffer, dst - buffer);
+    write(STDOUT_FILENO, buffer, dst - buffer);
     dst = buffer;
 }
@@ -149 +150 @@
         *dst = c;
         if ((c - '0') > 9 /* not a digit */
-         && ((c|0x20) - 'a') > 26 /* not A-Z or a-z */
+         && ((c|0x20) - 'a') > ('z' - 'a') /* not A-Z or a-z */
          && !strchr("._-+@", c)
         ) {
@@ -211 +212 @@
 }
 
-int main(void)
+int main(int argc, char *argv[])
 {
     dir_list_t *dir_list;
@@ -226 +227 @@
     if (!QUERY_STRING
      || QUERY_STRING[0] != '/'
+     || strstr(QUERY_STRING, "//")
      || strstr(QUERY_STRING, "/../")
      || strcmp(strrchr(QUERY_STRING, '/'), "/..") == 0
@@ -290 +292 @@
     cdir = dir_list;
     while (dir_list_count--) {
-        struct tm *tm;
+        struct tm *ptm;
 
         if (S_ISDIR(cdir->dl_mode)) {
@@ -314 +316 @@
             fmt_ull(cdir->dl_size);
         fmt_str("<td class=dt>");
-        tm = gmtime(&cdir->dl_mtime);
-        fmt_04u(1900 + tm->tm_year); *dst++ = '-';
-        fmt_02u(tm->tm_mon + 1); *dst++ = '-';
-        fmt_02u(tm->tm_mday); *dst++ = ' ';
-        fmt_02u(tm->tm_hour); *dst++ = ':';
-        fmt_02u(tm->tm_min); *dst++ = ':';
-        fmt_02u(tm->tm_sec);
+        ptm = gmtime(&cdir->dl_mtime);
+        fmt_04u(1900 + ptm->tm_year); *dst++ = '-';
+        fmt_02u(ptm->tm_mon + 1); *dst++ = '-';
+        fmt_02u(ptm->tm_mday); *dst++ = ' ';
+        fmt_02u(ptm->tm_hour); *dst++ = ':';
+        fmt_02u(ptm->tm_min); *dst++ = ':';
+        fmt_02u(ptm->tm_sec);
         *dst++ = '\n';
 

branches/2.2.9/mindi-busybox/networking/ifconfig.c

@@ -11 +11 @@
  *              Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
@@ -37 +37 @@
 #include <netinet/if_ether.h>
 #endif
+#include "libbb.h"
 #include "inet_common.h"
-#include "libbb.h"
 
 #if ENABLE_FEATURE_IFCONFIG_SLIP
@@ -165 +165 @@
 struct arg1opt {
     const char *name;
-    int selector;
+    unsigned short selector;
     unsigned short ifr_offset;
 };
@@ -184 +184 @@
 
 static const struct arg1opt Arg1Opt[] = {
-    {"SIOCSIFMETRIC",  SIOCSIFMETRIC,  ifreq_offsetof(ifr_metric)},
-    {"SIOCSIFMTU",     SIOCSIFMTU,     ifreq_offsetof(ifr_mtu)},
-    {"SIOCSIFTXQLEN",  SIOCSIFTXQLEN,  ifreq_offsetof(ifr_qlen)},
-    {"SIOCSIFDSTADDR", SIOCSIFDSTADDR, ifreq_offsetof(ifr_dstaddr)},
-    {"SIOCSIFNETMASK", SIOCSIFNETMASK, ifreq_offsetof(ifr_netmask)},
-    {"SIOCSIFBRDADDR", SIOCSIFBRDADDR, ifreq_offsetof(ifr_broadaddr)},
-#if ENABLE_FEATURE_IFCONFIG_HW
-    {"SIOCSIFHWADDR",  SIOCSIFHWADDR,  ifreq_offsetof(ifr_hwaddr)},
-#endif
-    {"SIOCSIFDSTADDR", SIOCSIFDSTADDR, ifreq_offsetof(ifr_dstaddr)},
+    { "SIFMETRIC",  SIOCSIFMETRIC,  ifreq_offsetof(ifr_metric) },
+    { "SIFMTU",     SIOCSIFMTU,     ifreq_offsetof(ifr_mtu) },
+    { "SIFTXQLEN",  SIOCSIFTXQLEN,  ifreq_offsetof(ifr_qlen) },
+    { "SIFDSTADDR", SIOCSIFDSTADDR, ifreq_offsetof(ifr_dstaddr) },
+    { "SIFNETMASK", SIOCSIFNETMASK, ifreq_offsetof(ifr_netmask) },
+    { "SIFBRDADDR", SIOCSIFBRDADDR, ifreq_offsetof(ifr_broadaddr) },
+#if ENABLE_FEATURE_IFCONFIG_HW
+    { "SIFHWADDR",  SIOCSIFHWADDR,  ifreq_offsetof(ifr_hwaddr) },
+#endif
+    { "SIFDSTADDR", SIOCSIFDSTADDR, ifreq_offsetof(ifr_dstaddr) },
 #ifdef SIOCSKEEPALIVE
-    {"SIOCSKEEPALIVE", SIOCSKEEPALIVE, ifreq_offsetof(ifr_data)},
+    { "SKEEPALIVE", SIOCSKEEPALIVE, ifreq_offsetof(ifr_data) },
 #endif
 #ifdef SIOCSOUTFILL
-    {"SIOCSOUTFILL",   SIOCSOUTFILL,   ifreq_offsetof(ifr_data)},
+    { "SOUTFILL",   SIOCSOUTFILL,   ifreq_offsetof(ifr_data) },
 #endif
 #if ENABLE_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
-    {"SIOCSIFMAP",     SIOCSIFMAP,     ifreq_offsetof(ifr_map.mem_start)},
-    {"SIOCSIFMAP",     SIOCSIFMAP,     ifreq_offsetof(ifr_map.base_addr)},
-    {"SIOCSIFMAP",     SIOCSIFMAP,     ifreq_offsetof(ifr_map.irq)},
+    { "SIFMAP",     SIOCSIFMAP,     ifreq_offsetof(ifr_map.mem_start) },
+    { "SIFMAP",     SIOCSIFMAP,     ifreq_offsetof(ifr_map.base_addr) },
+    { "SIFMAP",     SIOCSIFMAP,     ifreq_offsetof(ifr_map.irq) },
 #endif
     /* Last entry if for unmatched (possibly hostname) arg. */
 #if ENABLE_FEATURE_IPV6
-    {"SIOCSIFADDR",    SIOCSIFADDR,    ifreq_offsetof(ifr_addr)}, /* IPv6 version ignores the offset */
-    {"SIOCDIFADDR",    SIOCDIFADDR,    ifreq_offsetof(ifr_addr)}, /* IPv6 version ignores the offset */
-#endif
-    {"SIOCSIFADDR",    SIOCSIFADDR,    ifreq_offsetof(ifr_addr)},
+    { "SIFADDR",    SIOCSIFADDR,    ifreq_offsetof(ifr_addr) }, /* IPv6 version ignores the offset */
+    { "DIFADDR",    SIOCDIFADDR,    ifreq_offsetof(ifr_addr) }, /* IPv6 version ignores the offset */
+#endif
+    { "SIFADDR",    SIOCSIFADDR,    ifreq_offsetof(ifr_addr) },
 };
 
 static const struct options OptArray[] = {
-    {"metric",      N_ARG,         ARG_METRIC,      0},
-    {"mtu",         N_ARG,         ARG_MTU,         0},
-    {"txqueuelen",  N_ARG,         ARG_TXQUEUELEN,  0},
-    {"dstaddr",     N_ARG,         ARG_DSTADDR,     0},
-    {"netmask",     N_ARG,         ARG_NETMASK,     0},
-    {"broadcast",   N_ARG | M_CLR, ARG_BROADCAST,   IFF_BROADCAST},
-#if ENABLE_FEATURE_IFCONFIG_HW
-    {"hw",          N_ARG, ARG_HW,                  0},
-#endif
-    {"pointopoint", N_ARG | M_CLR, ARG_POINTOPOINT, IFF_POINTOPOINT},
+    { "metric",      N_ARG,         ARG_METRIC,      0 },
+    { "mtu",         N_ARG,         ARG_MTU,         0 },
+    { "txqueuelen",  N_ARG,         ARG_TXQUEUELEN,  0 },
+    { "dstaddr",     N_ARG,         ARG_DSTADDR,     0 },
+    { "netmask",     N_ARG,         ARG_NETMASK,     0 },
+    { "broadcast",   N_ARG | M_CLR, ARG_BROADCAST,   IFF_BROADCAST },
+#if ENABLE_FEATURE_IFCONFIG_HW
+    { "hw",          N_ARG,         ARG_HW,          0 },
+#endif
+    { "pointopoint", N_ARG | M_CLR, ARG_POINTOPOINT, IFF_POINTOPOINT },
 #ifdef SIOCSKEEPALIVE
-    {"keepalive",   N_ARG,         ARG_KEEPALIVE,   0},
+    { "keepalive",   N_ARG,         ARG_KEEPALIVE,   0 },
 #endif
 #ifdef SIOCSOUTFILL
-    {"outfill",     N_ARG,         ARG_OUTFILL,     0},
+    { "outfill",     N_ARG,         ARG_OUTFILL,     0 },
 #endif
 #if ENABLE_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
-    {"mem_start",   N_ARG,         ARG_MEM_START,   0},
-    {"io_addr",     N_ARG,         ARG_IO_ADDR,     0},
-    {"irq",         N_ARG,         ARG_IRQ,         0},
+    { "mem_start",   N_ARG,         ARG_MEM_START,   0 },
+    { "io_addr",     N_ARG,         ARG_IO_ADDR,     0 },
+    { "irq",         N_ARG,         ARG_IRQ,         0 },
 #endif
 #if ENABLE_FEATURE_IPV6
-    {"add",         N_ARG,         ARG_ADD_DEL,     0},
-    {"del",         N_ARG,         ARG_ADD_DEL,     0},
-#endif
-    {"arp",         N_CLR | M_SET, 0,               IFF_NOARP},
-    {"trailers",    N_CLR | M_SET, 0,               IFF_NOTRAILERS},
-    {"promisc",     N_SET | M_CLR, 0,               IFF_PROMISC},
-    {"multicast",   N_SET | M_CLR, 0,               IFF_MULTICAST},
-    {"allmulti",    N_SET | M_CLR, 0,               IFF_ALLMULTI},
-    {"dynamic",     N_SET | M_CLR, 0,               IFF_DYNAMIC},
-    {"up",          N_SET,         0,               (IFF_UP | IFF_RUNNING)},
-    {"down",        N_CLR,         0,               IFF_UP},
-    {NULL,          0,             ARG_HOSTNAME,    (IFF_UP | IFF_RUNNING)}
+    { "add",         N_ARG,         ARG_ADD_DEL,     0 },
+    { "del",         N_ARG,         ARG_ADD_DEL,     0 },
+#endif
+    { "arp",         N_CLR | M_SET, 0,               IFF_NOARP },
+    { "trailers",    N_CLR | M_SET, 0,               IFF_NOTRAILERS },
+    { "promisc",     N_SET | M_CLR, 0,               IFF_PROMISC },
+    { "multicast",   N_SET | M_CLR, 0,               IFF_MULTICAST },
+    { "allmulti",    N_SET | M_CLR, 0,               IFF_ALLMULTI },
+    { "dynamic",     N_SET | M_CLR, 0,               IFF_DYNAMIC },
+    { "up",          N_SET,         0,               (IFF_UP | IFF_RUNNING) },
+    { "down",        N_CLR,         0,               IFF_UP },
+    { NULL,          0,             ARG_HOSTNAME,    (IFF_UP | IFF_RUNNING) }
 };
 
@@ -253 +253 @@
  * A couple of prototypes.
  */
-
 #if ENABLE_FEATURE_IFCONFIG_HW
 static int in_ether(const char *bufp, struct sockaddr *sap);
@@ -261 +260 @@
  * Our main function.
  */
-
-int ifconfig_main(int argc, char **argv);
-int ifconfig_main(int argc, char **argv)
+int ifconfig_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int ifconfig_main(int argc UNUSED_PARAM, char **argv)
 {
     struct ifreq ifr;
@@ -294 +292 @@
     /* skip argv[0] */
     ++argv;
-    --argc;
 
 #if ENABLE_FEATURE_IFCONFIG_STATUS
-    if (argc > 0 && (argv[0][0] == '-' && argv[0][1] == 'a' && !argv[0][2])) {
+    if (argv[0] && (argv[0][0] == '-' && argv[0][1] == 'a' && !argv[0][2])) {
         interface_opt_a = 1;
-        --argc;
         ++argv;
     }
 #endif
 
-    if (argc <= 1) {
+    if (!argv[0] || !argv[1]) { /* one or no args */
 #if ENABLE_FEATURE_IFCONFIG_STATUS
-        return display_interfaces(argc ? *argv : NULL);
+        return display_interfaces(argv[0] /* can be NULL */);
 #else
         bb_error_msg_and_die("no support for status display");
@@ -316 +312 @@
 
     /* get interface name */
-    safe_strncpy(ifr.ifr_name, *argv, IFNAMSIZ);
+    strncpy_IFNAMSIZ(ifr.ifr_name, *argv);
 
     /* Process the remaining arguments. */
@@ -375 +371 @@
                         sai.sin_family = AF_INET;
                         sai.sin_port = 0;
-                        if (!strcmp(host, bb_str_default)) {
+                        if (strcmp(host, "default") == 0) {
                             /* Default is special, meaning 0.0.0.0. */
                             sai.sin_addr.s_addr = INADDR_ANY;
@@ -393 +389 @@
                             lsa = xhost2sockaddr(host, 0);
 #if ENABLE_FEATURE_IPV6
-                            if (lsa->sa.sa_family == AF_INET6) {
+                            if (lsa->u.sa.sa_family == AF_INET6) {
                                 int sockfd6;
                                 struct in6_ifreq ifr6;
 
                                 memcpy((char *) &ifr6.ifr6_addr,
-                                        (char *) &(lsa->sin6.sin6_addr),
+                                        (char *) &(lsa->u.sin6.sin6_addr),
                                         sizeof(struct in6_addr));
 
@@ -406 +402 @@
                                 ifr6.ifr6_ifindex = ifr.ifr_ifindex;
                                 ifr6.ifr6_prefixlen = prefix_len;
-                                ioctl_or_perror_and_die(sockfd6, a1op->selector, &ifr6, "%s", a1op->name);
+                                ioctl_or_perror_and_die(sockfd6, a1op->selector, &ifr6, "SIOC%s", a1op->name);
                                 if (ENABLE_FEATURE_CLEAN_UP)
                                     free(lsa);
@@ -412 +408 @@
                             }
 #endif
-                            sai.sin_addr = lsa->sin.sin_addr;
+                            sai.sin_addr = lsa->u.sin.sin_addr;
                             if (ENABLE_FEATURE_CLEAN_UP)
                                 free(lsa);
@@ -426 +422 @@
                     } else {    /* A_CAST_HOST_COPY_IN_ETHER */
                         /* This is the "hw" arg case. */
-                        if (strcmp("ether", *argv) || !*++argv)
+                        smalluint hw_class= index_in_substrings("ether\0"
+                                IF_FEATURE_HWIB("infiniband\0"), *argv) + 1;
+                        if (!hw_class || !*++argv)
                             bb_show_usage();
                         /*safe_strncpy(host, *argv, sizeof(host));*/
                         host = *argv;
-                        if (in_ether(host, &sa))
+                        if (hw_class == 1 ? in_ether(host, &sa) : in_ib(host, &sa))
                             bb_error_msg_and_die("invalid hw-addr %s", host);
                         p = (char *) &sa;
@@ -458 +456 @@
                 }
 
-                ioctl_or_perror_and_die(sockfd, a1op->selector, &ifr, "%s", a1op->name);
+                ioctl_or_perror_and_die(sockfd, a1op->selector, &ifr, "SIOC%s", a1op->name);
 #ifdef QUESTIONABLE_ALIAS_CASE
                 if (mask & A_COLON_CHK) {
@@ -507 +505 @@
 
     sap->sa_family = ARPHRD_ETHER;
-    ptr = sap->sa_data;
+    ptr = (char *) sap->sa_data;
 
     i = 0;

branches/2.2.9/mindi-busybox/networking/ifupdown.c

@@ -2 +2 @@
 /*
  *  ifupdown for busybox
- *  Copyright (c) 2002 Glenn McGrath <bug1@iinet.net.au>
+ *  Copyright (c) 2002 Glenn McGrath
  *  Copyright (c) 2003-2004 Erik Andersen <andersen@codepoet.org>
  *
@@ -15 +15 @@
  *  configuration.
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
+#include "libbb.h"
+/* After libbb.h, since it needs sys/types.h on some systems */
 #include <sys/utsname.h>
 #include <fnmatch.h>
-#include <getopt.h>
-
-#include "libbb.h"
 
 #define MAX_OPT_DEPTH 10
@@ -33 +32 @@
 #endif
 
+#define UDHCPC_CMD_OPTIONS CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS
+
 #define debug_noise(args...) /*fprintf(stderr, args)*/
 
@@ -42 +43 @@
 struct method_t {
     const char *name;
-    int (*up)(struct interface_defn_t *ifd, execfn *e);
-    int (*down)(struct interface_defn_t *ifd, execfn *e);
+    int (*up)(struct interface_defn_t *ifd, execfn *e) FAST_FUNC;
+    int (*down)(struct interface_defn_t *ifd, execfn *e) FAST_FUNC;
 };
 
@@ -87 +88 @@
 };
 
-#define OPTION_STR "anvf" USE_FEATURE_IFUPDOWN_MAPPING("m") "i:"
+
+#define OPTION_STR "anvf" IF_FEATURE_IFUPDOWN_MAPPING("m") "i:"
 enum {
-    OPT_do_all = 0x1,
-    OPT_no_act = 0x2,
-    OPT_verbose = 0x4,
-    OPT_force = 0x8,
+    OPT_do_all      = 0x1,
+    OPT_no_act      = 0x2,
+    OPT_verbose     = 0x4,
+    OPT_force       = 0x8,
     OPT_no_mappings = 0x10,
 };
-#define DO_ALL (option_mask32 & OPT_do_all)
-#define NO_ACT (option_mask32 & OPT_no_act)
-#define VERBOSE (option_mask32 & OPT_verbose)
-#define FORCE (option_mask32 & OPT_force)
+#define DO_ALL      (option_mask32 & OPT_do_all)
+#define NO_ACT      (option_mask32 & OPT_no_act)
+#define VERBOSE     (option_mask32 & OPT_verbose)
+#define FORCE       (option_mask32 & OPT_force)
 #define NO_MAPPINGS (option_mask32 & OPT_no_mappings)
 
-static char **my_environ;
-
-static const char *startup_PATH;
+
+struct globals {
+    char **my_environ;
+    const char *startup_PATH;
+} FIX_ALIASING;
+#define G (*(struct globals*)&bb_common_bufsiz1)
+#define INIT_G() do { } while (0)
+
 
 #if ENABLE_FEATURE_IFUPDOWN_IPV4 || ENABLE_FEATURE_IFUPDOWN_IPV6
@@ -126 +133 @@
 
     if (i == 0)
-        return -r[llen];
+        return - (unsigned char)r[llen];
     return i;
 }
@@ -135 +142 @@
 
     if (strncmpz(id, "iface", idlen) == 0) {
-        char *result;
-        static char label_buf[20];
-        safe_strncpy(label_buf, ifd->iface, sizeof(label_buf));
-        result = strchr(label_buf, ':');
-        if (result) {
-            *result = '\0';
-        }
-        return label_buf;
+        // ubuntu's ifup doesn't do this:
+        //static char *label_buf;
+        //char *result;
+        //free(label_buf);
+        //label_buf = xstrdup(ifd->iface);
+        // Remove virtual iface suffix
+        //result = strchrnul(label_buf, ':');
+        //*result = '\0';
+        //return label_buf;
+
+        return ifd->iface;
     }
     if (strncmpz(id, "label", idlen) == 0) {
@@ -155 +165 @@
 }
 
-#if ENABLE_FEATURE_IFUPDOWN_IP
+# if ENABLE_FEATURE_IFUPDOWN_IP
 static int count_netmask_bits(const char *dotted_quad)
 {
@@ -186 +196 @@
     return result;
 }
-#endif
+# endif
 
 static char *parse(const char *command, struct interface_defn_t *ifd)
@@ -249 +259 @@
 
                 if (varvalue) {
+# if ENABLE_FEATURE_IFUPDOWN_IP
+                    /* "hwaddress <class> <address>":
+                     * unlike ifconfig, ip doesnt want <class>
+                     * (usually "ether" keyword). Skip it. */
+                    if (strncmp(command, "hwaddress", 9) == 0) {
+                        varvalue = skip_whitespace(skip_non_whitespace(varvalue));
+                    }
+# endif
                     addstr(&result, varvalue, strlen(varvalue));
                 } else {
-#if ENABLE_FEATURE_IFUPDOWN_IP
+# if ENABLE_FEATURE_IFUPDOWN_IP
                     /* Sigh...  Add a special case for 'ip' to convert from
                      * dotted quad to bit count style netmasks.  */
@@ -267 +285 @@
                         }
                     }
-#endif
+# endif
                     okay[opt_depth - 1] = 0;
                 }
@@ -312 +330 @@
     return 1;
 }
-#endif
+
+#endif /* FEATURE_IFUPDOWN_IPV4 || FEATURE_IFUPDOWN_IPV6 */
+
 
 #if ENABLE_FEATURE_IFUPDOWN_IPV6
-static int loopback_up6(struct interface_defn_t *ifd, execfn *exec)
-{
-#if ENABLE_FEATURE_IFUPDOWN_IP
+
+static int FAST_FUNC loopback_up6(struct interface_defn_t *ifd, execfn *exec)
+{
+# if ENABLE_FEATURE_IFUPDOWN_IP
     int result;
     result = execute("ip addr add ::1 dev %iface%", ifd, exec);
     result += execute("ip link set %iface% up", ifd, exec);
     return ((result == 2) ? 2 : 0);
-#else
+# else
     return execute("ifconfig %iface% add ::1", ifd, exec);
-#endif
-}
-
-static int loopback_down6(struct interface_defn_t *ifd, execfn *exec)
-{
-#if ENABLE_FEATURE_IFUPDOWN_IP
+# endif
+}
+
+static int FAST_FUNC loopback_down6(struct interface_defn_t *ifd, execfn *exec)
+{
+# if ENABLE_FEATURE_IFUPDOWN_IP
     return execute("ip link set %iface% down", ifd, exec);
-#else
+# else
     return execute("ifconfig %iface% del ::1", ifd, exec);
-#endif
-}
-
-static int static_up6(struct interface_defn_t *ifd, execfn *exec)
+# endif
+}
+
+static int FAST_FUNC manual_up_down6(struct interface_defn_t *ifd UNUSED_PARAM, execfn *exec UNUSED_PARAM)
+{
+    return 1;
+}
+
+static int FAST_FUNC static_up6(struct interface_defn_t *ifd, execfn *exec)
 {
     int result;
-#if ENABLE_FEATURE_IFUPDOWN_IP
+# if ENABLE_FEATURE_IFUPDOWN_IP
     result = execute("ip addr add %address%/%netmask% dev %iface%[[ label %label%]]", ifd, exec);
-    result += execute("ip link set[[ mtu %mtu%]][[ address %hwaddress%]] %iface% up", ifd, exec);
+    result += execute("ip link set[[ mtu %mtu%]][[ addr %hwaddress%]] %iface% up", ifd, exec);
     /* Was: "[[ ip ....%gateway% ]]". Removed extra spaces w/o checking */
     result += execute("[[ip route add ::/0 via %gateway%]]", ifd, exec);
-#else
+# else
     result = execute("ifconfig %iface%[[ media %media%]][[ hw %hwaddress%]][[ mtu %mtu%]] up", ifd, exec);
     result += execute("ifconfig %iface% add %address%/%netmask%", ifd, exec);
     result += execute("[[route -A inet6 add ::/0 gw %gateway%]]", ifd, exec);
-#endif
+# endif
     return ((result == 3) ? 3 : 0);
 }
 
-static int static_down6(struct interface_defn_t *ifd, execfn *exec)
-{
-#if ENABLE_FEATURE_IFUPDOWN_IP
+static int FAST_FUNC static_down6(struct interface_defn_t *ifd, execfn *exec)
+{
+# if ENABLE_FEATURE_IFUPDOWN_IP
     return execute("ip link set %iface% down", ifd, exec);
-#else
+# else
     return execute("ifconfig %iface% down", ifd, exec);
-#endif
-}
-
-#if ENABLE_FEATURE_IFUPDOWN_IP
-static int v4tunnel_up(struct interface_defn_t *ifd, execfn *exec)
+# endif
+}
+
+# if ENABLE_FEATURE_IFUPDOWN_IP
+static int FAST_FUNC v4tunnel_up(struct interface_defn_t *ifd, execfn *exec)
 {
     int result;
@@ -373 +399 @@
 }
 
-static int v4tunnel_down(struct interface_defn_t * ifd, execfn * exec)
+static int FAST_FUNC v4tunnel_down(struct interface_defn_t * ifd, execfn * exec)
 {
     return execute("ip tunnel del %iface%", ifd, exec);
 }
-#endif
+# endif
 
 static const struct method_t methods6[] = {
-#if ENABLE_FEATURE_IFUPDOWN_IP
-    { "v4tunnel", v4tunnel_up, v4tunnel_down, },
-#endif
-    { "static", static_up6, static_down6, },
-    { "loopback", loopback_up6, loopback_down6, },
+# if ENABLE_FEATURE_IFUPDOWN_IP
+    { "v4tunnel" , v4tunnel_up     , v4tunnel_down   , },
+# endif
+    { "static"   , static_up6      , static_down6    , },
+    { "manual"   , manual_up_down6 , manual_up_down6 , },
+    { "loopback" , loopback_up6    , loopback_down6  , },
 };
 
@@ -392 +419 @@
     methods6
 };
+
 #endif /* FEATURE_IFUPDOWN_IPV6 */
 
+
 #if ENABLE_FEATURE_IFUPDOWN_IPV4
-static int loopback_up(struct interface_defn_t *ifd, execfn *exec)
-{
-#if ENABLE_FEATURE_IFUPDOWN_IP
+
+static int FAST_FUNC loopback_up(struct interface_defn_t *ifd, execfn *exec)
+{
+# if ENABLE_FEATURE_IFUPDOWN_IP
     int result;
     result = execute("ip addr add 127.0.0.1/8 dev %iface%", ifd, exec);
     result += execute("ip link set %iface% up", ifd, exec);
     return ((result == 2) ? 2 : 0);
-#else
+# else
     return execute("ifconfig %iface% 127.0.0.1 up", ifd, exec);
-#endif
-}
-
-static int loopback_down(struct interface_defn_t *ifd, execfn *exec)
-{
-#if ENABLE_FEATURE_IFUPDOWN_IP
+# endif
+}
+
+static int FAST_FUNC loopback_down(struct interface_defn_t *ifd, execfn *exec)
+{
+# if ENABLE_FEATURE_IFUPDOWN_IP
     int result;
     result = execute("ip addr flush dev %iface%", ifd, exec);
     result += execute("ip link set %iface% down", ifd, exec);
     return ((result == 2) ? 2 : 0);
-#else
+# else
     return execute("ifconfig %iface% 127.0.0.1 down", ifd, exec);
-#endif
-}
-
-static int static_up(struct interface_defn_t *ifd, execfn *exec)
+# endif
+}
+
+static int FAST_FUNC static_up(struct interface_defn_t *ifd, execfn *exec)
 {
     int result;
-#if ENABLE_FEATURE_IFUPDOWN_IP
+# if ENABLE_FEATURE_IFUPDOWN_IP
     result = execute("ip addr add %address%/%bnmask%[[ broadcast %broadcast%]] "
             "dev %iface%[[ peer %pointopoint%]][[ label %label%]]", ifd, exec);
-    result += execute("ip link set[[ mtu %mtu%]][[ address %hwaddress%]] %iface% up", ifd, exec);
+    result += execute("ip link set[[ mtu %mtu%]][[ addr %hwaddress%]] %iface% up", ifd, exec);
     result += execute("[[ip route add default via %gateway% dev %iface%]]", ifd, exec);
     return ((result == 3) ? 3 : 0);
-#else
+# else
     /* ifconfig said to set iface up before it processes hw %hwaddress%,
      * which then of course fails. Thus we run two separate ifconfig */
@@ -438 +468 @@
     result += execute("[[route add default gw %gateway% %iface%]]", ifd, exec);
     return ((result == 3) ? 3 : 0);
-#endif
-}
-
-static int static_down(struct interface_defn_t *ifd, execfn *exec)
+# endif
+}
+
+static int FAST_FUNC static_down(struct interface_defn_t *ifd, execfn *exec)
 {
     int result;
-#if ENABLE_FEATURE_IFUPDOWN_IP
+# if ENABLE_FEATURE_IFUPDOWN_IP
     result = execute("ip addr flush dev %iface%", ifd, exec);
     result += execute("ip link set %iface% down", ifd, exec);
-#else
-    result = execute("[[route del default gw %gateway% %iface%]]", ifd, exec);
+# else
+    /* result = execute("[[route del default gw %gateway% %iface%]]", ifd, exec); */
+    /* Bringing the interface down deletes the routes in itself.
+       Otherwise this fails if we reference 'gateway' when using this from dhcp_down */
+    result = 1;
     result += execute("ifconfig %iface% down", ifd, exec);
-#endif
+# endif
     return ((result == 2) ? 2 : 0);
 }
 
-#if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP
-struct dhcp_client_t
-{
+# if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP
+struct dhcp_client_t {
     const char *name;
     const char *startcmd;
@@ -464 +496 @@
 static const struct dhcp_client_t ext_dhcp_clients[] = {
     { "dhcpcd",
-        "dhcpcd[[ -h %hostname%]][[ -i %vendor%]][[ -I %clientid%]][[ -l %leasetime%]] %iface%",
+        "dhcpcd[[ -h %hostname%]][[ -i %vendor%]][[ -I %client%]][[ -l %leasetime%]] %iface%",
         "dhcpcd -k %iface%",
     },
@@ -476 +508 @@
     },
     { "udhcpc",
-        "udhcpc -R -n -p /var/run/udhcpc.%iface%.pid -i %iface%[[ -H %hostname%]][[ -c %clientid%]][[ -s %script%]]",
+        "udhcpc " UDHCPC_CMD_OPTIONS " -p /var/run/udhcpc.%iface%.pid -i %iface%[[ -H %hostname%]][[ -c %client%]]"
+                "[[ -s %script%]][[ %udhcpc_opts%]]",
         "kill `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null",
     },
 };
-#endif /* ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCPC */
-
-static int dhcp_up(struct interface_defn_t *ifd, execfn *exec)
-{
-#if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP
-    int i;
-#if ENABLE_FEATURE_IFUPDOWN_IP
+# endif /* FEATURE_IFUPDOWN_EXTERNAL_DHCPC */
+
+# if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP
+static int FAST_FUNC dhcp_up(struct interface_defn_t *ifd, execfn *exec)
+{
+    unsigned i;
+#  if ENABLE_FEATURE_IFUPDOWN_IP
     /* ip doesn't up iface when it configures it (unlike ifconfig) */
-    if (!execute("ip link set %iface% up", ifd, exec))
+    if (!execute("ip link set[[ addr %hwaddress%]] %iface% up", ifd, exec))
         return 0;
-#endif
+#  else
+    /* needed if we have hwaddress on dhcp iface */
+    if (!execute("ifconfig %iface%[[ hw %hwaddress%]] up", ifd, exec))
+        return 0;
+#  endif
     for (i = 0; i < ARRAY_SIZE(ext_dhcp_clients); i++) {
         if (exists_execable(ext_dhcp_clients[i].name))
@@ -497 +534 @@
     bb_error_msg("no dhcp clients found");
     return 0;
-#elif ENABLE_APP_UDHCPC
-#if ENABLE_FEATURE_IFUPDOWN_IP
+}
+# elif ENABLE_UDHCPC
+static int FAST_FUNC dhcp_up(struct interface_defn_t *ifd, execfn *exec)
+{
+#  if ENABLE_FEATURE_IFUPDOWN_IP
     /* ip doesn't up iface when it configures it (unlike ifconfig) */
-    if (!execute("ip link set %iface% up", ifd, exec))
+    if (!execute("ip link set[[ addr %hwaddress%]] %iface% up", ifd, exec))
         return 0;
-#endif
-    return execute("udhcpc -R -n -p /var/run/udhcpc.%iface%.pid "
-            "-i %iface%[[ -H %hostname%]][[ -c %clientid%]][[ -s %script%]]",
+#  else
+    /* needed if we have hwaddress on dhcp iface */
+    if (!execute("ifconfig %iface%[[ hw %hwaddress%]] up", ifd, exec))
+        return 0;
+#  endif
+    return execute("udhcpc " UDHCPC_CMD_OPTIONS " -p /var/run/udhcpc.%iface%.pid "
+            "-i %iface%[[ -H %hostname%]][[ -c %client%]][[ -s %script%]][[ %udhcpc_opts%]]",
             ifd, exec);
-#else
+}
+# else
+static int FAST_FUNC dhcp_up(struct interface_defn_t *ifd UNUSED_PARAM,
+        execfn *exec UNUSED_PARAM)
+{
     return 0; /* no dhcp support */
-#endif
-}
-
-static int dhcp_down(struct interface_defn_t *ifd, execfn *exec)
-{
-#if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP
-    int i;
+}
+# endif
+
+# if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP
+static int FAST_FUNC dhcp_down(struct interface_defn_t *ifd, execfn *exec)
+{
+    int result = 0;
+    unsigned i;
+
     for (i = 0; i < ARRAY_SIZE(ext_dhcp_clients); i++) {
-        if (exists_execable(ext_dhcp_clients[i].name))
-            return execute(ext_dhcp_clients[i].stopcmd, ifd, exec);
-    }
-    bb_error_msg("no dhcp clients found, using static interface shutdown");
-    return static_down(ifd, exec);
-#elif ENABLE_APP_UDHCPC
-    return execute("kill "
-                   "`cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec);
-#else
+        if (exists_execable(ext_dhcp_clients[i].name)) {
+            result = execute(ext_dhcp_clients[i].stopcmd, ifd, exec);
+            if (result)
+                break;
+        }
+    }
+
+    if (!result)
+        bb_error_msg("warning: no dhcp clients found and stopped");
+
+    /* Sleep a bit, otherwise static_down tries to bring down interface too soon,
+       and it may come back up because udhcpc is still shutting down */
+    usleep(100000);
+    result += static_down(ifd, exec);
+    return ((result == 3) ? 3 : 0);
+}
+# elif ENABLE_UDHCPC
+static int FAST_FUNC dhcp_down(struct interface_defn_t *ifd, execfn *exec)
+{
+    int result;
+    result = execute(
+        "test -f /var/run/udhcpc.%iface%.pid && "
+        "kill `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null",
+        ifd, exec);
+    /* Also bring the hardware interface down since
+       killing the dhcp client alone doesn't do it.
+       This enables consecutive ifup->ifdown->ifup */
+    /* Sleep a bit, otherwise static_down tries to bring down interface too soon,
+       and it may come back up because udhcpc is still shutting down */
+    usleep(100000);
+    result += static_down(ifd, exec);
+    return ((result == 3) ? 3 : 0);
+}
+# else
+static int FAST_FUNC dhcp_down(struct interface_defn_t *ifd UNUSED_PARAM,
+        execfn *exec UNUSED_PARAM)
+{
     return 0; /* no dhcp support */
-#endif
-}
-
-static int manual_up_down(struct interface_defn_t *ifd, execfn *exec)
+}
+# endif
+
+static int FAST_FUNC manual_up_down(struct interface_defn_t *ifd UNUSED_PARAM, execfn *exec UNUSED_PARAM)
 {
     return 1;
 }
 
-static int bootp_up(struct interface_defn_t *ifd, execfn *exec)
+static int FAST_FUNC bootp_up(struct interface_defn_t *ifd, execfn *exec)
 {
     return execute("bootpc[[ --bootfile %bootfile%]] --dev %iface%"
@@ -541 +619 @@
 }
 
-static int ppp_up(struct interface_defn_t *ifd, execfn *exec)
+static int FAST_FUNC ppp_up(struct interface_defn_t *ifd, execfn *exec)
 {
     return execute("pon[[ %provider%]]", ifd, exec);
 }
 
-static int ppp_down(struct interface_defn_t *ifd, execfn *exec)
+static int FAST_FUNC ppp_down(struct interface_defn_t *ifd, execfn *exec)
 {
     return execute("poff[[ %provider%]]", ifd, exec);
 }
 
-static int wvdial_up(struct interface_defn_t *ifd, execfn *exec)
+static int FAST_FUNC wvdial_up(struct interface_defn_t *ifd, execfn *exec)
 {
     return execute("start-stop-daemon --start -x wvdial "
@@ -557 +635 @@
 }
 
-static int wvdial_down(struct interface_defn_t *ifd, execfn *exec)
+static int FAST_FUNC wvdial_down(struct interface_defn_t *ifd, execfn *exec)
 {
     return execute("start-stop-daemon --stop -x wvdial "
@@ -564 +642 @@
 
 static const struct method_t methods[] = {
-    { "manual", manual_up_down, manual_up_down, },
-    { "wvdial", wvdial_up, wvdial_down, },
-    { "ppp", ppp_up, ppp_down, },
-    { "static", static_up, static_down, },
-    { "bootp", bootp_up, static_down, },
-    { "dhcp", dhcp_up, dhcp_down, },
-    { "loopback", loopback_up, loopback_down, },
+    { "manual"  , manual_up_down, manual_up_down, },
+    { "wvdial"  , wvdial_up     , wvdial_down   , },
+    { "ppp"     , ppp_up        , ppp_down      , },
+    { "static"  , static_up     , static_down   , },
+    { "bootp"   , bootp_up      , static_down   , },
+    { "dhcp"    , dhcp_up       , dhcp_down     , },
+    { "loopback", loopback_up   , loopback_down , },
 };
 
@@ -579 +657 @@
 };
 
-#endif  /* if ENABLE_FEATURE_IFUPDOWN_IPV4 */
-
+#endif  /* FEATURE_IFUPDOWN_IPV4 */
+
+
+/* Returns pointer to the next word, or NULL.
+ * In 1st case, advances *buf to the word after this one.
+ */
 static char *next_word(char **buf)
 {
-    unsigned short length;
+    unsigned length;
     char *word;
-
-    if (!buf || !*buf || !**buf) {
-        return NULL;
-    }
 
     /* Skip over leading whitespace */
     word = skip_whitespace(*buf);
 
-    /* Skip over comments */
-    if (*word == '#') {
+    /* Stop on EOL */
+    if (*word == '\0')
         return NULL;
-    }
-
-    /* Find the length of this word */
+
+    /* Find the length of this word (can't be 0) */
     length = strcspn(word, " \t\n");
-    if (length == 0) {
-        return NULL;
-    }
-    *buf = word + length;
-    /*DBU:[dave@cray.com] if we are already at EOL dont't increment beyond it */
-    if (**buf) {
-        **buf = '\0';
-        (*buf)++;
-    }
+
+    /* Unless we are already at NUL, store NUL and advance */
+    if (word[length] != '\0')
+        word[length++] = '\0';
+
+    *buf = skip_whitespace(word + length);
 
     return word;
@@ -634 +708 @@
     if (!name)
         return NULL;
-
+    /* TODO: use index_in_str_array() */
     for (i = 0; i < af->n_methods; i++) {
         if (strcmp(af->method[i].name, name) == 0) {
@@ -643 +717 @@
 }
 
-static const llist_t *find_list_string(const llist_t *list, const char *string)
-{
-    if (string == NULL)
-        return NULL;
-
-    while (list) {
-        if (strcmp(list->data, string) == 0) {
-            return list;
-        }
-        list = list->link;
-    }
-    return NULL;
-}
-
 static struct interfaces_file_t *read_interfaces(const char *filename)
 {
+    /* Let's try to be compatible.
+     *
+     * "man 5 interfaces" says:
+     * Lines starting with "#" are ignored. Note that end-of-line
+     * comments are NOT supported, comments must be on a line of their own.
+     * A line may be extended across multiple lines by making
+     * the last character a backslash.
+     *
+     * Seen elsewhere in example config file:
+     * A first non-blank "#" character makes the rest of the line
+     * be ignored. Blank lines are ignored. Lines may be indented freely.
+     * A "\" character at the very end of the line indicates the next line
+     * should be treated as a continuation of the current one.
+     */
 #if ENABLE_FEATURE_IFUPDOWN_MAPPING
     struct mapping_defn_t *currmap = NULL;
@@ -665 +739 @@
     struct interfaces_file_t *defn;
     FILE *f;
-    char *firstword;
     char *buf;
-
+    char *first_word;
+    char *rest_of_line;
     enum { NONE, IFACE, MAPPING } currently_processing = NONE;
 
-    defn = xzalloc(sizeof(struct interfaces_file_t));
-
-    f = xfopen(filename, "r");
-
-    while ((buf = xmalloc_getline(f)) != NULL) {
-        char *buf_ptr = buf;
-
-        firstword = next_word(&buf_ptr);
-        if (firstword == NULL) {
+    defn = xzalloc(sizeof(*defn));
+    f = xfopen_for_read(filename);
+
+    while ((buf = xmalloc_fgetline(f)) != NULL) {
+#if ENABLE_DESKTOP
+        /* Trailing "\" concatenates lines */
+        char *p;
+        while ((p = last_char_is(buf, '\\')) != NULL) {
+            *p = '\0';
+            rest_of_line = xmalloc_fgetline(f);
+            if (!rest_of_line)
+                break;
+            p = xasprintf("%s%s", buf, rest_of_line);
             free(buf);
-            continue;   /* blank line */
-        }
-
-        if (strcmp(firstword, "mapping") == 0) {
+            free(rest_of_line);
+            buf = p;
+        }
+#endif
+        rest_of_line = buf;
+        first_word = next_word(&rest_of_line);
+        if (!first_word || *first_word == '#') {
+            free(buf);
+            continue; /* blank/comment line */
+        }
+
+        if (strcmp(first_word, "mapping") == 0) {
 #if ENABLE_FEATURE_IFUPDOWN_MAPPING
-            currmap = xzalloc(sizeof(struct mapping_defn_t));
-
-            while ((firstword = next_word(&buf_ptr)) != NULL) {
-                if (currmap->max_matches == currmap->n_matches) {
-                    currmap->max_matches = currmap->max_matches * 2 + 1;
-                    currmap->match = xrealloc(currmap->match, sizeof(currmap->match) * currmap->max_matches);
-                }
-
-                currmap->match[currmap->n_matches++] = xstrdup(firstword);
-            }
-            currmap->max_mappings = 0;
-            currmap->n_mappings = 0;
-            currmap->mapping = NULL;
-            currmap->script = NULL;
+            currmap = xzalloc(sizeof(*currmap));
+
+            while ((first_word = next_word(&rest_of_line)) != NULL) {
+                currmap->match = xrealloc_vector(currmap->match, 4, currmap->n_matches);
+                currmap->match[currmap->n_matches++] = xstrdup(first_word);
+            }
+            /*currmap->max_mappings = 0; - done by xzalloc */
+            /*currmap->n_mappings = 0;*/
+            /*currmap->mapping = NULL;*/
+            /*currmap->script = NULL;*/
             {
                 struct mapping_defn_t **where = &defn->mappings;
@@ -705 +787 @@
                 }
                 *where = currmap;
-                currmap->next = NULL;
+                /*currmap->next = NULL;*/
             }
             debug_noise("Added mapping\n");
 #endif
             currently_processing = MAPPING;
-        } else if (strcmp(firstword, "iface") == 0) {
+        } else if (strcmp(first_word, "iface") == 0) {
             static const struct address_family_t *const addr_fams[] = {
 #if ENABLE_FEATURE_IFUPDOWN_IPV4
@@ -720 +802 @@
                 NULL
             };
-
             char *iface_name;
             char *address_family_name;
@@ -726 +807 @@
             llist_t *iface_list;
 
-            currif = xzalloc(sizeof(struct interface_defn_t));
-            iface_name = next_word(&buf_ptr);
-            address_family_name = next_word(&buf_ptr);
-            method_name = next_word(&buf_ptr);
-
-            if (buf_ptr == NULL) {
-                bb_error_msg("too few parameters for line \"%s\"", buf);
-                return NULL;
-            }
+            currif = xzalloc(sizeof(*currif));
+            iface_name = next_word(&rest_of_line);
+            address_family_name = next_word(&rest_of_line);
+            method_name = next_word(&rest_of_line);
+
+            if (method_name == NULL)
+                bb_error_msg_and_die("too few parameters for line \"%s\"", buf);
 
             /* ship any trailing whitespace */
-            buf_ptr = skip_whitespace(buf_ptr);
-
-            if (buf_ptr[0] != '\0') {
-                bb_error_msg("too many parameters \"%s\"", buf);
-                return NULL;
-            }
+            rest_of_line = skip_whitespace(rest_of_line);
+
+            if (rest_of_line[0] != '\0' /* && rest_of_line[0] != '#' */)
+                bb_error_msg_and_die("too many parameters \"%s\"", buf);
 
             currif->iface = xstrdup(iface_name);
 
             currif->address_family = get_address_family(addr_fams, address_family_name);
-            if (!currif->address_family) {
-                bb_error_msg("unknown address type \"%s\"", address_family_name);
-                return NULL;
-            }
+            if (!currif->address_family)
+                bb_error_msg_and_die("unknown address type \"%s\"", address_family_name);
 
             currif->method = get_method(currif->address_family, method_name);
-            if (!currif->method) {
-                bb_error_msg("unknown method \"%s\"", method_name);
-                return NULL;
-            }
+            if (!currif->method)
+                bb_error_msg_and_die("unknown method \"%s\"", method_name);
 
             for (iface_list = defn->ifaces; iface_list; iface_list = iface_list->link) {
                 struct interface_defn_t *tmp = (struct interface_defn_t *) iface_list->data;
-                if ((strcmp(tmp->iface, currif->iface) == 0) &&
-                    (tmp->address_family == currif->address_family)) {
-                    bb_error_msg("duplicate interface \"%s\"", tmp->iface);
-                    return NULL;
+                if ((strcmp(tmp->iface, currif->iface) == 0)
+                 && (tmp->address_family == currif->address_family)
+                ) {
+                    bb_error_msg_and_die("duplicate interface \"%s\"", tmp->iface);
                 }
             }
@@ -770 +843 @@
             debug_noise("iface %s %s %s\n", currif->iface, address_family_name, method_name);
             currently_processing = IFACE;
-        } else if (strcmp(firstword, "auto") == 0) {
-            while ((firstword = next_word(&buf_ptr)) != NULL) {
+        } else if (strcmp(first_word, "auto") == 0) {
+            while ((first_word = next_word(&rest_of_line)) != NULL) {
 
                 /* Check the interface isnt already listed */
-                if (find_list_string(defn->autointerfaces, firstword)) {
+                if (llist_find_str(defn->autointerfaces, first_word)) {
                     bb_perror_msg_and_die("interface declared auto twice \"%s\"", buf);
                 }
 
                 /* Add the interface to the list */
-                llist_add_to_end(&(defn->autointerfaces), xstrdup(firstword));
-                debug_noise("\nauto %s\n", firstword);
+                llist_add_to_end(&(defn->autointerfaces), xstrdup(first_word));
+                debug_noise("\nauto %s\n", first_word);
             }
             currently_processing = NONE;
@@ -786 +859 @@
             switch (currently_processing) {
             case IFACE:
-                {
+                if (rest_of_line[0] == '\0')
+                    bb_error_msg_and_die("option with empty value \"%s\"", buf);
+
+                if (strcmp(first_word, "up") != 0
+                 && strcmp(first_word, "down") != 0
+                 && strcmp(first_word, "pre-up") != 0
+                 && strcmp(first_word, "post-down") != 0
+                ) {
                     int i;
-
-                    if (strlen(buf_ptr) == 0) {
-                        bb_error_msg("option with empty value \"%s\"", buf);
-                        return NULL;
+                    for (i = 0; i < currif->n_options; i++) {
+                        if (strcmp(currif->option[i].name, first_word) == 0)
+                            bb_error_msg_and_die("duplicate option \"%s\"", buf);
                     }
-
-                    if (strcmp(firstword, "up") != 0
-                            && strcmp(firstword, "down") != 0
-                            && strcmp(firstword, "pre-up") != 0
-                            && strcmp(firstword, "post-down") != 0) {
-                        for (i = 0; i < currif->n_options; i++) {
-                            if (strcmp(currif->option[i].name, firstword) == 0) {
-                                bb_error_msg("duplicate option \"%s\"", buf);
-                                return NULL;
-                            }
-                        }
-                    }
                 }
                 if (currif->n_options >= currif->max_options) {
-                    struct variable_t *opt;
-
-                    currif->max_options = currif->max_options + 10;
-                    opt = xrealloc(currif->option, sizeof(*opt) * currif->max_options);
-                    currif->option = opt;
-                }
-                currif->option[currif->n_options].name = xstrdup(firstword);
-                currif->option[currif->n_options].value = xstrdup(buf_ptr);
-                if (!currif->option[currif->n_options].name) {
-                    perror(filename);
-                    return NULL;
-                }
-                if (!currif->option[currif->n_options].value) {
-                    perror(filename);
-                    return NULL;
-                }
-                debug_noise("\t%s=%s\n", currif->option[currif->n_options].name,
-                        currif->option[currif->n_options].value);
+                    currif->max_options += 10;
+                    currif->option = xrealloc(currif->option,
+                        sizeof(*currif->option) * currif->max_options);
+                }
+                debug_noise("\t%s=%s\n", first_word, rest_of_line);
+                currif->option[currif->n_options].name = xstrdup(first_word);
+                currif->option[currif->n_options].value = xstrdup(rest_of_line);
                 currif->n_options++;
                 break;
             case MAPPING:
 #if ENABLE_FEATURE_IFUPDOWN_MAPPING
-                if (strcmp(firstword, "script") == 0) {
-                    if (currmap->script != NULL) {
-                        bb_error_msg("duplicate script in mapping \"%s\"", buf);
-                        return NULL;
-                    } else {
-                        currmap->script = xstrdup(next_word(&buf_ptr));
+                if (strcmp(first_word, "script") == 0) {
+                    if (currmap->script != NULL)
+                        bb_error_msg_and_die("duplicate script in mapping \"%s\"", buf);
+                    currmap->script = xstrdup(next_word(&rest_of_line));
+                } else if (strcmp(first_word, "map") == 0) {
+                    if (currmap->n_mappings >= currmap->max_mappings) {
+                        currmap->max_mappings = currmap->max_mappings * 2 + 1;
+                        currmap->mapping = xrealloc(currmap->mapping,
+                            sizeof(char *) * currmap->max_mappings);
                     }
-                } else if (strcmp(firstword, "map") == 0) {
-                    if (currmap->max_mappings == currmap->n_mappings) {
-                        currmap->max_mappings = currmap->max_mappings * 2 + 1;
-                        currmap->mapping = xrealloc(currmap->mapping, sizeof(char *) * currmap->max_mappings);
-                    }
-                    currmap->mapping[currmap->n_mappings] = xstrdup(next_word(&buf_ptr));
+                    currmap->mapping[currmap->n_mappings] = xstrdup(next_word(&rest_of_line));
                     currmap->n_mappings++;
                 } else {
-                    bb_error_msg("misplaced option \"%s\"", buf);
-                    return NULL;
+                    bb_error_msg_and_die("misplaced option \"%s\"", buf);
                 }
 #endif
@@ -851 +904 @@
             case NONE:
             default:
-                bb_error_msg("misplaced option \"%s\"", buf);
-                return NULL;
+                bb_error_msg_and_die("misplaced option \"%s\"", buf);
             }
         }
         free(buf);
-    }
+    } /* while (fgets) */
+
     if (ferror(f) != 0) {
         /* ferror does NOT set errno! */
@@ -869 +922 @@
 {
     char *result;
-    char *here;
-    char *there;
+    char *dst;
+    char *src;
+    char c;
 
     result = xasprintf(format, name, value);
 
-    for (here = there = result; *there != '=' && *there; there++) {
-        if (*there == '-')
-            *there = '_';
-        if (isalpha(*there))
-            *there = toupper(*there);
-
-        if (isalnum(*there) || *there == '_') {
-            *here = *there;
-            here++;
-        }
-    }
-    memmove(here, there, strlen(there) + 1);
+    for (dst = src = result; (c = *src) != '=' && c; src++) {
+        if (c == '-')
+            c = '_';
+        if (c >= 'a' && c <= 'z')
+            c -= ('a' - 'A');
+        if (isalnum(c) || c == '_')
+            *dst++ = c;
+    }
+    overlapping_strcpy(dst, src);
 
     return result;
@@ -892 +943 @@
 static void set_environ(struct interface_defn_t *iface, const char *mode)
 {
-    char **environend;
     int i;
-    const int n_env_entries = iface->n_options + 5;
-    char **ppch;
-
-    if (my_environ != NULL) {
-        for (ppch = my_environ; *ppch; ppch++) {
-            free(*ppch);
-            *ppch = NULL;
-        }
-        free(my_environ);
-    }
-    my_environ = xzalloc(sizeof(char *) * (n_env_entries + 1 /* for final NULL */ ));
-    environend = my_environ;
+    char **pp;
+
+    if (G.my_environ != NULL) {
+        for (pp = G.my_environ; *pp; pp++) {
+            free(*pp);
+        }
+        free(G.my_environ);
+    }
+
+    /* note: last element will stay NULL: */
+    G.my_environ = xzalloc(sizeof(char *) * (iface->n_options + 6));
+    pp = G.my_environ;
 
     for (i = 0; i < iface->n_options; i++) {
@@ -915 +965 @@
             continue;
         }
-        *(environend++) = setlocalenv("IF_%s=%s", iface->option[i].name, iface->option[i].value);
-    }
-
-    *(environend++) = setlocalenv("%s=%s", "IFACE", iface->iface);
-    *(environend++) = setlocalenv("%s=%s", "ADDRFAM", iface->address_family->name);
-    *(environend++) = setlocalenv("%s=%s", "METHOD", iface->method->name);
-    *(environend++) = setlocalenv("%s=%s", "MODE", mode);
-    *(environend++) = setlocalenv("%s=%s", "PATH", startup_PATH);
+        *pp++ = setlocalenv("IF_%s=%s", iface->option[i].name, iface->option[i].value);
+    }
+
+    *pp++ = setlocalenv("%s=%s", "IFACE", iface->iface);
+    *pp++ = setlocalenv("%s=%s", "ADDRFAM", iface->address_family->name);
+    *pp++ = setlocalenv("%s=%s", "METHOD", iface->method->name);
+    *pp++ = setlocalenv("%s=%s", "MODE", mode);
+    if (G.startup_PATH)
+        *pp++ = setlocalenv("%s=%s", "PATH", G.startup_PATH);
 }
 
@@ -934 +985 @@
         int status;
 
-        fflush(NULL);
-        child = fork();
+        fflush_all();
+        child = vfork();
         switch (child) {
         case -1: /* failure */
             return 0;
         case 0: /* child */
-            execle(DEFAULT_SHELL, DEFAULT_SHELL, "-c", str, NULL, my_environ);
-            exit(127);
-        }
-        waitpid(child, &status, 0);
+            execle(DEFAULT_SHELL, DEFAULT_SHELL, "-c", str, (char *) NULL, G.my_environ);
+            _exit(127);
+        }
+        safe_waitpid(child, &status, 0);
         if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
             return 0;
@@ -994 +1045 @@
 
 #if ENABLE_FEATURE_IFUPDOWN_MAPPING
-static int popen2(FILE **in, FILE **out, char *command, ...)
-{
-    va_list ap;
-    char *argv[11] = { command };
-    int argc;
-    int infd[2], outfd[2];
+static int popen2(FILE **in, FILE **out, char *command, char *param)
+{
+    char *argv[3] = { command, param, NULL };
+    struct fd_pair infd, outfd;
     pid_t pid;
 
-    argc = 1;
-    va_start(ap, command);
-    while ((argc < 10) && (argv[argc] = va_arg(ap, char *))) {
-        argc++;
-    }
-    argv[argc] = NULL;  /* make sure */
-    va_end(ap);
-
-    if (pipe(infd) != 0) {
-        return 0;
-    }
-
-    if (pipe(outfd) != 0) {
-        close(infd[0]);
-        close(infd[1]);
-        return 0;
-    }
-
-    fflush(NULL);
-    switch (pid = fork()) {
-    case -1:            /* failure */
-        close(infd[0]);
-        close(infd[1]);
-        close(outfd[0]);
-        close(outfd[1]);
-        return 0;
-    case 0:         /* child */
-        dup2(infd[0], 0);
-        dup2(outfd[1], 1);
-        close(infd[0]);
-        close(infd[1]);
-        close(outfd[0]);
-        close(outfd[1]);
-        BB_EXECVP(command, argv);
-        exit(127);
-    default:            /* parent */
-        *in = fdopen(infd[1], "w");
-        *out = fdopen(outfd[0], "r");
-        close(infd[0]);
-        close(outfd[1]);
-        return pid;
-    }
-    /* unreached */
-}
-
-static char *run_mapping(char *physical, struct mapping_defn_t * map)
+    xpiped_pair(infd);
+    xpiped_pair(outfd);
+
+    fflush_all();
+    pid = xvfork();
+
+    if (pid == 0) {
+        /* Child */
+        /* NB: close _first_, then move fds! */
+        close(infd.wr);
+        close(outfd.rd);
+        xmove_fd(infd.rd, 0);
+        xmove_fd(outfd.wr, 1);
+        BB_EXECVP_or_die(argv);
+    }
+    /* parent */
+    close(infd.rd);
+    close(outfd.wr);
+    *in = xfdopen_for_write(infd.wr);
+    *out = xfdopen_for_read(outfd.rd);
+    return pid;
+}
+
+static char *run_mapping(char *physical, struct mapping_defn_t *map)
 {
     FILE *in, *out;
@@ -1055 +1082 @@
     char *logical = xstrdup(physical);
 
-    /* Run the mapping script. */
-    pid = popen2(&in, &out, map->script, physical, NULL);
-
-    /* popen2() returns 0 on failure. */
-    if (pid == 0)
-        return logical;
+    /* Run the mapping script. Never fails. */
+    pid = popen2(&in, &out, map->script, physical);
 
     /* Write mappings to stdin of mapping script. */
@@ -1067 +1090 @@
     }
     fclose(in);
-    waitpid(pid, &status, 0);
+    safe_waitpid(pid, &status, 0);
 
     if (WIFEXITED(status) && WEXITSTATUS(status) == 0) {
@@ -1073 +1096 @@
          * grab a line of output and use that as the name of the
          * logical interface. */
-        char *new_logical = xmalloc(MAX_INTERFACE_LENGTH);
-
-        if (fgets(new_logical, MAX_INTERFACE_LENGTH, out)) {
+        char *new_logical = xmalloc_fgetline(out);
+
+        if (new_logical) {
             /* If we are able to read a line of output from the script,
              * remove any trailing whitespace and use this value
@@ -1086 +1109 @@
             free(logical);
             logical = new_logical;
-        } else {
-            /* If we are UNABLE to read a line of output, discard our
-             * freshly allocated memory. */
-            free(new_logical);
         }
     }
@@ -1101 +1120 @@
 static llist_t *find_iface_state(llist_t *state_list, const char *iface)
 {
-    unsigned short iface_len = strlen(iface);
+    unsigned iface_len = strlen(iface);
     llist_t *search = state_list;
 
     while (search) {
         if ((strncmp(search->data, iface, iface_len) == 0)
-         && (search->data[iface_len] == '=')) {
+         && (search->data[iface_len] == '=')
+        ) {
             return search;
         }
@@ -1118 +1138 @@
 {
     llist_t *state_list = NULL;
-    FILE *state_fp = fopen(CONFIG_IFUPDOWN_IFSTATE_PATH, "r");
+    FILE *state_fp = fopen_for_read(CONFIG_IFUPDOWN_IFSTATE_PATH);
 
     if (state_fp) {
@@ -1134 +1154 @@
 
 
-int ifupdown_main(int argc, char **argv);
-int ifupdown_main(int argc, char **argv)
-{
-    int (*cmds)(struct interface_defn_t *) = NULL;
+int ifupdown_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int ifupdown_main(int argc UNUSED_PARAM, char **argv)
+{
+    int (*cmds)(struct interface_defn_t *);
     struct interfaces_file_t *defn;
     llist_t *target_list = NULL;
@@ -1143 +1163 @@
     bool any_failures = 0;
 
+    INIT_G();
+
+    G.startup_PATH = getenv("PATH");
+
     cmds = iface_down;
     if (applet_name[2] == 'u') {
@@ -1150 +1174 @@
 
     getopt32(argv, OPTION_STR, &interfaces);
-    if (argc - optind > 0) {
+    argv += optind;
+    if (argv[0]) {
         if (DO_ALL) bb_show_usage();
     } else {
@@ -1159 +1184 @@
     defn = read_interfaces(interfaces);
     debug_noise("\ndone reading %s\n\n", interfaces);
-
-    if (!defn) {
-        return EXIT_FAILURE;
-    }
-
-    startup_PATH = getenv("PATH");
-    if (!startup_PATH) startup_PATH = "";
 
     /* Create a list of interfaces to work on */
@@ -1171 +1189 @@
         target_list = defn->autointerfaces;
     } else {
-        llist_add_to_end(&target_list, argv[optind]);
+        llist_add_to_end(&target_list, argv[0]);
     }
 
@@ -1182 +1200 @@
         char *pch;
         bool okay = 0;
-        unsigned cmds_ret;
+        int cmds_ret;
 
         iface = xstrdup(target_list->data);
@@ -1260 +1278 @@
         }
         if (VERBOSE) {
-            puts("");
+            bb_putchar('\n');
         }
 
@@ -1288 +1306 @@
 
             /* Actually write the new state */
-            state_fp = xfopen(CONFIG_IFUPDOWN_IFSTATE_PATH, "w");
+            state_fp = xfopen_for_write(CONFIG_IFUPDOWN_IFSTATE_PATH);
             state = state_list;
             while (state) {

branches/2.2.9/mindi-busybox/networking/inetd.c

@@ -4 +4 @@
 /*      $NetBSD: inetd.c,v 1.11 1996/02/22 11:14:41 mycroft Exp $       */
 /* Busybox port by Vladimir Oleynik (C) 2001-2005 <dzo@simtreas.ru>     */
+/* IPv6 support, many bug fixes by Denys Vlasenko (c) 2008 */
 /*
  * Copyright (c) 1983,1991 The Regents of the University of California.
@@ -39 +40 @@
 /* Inetd - Internet super-server
  *
- * This program invokes all internet services as needed.
- * connection-oriented services are invoked each time a
+ * This program invokes configured services when a connection
+ * from a peer is established or a datagram arrives.
+ * Connection-oriented services are invoked each time a
  * connection is made, by creating a process.  This process
  * is passed the connection as file descriptor 0 and is
- * expected to do a getpeername to find out the source host
+ * expected to do a getpeername to find out peer's host
  * and port.
- *
  * Datagram oriented services are invoked when a datagram
  * arrives; a process is created and passed a pending message
- * on file descriptor 0.  Datagram servers may either connect
- * to their peer, freeing up the original socket for inetd
- * to receive further messages on, or "take over the socket",
- * processing all arriving datagrams and, eventually, timing
- * out.  The first type of server is said to be "multi-threaded";
- * the second type of server "single-threaded".
+ * on file descriptor 0. peer's address can be obtained
+ * using recvfrom.
  *
  * Inetd uses a configuration file which is read at startup
@@ -61 +58 @@
  * a space or tab.  All fields must be present in each entry.
  *
- *      service name                    must be in /etc/services
- *      socket type                     stream/dgram/raw/rdm/seqpacket
+ *      service_name                    must be in /etc/services
+ *      socket_type                     stream/dgram/raw/rdm/seqpacket
  *      protocol                        must be in /etc/protocols
+ *                                      (usually "tcp" or "udp")
  *      wait/nowait[.max]               single-threaded/multi-threaded, max #
  *      user[.group] or user[:group]    user/group to run daemon as
- *      server program                  full path name
- *      server program arguments        maximum of MAXARGS (20)
+ *      server_program                  full path name
+ *      server_program_arguments        maximum of MAXARGS (20)
  *
  * For RPC services
- *      service name/version            must be in /etc/rpc
- *      socket type                     stream/dgram/raw/rdm/seqpacket
- *      protocol                        must be in /etc/protocols
+ *      service_name/version            must be in /etc/rpc
+ *      socket_type                     stream/dgram/raw/rdm/seqpacket
+ *      rpc/protocol                    "rpc/tcp" etc
  *      wait/nowait[.max]               single-threaded/multi-threaded
  *      user[.group] or user[:group]    user to run daemon as
- *      server program                  full path name
- *      server program arguments        maximum of MAXARGS (20)
+ *      server_program                  full path name
+ *      server_program_arguments        maximum of MAXARGS (20)
  *
  * For non-RPC services, the "service name" can be of the form
  * hostaddress:servicename, in which case the hostaddress is used
  * as the host portion of the address to listen on.  If hostaddress
- * consists of a single `*' character, INADDR_ANY is used.
+ * consists of a single '*' character, INADDR_ANY is used.
  *
  * A line can also consist of just
@@ -102 +100 @@
  * specifiers are different.
  *
- * Comment lines are indicated by a `#' in column 1.
+ * Comment lines are indicated by a '#' in column 1.
  */
 
@@ -121 +119 @@
  * for new service requests to spawn new servers.  Datagram servers which
  * process all incoming datagrams on a socket and eventually time out are
- * said to be "single-threaded".  The comsat(8), (biff(1)) and talkd(8)
+ * said to be "single-threaded".  The comsat(8), biff(1) and talkd(8)
  * utilities are both examples of the latter type of datagram server.  The
  * tftpd(8) utility is an example of a multi-threaded datagram server.
@@ -135 +133 @@
  */
 
-/* Here's the scoop concerning the user[.:]group feature:
- *
- * 1) set-group-option off.
- *
+/* Despite of above doc saying that dgram services must use "wait",
+ * "udp nowait" servers are implemented in busyboxed inetd.
+ * IPv6 addresses are also implemented. However, they may look ugly -
+ * ":::service..." means "address '::' (IPv6 wildcard addr)":"service"...
+ * You have to put "tcp6"/"udp6" in protocol field to select IPv6.
+ */
+
+/* Here's the scoop concerning the user[:group] feature:
+ * 1) group is not specified:
  *      a) user = root: NO setuid() or setgid() is done
- *
- *      b) other:       setgid(primary group as found in passwd)
- *                      initgroups(name, primary group)
+ *      b) other:       initgroups(name, primary group)
+ *                      setgid(primary group as found in passwd)
  *                      setuid()
- *
- * 2) set-group-option on.
- *
+ * 2) group is specified:
  *      a) user = root: setgid(specified group)
  *                      NO initgroups()
  *                      NO setuid()
- *
- *      b) other:       setgid(specified group)
- *                      initgroups(name, specified group)
+ *      b) other:       initgroups(name, specified group)
+ *                      setgid(specified group)
  *                      setuid()
  */
 
-#include "libbb.h"
 #include <syslog.h>
 #include <sys/un.h>
 
-//#define ENABLE_FEATURE_INETD_RPC 1
-//#define ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_ECHO 1
-//#define ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD 1
-//#define ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_TIME 1
-//#define ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME 1
-//#define ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN 1
-//#define ENABLE_FEATURE_IPV6 1
+#include "libbb.h"
 
 #if ENABLE_FEATURE_INETD_RPC
@@ -173 +165 @@
 #endif
 
-extern char **environ;
-
+#if !BB_MMU
+/* stream version of chargen is forking but not execing,
+ * can't do that (easily) on NOMMU */
+#undef  ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
+#define ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN 0
+#endif
 
 #define _PATH_INETDPID  "/var/run/inetd.pid"
 
-#define CNT_INTVL       60              /* servers in CNT_INTVL sec. */
-#define RETRYTIME       (60*10)         /* retry after bind or server fail */
+#define CNT_INTERVAL    60      /* servers in CNT_INTERVAL sec. */
+#define RETRYTIME       60      /* retry after bind or server fail */
+
+// TODO: explain, or get rid of setrlimit games
 
 #ifndef RLIMIT_NOFILE
@@ -191 +189 @@
 /* Reserve some descriptors, 3 stdio + at least: 1 log, 1 conf. file */
 #define FD_MARGIN       8
-static rlim_t rlim_ofile_cur = OPEN_MAX;
-static struct rlimit rlim_ofile;
-
-
-/* Check unsupporting builtin */
-#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_ECHO || \
-    ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD || \
-    ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_TIME || \
-    ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME || \
-    ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
-# define INETD_FEATURE_ENABLED
-#endif
-
-#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_ECHO || \
-    ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD || \
-    ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
-# define INETD_SETPROCTITLE
-#endif
-
-typedef struct servtab {
-    char *se_hostaddr;                    /* host address to listen on */
-    char *se_service;                     /* name of service */
-    int se_socktype;                      /* type of socket to use */
-    int se_family;                        /* address family */
-    char *se_proto;                       /* protocol used */
+
+#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD \
+ || ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_ECHO    \
+ || ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN \
+ || ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_TIME    \
+ || ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME
+# define INETD_BUILTINS_ENABLED
+#endif
+
+typedef struct servtab_t {
+    /* The most frequently referenced one: */
+    int se_fd;                            /* open descriptor */
+    /* NB: 'biggest fields last' saves on code size (~250 bytes) */
+    /* [addr:]service socktype proto wait user[:group] prog [args] */
+    char *se_local_hostname;              /* addr to listen on */
+    char *se_service;                     /* "80" or "www" or "mount/2[-3]" */
+    /* socktype is in se_socktype */      /* "stream" "dgram" "raw" "rdm" "seqpacket" */
+    char *se_proto;                       /* "unix" or "[rpc/]tcp[6]" */
 #if ENABLE_FEATURE_INETD_RPC
     int se_rpcprog;                       /* rpc program number */
-    int se_rpcversl;                      /* rpc program lowest version */
-    int se_rpcversh;                      /* rpc program highest version */
-#define isrpcservice(sep)       ((sep)->se_rpcversl != 0)
+    int se_rpcver_lo;                     /* rpc program lowest version */
+    int se_rpcver_hi;                     /* rpc program highest version */
+#define is_rpc_service(sep)       ((sep)->se_rpcver_lo != 0)
 #else
-#define isrpcservice(sep)       0
-#endif
-    pid_t se_wait;                        /* single threaded server */
-    short se_checked;                     /* looked at during merge */
+#define is_rpc_service(sep)       0
+#endif
+    pid_t se_wait;                        /* 0:"nowait", 1:"wait", >1:"wait" */
+                                          /* and waiting for this pid */
+    socktype_t se_socktype;               /* SOCK_STREAM/DGRAM/RDM/... */
+    family_t se_family;                   /* AF_UNIX/INET[6] */
+    /* se_proto_no is used by RPC code only... hmm */
+    smallint se_proto_no;                 /* IPPROTO_TCP/UDP, n/a for AF_UNIX */
+    smallint se_checked;                  /* looked at during merge */
+    unsigned se_max;                      /* allowed instances per minute */
+    unsigned se_count;                    /* number started since se_time */
+    unsigned se_time;                     /* when we started counting */
     char *se_user;                        /* user name to run as */
-    char *se_group;                       /* group name to run as */
-#ifdef INETD_FEATURE_ENABLED
-    const struct builtin *se_bi;          /* if built-in, description */
-#endif
-    char *se_server;                      /* server program */
+    char *se_group;                       /* group name to run as, can be NULL */
+#ifdef INETD_BUILTINS_ENABLED
+    const struct builtin *se_builtin;     /* if built-in, description */
+#endif
+    struct servtab_t *se_next;
+    len_and_sockaddr *se_lsa;
+    char *se_program;                     /* server program */
 #define MAXARGV 20
     char *se_argv[MAXARGV + 1];           /* program arguments */
-    int se_fd;                            /* open descriptor */
-    union {
-        struct sockaddr se_un_ctrladdr;
-        struct sockaddr_in se_un_ctrladdr_in;
-#if ENABLE_FEATURE_IPV6
-        struct sockaddr_in6 se_un_ctrladdr_in6;
-#endif
-        struct sockaddr_un se_un_ctrladdr_un;
-    } se_un;                              /* bound address */
-#define se_ctrladdr     se_un.se_un_ctrladdr
-#define se_ctrladdr_in  se_un.se_un_ctrladdr_in
-#define se_ctrladdr_in6 se_un.se_un_ctrladdr_in6
-#define se_ctrladdr_un  se_un.se_un_ctrladdr_un
-    int se_ctrladdr_size;
-    int se_max;                           /* max # of instances of this service */
-    int se_count;                         /* number started since se_time */
-    struct timeval se_time;               /* start of se_count */
-    struct servtab *se_next;
 } servtab_t;
 
-static servtab_t *servtab;
-
-#ifdef INETD_FEATURE_ENABLED
+#ifdef INETD_BUILTINS_ENABLED
+/* Echo received data */
+#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_ECHO
+static void FAST_FUNC echo_stream(int, servtab_t *);
+static void FAST_FUNC echo_dg(int, servtab_t *);
+#endif
+/* Internet /dev/null */
+#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD
+static void FAST_FUNC discard_stream(int, servtab_t *);
+static void FAST_FUNC discard_dg(int, servtab_t *);
+#endif
+/* Return 32 bit time since 1900 */
+#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_TIME
+static void FAST_FUNC machtime_stream(int, servtab_t *);
+static void FAST_FUNC machtime_dg(int, servtab_t *);
+#endif
+/* Return human-readable time */
+#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME
+static void FAST_FUNC daytime_stream(int, servtab_t *);
+static void FAST_FUNC daytime_dg(int, servtab_t *);
+#endif
+/* Familiar character generator */
+#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
+static void FAST_FUNC chargen_stream(int, servtab_t *);
+static void FAST_FUNC chargen_dg(int, servtab_t *);
+#endif
+
 struct builtin {
-    const char *bi_service;               /* internally provided service name */
-    int bi_socktype;                      /* type of socket supported */
-    short bi_fork;                        /* 1 if should fork before call */
-    short bi_wait;                        /* 1 if should wait for child */
-    void (*bi_fn) (int, servtab_t *);
+    /* NB: not necessarily NUL terminated */
+    char bi_service7[7];      /* internally provided service name */
+    uint8_t bi_fork;          /* 1 if stream fn should run in child */
+    void (*bi_stream_fn)(int, servtab_t *) FAST_FUNC;
+    void (*bi_dgram_fn)(int, servtab_t *) FAST_FUNC;
 };
-
-        /* Echo received data */
-#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_ECHO
-static void echo_stream(int, servtab_t *);
-static void echo_dg(int, servtab_t *);
-#endif
-        /* Internet /dev/null */
-#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD
-static void discard_stream(int, servtab_t *);
-static void discard_dg(int, servtab_t *);
-#endif
-        /* Return 32 bit time since 1900 */
-#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_TIME
-static void machtime_stream(int, servtab_t *);
-static void machtime_dg(int, servtab_t *);
-#endif
-        /* Return human-readable time */
-#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME
-static void daytime_stream(int, servtab_t *);
-static void daytime_dg(int, servtab_t *);
-#endif
-        /* Familiar character generator */
-#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
-static void chargen_stream(int, servtab_t *);
-static void chargen_dg(int, servtab_t *);
-#endif
 
 static const struct builtin builtins[] = {
 #if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_ECHO
-    /* Echo received data */
-    {"echo", SOCK_STREAM, 1, 0, echo_stream,},
-    {"echo", SOCK_DGRAM, 0, 0, echo_dg,},
+    { "echo", 1, echo_stream, echo_dg },
 #endif
 #if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD
-    /* Internet /dev/null */
-    {"discard", SOCK_STREAM, 1, 0, discard_stream,},
-    {"discard", SOCK_DGRAM, 0, 0, discard_dg,},
+    { "discard", 1, discard_stream, discard_dg },
+#endif
+#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
+    { "chargen", 1, chargen_stream, chargen_dg },
 #endif
 #if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_TIME
-    /* Return 32 bit time since 1900 */
-    {"time", SOCK_STREAM, 0, 0, machtime_stream,},
-    {"time", SOCK_DGRAM, 0, 0, machtime_dg,},
+    { "time", 0, machtime_stream, machtime_dg },
 #endif
 #if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME
-    /* Return human-readable time */
-    {"daytime", SOCK_STREAM, 0, 0, daytime_stream,},
-    {"daytime", SOCK_DGRAM, 0, 0, daytime_dg,},
-#endif
+    { "daytime", 0, daytime_stream, daytime_dg },
+#endif
+};
+#endif /* INETD_BUILTINS_ENABLED */
+
+struct globals {
+    rlim_t rlim_ofile_cur;
+    struct rlimit rlim_ofile;
+    servtab_t *serv_list;
+    int global_queuelen;
+    int maxsock;         /* max fd# in allsock, -1: unknown */
+    /* whenever maxsock grows, prev_maxsock is set to new maxsock,
+     * but if maxsock is set to -1, prev_maxsock is not changed */
+    int prev_maxsock;
+    unsigned max_concurrency;
+    smallint alarm_armed;
+    uid_t real_uid; /* user ID who ran us */
+    const char *config_filename;
+    parser_t *parser;
+    char *default_local_hostname;
 #if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
-    /* Familiar character generator */
-    {"chargen", SOCK_STREAM, 1, 0, chargen_stream,},
-    {"chargen", SOCK_DGRAM, 0, 0, chargen_dg,},
-#endif
-    {NULL, 0, 0, 0, NULL}
+    char *end_ring;
+    char *ring_pos;
+    char ring[128];
+#endif
+    fd_set allsock;
+    /* Used in next_line(), and as scratch read buffer */
+    char line[256];          /* _at least_ 256, see LINE_SIZE */
+} FIX_ALIASING;
+#define G (*(struct globals*)&bb_common_bufsiz1)
+enum { LINE_SIZE = COMMON_BUFSIZE - offsetof(struct globals, line) };
+struct BUG_G_too_big {
+    char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1];
 };
-#endif /* INETD_FEATURE_ENABLED */
-
-static int global_queuelen = 128;
-static int nsock, maxsock;
-static fd_set allsock;
-static int toomany;
-static int timingout;
-static struct servent *sp;
-static uid_t uid;
-
-static const char *config_filename = "/etc/inetd.conf";
-
-static FILE *fconfig;
-static char *defhost;
-
-/* xstrdup(NULL) returns NULL, but this one
- * will return newly-allocated "" if called with NULL arg
- * TODO: audit whether this makes any real difference
- */
-static char *xxstrdup(char *cp)
-{
-    return xstrdup(cp ? cp : "");
-}
-
-static int setconfig(void)
-{
-    free(defhost);
-    defhost = xstrdup("*");
-    if (fconfig != NULL) {
-        fseek(fconfig, 0L, SEEK_SET);
-        return 1;
-    }
-    fconfig = fopen(config_filename, "r");
-    return (fconfig != NULL);
-}
-
-static void endconfig(void)
-{
-    if (fconfig) {
-        (void) fclose(fconfig);
-        fconfig = NULL;
-    }
-    free(defhost);
-    defhost = 0;
+#define rlim_ofile_cur  (G.rlim_ofile_cur )
+#define rlim_ofile      (G.rlim_ofile     )
+#define serv_list       (G.serv_list      )
+#define global_queuelen (G.global_queuelen)
+#define maxsock         (G.maxsock        )
+#define prev_maxsock    (G.prev_maxsock   )
+#define max_concurrency (G.max_concurrency)
+#define alarm_armed     (G.alarm_armed    )
+#define real_uid        (G.real_uid       )
+#define config_filename (G.config_filename)
+#define parser          (G.parser         )
+#define default_local_hostname (G.default_local_hostname)
+#define first_ps_byte   (G.first_ps_byte  )
+#define last_ps_byte    (G.last_ps_byte   )
+#define end_ring        (G.end_ring       )
+#define ring_pos        (G.ring_pos       )
+#define ring            (G.ring           )
+#define allsock         (G.allsock        )
+#define line            (G.line           )
+#define INIT_G() do { \
+    rlim_ofile_cur = OPEN_MAX; \
+    global_queuelen = 128; \
+    config_filename = "/etc/inetd.conf"; \
+} while (0)
+
+static void maybe_close(int fd)
+{
+    if (fd >= 0)
+        close(fd);
+}
+
+// TODO: move to libbb?
+static len_and_sockaddr *xzalloc_lsa(int family)
+{
+    len_and_sockaddr *lsa;
+    int sz;
+
+    sz = sizeof(struct sockaddr_in);
+    if (family == AF_UNIX)
+        sz = sizeof(struct sockaddr_un);
+#if ENABLE_FEATURE_IPV6
+    if (family == AF_INET6)
+        sz = sizeof(struct sockaddr_in6);
+#endif
+    lsa = xzalloc(LSA_LEN_SIZE + sz);
+    lsa->len = sz;
+    lsa->u.sa.sa_family = family;
+    return lsa;
+}
+
+static void rearm_alarm(void)
+{
+    if (!alarm_armed) {
+        alarm_armed = 1;
+        alarm(RETRYTIME);
+    }
+}
+
+static void block_CHLD_HUP_ALRM(sigset_t *m)
+{
+    sigemptyset(m);
+    sigaddset(m, SIGCHLD);
+    sigaddset(m, SIGHUP);
+    sigaddset(m, SIGALRM);
+    sigprocmask(SIG_BLOCK, m, m); /* old sigmask is stored in m */
+}
+
+static void restore_sigmask(sigset_t *m)
+{
+    sigprocmask(SIG_SETMASK, m, NULL);
 }
 
@@ -370 +397 @@
     int n;
     struct sockaddr_in ir_sin;
-    struct protoent *pp;
     socklen_t size;
 
-    if ((pp = getprotobyname(sep->se_proto + 4)) == NULL) {
-        bb_perror_msg("%s: getproto", sep->se_proto);
+    size = sizeof(ir_sin);
+    if (getsockname(sep->se_fd, (struct sockaddr *) &ir_sin, &size) < 0) {
+        bb_perror_msg("getsockname");
         return;
     }
-    size = sizeof ir_sin;
-    if (getsockname(sep->se_fd, (struct sockaddr *) &ir_sin, &size) < 0) {
-        bb_perror_msg("%s/%s: getsockname",
+
+    for (n = sep->se_rpcver_lo; n <= sep->se_rpcver_hi; n++) {
+        pmap_unset(sep->se_rpcprog, n);
+        if (!pmap_set(sep->se_rpcprog, n, sep->se_proto_no, ntohs(ir_sin.sin_port)))
+            bb_perror_msg("%s %s: pmap_set(%u,%u,%u,%u)",
+                sep->se_service, sep->se_proto,
+                sep->se_rpcprog, n, sep->se_proto_no, ntohs(ir_sin.sin_port));
+    }
+}
+
+static void unregister_rpc(servtab_t *sep)
+{
+    int n;
+
+    for (n = sep->se_rpcver_lo; n <= sep->se_rpcver_hi; n++) {
+        if (!pmap_unset(sep->se_rpcprog, n))
+            bb_perror_msg("pmap_unset(%u,%u)", sep->se_rpcprog, n);
+    }
+}
+#endif /* FEATURE_INETD_RPC */
+
+static void bump_nofile(void)
+{
+    enum { FD_CHUNK = 32 };
+    struct rlimit rl;
+
+    /* Never fails under Linux (except if you pass it bad arguments) */
+    getrlimit(RLIMIT_NOFILE, &rl);
+    rl.rlim_cur = MIN(rl.rlim_max, rl.rlim_cur + FD_CHUNK);
+    rl.rlim_cur = MIN(FD_SETSIZE, rl.rlim_cur + FD_CHUNK);
+    if (rl.rlim_cur <= rlim_ofile_cur) {
+        bb_error_msg("can't extend file limit, max = %d",
+                        (int) rl.rlim_cur);
+        return;
+    }
+
+    if (setrlimit(RLIMIT_NOFILE, &rl) < 0) {
+        bb_perror_msg("setrlimit");
+        return;
+    }
+
+    rlim_ofile_cur = rl.rlim_cur;
+}
+
+static void remove_fd_from_set(int fd)
+{
+    if (fd >= 0) {
+        FD_CLR(fd, &allsock);
+        maxsock = -1;
+    }
+}
+
+static void add_fd_to_set(int fd)
+{
+    if (fd >= 0) {
+        FD_SET(fd, &allsock);
+        if (maxsock >= 0 && fd > maxsock) {
+            prev_maxsock = maxsock = fd;
+            if ((rlim_t)fd > rlim_ofile_cur - FD_MARGIN)
+                bump_nofile();
+        }
+    }
+}
+
+static void recalculate_maxsock(void)
+{
+    int fd = 0;
+
+    /* We may have no services, in this case maxsock should still be >= 0
+     * (code elsewhere is not happy with maxsock == -1) */
+    maxsock = 0;
+    while (fd <= prev_maxsock) {
+        if (FD_ISSET(fd, &allsock))
+            maxsock = fd;
+        fd++;
+    }
+    prev_maxsock = maxsock;
+    if ((rlim_t)maxsock > rlim_ofile_cur - FD_MARGIN)
+        bump_nofile();
+}
+
+static void prepare_socket_fd(servtab_t *sep)
+{
+    int r, fd;
+
+    fd = socket(sep->se_family, sep->se_socktype, 0);
+    if (fd < 0) {
+        bb_perror_msg("socket");
+        return;
+    }
+    setsockopt_reuseaddr(fd);
+
+#if ENABLE_FEATURE_INETD_RPC
+    if (is_rpc_service(sep)) {
+        struct passwd *pwd;
+
+        /* zero out the port for all RPC services; let bind()
+         * find one. */
+        set_nport(sep->se_lsa, 0);
+
+        /* for RPC services, attempt to use a reserved port
+         * if they are going to be running as root. */
+        if (real_uid == 0 && sep->se_family == AF_INET
+         && (pwd = getpwnam(sep->se_user)) != NULL
+         && pwd->pw_uid == 0
+        ) {
+            r = bindresvport(fd, &sep->se_lsa->u.sin);
+        } else {
+            r = bind(fd, &sep->se_lsa->u.sa, sep->se_lsa->len);
+        }
+        if (r == 0) {
+            int saveerrno = errno;
+            /* update lsa with port# */
+            getsockname(fd, &sep->se_lsa->u.sa, &sep->se_lsa->len);
+            errno = saveerrno;
+        }
+    } else
+#endif
+    {
+        if (sep->se_family == AF_UNIX) {
+            struct sockaddr_un *sun;
+            sun = (struct sockaddr_un*)&(sep->se_lsa->u.sa);
+            unlink(sun->sun_path);
+        }
+        r = bind(fd, &sep->se_lsa->u.sa, sep->se_lsa->len);
+    }
+    if (r < 0) {
+        bb_perror_msg("%s/%s: bind",
                 sep->se_service, sep->se_proto);
+        close(fd);
+        rearm_alarm();
         return;
     }
-
-    for (n = sep->se_rpcversl; n <= sep->se_rpcversh; n++) {
-        (void) pmap_unset(sep->se_rpcprog, n);
-        if (!pmap_set(sep->se_rpcprog, n, pp->p_proto, ntohs(ir_sin.sin_port)))
-            bb_perror_msg("%s %s: pmap_set: %u %u %u %u",
-                    sep->se_service, sep->se_proto,
-                    sep->se_rpcprog, n, pp->p_proto, ntohs(ir_sin.sin_port));
-    }
-}
-
-static void unregister_rpc(servtab_t *sep)
-{
-    int n;
-
-    for (n = sep->se_rpcversl; n <= sep->se_rpcversh; n++) {
-        if (!pmap_unset(sep->se_rpcprog, n))
-            bb_error_msg("pmap_unset(%u, %u)", sep->se_rpcprog, n);
-    }
-}
-#endif /* FEATURE_INETD_RPC */
-
-static void freeconfig(servtab_t *cp)
+    if (sep->se_socktype == SOCK_STREAM)
+        listen(fd, global_queuelen);
+
+    add_fd_to_set(fd);
+    sep->se_fd = fd;
+}
+
+static int reopen_config_file(void)
+{
+    free(default_local_hostname);
+    default_local_hostname = xstrdup("*");
+    if (parser != NULL)
+        config_close(parser);
+    parser = config_open(config_filename);
+    return (parser != NULL);
+}
+
+static void close_config_file(void)
+{
+    if (parser) {
+        config_close(parser);
+        parser = NULL;
+    }
+}
+
+static void free_servtab_strings(servtab_t *cp)
 {
     int i;
 
-    free(cp->se_hostaddr);
+    free(cp->se_local_hostname);
     free(cp->se_service);
     free(cp->se_proto);
     free(cp->se_user);
     free(cp->se_group);
-    free(cp->se_server);
+    free(cp->se_lsa); /* not a string in fact */
+    free(cp->se_program);
     for (i = 0; i < MAXARGV; i++)
         free(cp->se_argv[i]);
 }
 
-static int bump_nofile(void)
-{
-#define FD_CHUNK        32
-
-    struct rlimit rl;
-
-    if (getrlimit(RLIMIT_NOFILE, &rl) < 0) {
-        bb_perror_msg("getrlimit");
-        return -1;
-    }
-    rl.rlim_cur = MIN(rl.rlim_max, rl.rlim_cur + FD_CHUNK);
-    rl.rlim_cur = MIN(FD_SETSIZE, rl.rlim_cur + FD_CHUNK);
-    if (rl.rlim_cur <= rlim_ofile_cur) {
-        bb_error_msg("bump_nofile: cannot extend file limit, max = %d",
-                        (int) rl.rlim_cur);
-        return -1;
-    }
-
-    if (setrlimit(RLIMIT_NOFILE, &rl) < 0) {
-        bb_perror_msg("setrlimit");
-        return -1;
-    }
-
-    rlim_ofile_cur = rl.rlim_cur;
-    return 0;
-}
-
-static void setup(servtab_t *sep)
-{
-    int r;
-
-    sep->se_fd = socket(sep->se_family, sep->se_socktype, 0);
-    if (sep->se_fd < 0) {
-        bb_perror_msg("%s/%s: socket", sep->se_service, sep->se_proto);
-        return;
-    }
-    setsockopt_reuseaddr(sep->se_fd);
-
-#if ENABLE_FEATURE_INETD_RPC
-    if (isrpcservice(sep)) {
-        struct passwd *pwd;
-
-        /*
-         * for RPC services, attempt to use a reserved port
-         * if they are going to be running as root.
-         *
-         * Also, zero out the port for all RPC services; let bind()
-         * find one.
-         */
-        sep->se_ctrladdr_in.sin_port = 0;
-        if (sep->se_user && (pwd = getpwnam(sep->se_user)) &&
-                pwd->pw_uid == 0 && uid == 0)
-            r = bindresvport(sep->se_fd, &sep->se_ctrladdr_in);
-        else {
-            r = bind(sep->se_fd, &sep->se_ctrladdr, sep->se_ctrladdr_size);
-            if (r == 0) {
-                socklen_t len = sep->se_ctrladdr_size;
-                int saveerrno = errno;
-
-                /* update se_ctrladdr_in.sin_port */
-                r = getsockname(sep->se_fd, &sep->se_ctrladdr, &len);
-                if (r <= 0)
-                    errno = saveerrno;
-            }
-        }
-    } else
-#endif
-        r = bind(sep->se_fd, &sep->se_ctrladdr, sep->se_ctrladdr_size);
-    if (r < 0) {
-        bb_perror_msg("%s/%s (%d): bind",
-                sep->se_service, sep->se_proto, sep->se_ctrladdr.sa_family);
-        close(sep->se_fd);
-        sep->se_fd = -1;
-        if (!timingout) {
-            timingout = 1;
-            alarm(RETRYTIME);
-        }
-        return;
-    }
-    if (sep->se_socktype == SOCK_STREAM)
-        listen(sep->se_fd, global_queuelen);
-
-    FD_SET(sep->se_fd, &allsock);
-    nsock++;
-    if (sep->se_fd > maxsock) {
-        maxsock = sep->se_fd;
-        if ((rlim_t)maxsock > rlim_ofile_cur - FD_MARGIN)
-            bump_nofile();
-    }
-}
-
-static char *nextline(void)
-{
-#define line bb_common_bufsiz1
-
-    char *cp;
-    FILE *fd = fconfig;
-
-    if (fgets(line, sizeof(line), fd) == NULL)
-        return NULL;
-    cp = strchr(line, '\n');
-    if (cp)
-        *cp = '\0';
-    return line;
-}
-
-static char *skip(char **cpp) /* int report; */
-{
-    char *cp = *cpp;
-    char *start;
-
-/* erp: */
-    if (*cpp == NULL) {
-        /* if (report) */
-        /* bb_error_msg("syntax error in inetd config file"); */
-        return NULL;
-    }
-
- again:
-    while (*cp == ' ' || *cp == '\t')
-        cp++;
-    if (*cp == '\0') {
-        int c;
-
-        c = getc(fconfig);
-        ungetc(c, fconfig);
-        if (c == ' ' || c == '\t') {
-            cp = nextline();
-            if (cp)
-                goto again;
-        }
-        *cpp = NULL;
-        /* goto erp; */
-        return NULL;
-    }
-    start = cp;
-    while (*cp && *cp != ' ' && *cp != '\t')
-        cp++;
-    if (*cp != '\0')
-        *cp++ = '\0';
-    /* if ((*cpp = cp) == NULL) */
-    /* goto erp; */
-
-    *cpp = cp;
-    return start;
-}
-
 static servtab_t *new_servtab(void)
 {
-    return xmalloc(sizeof(servtab_t));
-}
-
-static servtab_t *dupconfig(servtab_t *sep)
+    servtab_t *newtab = xzalloc(sizeof(servtab_t));
+    newtab->se_fd = -1; /* paranoia */
+    return newtab;
+}
+
+static servtab_t *dup_servtab(servtab_t *sep)
 {
     servtab_t *newtab;
@@ -576 +590 @@
 
     newtab = new_servtab();
-    memset(newtab, 0, sizeof(servtab_t));
-    newtab->se_service = xstrdup(sep->se_service);
-    newtab->se_socktype = sep->se_socktype;
-    newtab->se_family = sep->se_family;
-    newtab->se_proto = xstrdup(sep->se_proto);
-#if ENABLE_FEATURE_INETD_RPC
-    newtab->se_rpcprog = sep->se_rpcprog;
-    newtab->se_rpcversl = sep->se_rpcversl;
-    newtab->se_rpcversh = sep->se_rpcversh;
-#endif
-    newtab->se_wait = sep->se_wait;
-    newtab->se_user = xstrdup(sep->se_user);
-    newtab->se_group = xstrdup(sep->se_group);
-#ifdef INETD_FEATURE_ENABLED
-    newtab->se_bi = sep->se_bi;
-#endif
-    newtab->se_server = xstrdup(sep->se_server);
-
+    *newtab = *sep; /* struct copy */
+    /* deep-copying strings */
+    newtab->se_service = xstrdup(newtab->se_service);
+    newtab->se_proto = xstrdup(newtab->se_proto);
+    newtab->se_user = xstrdup(newtab->se_user);
+    newtab->se_group = xstrdup(newtab->se_group);
+    newtab->se_program = xstrdup(newtab->se_program);
     for (argc = 0; argc <= MAXARGV; argc++)
-        newtab->se_argv[argc] = xstrdup(sep->se_argv[argc]);
-    newtab->se_max = sep->se_max;
+        newtab->se_argv[argc] = xstrdup(newtab->se_argv[argc]);
+    /* NB: se_fd, se_hostaddr and se_next are always
+     * overwrittend by callers, so we don't bother resetting them
+     * to NULL/0/-1 etc */
 
     return newtab;
 }
 
-static servtab_t *getconfigent(void)
-{
+/* gcc generates much more code if this is inlined */
+static servtab_t *parse_one_line(void)
+{
+    int argc;
+    char *token[6+MAXARGV];
+    char *p, *arg;
+    char *hostdelim;
     servtab_t *sep;
-    int argc;
-    char *cp, *arg;
-    char *hostdelim;
     servtab_t *nsep;
-    servtab_t *psep;
-
+ new:
     sep = new_servtab();
-
-    /* memset(sep, 0, sizeof *sep); */
  more:
-    /* freeconfig(sep); */
-
-    while ((cp = nextline()) && *cp == '#') /* skip comment line */;
-    if (cp == NULL) {
-        /* free(sep); */
+    argc = config_read(parser, token, 6+MAXARGV, 1, "# \t", PARSE_NORMAL);
+    if (!argc) {
+        free(sep);
         return NULL;
     }
 
-    memset((char *) sep, 0, sizeof *sep);
-    arg = skip(&cp);
-    if (arg == NULL) {
-        /* A blank line. */
-        goto more;
-    }
-
-    /* Check for a host name. */
+    /* [host:]service socktype proto wait user[:group] prog [args] */
+    /* Check for "host:...." line */
+    arg = token[0];
     hostdelim = strrchr(arg, ':');
     if (hostdelim) {
         *hostdelim = '\0';
-        sep->se_hostaddr = xstrdup(arg);
+        sep->se_local_hostname = xstrdup(arg);
         arg = hostdelim + 1;
-        /*
-         * If the line is of the form `host:', then just change the
-         * default host for the following lines.
-         */
-        if (*arg == '\0') {
-            arg = skip(&cp);
-            if (cp == NULL) {
-                free(defhost);
-                defhost = sep->se_hostaddr;
-                goto more;
-            }
+        if (*arg == '\0' && argc == 1) {
+            /* Line has just "host:", change the
+             * default host for the following lines. */
+            free(default_local_hostname);
+            default_local_hostname = sep->se_local_hostname;
+            goto more;
         }
     } else
-        sep->se_hostaddr = xxstrdup(defhost);
-
-    sep->se_service = xxstrdup(arg);
-    arg = skip(&cp);
-
-    if (strcmp(arg, "stream") == 0)
-        sep->se_socktype = SOCK_STREAM;
-    else if (strcmp(arg, "dgram") == 0)
-        sep->se_socktype = SOCK_DGRAM;
-    else if (strcmp(arg, "rdm") == 0)
-        sep->se_socktype = SOCK_RDM;
-    else if (strcmp(arg, "seqpacket") == 0)
-        sep->se_socktype = SOCK_SEQPACKET;
-    else if (strcmp(arg, "raw") == 0)
-        sep->se_socktype = SOCK_RAW;
-    else
-        sep->se_socktype = -1;
-
-    sep->se_proto = xxstrdup(skip(&cp));
-
-    if (strcmp(sep->se_proto, "unix") == 0) {
+        sep->se_local_hostname = xstrdup(default_local_hostname);
+
+    /* service socktype proto wait user[:group] prog [args] */
+    sep->se_service = xstrdup(arg);
+
+    /* socktype proto wait user[:group] prog [args] */
+    if (argc < 6) {
+ parse_err:
+        bb_error_msg("parse error on line %u, line is ignored",
+                parser->lineno);
+        free_servtab_strings(sep);
+        /* Just "goto more" can make sep to carry over e.g.
+         * "rpc"-ness (by having se_rpcver_lo != 0).
+         * We will be more paranoid: */
+        free(sep);
+        goto new;
+    }
+
+    {
+        static const int8_t SOCK_xxx[] ALIGN1 = {
+            -1,
+            SOCK_STREAM, SOCK_DGRAM, SOCK_RDM,
+            SOCK_SEQPACKET, SOCK_RAW
+        };
+        sep->se_socktype = SOCK_xxx[1 + index_in_strings(
+            "stream""\0" "dgram""\0" "rdm""\0"
+            "seqpacket""\0" "raw""\0"
+            , token[1])];
+    }
+
+    /* {unix,[rpc/]{tcp,udp}[6]} wait user[:group] prog [args] */
+    sep->se_proto = arg = xstrdup(token[2]);
+    if (strcmp(arg, "unix") == 0) {
         sep->se_family = AF_UNIX;
     } else {
+        char *six;
         sep->se_family = AF_INET;
-        if (sep->se_proto[strlen(sep->se_proto) - 1] == '6')
+        six = last_char_is(arg, '6');
+        if (six) {
 #if ENABLE_FEATURE_IPV6
+            *six = '\0';
             sep->se_family = AF_INET6;
 #else
-            bb_error_msg("%s: IPV6 not supported", sep->se_proto);
-#endif
-        if (strncmp(sep->se_proto, "rpc/", 4) == 0) {
+            bb_error_msg("%s: no support for IPv6", sep->se_proto);
+            goto parse_err;
+#endif
+        }
+        if (strncmp(arg, "rpc/", 4) == 0) {
 #if ENABLE_FEATURE_INETD_RPC
-            char *p, *ccp;
-            long l;
-
+            unsigned n;
+            arg += 4;
             p = strchr(sep->se_service, '/');
-            if (p == 0) {
-                bb_error_msg("%s: no rpc version", sep->se_service);
-                goto more;
+            if (p == NULL) {
+                bb_error_msg("no rpc version: '%s'", sep->se_service);
+                goto parse_err;
             }
             *p++ = '\0';
-            l = strtol(p, &ccp, 0);
-            if (ccp == p || l < 0 || l > INT_MAX) {
- badafterall:
-                bb_error_msg("%s/%s: bad rpc version", sep->se_service, p);
-                goto more;
+            n = bb_strtou(p, &p, 10);
+            if (n > INT_MAX) {
+ bad_ver_spec:
+                bb_error_msg("bad rpc version");
+                goto parse_err;
             }
-            sep->se_rpcversl = sep->se_rpcversh = l;
-            if (*ccp == '-') {
-                p = ccp + 1;
-                l = strtol(p, &ccp, 0);
-                if (ccp == p || l < 0 || l > INT_MAX || l < sep->se_rpcversl || *ccp)
-                    goto badafterall;
-                sep->se_rpcversh = l;
-            } else if (*ccp != '\0')
-                goto badafterall;
+            sep->se_rpcver_lo = sep->se_rpcver_hi = n;
+            if (*p == '-') {
+                p++;
+                n = bb_strtou(p, &p, 10);
+                if (n > INT_MAX || (int)n < sep->se_rpcver_lo)
+                    goto bad_ver_spec;
+                sep->se_rpcver_hi = n;
+            }
+            if (*p != '\0')
+                goto bad_ver_spec;
 #else
-            bb_error_msg("%s: rpc services not supported", sep->se_service);
+            bb_error_msg("no support for rpc services");
+            goto parse_err;
 #endif
         }
-    }
-    arg = skip(&cp);
-    if (arg == NULL)
-        goto more;
-
-    {
-        char *s = strchr(arg, '.');
-        if (s) {
-            *s++ = '\0';
-            sep->se_max = xatoi(s);
-        } else
-            sep->se_max = toomany;
-    }
-    sep->se_wait = strcmp(arg, "wait") == 0;
-    /* if ((arg = skip(&cp, 1)) == NULL) */
-    /* goto more; */
-    sep->se_user = xxstrdup(skip(&cp));
+        /* we don't really need getprotobyname()! */
+        if (strcmp(arg, "tcp") == 0)
+            sep->se_proto_no = IPPROTO_TCP; /* = 6 */
+        if (strcmp(arg, "udp") == 0)
+            sep->se_proto_no = IPPROTO_UDP; /* = 17 */
+        if (six)
+            *six = '6';
+        if (!sep->se_proto_no) /* not tcp/udp?? */
+            goto parse_err;
+    }
+
+    /* [no]wait[.max] user[:group] prog [args] */
+    arg = token[3];
+    sep->se_max = max_concurrency;
+    p = strchr(arg, '.');
+    if (p) {
+        *p++ = '\0';
+        sep->se_max = bb_strtou(p, NULL, 10);
+        if (errno)
+            goto parse_err;
+    }
+    sep->se_wait = (arg[0] != 'n' || arg[1] != 'o');
+    if (!sep->se_wait) /* "no" seen */
+        arg += 2;
+    if (strcmp(arg, "wait") != 0)
+        goto parse_err;
+
+    /* user[:group] prog [args] */
+    sep->se_user = xstrdup(token[4]);
     arg = strchr(sep->se_user, '.');
     if (arg == NULL)
@@ -732 +754 @@
         sep->se_group = xstrdup(arg);
     }
-    /* if ((arg = skip(&cp, 1)) == NULL) */
-    /* goto more; */
-
-    arg = skip(&cp);
-    sep->se_server = xxstrdup(arg);
-    if (strcmp(sep->se_server, "internal") == 0) {
-#ifdef INETD_FEATURE_ENABLED
-        const struct builtin *bi;
-
-        for (bi = builtins; bi->bi_service; bi++)
-            if (bi->bi_socktype == sep->se_socktype &&
-                    strcmp(bi->bi_service, sep->se_service) == 0)
-                break;
-        if (bi->bi_service == 0) {
-            bb_error_msg("internal service %s unknown", sep->se_service);
-            goto more;
-        }
-        sep->se_bi = bi;
-        sep->se_wait = bi->bi_wait;
-#else
-        bb_perror_msg("internal service %s unknown", sep->se_service);
-        goto more;
-#endif
-    }
-#ifdef INETD_FEATURE_ENABLED
-        else
-        sep->se_bi = NULL;
+
+    /* prog [args] */
+    sep->se_program = xstrdup(token[5]);
+#ifdef INETD_BUILTINS_ENABLED
+    if (strcmp(sep->se_program, "internal") == 0
+     && strlen(sep->se_service) <= 7
+     && (sep->se_socktype == SOCK_STREAM
+         || sep->se_socktype == SOCK_DGRAM)
+    ) {
+        unsigned i;
+        for (i = 0; i < ARRAY_SIZE(builtins); i++)
+            if (strncmp(builtins[i].bi_service7, sep->se_service, 7) == 0)
+                goto found_bi;
+        bb_error_msg("unknown internal service %s", sep->se_service);
+        goto parse_err;
+ found_bi:
+        sep->se_builtin = &builtins[i];
+        /* stream builtins must be "nowait", dgram must be "wait" */
+        if (sep->se_wait != (sep->se_socktype == SOCK_DGRAM))
+            goto parse_err;
+    }
 #endif
     argc = 0;
-    for (; cp; arg = skip(&cp)) {
-        if (argc < MAXARGV)
-            sep->se_argv[argc++] = xxstrdup(arg);
-    }
-    while (argc <= MAXARGV)
-        sep->se_argv[argc++] = NULL;
-
-    /*
-     * Now that we've processed the entire line, check if the hostname
-     * specifier was a comma separated list of hostnames. If so
-     * we'll make new entries for each address.
-     */
-    while ((hostdelim = strrchr(sep->se_hostaddr, ',')) != NULL) {
-        nsep = dupconfig(sep);
-
-        /*
-         * NULL terminate the hostname field of the existing entry,
-         * and make a dup for the new entry.
-         */
+    while ((arg = token[6+argc]) != NULL && argc < MAXARGV)
+        sep->se_argv[argc++] = xstrdup(arg);
+    /* Some inetd.conf files have no argv's, not even argv[0].
+     * Fix them up.
+     * (Technically, programs can be execed with argv[0] = NULL,
+     * but many programs do not like that at all) */
+    if (argc == 0)
+        sep->se_argv[0] = xstrdup(sep->se_program);
+
+    /* catch mixups. "<service> stream udp ..." == wtf */
+    if (sep->se_socktype == SOCK_STREAM) {
+        if (sep->se_proto_no == IPPROTO_UDP)
+            goto parse_err;
+    }
+    if (sep->se_socktype == SOCK_DGRAM) {
+        if (sep->se_proto_no == IPPROTO_TCP)
+            goto parse_err;
+    }
+
+//  bb_info_msg(
+//      "ENTRY[%s][%s][%s][%d][%d][%d][%d][%d][%s][%s][%s]",
+//      sep->se_local_hostname, sep->se_service, sep->se_proto, sep->se_wait, sep->se_proto_no,
+//      sep->se_max, sep->se_count, sep->se_time, sep->se_user, sep->se_group, sep->se_program);
+
+    /* check if the hostname specifier is a comma separated list
+     * of hostnames. we'll make new entries for each address. */
+    while ((hostdelim = strrchr(sep->se_local_hostname, ',')) != NULL) {
+        nsep = dup_servtab(sep);
+        /* NUL terminate the hostname field of the existing entry,
+         * and make a dup for the new entry. */
         *hostdelim++ = '\0';
-        nsep->se_hostaddr = xstrdup(hostdelim);
-
+        nsep->se_local_hostname = xstrdup(hostdelim);
         nsep->se_next = sep->se_next;
         sep->se_next = nsep;
     }
 
-    nsep = sep;
-    while (nsep != NULL) {
-        nsep->se_checked = 1;
-        if (nsep->se_family == AF_INET) {
-            if (LONE_CHAR(nsep->se_hostaddr, '*'))
-                nsep->se_ctrladdr_in.sin_addr.s_addr = INADDR_ANY;
-            else if (!inet_aton(nsep->se_hostaddr, &nsep->se_ctrladdr_in.sin_addr)) {
-                struct hostent *hp;
-
-                hp = gethostbyname(nsep->se_hostaddr);
-                if (hp == 0) {
-                    bb_error_msg("%s: unknown host", nsep->se_hostaddr);
-                    nsep->se_checked = 0;
-                    goto skip;
-                } else if (hp->h_addrtype != AF_INET) {
-                    bb_error_msg("%s: address isn't an Internet "
-                                  "address", nsep->se_hostaddr);
-                    nsep->se_checked = 0;
-                    goto skip;
-                } else {
-                    int i = 1;
-
-                    memmove(&nsep->se_ctrladdr_in.sin_addr,
-                                   hp->h_addr_list[0], sizeof(struct in_addr));
-                    while (hp->h_addr_list[i] != NULL) {
-                        psep = dupconfig(nsep);
-                        psep->se_hostaddr = xxstrdup(nsep->se_hostaddr);
-                        psep->se_checked = 1;
-                        memmove(&psep->se_ctrladdr_in.sin_addr,
-                                     hp->h_addr_list[i], sizeof(struct in_addr));
-                        psep->se_ctrladdr_size = sizeof(psep->se_ctrladdr_in);
-                        i++;
-                        /* Prepend to list, don't want to look up */
-                        /* its hostname again. */
-                        psep->se_next = sep;
-                        sep = psep;
-                    }
-                }
-            }
-        }
-/* XXX BUG?: is this skip: label supposed to remain? */
- skip:
-        nsep = nsep->se_next;
-    }
-
-    /*
-     * Finally, free any entries which failed the gethostbyname
-     * check.
-     */
-    psep = NULL;
-    nsep = sep;
-    while (nsep != NULL) {
-        servtab_t *tsep;
-
-        if (nsep->se_checked == 0) {
-            tsep = nsep;
-            if (psep == NULL) {
-                sep = nsep->se_next;
-                nsep = sep;
-            } else {
-                nsep = nsep->se_next;
-                psep->se_next = nsep;
-            }
-            freeconfig(tsep);
-        } else {
-            nsep->se_checked = 0;
-            psep = nsep;
-            nsep = nsep->se_next;
-        }
-    }
+    /* was doing it here: */
+    /* DNS resolution, create copies for each IP address */
+    /* IPv6-ization destroyed it :( */
 
     return sep;
 }
 
-#define Block_Using_Signals(m) do { \
-    sigemptyset(&m); \
-    sigaddset(&m, SIGCHLD); \
-    sigaddset(&m, SIGHUP); \
-    sigaddset(&m, SIGALRM); \
-    sigprocmask(SIG_BLOCK, &m, NULL); \
-} while (0)
-
-static servtab_t *enter(servtab_t *cp)
+static servtab_t *insert_in_servlist(servtab_t *cp)
 {
     servtab_t *sep;
@@ -875 +826 @@
 
     sep = new_servtab();
-    *sep = *cp;
+    *sep = *cp; /* struct copy */
     sep->se_fd = -1;
 #if ENABLE_FEATURE_INETD_RPC
     sep->se_rpcprog = -1;
 #endif
-    Block_Using_Signals(omask);
-    sep->se_next = servtab;
-    servtab = sep;
-    sigprocmask(SIG_UNBLOCK, &omask, NULL);
+    block_CHLD_HUP_ALRM(&omask);
+    sep->se_next = serv_list;
+    serv_list = sep;
+    restore_sigmask(&omask);
     return sep;
 }
 
-static int matchconf(servtab_t *old, servtab_t *new)
-{
+static int same_serv_addr_proto(servtab_t *old, servtab_t *new)
+{
+    if (strcmp(old->se_local_hostname, new->se_local_hostname) != 0)
+        return 0;
     if (strcmp(old->se_service, new->se_service) != 0)
         return 0;
-
-    if (strcmp(old->se_hostaddr, new->se_hostaddr) != 0)
-        return 0;
-
     if (strcmp(old->se_proto, new->se_proto) != 0)
         return 0;
-
-    /*
-     * If the new servtab is bound to a specific address, check that the
-     * old servtab is bound to the same entry. If the new service is not
-     * bound to a specific address then the check of se_hostaddr above
-     * is sufficient.
-     */
-
-    if (old->se_family == AF_INET && new->se_family == AF_INET &&
-            memcmp(&old->se_ctrladdr_in.sin_addr,
-                    &new->se_ctrladdr_in.sin_addr,
-                    sizeof(new->se_ctrladdr_in.sin_addr)) != 0)
-        return 0;
-
-#if ENABLE_FEATURE_IPV6
-    if (old->se_family == AF_INET6 && new->se_family == AF_INET6 &&
-            memcmp(&old->se_ctrladdr_in6.sin6_addr,
-                    &new->se_ctrladdr_in6.sin6_addr,
-                    sizeof(new->se_ctrladdr_in6.sin6_addr)) != 0)
-        return 0;
-#endif
     return 1;
 }
 
-static void config(int sig ATTRIBUTE_UNUSED)
+static void reread_config_file(int sig UNUSED_PARAM)
 {
     servtab_t *sep, *cp, **sepp;
+    len_and_sockaddr *lsa;
     sigset_t omask;
-    size_t n;
-    char protoname[10];
-
-    if (!setconfig()) {
-        bb_perror_msg("%s", config_filename);
-        return;
-    }
-    for (sep = servtab; sep; sep = sep->se_next)
+    unsigned n;
+    uint16_t port;
+    int save_errno = errno;
+
+    if (!reopen_config_file())
+        goto ret;
+    for (sep = serv_list; sep; sep = sep->se_next)
         sep->se_checked = 0;
-    cp = getconfigent();
-    while (cp != NULL) {
-        for (sep = servtab; sep; sep = sep->se_next)
-            if (matchconf(sep, cp))
+
+    goto first_line;
+    while (1) {
+        if (cp == NULL) {
+ first_line:
+            cp = parse_one_line();
+            if (cp == NULL)
                 break;
-
-        if (sep != 0) {
+        }
+        for (sep = serv_list; sep; sep = sep->se_next)
+            if (same_serv_addr_proto(sep, cp))
+                goto equal_servtab;
+        /* not an "equal" servtab */
+        sep = insert_in_servlist(cp);
+        goto after_check;
+ equal_servtab:
+        {
             int i;
 
-#define SWAP(type, a, b) do {type c=(type)a; a=(type)b; b=(type)c;} while (0)
-
-            Block_Using_Signals(omask);
-            /*
-             * sep->se_wait may be holding the pid of a daemon
-             * that we're waiting for.  If so, don't overwrite
-             * it unless the config file explicitly says don't
-             * wait.
-             */
-            if (
-#ifdef INETD_FEATURE_ENABLED
-                cp->se_bi == 0 &&
-#endif
-                (sep->se_wait == 1 || cp->se_wait == 0))
-                sep->se_wait = cp->se_wait;
-            SWAP(int, cp->se_max, sep->se_max);
-            SWAP(char *, sep->se_user, cp->se_user);
-            SWAP(char *, sep->se_group, cp->se_group);
-            SWAP(char *, sep->se_server, cp->se_server);
+            block_CHLD_HUP_ALRM(&omask);
+#if ENABLE_FEATURE_INETD_RPC
+            if (is_rpc_service(sep))
+                unregister_rpc(sep);
+            sep->se_rpcver_lo = cp->se_rpcver_lo;
+            sep->se_rpcver_hi = cp->se_rpcver_hi;
+#endif
+            if (cp->se_wait == 0) {
+                /* New config says "nowait". If old one
+                 * was "wait", we currently may be waiting
+                 * for a child (and not accepting connects).
+                 * Stop waiting, start listening again.
+                 * (if it's not true, this op is harmless) */
+                add_fd_to_set(sep->se_fd);
+            }
+            sep->se_wait = cp->se_wait;
+            sep->se_max = cp->se_max;
+            /* string fields need more love - we don't want to leak them */
+#define SWAP(type, a, b) do { type c = (type)a; a = (type)b; b = (type)c; } while (0)
+            SWAP(char*, sep->se_user, cp->se_user);
+            SWAP(char*, sep->se_group, cp->se_group);
+            SWAP(char*, sep->se_program, cp->se_program);
             for (i = 0; i < MAXARGV; i++)
-                SWAP(char *, sep->se_argv[i], cp->se_argv[i]);
+                SWAP(char*, sep->se_argv[i], cp->se_argv[i]);
 #undef SWAP
-
+            restore_sigmask(&omask);
+            free_servtab_strings(cp);
+        }
+ after_check:
+        /* cp->string_fields are consumed by insert_in_servlist()
+         * or freed at this point, cp itself is not yet freed. */
+        sep->se_checked = 1;
+
+        /* create new len_and_sockaddr */
+        switch (sep->se_family) {
+            struct sockaddr_un *sun;
+        case AF_UNIX:
+            lsa = xzalloc_lsa(AF_UNIX);
+            sun = (struct sockaddr_un*)&lsa->u.sa;
+            safe_strncpy(sun->sun_path, sep->se_service, sizeof(sun->sun_path));
+            break;
+
+        default: /* case AF_INET, case AF_INET6 */
+            n = bb_strtou(sep->se_service, NULL, 10);
 #if ENABLE_FEATURE_INETD_RPC
-            if (isrpcservice(sep))
-                unregister_rpc(sep);
-            sep->se_rpcversl = cp->se_rpcversl;
-            sep->se_rpcversh = cp->se_rpcversh;
-#endif
-            sigprocmask(SIG_UNBLOCK, &omask, NULL);
-            freeconfig(cp);
-        } else {
-            sep = enter(cp);
-        }
-        sep->se_checked = 1;
-
-        switch (sep->se_family) {
-        case AF_UNIX:
-            if (sep->se_fd != -1)
-                break;
-            (void) unlink(sep->se_service);
-            n = strlen(sep->se_service);
-            if (n > sizeof sep->se_ctrladdr_un.sun_path - 1)
-                n = sizeof sep->se_ctrladdr_un.sun_path - 1;
-            safe_strncpy(sep->se_ctrladdr_un.sun_path, sep->se_service, n + 1);
-            sep->se_ctrladdr_un.sun_family = AF_UNIX;
-            sep->se_ctrladdr_size = n + sizeof sep->se_ctrladdr_un.sun_family;
-            setup(sep);
-            break;
-        case AF_INET:
-            sep->se_ctrladdr_in.sin_family = AF_INET;
-            /* se_ctrladdr_in was set in getconfigent */
-            sep->se_ctrladdr_size = sizeof sep->se_ctrladdr_in;
-
-#if ENABLE_FEATURE_INETD_RPC
-            if (isrpcservice(sep)) {
-                struct rpcent *rp;
-                // FIXME: atoi_or_else(str, 0) would be handy here
-                sep->se_rpcprog = atoi(sep->se_service);
-                if (sep->se_rpcprog == 0) {
-                    rp = getrpcbyname(sep->se_service);
-                    if (rp == 0) {
+            if (is_rpc_service(sep)) {
+                sep->se_rpcprog = n;
+                if (errno) { /* se_service is not numeric */
+                    struct rpcent *rp = getrpcbyname(sep->se_service);
+                    if (rp == NULL) {
                         bb_error_msg("%s: unknown rpc service", sep->se_service);
-                        goto serv_unknown;
+                        goto next_cp;
                     }
                     sep->se_rpcprog = rp->r_number;
                 }
                 if (sep->se_fd == -1)
-                    setup(sep);
+                    prepare_socket_fd(sep);
                 if (sep->se_fd != -1)
                     register_rpc(sep);
-            } else
-#endif
-            {
-                uint16_t port = htons(atoi(sep->se_service));
-                // FIXME: atoi_or_else(str, 0) would be handy here
-                if (!port) {
-                     /*XXX*/ strncpy(protoname, sep->se_proto, sizeof(protoname));
-                    if (isdigit(protoname[strlen(protoname) - 1]))
-                        protoname[strlen(protoname) - 1] = '\0';
-                    sp = getservbyname(sep->se_service, protoname);
-                    if (sp == 0) {
-                        bb_error_msg("%s/%s: unknown service",
-                                sep->se_service, sep->se_proto);
-                        goto serv_unknown;
-                    }
-                    port = sp->s_port;
+                goto next_cp;
+            }
+#endif
+            /* what port to listen on? */
+            port = htons(n);
+            if (errno || n > 0xffff) { /* se_service is not numeric */
+                char protoname[4];
+                struct servent *sp;
+                /* can result only in "tcp" or "udp": */
+                safe_strncpy(protoname, sep->se_proto, 4);
+                sp = getservbyname(sep->se_service, protoname);
+                if (sp == NULL) {
+                    bb_error_msg("%s/%s: unknown service",
+                            sep->se_service, sep->se_proto);
+                    goto next_cp;
                 }
-                if (port != sep->se_ctrladdr_in.sin_port) {
-                    sep->se_ctrladdr_in.sin_port = port;
-                    if (sep->se_fd != -1) {
-                        FD_CLR(sep->se_fd, &allsock);
-                        nsock--;
-                        (void) close(sep->se_fd);
-                    }
-                    sep->se_fd = -1;
+                port = sp->s_port;
+            }
+            if (LONE_CHAR(sep->se_local_hostname, '*')) {
+                lsa = xzalloc_lsa(sep->se_family);
+                set_nport(lsa, port);
+            } else {
+                lsa = host_and_af2sockaddr(sep->se_local_hostname,
+                        ntohs(port), sep->se_family);
+                if (!lsa) {
+                    bb_error_msg("%s/%s: unknown host '%s'",
+                        sep->se_service, sep->se_proto,
+                        sep->se_local_hostname);
+                    goto next_cp;
                 }
-                if (sep->se_fd == -1)
-                    setup(sep);
             }
             break;
-#if ENABLE_FEATURE_IPV6
-        case AF_INET6:
-            sep->se_ctrladdr_in6.sin6_family = AF_INET6;
-            /* se_ctrladdr_in was set in getconfigent */
-            sep->se_ctrladdr_size = sizeof sep->se_ctrladdr_in6;
-
-#if ENABLE_FEATURE_INETD_RPC
-            if (isrpcservice(sep)) {
-                struct rpcent *rp;
-
-                sep->se_rpcprog = atoi(sep->se_service);
-                if (sep->se_rpcprog == 0) {
-                    rp = getrpcbyname(sep->se_service);
-                    if (rp == 0) {
-                        bb_error_msg("%s: unknown rpc service", sep->se_service);
-                        goto serv_unknown;
-                    }
-                    sep->se_rpcprog = rp->r_number;
-                }
-                if (sep->se_fd == -1)
-                    setup(sep);
-                if (sep->se_fd != -1)
-                    register_rpc(sep);
-            } else
-#endif
-            {
-                uint16_t port = htons(atoi(sep->se_service));
-
-                if (!port) {
-                     /*XXX*/ strncpy(protoname, sep->se_proto, sizeof(protoname));
-                    if (isdigit(protoname[strlen(protoname) - 1]))
-                        protoname[strlen(protoname) - 1] = '\0';
-                    sp = getservbyname(sep->se_service, protoname);
-                    if (sp == 0) {
-                        bb_error_msg("%s/%s: unknown service",
-                                sep->se_service, sep->se_proto);
-                        goto serv_unknown;
-                    }
-                    port = sp->s_port;
-                }
-                if (port != sep->se_ctrladdr_in6.sin6_port) {
-                    sep->se_ctrladdr_in6.sin6_port = port;
-                    if (sep->se_fd != -1) {
-                        FD_CLR(sep->se_fd, &allsock);
-                        nsock--;
-                        (void) close(sep->se_fd);
-                    }
-                    sep->se_fd = -1;
-                }
-                if (sep->se_fd == -1)
-                    setup(sep);
-            }
-            break;
-#endif /* FEATURE_IPV6 */
+        } /* end of "switch (sep->se_family)" */
+
+        /* did lsa change? Then close/open */
+        if (sep->se_lsa == NULL
+         || lsa->len != sep->se_lsa->len
+         || memcmp(&lsa->u.sa, &sep->se_lsa->u.sa, lsa->len) != 0
+        ) {
+            remove_fd_from_set(sep->se_fd);
+            maybe_close(sep->se_fd);
+            free(sep->se_lsa);
+            sep->se_lsa = lsa;
+            sep->se_fd = -1;
+        } else {
+            free(lsa);
         }
- serv_unknown:
-        if (cp->se_next != NULL) {
-            servtab_t *tmp = cp;
-
-            cp = cp->se_next;
-            free(tmp);
-        } else {
-            free(cp);
-            cp = getconfigent();
-        }
-    }
-    endconfig();
-    /*
-     * Purge anything not looked at above.
-     */
-    Block_Using_Signals(omask);
-    sepp = &servtab;
+        if (sep->se_fd == -1)
+            prepare_socket_fd(sep);
+ next_cp:
+        sep = cp->se_next;
+        free(cp);
+        cp = sep;
+    } /* end of "while (1) parse lines" */
+    close_config_file();
+
+    /* Purge anything not looked at above - these are stale entries,
+     * new config file doesnt have them. */
+    block_CHLD_HUP_ALRM(&omask);
+    sepp = &serv_list;
     while ((sep = *sepp)) {
         if (sep->se_checked) {
@@ -1122 +1006 @@
         }
         *sepp = sep->se_next;
-        if (sep->se_fd != -1) {
-            FD_CLR(sep->se_fd, &allsock);
-            nsock--;
-            (void) close(sep->se_fd);
-        }
+        remove_fd_from_set(sep->se_fd);
+        maybe_close(sep->se_fd);
 #if ENABLE_FEATURE_INETD_RPC
-        if (isrpcservice(sep))
+        if (is_rpc_service(sep))
             unregister_rpc(sep);
 #endif
         if (sep->se_family == AF_UNIX)
-            (void) unlink(sep->se_service);
-        freeconfig(sep);
+            unlink(sep->se_service);
+        free_servtab_strings(sep);
         free(sep);
     }
-    sigprocmask(SIG_UNBLOCK, &omask, NULL);
-}
-
-
-static void reapchild(int sig ATTRIBUTE_UNUSED)
+    restore_sigmask(&omask);
+ ret:
+    errno = save_errno;
+}
+
+static void reap_child(int sig UNUSED_PARAM)
 {
     pid_t pid;
-    int save_errno = errno, status;
+    int status;
     servtab_t *sep;
+    int save_errno = errno;
 
     for (;;) {
-        pid = wait3(&status, WNOHANG, NULL);
+        pid = wait_any_nohang(&status);
         if (pid <= 0)
             break;
-        for (sep = servtab; sep; sep = sep->se_next)
-            if (sep->se_wait == pid) {
-                if (WIFEXITED(status) && WEXITSTATUS(status))
-                    bb_error_msg("%s: exit status 0x%x",
-                            sep->se_server, WEXITSTATUS(status));
-                else if (WIFSIGNALED(status))
-                    bb_error_msg("%s: exit signal 0x%x",
-                            sep->se_server, WTERMSIG(status));
-                sep->se_wait = 1;
-                FD_SET(sep->se_fd, &allsock);
-                nsock++;
-            }
+        for (sep = serv_list; sep; sep = sep->se_next) {
+            if (sep->se_wait != pid)
+                continue;
+            /* One of our "wait" services */
+            if (WIFEXITED(status) && WEXITSTATUS(status))
+                bb_error_msg("%s: exit status %u",
+                        sep->se_program, WEXITSTATUS(status));
+            else if (WIFSIGNALED(status))
+                bb_error_msg("%s: exit signal %u",
+                        sep->se_program, WTERMSIG(status));
+            sep->se_wait = 1;
+            add_fd_to_set(sep->se_fd);
+            break;
+        }
     }
     errno = save_errno;
 }
 
-static void retry(int sig ATTRIBUTE_UNUSED)
-{
+static void retry_network_setup(int sig UNUSED_PARAM)
+{
+    int save_errno = errno;
     servtab_t *sep;
 
-    timingout = 0;
-    for (sep = servtab; sep; sep = sep->se_next) {
+    alarm_armed = 0;
+    for (sep = serv_list; sep; sep = sep->se_next) {
         if (sep->se_fd == -1) {
-            switch (sep->se_family) {
-            case AF_UNIX:
-            case AF_INET:
-#if ENABLE_FEATURE_IPV6
-            case AF_INET6:
-#endif
-                setup(sep);
+            prepare_socket_fd(sep);
 #if ENABLE_FEATURE_INETD_RPC
-                if (sep->se_fd != -1 && isrpcservice(sep))
-                    register_rpc(sep);
-#endif
-                break;
-            }
+            if (sep->se_fd != -1 && is_rpc_service(sep))
+                register_rpc(sep);
+#endif
         }
     }
-}
-
-static void goaway(int sig ATTRIBUTE_UNUSED)
+    errno = save_errno;
+}
+
+static void clean_up_and_exit(int sig UNUSED_PARAM)
 {
     servtab_t *sep;
 
     /* XXX signal race walking sep list */
-    for (sep = servtab; sep; sep = sep->se_next) {
+    for (sep = serv_list; sep; sep = sep->se_next) {
         if (sep->se_fd == -1)
             continue;
@@ -1201 +1080 @@
         switch (sep->se_family) {
         case AF_UNIX:
-            (void) unlink(sep->se_service);
+            unlink(sep->se_service);
             break;
-        case AF_INET:
-#if ENABLE_FEATURE_IPV6
-        case AF_INET6:
-#endif
+        default: /* case AF_INET, AF_INET6 */
 #if ENABLE_FEATURE_INETD_RPC
-            if (sep->se_wait == 1 && isrpcservice(sep))
+            if (sep->se_wait == 1 && is_rpc_service(sep))
                 unregister_rpc(sep);   /* XXX signal race */
 #endif
             break;
         }
-        (void) close(sep->se_fd);
+        if (ENABLE_FEATURE_CLEAN_UP)
+            close(sep->se_fd);
     }
     remove_pidfile(_PATH_INETDPID);
-    exit(0);
-}
-
-
-#ifdef INETD_SETPROCTITLE
-static char **Argv;
-static char *LastArg;
-
-static void
-inetd_setproctitle(char *a, int s)
-{
-    socklen_t size;
-    char *cp;
-    struct sockaddr_in prt_sin;
-    char buf[80];
-
-    cp = Argv[0];
-    size = sizeof(prt_sin);
-    (void) snprintf(buf, sizeof buf, "-%s", a);
-    if (getpeername(s, (struct sockaddr *) &prt_sin, &size) == 0) {
-        char *sa = inet_ntoa(prt_sin.sin_addr);
-
-        buf[sizeof(buf) - 1 - strlen(sa) - 3] = '\0';
-        strcat(buf, " [");
-        strcat(buf, sa);
-        strcat(buf, "]");
-    }
-    strncpy(cp, buf, LastArg - cp);
-    cp += strlen(cp);
-    while (cp < LastArg)
-        *cp++ = ' ';
-}
-#endif
-
-
-int inetd_main(int argc, char **argv);
-int inetd_main(int argc, char **argv)
-{
-    servtab_t *sep;
+    exit(EXIT_SUCCESS);
+}
+
+int inetd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int inetd_main(int argc UNUSED_PARAM, char **argv)
+{
+    struct sigaction sa, saved_pipe_handler;
+    servtab_t *sep, *sep2;
     struct passwd *pwd;
-    struct group *grp = NULL;
-    int tmpint;
-    struct sigaction sa, sapipe;
+    struct group *grp = grp; /* for compiler */
     int opt;
     pid_t pid;
-    char buf[50];
-    char *stoomany;
-    sigset_t omask, wait_mask;
-
-#ifdef INETD_SETPROCTITLE
-    char **envp = environ;
-
-    Argv = argv;
-    if (envp == 0 || *envp == 0)
-        envp = argv;
-    while (*envp)
-        envp++;
-    LastArg = envp[-1] + strlen(envp[-1]);
-#endif
-
-    uid = getuid();
-    if (uid != 0)
+    sigset_t omask;
+
+    INIT_G();
+
+    real_uid = getuid();
+    if (real_uid != 0) /* run by non-root user */
         config_filename = NULL;
 
-    opt = getopt32(argv, "R:f", &stoomany);
-    if (opt & 1)
-        toomany = xatoi_u(stoomany);
+    opt_complementary = "R+:q+"; /* -q N, -R N */
+    opt = getopt32(argv, "R:feq:", &max_concurrency, &global_queuelen);
     argv += optind;
-    argc -= optind;
-    if (argc)
+    //argc -= optind;
+    if (argv[0])
         config_filename = argv[0];
     if (config_filename == NULL)
-        bb_error_msg_and_die("non-root must specify a config file");
-
+        bb_error_msg_and_die("non-root must specify config file");
     if (!(opt & 2))
         bb_daemonize_or_rexec(0, argv - optind);
     else
         bb_sanitize_stdio();
-    openlog(applet_name, LOG_PID | LOG_NOWAIT, LOG_DAEMON);
-    logmode = LOGMODE_SYSLOG;
-
-    if (uid == 0) {
-        /* If run by hand, ensure groups vector gets trashed */
+    if (!(opt & 4)) {
+        /* LOG_NDELAY: connect to syslog daemon NOW.
+         * Otherwise, we may open syslog socket
+         * in vforked child, making opened fds and syslog()
+         * internal state inconsistent.
+         * This was observed to leak file descriptors. */
+        openlog(applet_name, LOG_PID | LOG_NDELAY, LOG_DAEMON);
+        logmode = LOGMODE_SYSLOG;
+    }
+
+    if (real_uid == 0) {
+        /* run by root, ensure groups vector gets trashed */
         gid_t gid = getgid();
         setgroups(1, &gid);
@@ -1305 +1143 @@
     write_pidfile(_PATH_INETDPID);
 
-    if (getrlimit(RLIMIT_NOFILE, &rlim_ofile) < 0) {
-        bb_perror_msg("getrlimit");
-    } else {
-        rlim_ofile_cur = rlim_ofile.rlim_cur;
-        if (rlim_ofile_cur == RLIM_INFINITY)    /* ! */
-            rlim_ofile_cur = OPEN_MAX;
-    }
-
-    memset((char *) &sa, 0, sizeof(sa));
-    sigemptyset(&sa.sa_mask);
+    /* never fails under Linux (except if you pass it bad arguments) */
+    getrlimit(RLIMIT_NOFILE, &rlim_ofile);
+    rlim_ofile_cur = rlim_ofile.rlim_cur;
+    if (rlim_ofile_cur == RLIM_INFINITY)    /* ! */
+        rlim_ofile_cur = OPEN_MAX;
+
+    memset(&sa, 0, sizeof(sa));
+    /*sigemptyset(&sa.sa_mask); - memset did it */
     sigaddset(&sa.sa_mask, SIGALRM);
     sigaddset(&sa.sa_mask, SIGCHLD);
     sigaddset(&sa.sa_mask, SIGHUP);
-    sa.sa_handler = retry;
-    sigaction(SIGALRM, &sa, NULL);
-    config(SIGHUP);
-    sa.sa_handler = config;
-    sigaction(SIGHUP, &sa, NULL);
-    sa.sa_handler = reapchild;
-    sigaction(SIGCHLD, &sa, NULL);
-    sa.sa_handler = goaway;
-    sigaction(SIGTERM, &sa, NULL);
-    sa.sa_handler = goaway;
-    sigaction(SIGINT, &sa, NULL);
+    sa.sa_handler = retry_network_setup;
+    sigaction_set(SIGALRM, &sa);
+    sa.sa_handler = reread_config_file;
+    sigaction_set(SIGHUP, &sa);
+    sa.sa_handler = reap_child;
+    sigaction_set(SIGCHLD, &sa);
+    sa.sa_handler = clean_up_and_exit;
+    sigaction_set(SIGTERM, &sa);
+    sa.sa_handler = clean_up_and_exit;
+    sigaction_set(SIGINT, &sa);
     sa.sa_handler = SIG_IGN;
-    sigaction(SIGPIPE, &sa, &sapipe);
-    memset(&wait_mask, 0, sizeof(wait_mask));
-    {
-        /* space for daemons to overwrite environment for ps */
-#define DUMMYSIZE       100
-        char dummy[DUMMYSIZE];
-
-        (void) memset(dummy, 'x', DUMMYSIZE - 1);
-        dummy[DUMMYSIZE - 1] = '\0';
-
-        (void) setenv("inetd_dummy", dummy, 1);
-    }
+    sigaction(SIGPIPE, &sa, &saved_pipe_handler);
+
+    reread_config_file(SIGHUP); /* load config from file */
 
     for (;;) {
-        int n, ctrl = -1;
+        int ready_fd_cnt;
+        int ctrl, accepted_fd, new_udp_fd;
         fd_set readable;
 
-        if (nsock == 0) {
-            Block_Using_Signals(omask);
-            while (nsock == 0)
-                sigsuspend(&wait_mask);
-            sigprocmask(SIG_UNBLOCK, &omask, NULL);
-        }
-
-        readable = allsock;
-        n = select(maxsock + 1, &readable, NULL, NULL, NULL);
-        if (n <= 0) {
-            if (n < 0 && errno != EINTR) {
+        if (maxsock < 0)
+            recalculate_maxsock();
+
+        readable = allsock; /* struct copy */
+        /* if there are no fds to wait on, we will block
+         * until signal wakes us up (maxsock == 0, but readable
+         * never contains fds 0 and 1...) */
+        ready_fd_cnt = select(maxsock + 1, &readable, NULL, NULL, NULL);
+        if (ready_fd_cnt < 0) {
+            if (errno != EINTR) {
                 bb_perror_msg("select");
                 sleep(1);
@@ -1364 +1190 @@
         }
 
-        for (sep = servtab; n && sep; sep = sep->se_next) {
+        for (sep = serv_list; ready_fd_cnt && sep; sep = sep->se_next) {
             if (sep->se_fd == -1 || !FD_ISSET(sep->se_fd, &readable))
                 continue;
 
-            n--;
-            if (!sep->se_wait && sep->se_socktype == SOCK_STREAM) {
-                ctrl = accept(sep->se_fd, NULL, NULL);
-                if (ctrl < 0) {
-                    if (errno == EINTR)
-                        continue;
-                    bb_perror_msg("accept (for %s)", sep->se_service);
-                    continue;
-                }
-                if (sep->se_family == AF_INET && sep->se_socktype == SOCK_STREAM) {
-                    struct sockaddr_in peer;
-                    socklen_t plen = sizeof(peer);
-
-                    if (getpeername(ctrl, (struct sockaddr *) &peer, &plen) < 0) {
-                        bb_error_msg("cannot getpeername");
-                        close(ctrl);
-                        continue;
-                    }
-                    if (ntohs(peer.sin_port) == 20) {
-                        /* XXX ftp bounce */
-                        close(ctrl);
+            ready_fd_cnt--;
+            ctrl = sep->se_fd;
+            accepted_fd = -1;
+            new_udp_fd = -1;
+            if (!sep->se_wait) {
+                if (sep->se_socktype == SOCK_STREAM) {
+                    ctrl = accepted_fd = accept(sep->se_fd, NULL, NULL);
+                    if (ctrl < 0) {
+                        if (errno != EINTR)
+                            bb_perror_msg("accept (for %s)", sep->se_service);
                         continue;
                     }
                 }
-            } else
-                ctrl = sep->se_fd;
-
-            Block_Using_Signals(omask);
-            pid = 0;
-#ifdef INETD_FEATURE_ENABLED
-            if (sep->se_bi == 0 || sep->se_bi->bi_fork)
-#endif
-            {
-                if (sep->se_count++ == 0)
-                    (void) gettimeofday(&sep->se_time, NULL);
-                else if (toomany > 0 && sep->se_count >= sep->se_max) {
-                    struct timeval now;
-
-                    (void) gettimeofday(&now, NULL);
-                    if (now.tv_sec - sep->se_time.tv_sec > CNT_INTVL) {
-                        sep->se_time = now;
-                        sep->se_count = 1;
-                    } else {
-                        if (!sep->se_wait && sep->se_socktype == SOCK_STREAM)
-                            close(ctrl);
-                        if (sep->se_family == AF_INET &&
-                              ntohs(sep->se_ctrladdr_in.sin_port) >= IPPORT_RESERVED) {
-                            /*
-                             * Cannot close it -- there are
-                             * thieves on the system.
-                             * Simply ignore the connection.
-                             */
-                            --sep->se_count;
-                            continue;
-                        }
-                        bb_error_msg("%s/%s server failing (looping), service terminated",
-                                  sep->se_service, sep->se_proto);
-                        if (!sep->se_wait && sep->se_socktype == SOCK_STREAM)
-                            close(ctrl);
-                        FD_CLR(sep->se_fd, &allsock);
-                        (void) close(sep->se_fd);
-                        sep->se_fd = -1;
-                        sep->se_count = 0;
-                        nsock--;
-                        sigprocmask(SIG_UNBLOCK, &omask, NULL);
-                        if (!timingout) {
-                            timingout = 1;
-                            alarm(RETRYTIME);
-                        }
+                /* "nowait" udp */
+                if (sep->se_socktype == SOCK_DGRAM
+                 && sep->se_family != AF_UNIX
+                ) {
+/* How udp "nowait" works:
+ * child peeks at (received and buffered by kernel) UDP packet,
+ * performs connect() on the socket so that it is linked only
+ * to this peer. But this also affects parent, because descriptors
+ * are shared after fork() a-la dup(). When parent performs
+ * select(), it will see this descriptor connected to the peer (!)
+ * and still readable, will act on it and mess things up
+ * (can create many copies of same child, etc).
+ * Parent must create and use new socket instead. */
+                    new_udp_fd = socket(sep->se_family, SOCK_DGRAM, 0);
+                    if (new_udp_fd < 0) { /* error: eat packet, forget about it */
+ udp_err:
+                        recv(sep->se_fd, line, LINE_SIZE, MSG_DONTWAIT);
                         continue;
                     }
-                }
-                pid = fork();
-            }
-            if (pid < 0) {
-                bb_perror_msg("fork");
-                if (!sep->se_wait && sep->se_socktype == SOCK_STREAM)
-                    close(ctrl);
-                sigprocmask(SIG_UNBLOCK, &omask, NULL);
-                sleep(1);
-                continue;
-            }
-            if (pid && sep->se_wait) {
-                sep->se_wait = pid;
-                FD_CLR(sep->se_fd, &allsock);
-                nsock--;
-            }
-            sigprocmask(SIG_UNBLOCK, &omask, NULL);
-            if (pid == 0) {
-#ifdef INETD_FEATURE_ENABLED
-                if (sep->se_bi) {
-                    (*sep->se_bi->bi_fn)(ctrl, sep);
-                } else
-#endif
-                {
-                    pwd = getpwnam(sep->se_user);
-                    if (pwd == NULL) {
-                        bb_error_msg("getpwnam: %s: no such user", sep->se_user);
-                        goto do_exit1;
+                    setsockopt_reuseaddr(new_udp_fd);
+                    /* TODO: better do bind after vfork in parent,
+                     * so that we don't have two wildcard bound sockets
+                     * even for a brief moment? */
+                    if (bind(new_udp_fd, &sep->se_lsa->u.sa, sep->se_lsa->len) < 0) {
+                        close(new_udp_fd);
+                        goto udp_err;
                     }
-                    if (setsid() < 0)
-                        bb_perror_msg("%s: setsid", sep->se_service);
-                    if (sep->se_group && (grp = getgrnam(sep->se_group)) == NULL) {
-                        bb_error_msg("getgrnam: %s: no such group", sep->se_group);
-                        goto do_exit1;
-                    }
-                    if (uid != 0) {
-                        /* a user running private inetd */
-                        if (uid != pwd->pw_uid)
-                            _exit(1);
-                    } else if (pwd->pw_uid) {
-                        if (sep->se_group)
-                            pwd->pw_gid = grp->gr_gid;
-                        xsetgid((gid_t) pwd->pw_gid);
-                        initgroups(pwd->pw_name, pwd->pw_gid);
-                        xsetuid((uid_t) pwd->pw_uid);
-                    } else if (sep->se_group) {
-                        xsetgid(grp->gr_gid);
-                        setgroups(1, &grp->gr_gid);
-                    }
-                    dup2(ctrl, 0);
-                    if (ctrl) close(ctrl);
-                    dup2(0, 1);
-                    dup2(0, 2);
-                    if (rlim_ofile.rlim_cur != rlim_ofile_cur)
-                        if (setrlimit(RLIMIT_NOFILE, &rlim_ofile) < 0)
-                            bb_perror_msg("setrlimit");
-                    closelog();
-                    for (tmpint = rlim_ofile_cur - 1; --tmpint > 2;)
-                        (void) close(tmpint);
-                    sigaction(SIGPIPE, &sapipe, NULL);
-                    execv(sep->se_server, sep->se_argv);
-                    bb_perror_msg("execv %s", sep->se_server);
- do_exit1:
-                    if (sep->se_socktype != SOCK_STREAM)
-                        recv(0, buf, sizeof(buf), 0);
-                    _exit(1);
                 }
             }
-            if (!sep->se_wait && sep->se_socktype == SOCK_STREAM)
-                close(ctrl);
+
+            block_CHLD_HUP_ALRM(&omask);
+            pid = 0;
+#ifdef INETD_BUILTINS_ENABLED
+            /* do we need to fork? */
+            if (sep->se_builtin == NULL
+             || (sep->se_socktype == SOCK_STREAM
+                 && sep->se_builtin->bi_fork))
+#endif
+            {
+                if (sep->se_max != 0) {
+                    if (++sep->se_count == 1)
+                        sep->se_time = monotonic_sec();
+                    else if (sep->se_count >= sep->se_max) {
+                        unsigned now = monotonic_sec();
+                        /* did we accumulate se_max connects too quickly? */
+                        if (now - sep->se_time <= CNT_INTERVAL) {
+                            bb_error_msg("%s/%s: too many connections, pausing",
+                                    sep->se_service, sep->se_proto);
+                            remove_fd_from_set(sep->se_fd);
+                            close(sep->se_fd);
+                            sep->se_fd = -1;
+                            sep->se_count = 0;
+                            rearm_alarm(); /* will revive it in RETRYTIME sec */
+                            restore_sigmask(&omask);
+                            maybe_close(accepted_fd);
+                            continue; /* -> check next fd in fd set */
+                        }
+                        sep->se_count = 0;
+                    }
+                }
+                /* on NOMMU, streamed chargen
+                 * builtin wouldn't work, but it is
+                 * not allowed on NOMMU (ifdefed out) */
+#ifdef INETD_BUILTINS_ENABLED
+                if (BB_MMU && sep->se_builtin)
+                    pid = fork();
+                else
+#endif
+                    pid = vfork();
+
+                if (pid < 0) { /* fork error */
+                    bb_perror_msg("vfork"+1);
+                    sleep(1);
+                    restore_sigmask(&omask);
+                    maybe_close(accepted_fd);
+                    continue; /* -> check next fd in fd set */
+                }
+                if (pid == 0)
+                    pid--; /* -1: "we did fork and we are child" */
+            }
+            /* if pid == 0 here, we never forked */
+
+            if (pid > 0) { /* parent */
+                if (sep->se_wait) {
+                    /* tcp wait: we passed listening socket to child,
+                     * will wait for child to terminate */
+                    sep->se_wait = pid;
+                    remove_fd_from_set(sep->se_fd);
+                }
+                if (new_udp_fd >= 0) {
+                    /* udp nowait: child connected the socket,
+                     * we created and will use new, unconnected one */
+                    xmove_fd(new_udp_fd, sep->se_fd);
+                }
+                restore_sigmask(&omask);
+                maybe_close(accepted_fd);
+                continue; /* -> check next fd in fd set */
+            }
+
+            /* we are either child or didn't vfork at all */
+#ifdef INETD_BUILTINS_ENABLED
+            if (sep->se_builtin) {
+                if (pid) { /* "pid" is -1: we did vfork */
+                    close(sep->se_fd); /* listening socket */
+                    logmode = LOGMODE_NONE; /* make xwrite etc silent */
+                }
+                restore_sigmask(&omask);
+                if (sep->se_socktype == SOCK_STREAM)
+                    sep->se_builtin->bi_stream_fn(ctrl, sep);
+                else
+                    sep->se_builtin->bi_dgram_fn(ctrl, sep);
+                if (pid) /* we did vfork */
+                    _exit(EXIT_FAILURE);
+                maybe_close(accepted_fd);
+                continue; /* -> check next fd in fd set */
+            }
+#endif
+            /* child */
+            setsid();
+            /* "nowait" udp */
+            if (new_udp_fd >= 0) {
+                len_and_sockaddr *lsa = xzalloc_lsa(sep->se_family);
+                /* peek at the packet and remember peer addr */
+                int r = recvfrom(ctrl, NULL, 0, MSG_PEEK|MSG_DONTWAIT,
+                    &lsa->u.sa, &lsa->len);
+                if (r < 0)
+                    goto do_exit1;
+                /* make this socket "connected" to peer addr:
+                 * only packets from this peer will be recv'ed,
+                 * and bare write()/send() will work on it */
+                connect(ctrl, &lsa->u.sa, lsa->len);
+                free(lsa);
+            }
+            /* prepare env and exec program */
+            pwd = getpwnam(sep->se_user);
+            if (pwd == NULL) {
+                bb_error_msg("%s: no such %s", sep->se_user, "user");
+                goto do_exit1;
+            }
+            if (sep->se_group && (grp = getgrnam(sep->se_group)) == NULL) {
+                bb_error_msg("%s: no such %s", sep->se_group, "group");
+                goto do_exit1;
+            }
+            if (real_uid != 0 && real_uid != pwd->pw_uid) {
+                /* a user running private inetd */
+                bb_error_msg("non-root must run services as himself");
+                goto do_exit1;
+            }
+            if (pwd->pw_uid) {
+                if (sep->se_group)
+                    pwd->pw_gid = grp->gr_gid;
+                /* initgroups, setgid, setuid: */
+                change_identity(pwd);
+            } else if (sep->se_group) {
+                xsetgid(grp->gr_gid);
+                setgroups(1, &grp->gr_gid);
+            }
+            if (rlim_ofile.rlim_cur != rlim_ofile_cur)
+                if (setrlimit(RLIMIT_NOFILE, &rlim_ofile) < 0)
+                    bb_perror_msg("setrlimit");
+
+            /* closelog(); - WRONG. we are after vfork,
+             * this may confuse syslog() internal state.
+             * Let's hope libc sets syslog fd to CLOEXEC...
+             */
+            xmove_fd(ctrl, STDIN_FILENO);
+            xdup2(STDIN_FILENO, STDOUT_FILENO);
+            /* manpages of inetd I managed to find either say
+             * that stderr is also redirected to the network,
+             * or do not talk about redirection at all (!) */
+            if (!sep->se_wait) /* only for usual "tcp nowait" */
+                xdup2(STDIN_FILENO, STDERR_FILENO);
+            /* NB: among others, this loop closes listening sockets
+             * for nowait stream children */
+            for (sep2 = serv_list; sep2; sep2 = sep2->se_next)
+                if (sep2->se_fd != ctrl)
+                    maybe_close(sep2->se_fd);
+            sigaction_set(SIGPIPE, &saved_pipe_handler);
+            restore_sigmask(&omask);
+            BB_EXECVP(sep->se_program, sep->se_argv);
+            bb_perror_msg("can't execute '%s'", sep->se_program);
+ do_exit1:
+            /* eat packet in udp case */
+            if (sep->se_socktype != SOCK_STREAM)
+                recv(0, line, LINE_SIZE, MSG_DONTWAIT);
+            _exit(EXIT_FAILURE);
         } /* for (sep = servtab...) */
     } /* for (;;) */
 }
+
+#if !BB_MMU
+static const char *const cat_args[] = { "cat", NULL };
+#endif
 
 /*
  * Internet services provided internally by inetd:
  */
-#define BUFSIZE 4096
-
-#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_ECHO || \
-    ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN || \
-    ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME
-static int dg_badinput(struct sockaddr_in *dg_sin)
-{
-    if (ntohs(dg_sin->sin_port) < IPPORT_RESERVED)
-        return 1;
-    if (dg_sin->sin_addr.s_addr == htonl(INADDR_BROADCAST))
-        return 1;
-    /* XXX compare against broadcast addresses in SIOCGIFCONF list? */
-    return 0;
-}
-#endif
-
 #if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_ECHO
-/* Echo service -- echo data back */
+/* Echo service -- echo data back. */
 /* ARGSUSED */
-static void
-echo_stream(int s, servtab_t *sep)
-{
-    char buffer[BUFSIZE];
-    int i;
-
-    inetd_setproctitle(sep->se_service, s);
+static void FAST_FUNC echo_stream(int s, servtab_t *sep UNUSED_PARAM)
+{
+#if BB_MMU
     while (1) {
-        i = read(s, buffer, sizeof(buffer));
-        if (i <= 0) break;
-        /* FIXME: this isnt correct - safe_write()? */
-        if (write(s, buffer, i) <= 0) break;
-    }
-    exit(0);
-}
-
-/* Echo service -- echo data back */
+        ssize_t sz = safe_read(s, line, LINE_SIZE);
+        if (sz <= 0)
+            break;
+        xwrite(s, line, sz);
+    }
+#else
+    /* We are after vfork here! */
+    /* move network socket to stdin/stdout */
+    xmove_fd(s, STDIN_FILENO);
+    xdup2(STDIN_FILENO, STDOUT_FILENO);
+    /* no error messages please... */
+    close(STDERR_FILENO);
+    xopen(bb_dev_null, O_WRONLY);
+    BB_EXECVP("cat", (char**)cat_args);
+    /* on failure we return to main, which does exit(EXIT_FAILURE) */
+#endif
+}
+static void FAST_FUNC echo_dg(int s, servtab_t *sep)
+{
+    enum { BUFSIZE = 12*1024 }; /* for jumbo sized packets! :) */
+    char *buf = xmalloc(BUFSIZE); /* too big for stack */
+    int sz;
+    len_and_sockaddr *lsa = alloca(LSA_LEN_SIZE + sep->se_lsa->len);
+
+    lsa->len = sep->se_lsa->len;
+    /* dgram builtins are non-forking - DONT BLOCK! */
+    sz = recvfrom(s, buf, BUFSIZE, MSG_DONTWAIT, &lsa->u.sa, &lsa->len);
+    if (sz > 0)
+        sendto(s, buf, sz, 0, &lsa->u.sa, lsa->len);
+    free(buf);
+}
+#endif  /* FEATURE_INETD_SUPPORT_BUILTIN_ECHO */
+
+
+#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD
+/* Discard service -- ignore data. */
 /* ARGSUSED */
-static void
-echo_dg(int s, servtab_t *sep ATTRIBUTE_UNUSED)
-{
-    char buffer[BUFSIZE];
-    int i;
-    socklen_t size;
-    /* struct sockaddr_storage ss; */
-    struct sockaddr sa;
-
-    size = sizeof(sa);
-    i = recvfrom(s, buffer, sizeof(buffer), 0, &sa, &size);
-    if (i < 0)
-        return;
-    if (dg_badinput((struct sockaddr_in *) &sa))
-        return;
-    (void) sendto(s, buffer, i, 0, &sa, sizeof(sa));
-}
-#endif  /* FEATURE_INETD_SUPPORT_BUILTIN_ECHO */
-
-#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD
-/* Discard service -- ignore data */
+static void FAST_FUNC discard_stream(int s, servtab_t *sep UNUSED_PARAM)
+{
+#if BB_MMU
+    while (safe_read(s, line, LINE_SIZE) > 0)
+        continue;
+#else
+    /* We are after vfork here! */
+    /* move network socket to stdin */
+    xmove_fd(s, STDIN_FILENO);
+    /* discard output */
+    close(STDOUT_FILENO);
+    xopen(bb_dev_null, O_WRONLY);
+    /* no error messages please... */
+    xdup2(STDOUT_FILENO, STDERR_FILENO);
+    BB_EXECVP("cat", (char**)cat_args);
+    /* on failure we return to main, which does exit(EXIT_FAILURE) */
+#endif
+}
 /* ARGSUSED */
-static void
-discard_stream(int s, servtab_t *sep)
-{
-    char buffer[BUFSIZE];
-
-    inetd_setproctitle(sep->se_service, s);
-    while (1) {
-        errno = 0;
-        if (read(s, buffer, sizeof(buffer)) <= 0 && errno != EINTR)
-            exit(0);
-    }
-}
-
-/* Discard service -- ignore data */
-/* ARGSUSED */
-static void
-discard_dg(int s, servtab_t *sep ATTRIBUTE_UNUSED)
-{
-    char buffer[BUFSIZE];
-
-    (void) read(s, buffer, sizeof(buffer));
+static void FAST_FUNC discard_dg(int s, servtab_t *sep UNUSED_PARAM)
+{
+    /* dgram builtins are non-forking - DONT BLOCK! */
+    recv(s, line, LINE_SIZE, MSG_DONTWAIT);
 }
 #endif /* FEATURE_INETD_SUPPORT_BUILTIN_DISCARD */
@@ -1602 +1477 @@
 #if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
 #define LINESIZ 72
-static char ring[128];
-static char *endring;
-
-static void
-initring(void)
+static void init_ring(void)
 {
     int i;
 
-    endring = ring;
-
-    for (i = 0; i <= 128; ++i)
-        if (isprint(i))
-            *endring++ = i;
-}
-
-/* Character generator */
+    end_ring = ring;
+    for (i = ' '; i < 127; i++)
+        *end_ring++ = i;
+}
+/* Character generator. MMU arches only. */
 /* ARGSUSED */
-static void
-chargen_stream(int s, servtab_t *sep)
+static void FAST_FUNC chargen_stream(int s, servtab_t *sep UNUSED_PARAM)
 {
     char *rs;
@@ -1626 +1493 @@
     char text[LINESIZ + 2];
 
-    inetd_setproctitle(sep->se_service, s);
-
-    if (!endring) {
-        initring();
+    if (!end_ring) {
+        init_ring();
         rs = ring;
     }
@@ -1637 +1502 @@
     rs = ring;
     for (;;) {
-        len = endring - rs;
+        len = end_ring - rs;
         if (len >= LINESIZ)
             memmove(text, rs, LINESIZ);
@@ -1644 +1509 @@
             memmove(text + len, ring, LINESIZ - len);
         }
-        if (++rs == endring)
+        if (++rs == end_ring)
             rs = ring;
-        if (write(s, text, sizeof(text)) != sizeof(text))
-            break;
-    }
-    exit(0);
-}
-
-/* Character generator */
+        xwrite(s, text, sizeof(text));
+    }
+}
 /* ARGSUSED */
-static void
-chargen_dg(int s, servtab_t *sep ATTRIBUTE_UNUSED)
-{
-    /* struct sockaddr_storage ss; */
-    struct sockaddr sa;
-    static char *rs;
+static void FAST_FUNC chargen_dg(int s, servtab_t *sep)
+{
     int len;
     char text[LINESIZ + 2];
-    socklen_t size;
-
-    if (endring == 0) {
-        initring();
-        rs = ring;
-    }
-
-    size = sizeof(sa);
-    if (recvfrom(s, text, sizeof(text), 0, &sa, &size) < 0)
+    len_and_sockaddr *lsa = alloca(LSA_LEN_SIZE + sep->se_lsa->len);
+
+    /* Eat UDP packet which started it all */
+    /* dgram builtins are non-forking - DONT BLOCK! */
+    lsa->len = sep->se_lsa->len;
+    if (recvfrom(s, text, sizeof(text), MSG_DONTWAIT, &lsa->u.sa, &lsa->len) < 0)
         return;
-    if (dg_badinput((struct sockaddr_in *) &sa))
-        return;
-
-    if ((len = endring - rs) >= LINESIZ)
-        memmove(text, rs, LINESIZ);
+
+    if (!end_ring) {
+        init_ring();
+        ring_pos = ring;
+    }
+
+    len = end_ring - ring_pos;
+    if (len >= LINESIZ)
+        memmove(text, ring_pos, LINESIZ);
     else {
-        memmove(text, rs, len);
+        memmove(text, ring_pos, len);
         memmove(text + len, ring, LINESIZ - len);
     }
-    if (++rs == endring)
-        rs = ring;
+    if (++ring_pos == end_ring)
+        ring_pos = ring;
     text[LINESIZ] = '\r';
     text[LINESIZ + 1] = '\n';
-    (void) sendto(s, text, sizeof(text), 0, &sa, sizeof(sa));
+    sendto(s, text, sizeof(text), 0, &lsa->u.sa, lsa->len);
 }
 #endif /* FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN */
@@ -1698 +1556 @@
  * some seventy years Bell Labs was asleep.
  */
-
-static unsigned machtime(void)
+static uint32_t machtime(void)
 {
     struct timeval tv;
 
-    if (gettimeofday(&tv, NULL) < 0) {
-        fprintf(stderr, "Unable to get time of day\n");
-        return 0L;
-    }
-    return htonl((unsigned) tv.tv_sec + 2208988800UL);
-}
-
+    gettimeofday(&tv, NULL);
+    return htonl((uint32_t)(tv.tv_sec + 2208988800));
+}
 /* ARGSUSED */
-static void
-machtime_stream(int s, servtab_t *sep ATTRIBUTE_UNUSED)
-{
-    unsigned result;
+static void FAST_FUNC machtime_stream(int s, servtab_t *sep UNUSED_PARAM)
+{
+    uint32_t result;
 
     result = machtime();
-    (void) write(s, (char *) &result, sizeof(result));
-}
-
-/* ARGSUSED */
-static void
-machtime_dg(int s, servtab_t *sep ATTRIBUTE_UNUSED)
-{
-    unsigned result;
-    /* struct sockaddr_storage ss; */
-    struct sockaddr sa;
-    struct sockaddr_in *dg_sin;
-    socklen_t size;
-
-    size = sizeof(sa);
-    if (recvfrom(s, (char *) &result, sizeof(result), 0, &sa, &size) < 0)
+    full_write(s, &result, sizeof(result));
+}
+static void FAST_FUNC machtime_dg(int s, servtab_t *sep)
+{
+    uint32_t result;
+    len_and_sockaddr *lsa = alloca(LSA_LEN_SIZE + sep->se_lsa->len);
+
+    lsa->len = sep->se_lsa->len;
+    if (recvfrom(s, line, LINE_SIZE, MSG_DONTWAIT, &lsa->u.sa, &lsa->len) < 0)
         return;
-    /* if (dg_badinput((struct sockaddr *)&ss)) */
-    dg_sin = (struct sockaddr_in *) &sa;
-    if (dg_sin->sin_addr.s_addr == htonl(INADDR_BROADCAST) ||
-            ntohs(dg_sin->sin_port) < IPPORT_RESERVED / 2)
-        return;
+
     result = machtime();
-    (void) sendto(s, (char *) &result, sizeof(result), 0, &sa, sizeof(sa));
+    sendto(s, &result, sizeof(result), 0, &lsa->u.sa, lsa->len);
 }
 #endif /* FEATURE_INETD_SUPPORT_BUILTIN_TIME */
@@ -1747 +1589 @@
 /* Return human-readable time of day */
 /* ARGSUSED */
-static void daytime_stream(int s, servtab_t *sep ATTRIBUTE_UNUSED)
-{
-    char buffer[32];
+static void FAST_FUNC daytime_stream(int s, servtab_t *sep UNUSED_PARAM)
+{
     time_t t;
 
     t = time(NULL);
-
-// fdprintf instead?
-    (void) sprintf(buffer, "%.24s\r\n", ctime(&t));
-    (void) write(s, buffer, strlen(buffer));
-}
-
-/* Return human-readable time of day */
-/* ARGSUSED */
-void
-daytime_dg(int s, servtab_t *sep ATTRIBUTE_UNUSED)
-{
-    char buffer[256];
+    fdprintf(s, "%.24s\r\n", ctime(&t));
+}
+static void FAST_FUNC daytime_dg(int s, servtab_t *sep)
+{
     time_t t;
-    /* struct sockaddr_storage ss; */
-    struct sockaddr sa;
-    socklen_t size;
+    len_and_sockaddr *lsa = alloca(LSA_LEN_SIZE + sep->se_lsa->len);
+
+    lsa->len = sep->se_lsa->len;
+    if (recvfrom(s, line, LINE_SIZE, MSG_DONTWAIT, &lsa->u.sa, &lsa->len) < 0)
+        return;
 
     t = time(NULL);
-
-    size = sizeof(sa);
-    if (recvfrom(s, buffer, sizeof(buffer), 0, &sa, &size) < 0)
-        return;
-    if (dg_badinput((struct sockaddr_in *) &sa))
-        return;
-    (void) sprintf(buffer, "%.24s\r\n", ctime(&t));
-    (void) sendto(s, buffer, strlen(buffer), 0, &sa, sizeof(sa));
+    sprintf(line, "%.24s\r\n", ctime(&t));
+    sendto(s, line, strlen(line), 0, &lsa->u.sa, lsa->len);
 }
 #endif /* FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME */

branches/2.2.9/mindi-busybox/networking/interface.c

@@ -20 +20 @@
  *              and others.  Copyright 1993 MicroWalt Corporation
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  * Patched to support 'add' and 'del' keywords for INET(4) addresses
@@ -31 +31 @@
  *          (default AF was wrong)
  */
-
 #include <net/if.h>
 #include <net/if_arp.h>
+#if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined(_NEWLIB_VERSION)
+# include <net/ethernet.h>
+#else
+# include <linux/if_ether.h>
+#endif
+#include "libbb.h"
 #include "inet_common.h"
-#include "libbb.h"
+
+#if ENABLE_FEATURE_HWIB
+/* #include <linux/if_infiniband.h> */
+# undef INFINIBAND_ALEN
+# define INFINIBAND_ALEN 20
+#endif
 
 #if ENABLE_FEATURE_IPV6
@@ -47 +57 @@
 
 #ifdef HAVE_AFINET6
-
-#ifndef _LINUX_IN6_H
+# ifndef _LINUX_IN6_H
 /*
- *    This is in linux/include/net/ipv6.h.
+ * This is from linux/include/net/ipv6.h
  */
-
 struct in6_ifreq {
     struct in6_addr ifr6_addr;
@@ -58 +66 @@
     unsigned int ifr6_ifindex;
 };
-
-#endif
-
+# endif
 #endif /* HAVE_AFINET6 */
 
 /* Defines for glibc2.0 users. */
 #ifndef SIOCSIFTXQLEN
-#define SIOCSIFTXQLEN      0x8943
-#define SIOCGIFTXQLEN      0x8942
+# define SIOCSIFTXQLEN      0x8943
+# define SIOCGIFTXQLEN      0x8942
 #endif
 
 /* ifr_qlen is ifru_ivalue, but it isn't present in 2.0 kernel headers */
 #ifndef ifr_qlen
-#define ifr_qlen        ifr_ifru.ifru_mtu
+# define ifr_qlen        ifr_ifru.ifru_mtu
 #endif
 
 #ifndef HAVE_TXQUEUELEN
-#define HAVE_TXQUEUELEN 1
+# define HAVE_TXQUEUELEN 1
 #endif
 
 #ifndef IFF_DYNAMIC
-#define IFF_DYNAMIC     0x8000  /* dialup device with changing addresses */
+# define IFF_DYNAMIC     0x8000 /* dialup device with changing addresses */
 #endif
 
 /* Display an Internet socket address. */
-static const char *INET_sprint(struct sockaddr *sap, int numeric)
-{
-    static char *buff;
+static const char* FAST_FUNC INET_sprint(struct sockaddr *sap, int numeric)
+{
+    static char *buff; /* defaults to NULL */
 
     free(buff);
@@ -137 +143 @@
 #endif
 
-static int INET_input(/*int type,*/ const char *bufp, struct sockaddr *sap)
+static int FAST_FUNC INET_input(/*int type,*/ const char *bufp, struct sockaddr *sap)
 {
     return INET_resolve(bufp, (struct sockaddr_in *) sap, 0);
@@ -153 +159 @@
 
 static const struct aftype inet_aftype = {
-    .name =     "inet",
-    .title =    "DARPA Internet",
-    .af =       AF_INET,
-    .alen =     4,
-    .sprint =   INET_sprint,
-    .input =    INET_input,
+    .name   = "inet",
+    .title  = "DARPA Internet",
+    .af     = AF_INET,
+    .alen   = 4,
+    .sprint = INET_sprint,
+    .input  = INET_input,
 };
 
@@ -165 +171 @@
 /* Display an Internet socket address. */
 /* dirty! struct sockaddr usually doesn't suffer for inet6 addresses, fst. */
-static const char *INET6_sprint(struct sockaddr *sap, int numeric)
+static const char* FAST_FUNC INET6_sprint(struct sockaddr *sap, int numeric)
 {
     static char *buff;
@@ -192 +198 @@
 #endif
 
-static int INET6_input(/*int type,*/ const char *bufp, struct sockaddr *sap)
+static int FAST_FUNC INET6_input(/*int type,*/ const char *bufp, struct sockaddr *sap)
 {
     return INET6_resolve(bufp, (struct sockaddr_in6 *) sap);
@@ -206 +212 @@
 
 static const struct aftype inet6_aftype = {
-    .name =     "inet6",
-    .title =    "IPv6",
-    .af =       AF_INET6,
-    .alen =     sizeof(struct in6_addr),
-    .sprint =   INET6_sprint,
-    .input =    INET6_input,
+    .name   = "inet6",
+    .title  = "IPv6",
+    .af     = AF_INET6,
+    .alen   = sizeof(struct in6_addr),
+    .sprint = INET6_sprint,
+    .input  = INET6_input,
 };
 
@@ -217 +223 @@
 
 /* Display an UNSPEC address. */
-static char *UNSPEC_print(unsigned char *ptr)
+static char* FAST_FUNC UNSPEC_print(unsigned char *ptr)
 {
     static char *buff;
@@ -224 +230 @@
     unsigned int i;
 
-    if (!buff);
+    if (!buff)
         buff = xmalloc(sizeof(struct sockaddr) * 3 + 1);
     pos = buff;
@@ -238 +244 @@
 
 /* Display an UNSPEC socket address. */
-static const char *UNSPEC_sprint(struct sockaddr *sap, int numeric)
+static const char* FAST_FUNC UNSPEC_sprint(struct sockaddr *sap, int numeric UNUSED_PARAM)
 {
     if (sap->sa_family == 0xFFFF || sap->sa_family == 0)
@@ -249 +255 @@
     .title  = "UNSPEC",
     .af     = AF_UNSPEC,
-    .alen    = 0,
+    .alen   = 0,
     .print  = UNSPEC_print,
     .sprint = UNSPEC_sprint,
@@ -264 +270 @@
 
 /* Check our protocol family table for this family. */
-const struct aftype *get_aftype(const char *name)
+const struct aftype* FAST_FUNC get_aftype(const char *name)
 {
     const struct aftype *const *afp;
@@ -322 +328 @@
 struct interface {
     struct interface *next, *prev;
-    char name[IFNAMSIZ];    /* interface name        */
-    short type;         /* if type               */
-    short flags;        /* various flags         */
-    int metric;         /* routing metric        */
-    int mtu;            /* MTU value             */
-    int tx_queue_len;   /* transmit queue length */
-    struct ifmap map;   /* hardware setup        */
-    struct sockaddr addr;   /* IP address            */
-    struct sockaddr dstaddr;    /* P-P IP address        */
-    struct sockaddr broadaddr;  /* IP broadcast address  */
-    struct sockaddr netmask;    /* IP network mask       */
+    char name[IFNAMSIZ];                    /* interface name        */
+    short type;                             /* if type               */
+    short flags;                            /* various flags         */
+    int metric;                             /* routing metric        */
+    int mtu;                                /* MTU value             */
+    int tx_queue_len;                       /* transmit queue length */
+    struct ifmap map;                       /* hardware setup        */
+    struct sockaddr addr;                   /* IP address            */
+    struct sockaddr dstaddr;                /* P-P IP address        */
+    struct sockaddr broadaddr;              /* IP broadcast address  */
+    struct sockaddr netmask;                /* IP network mask       */
     int has_ip;
-    char hwaddr[32];    /* HW address            */
+    char hwaddr[32];                        /* HW address            */
     int statistics_valid;
-    struct user_net_device_stats stats; /* statistics            */
-    int keepalive;      /* keepalive value for SLIP */
-    int outfill;        /* outfill value for SLIP */
+    struct user_net_device_stats stats;     /* statistics            */
+    int keepalive;                          /* keepalive value for SLIP */
+    int outfill;                            /* outfill value for SLIP */
 };
 
@@ -389 +395 @@
 
     new = xzalloc(sizeof(*new));
-    safe_strncpy(new->name, name, IFNAMSIZ);
+    strncpy_IFNAMSIZ(new->name, name);
     nextp = ife ? &ife->next : &int_list;
     new->prev = ife;
@@ -404 +410 @@
 {
     /* Extract <name> from nul-terminated p where p matches
-       <name>: after leading whitespace.
-       If match is not made, set name empty and return unchanged p */
-    int namestart=0, nameend=0;
-    while (isspace(p[namestart]))
-        namestart++;
-    nameend=namestart;
-    while (p[nameend] && p[nameend]!=':' && !isspace(p[nameend]))
+     * <name>: after leading whitespace.
+     * If match is not made, set name empty and return unchanged p
+     */
+    char *nameend;
+    char *namestart = skip_whitespace(p);
+
+    nameend = namestart;
+    while (*nameend && *nameend != ':' && !isspace(*nameend))
         nameend++;
-    if (p[nameend]==':') {
-        if ((nameend-namestart)<IFNAMSIZ) {
-            memcpy(name,&p[namestart],nameend-namestart);
-            name[nameend-namestart]='\0';
-            p=&p[nameend];
+    if (*nameend == ':') {
+        if ((nameend - namestart) < IFNAMSIZ) {
+            memcpy(name, namestart, nameend - namestart);
+            name[nameend - namestart] = '\0';
+            p = nameend;
         } else {
             /* Interface name too large */
-            name[0]='\0';
+            name[0] = '\0';
         }
     } else {
         /* trailing ':' not found - return empty */
-        name[0]='\0';
+        name[0] = '\0';
     }
     return p + 1;
@@ -491 +498 @@
 }
 
-static inline int procnetdev_version(char *buf)
+static int procnetdev_version(char *buf)
 {
     if (strstr(buf, "compressed"))
@@ -525 +532 @@
             goto out;
         }
-        if (ifc.ifc_len == sizeof(struct ifreq) * numreqs) {
+        if (ifc.ifc_len == (int)(sizeof(struct ifreq) * numreqs)) {
             /* assume it overflowed and try again */
             numreqs += 10;
@@ -560 +567 @@
         proc_read = 1;
 
-    fh = fopen(_PATH_PROCNET_DEV, "r");
+    fh = fopen_or_warn(_PATH_PROCNET_DEV, "r");
     if (!fh) {
-        bb_perror_msg("warning: cannot open %s, limiting output", _PATH_PROCNET_DEV);
         return if_readconf();
     }
@@ -608 +614 @@
     skfd = xsocket(AF_INET, SOCK_DGRAM, 0);
 
-    strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+    strncpy_IFNAMSIZ(ifr.ifr_name, ifname);
     if (ioctl(skfd, SIOCGIFFLAGS, &ifr) < 0) {
         close(skfd);
@@ -615 +621 @@
     ife->flags = ifr.ifr_flags;
 
-    strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+    strncpy_IFNAMSIZ(ifr.ifr_name, ifname);
     memset(ife->hwaddr, 0, 32);
     if (ioctl(skfd, SIOCGIFHWADDR, &ifr) >= 0)
@@ -622 +628 @@
     ife->type = ifr.ifr_hwaddr.sa_family;
 
-    strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+    strncpy_IFNAMSIZ(ifr.ifr_name, ifname);
     ife->metric = 0;
     if (ioctl(skfd, SIOCGIFMETRIC, &ifr) >= 0)
         ife->metric = ifr.ifr_metric;
 
-    strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+    strncpy_IFNAMSIZ(ifr.ifr_name, ifname);
     ife->mtu = 0;
     if (ioctl(skfd, SIOCGIFMTU, &ifr) >= 0)
@@ -634 +640 @@
     memset(&ife->map, 0, sizeof(struct ifmap));
 #ifdef SIOCGIFMAP
-    strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+    strncpy_IFNAMSIZ(ifr.ifr_name, ifname);
     if (ioctl(skfd, SIOCGIFMAP, &ifr) == 0)
         ife->map = ifr.ifr_map;
@@ -640 +646 @@
 
 #ifdef HAVE_TXQUEUELEN
-    strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+    strncpy_IFNAMSIZ(ifr.ifr_name, ifname);
     ife->tx_queue_len = -1; /* unknown value */
     if (ioctl(skfd, SIOCGIFTXQLEN, &ifr) >= 0)
@@ -648 +654 @@
 #endif
 
-    strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+    strncpy_IFNAMSIZ(ifr.ifr_name, ifname);
     ifr.ifr_addr.sa_family = AF_INET;
     memset(&ife->addr, 0, sizeof(struct sockaddr));
@@ -654 +660 @@
         ife->has_ip = 1;
         ife->addr = ifr.ifr_addr;
-        strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+        strncpy_IFNAMSIZ(ifr.ifr_name, ifname);
         memset(&ife->dstaddr, 0, sizeof(struct sockaddr));
         if (ioctl(skfd, SIOCGIFDSTADDR, &ifr) >= 0)
             ife->dstaddr = ifr.ifr_dstaddr;
 
-        strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+        strncpy_IFNAMSIZ(ifr.ifr_name, ifname);
         memset(&ife->broadaddr, 0, sizeof(struct sockaddr));
         if (ioctl(skfd, SIOCGIFBRDADDR, &ifr) >= 0)
             ife->broadaddr = ifr.ifr_broadaddr;
 
-        strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+        strncpy_IFNAMSIZ(ifr.ifr_name, ifname);
         memset(&ife->netmask, 0, sizeof(struct sockaddr));
         if (ioctl(skfd, SIOCGIFNETMASK, &ifr) >= 0)
@@ -673 +679 @@
     return 0;
 }
-
 
 static int do_if_fetch(struct interface *ife)
@@ -706 +711 @@
 };
 
-#include <net/if_arp.h>
-
-#if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined(_NEWLIB_VERSION)
-#include <net/ethernet.h>
-#else
-#include <linux/if_ether.h>
-#endif
-
 /* Display an Ethernet address in readable format. */
-static char *pr_ether(unsigned char *ptr)
+static char* FAST_FUNC ether_print(unsigned char *ptr)
 {
     static char *buff;
@@ -727 +724 @@
 }
 
-static int in_ether(const char *bufp, struct sockaddr *sap);
+static int FAST_FUNC ether_input(const char *bufp, struct sockaddr *sap);
 
 static const struct hwtype ether_hwtype = {
-    .name =     "ether",
-    .title =    "Ethernet",
-    .type =     ARPHRD_ETHER,
-    .alen =     ETH_ALEN,
-    .print =    pr_ether,
-    .input =    in_ether
+    .name  = "ether",
+    .title = "Ethernet",
+    .type  = ARPHRD_ETHER,
+    .alen  = ETH_ALEN,
+    .print = ether_print,
+    .input = ether_input
 };
 
@@ -749 +746 @@
 
 /* Input an Ethernet address and convert to binary. */
-static int in_ether(const char *bufp, struct sockaddr *sap)
+static int FAST_FUNC ether_input(const char *bufp, struct sockaddr *sap)
 {
     unsigned char *ptr;
@@ -789 +786 @@
 }
 
-#include <net/if_arp.h>
-
 static const struct hwtype ppp_hwtype = {
     .name =     "ppp",
@@ -806 +801 @@
 };
 #endif
+#if ENABLE_FEATURE_HWIB
+static const struct hwtype ib_hwtype = {
+    .name  = "infiniband",
+    .title = "InfiniBand",
+    .type  = ARPHRD_INFINIBAND,
+    .alen  = INFINIBAND_ALEN,
+    .print = UNSPEC_print,
+    .input = in_ib,
+};
+#endif
+
 
 static const struct hwtype *const hwtypes[] = {
@@ -814 +820 @@
 #if ENABLE_FEATURE_IPV6
     &sit_hwtype,
+#endif
+#if ENABLE_FEATURE_HWIB
+    &ib_hwtype,
 #endif
     NULL
@@ -833 +842 @@
 
 /* Check our hardware type table for this type. */
-const struct hwtype *get_hwtype(const char *name)
+const struct hwtype* FAST_FUNC get_hwtype(const char *name)
 {
     const struct hwtype *const *hwp;
@@ -847 +856 @@
 
 /* Check our hardware type table for this type. */
-const struct hwtype *get_hwntype(int type)
+const struct hwtype* FAST_FUNC get_hwntype(int type)
 {
     const struct hwtype *const *hwp;
@@ -863 +872 @@
 static int hw_null_address(const struct hwtype *hw, void *ap)
 {
-    unsigned int i;
+    int i;
     unsigned char *address = (unsigned char *) ap;
 
@@ -897 +906 @@
 }
 
-static void ife_print(struct interface *ptr)
-{
-    const struct aftype *ap;
-    const struct hwtype *hw;
-    int hf;
-    int can_compress = 0;
 
 #ifdef HAVE_AFINET6
+#define IPV6_ADDR_ANY           0x0000U
+
+#define IPV6_ADDR_UNICAST       0x0001U
+#define IPV6_ADDR_MULTICAST     0x0002U
+#define IPV6_ADDR_ANYCAST       0x0004U
+
+#define IPV6_ADDR_LOOPBACK      0x0010U
+#define IPV6_ADDR_LINKLOCAL     0x0020U
+#define IPV6_ADDR_SITELOCAL     0x0040U
+
+#define IPV6_ADDR_COMPATv4      0x0080U
+
+#define IPV6_ADDR_SCOPE_MASK    0x00f0U
+
+#define IPV6_ADDR_MAPPED        0x1000U
+#define IPV6_ADDR_RESERVED      0x2000U /* reserved address space */
+
+
+static void ife_print6(struct interface *ptr)
+{
     FILE *f;
     char addr6[40], devname[20];
@@ -910 +933 @@
     int plen, scope, dad_status, if_idx;
     char addr6p[8][5];
-#endif
+
+    f = fopen_for_read(_PATH_PROCNET_IFINET6);
+    if (f == NULL)
+        return;
+
+    while (fscanf
+           (f, "%4s%4s%4s%4s%4s%4s%4s%4s %08x %02x %02x %02x %20s\n",
+            addr6p[0], addr6p[1], addr6p[2], addr6p[3], addr6p[4],
+            addr6p[5], addr6p[6], addr6p[7], &if_idx, &plen, &scope,
+            &dad_status, devname) != EOF
+    ) {
+        if (!strcmp(devname, ptr->name)) {
+            sprintf(addr6, "%s:%s:%s:%s:%s:%s:%s:%s",
+                    addr6p[0], addr6p[1], addr6p[2], addr6p[3],
+                    addr6p[4], addr6p[5], addr6p[6], addr6p[7]);
+            inet_pton(AF_INET6, addr6,
+                      (struct sockaddr *) &sap.sin6_addr);
+            sap.sin6_family = AF_INET6;
+            printf("          inet6 addr: %s/%d",
+                   INET6_sprint((struct sockaddr *) &sap, 1),
+                   plen);
+            printf(" Scope:");
+            switch (scope & IPV6_ADDR_SCOPE_MASK) {
+            case 0:
+                puts("Global");
+                break;
+            case IPV6_ADDR_LINKLOCAL:
+                puts("Link");
+                break;
+            case IPV6_ADDR_SITELOCAL:
+                puts("Site");
+                break;
+            case IPV6_ADDR_COMPATv4:
+                puts("Compat");
+                break;
+            case IPV6_ADDR_LOOPBACK:
+                puts("Host");
+                break;
+            default:
+                puts("Unknown");
+            }
+        }
+    }
+    fclose(f);
+}
+#else
+#define ife_print6(a) ((void)0)
+#endif
+
+static void ife_print(struct interface *ptr)
+{
+    const struct aftype *ap;
+    const struct hwtype *hw;
+    int hf;
+    int can_compress = 0;
 
     ap = get_afntype(ptr->addr.sa_family);
@@ -925 +1002 @@
         hw = get_hwntype(-1);
 
-    printf("%-9.9s Link encap:%s  ", ptr->name, hw->title);
+    printf("%-9s Link encap:%s  ", ptr->name, hw->title);
     /* For some hardware types (eg Ash, ATM) we don't print the
        hardware address if it's null.  */
-    if (hw->print != NULL && (!(hw_null_address(hw, ptr->hwaddr) &&
-                                hw->suppress_null_addr)))
+    if (hw->print != NULL
+     && !(hw_null_address(hw, ptr->hwaddr) && hw->suppress_null_addr)
+    ) {
         printf("HWaddr %s  ", hw->print((unsigned char *)ptr->hwaddr));
+    }
 #ifdef IFF_PORTSEL
     if (ptr->flags & IFF_PORTSEL) {
@@ -938 +1017 @@
     }
 #endif
-    puts("");
+    bb_putchar('\n');
 
     if (ptr->has_ip) {
@@ -952 +1031 @@
     }
 
-#ifdef HAVE_AFINET6
-
-#define IPV6_ADDR_ANY           0x0000U
-
-#define IPV6_ADDR_UNICAST       0x0001U
-#define IPV6_ADDR_MULTICAST     0x0002U
-#define IPV6_ADDR_ANYCAST       0x0004U
-
-#define IPV6_ADDR_LOOPBACK      0x0010U
-#define IPV6_ADDR_LINKLOCAL     0x0020U
-#define IPV6_ADDR_SITELOCAL     0x0040U
-
-#define IPV6_ADDR_COMPATv4      0x0080U
-
-#define IPV6_ADDR_SCOPE_MASK    0x00f0U
-
-#define IPV6_ADDR_MAPPED        0x1000U
-#define IPV6_ADDR_RESERVED      0x2000U /* reserved address space */
-
-    f = fopen(_PATH_PROCNET_IFINET6, "r");
-    if (f != NULL) {
-        while (fscanf
-               (f, "%4s%4s%4s%4s%4s%4s%4s%4s %08x %02x %02x %02x %20s\n",
-                addr6p[0], addr6p[1], addr6p[2], addr6p[3], addr6p[4],
-                addr6p[5], addr6p[6], addr6p[7], &if_idx, &plen, &scope,
-                &dad_status, devname) != EOF
-        ) {
-            if (!strcmp(devname, ptr->name)) {
-                sprintf(addr6, "%s:%s:%s:%s:%s:%s:%s:%s",
-                        addr6p[0], addr6p[1], addr6p[2], addr6p[3],
-                        addr6p[4], addr6p[5], addr6p[6], addr6p[7]);
-                inet_pton(AF_INET6, addr6,
-                          (struct sockaddr *) &sap.sin6_addr);
-                sap.sin6_family = AF_INET6;
-                printf("          inet6 addr: %s/%d",
-                       INET6_sprint((struct sockaddr *) &sap, 1),
-                       plen);
-                printf(" Scope:");
-                switch (scope & IPV6_ADDR_SCOPE_MASK) {
-                case 0:
-                    puts("Global");
-                    break;
-                case IPV6_ADDR_LINKLOCAL:
-                    puts("Link");
-                    break;
-                case IPV6_ADDR_SITELOCAL:
-                    puts("Site");
-                    break;
-                case IPV6_ADDR_COMPATv4:
-                    puts("Compat");
-                    break;
-                case IPV6_ADDR_LOOPBACK:
-                    puts("Host");
-                    break;
-                default:
-                    puts("Unknown");
-                }
-            }
-        }
-        fclose(f);
-    }
-#endif
+    ife_print6(ptr);
 
     printf("          ");
@@ -1074 +1092 @@
         printf("  Outfill:%d  Keepalive:%d", ptr->outfill, ptr->keepalive);
 #endif
-    puts("");
+    bb_putchar('\n');
 
     /* If needed, display the interface statistics. */
@@ -1105 +1123 @@
         print_bytes_scaled(ptr->stats.rx_bytes, "  T");
         print_bytes_scaled(ptr->stats.tx_bytes, "\n");
-
-    }
-
-    if ((ptr->map.irq || ptr->map.mem_start || ptr->map.dma ||
-         ptr->map.base_addr)) {
+    }
+
+    if (ptr->map.irq || ptr->map.mem_start
+     || ptr->map.dma || ptr->map.base_addr
+    ) {
         printf("          ");
         if (ptr->map.irq)
@@ -1123 +1141 @@
         if (ptr->map.dma)
             printf("DMA chan:%x ", ptr->map.dma);
-        puts("");
-    }
-    puts("");
-}
-
+        bb_putchar('\n');
+    }
+    bb_putchar('\n');
+}
 
 static int do_if_print(struct interface *ife) /*, int *opt_a)*/
@@ -1161 +1178 @@
     for (ife = int_list; ife; ife = ife->next) {
         int err = doit(ife, cookie);
-
         if (err)
             return err;
@@ -1193 +1209 @@
 }
 
-int display_interfaces(char *ifname)
+#if ENABLE_FEATURE_HWIB
+/* Input an Infiniband address and convert to binary. */
+int FAST_FUNC in_ib(const char *bufp, struct sockaddr *sap)
+{
+    sap->sa_family = ib_hwtype.type;
+//TODO: error check?
+    hex2bin((char*)sap->sa_data, bufp, INFINIBAND_ALEN);
+# ifdef HWIB_DEBUG
+    fprintf(stderr, "in_ib(%s): %s\n", bufp, UNSPEC_print(sap->sa_data));
+# endif
+    return 0;
+}
+#endif
+
+int FAST_FUNC display_interfaces(char *ifname)
 {
     int status;

branches/2.2.9/mindi-busybox/networking/ip.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * ip.c     "ip" utility frontend.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
- *
- * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
  * Changes:
- *
- * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
- * Bernhard Fischer rewrote to use index_in_substr_array
+ * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
+ * Bernhard Reutner-Fischer rewrote to use index_in_substr_array
  */
 
@@ -25 +21 @@
  || ENABLE_FEATURE_IP_RULE
 
-static int ATTRIBUTE_NORETURN ip_print_help(int ATTRIBUTE_UNUSED ac, char ATTRIBUTE_UNUSED **av)
+static int FAST_FUNC ip_print_help(char **argv UNUSED_PARAM)
 {
     bb_show_usage();
 }
 
-static int (*ip_func)(int argc, char **argv) = ip_print_help;
+typedef int FAST_FUNC (*ip_func_ptr_t)(char**);
 
-static int ip_do(int argc, char **argv)
+static int ip_do(ip_func_ptr_t ip_func, char **argv)
 {
-    ip_parse_common_args(&argc, &argv);
-    return ip_func(argc-1, argv+1);
+    argv = ip_parse_common_args(argv + 1);
+    return ip_func(argv);
 }
 
 #if ENABLE_FEATURE_IP_ADDRESS
-int ipaddr_main(int argc, char **argv);
-int ipaddr_main(int argc, char **argv)
+int ipaddr_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int ipaddr_main(int argc UNUSED_PARAM, char **argv)
 {
-    ip_func = do_ipaddr;
-    return ip_do(argc, argv);
+    return ip_do(do_ipaddr, argv);
 }
 #endif
 #if ENABLE_FEATURE_IP_LINK
-int iplink_main(int argc, char **argv);
-int iplink_main(int argc, char **argv)
+int iplink_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int iplink_main(int argc UNUSED_PARAM, char **argv)
 {
-    ip_func = do_iplink;
-    return ip_do(argc, argv);
+    return ip_do(do_iplink, argv);
 }
 #endif
 #if ENABLE_FEATURE_IP_ROUTE
-int iproute_main(int argc, char **argv);
-int iproute_main(int argc, char **argv)
+int iproute_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int iproute_main(int argc UNUSED_PARAM, char **argv)
 {
-    ip_func = do_iproute;
-    return ip_do(argc, argv);
+    return ip_do(do_iproute, argv);
 }
 #endif
 #if ENABLE_FEATURE_IP_RULE
-int iprule_main(int argc, char **argv);
-int iprule_main(int argc, char **argv)
+int iprule_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int iprule_main(int argc UNUSED_PARAM, char **argv)
 {
-    ip_func = do_iprule;
-    return ip_do(argc, argv);
+    return ip_do(do_iprule, argv);
 }
 #endif
 #if ENABLE_FEATURE_IP_TUNNEL
-int iptunnel_main(int argc, char **argv);
-int iptunnel_main(int argc, char **argv)
+int iptunnel_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int iptunnel_main(int argc UNUSED_PARAM, char **argv)
 {
-    ip_func = do_iptunnel;
-    return ip_do(argc, argv);
+    return ip_do(do_iptunnel, argv);
 }
 #endif
 
 
-int ip_main(int argc, char **argv);
-int ip_main(int argc, char **argv)
+int ip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int ip_main(int argc UNUSED_PARAM, char **argv)
 {
     static const char keywords[] ALIGN1 =
-        USE_FEATURE_IP_ADDRESS("address\0")
-        USE_FEATURE_IP_ROUTE("route\0")
-        USE_FEATURE_IP_LINK("link\0")
-        USE_FEATURE_IP_TUNNEL("tunnel\0" "tunl\0")
-        USE_FEATURE_IP_RULE("rule\0")
+        IF_FEATURE_IP_ADDRESS("address\0")
+        IF_FEATURE_IP_ROUTE("route\0")
+        IF_FEATURE_IP_ROUTE("r\0")
+        IF_FEATURE_IP_LINK("link\0")
+        IF_FEATURE_IP_TUNNEL("tunnel\0")
+        IF_FEATURE_IP_TUNNEL("tunl\0")
+        IF_FEATURE_IP_RULE("rule\0")
         ;
-    enum {
-        USE_FEATURE_IP_ADDRESS(IP_addr,)
-        USE_FEATURE_IP_ROUTE(IP_route,)
-        USE_FEATURE_IP_LINK(IP_link,)
-        USE_FEATURE_IP_TUNNEL(IP_tunnel, IP_tunl,)
-        USE_FEATURE_IP_RULE(IP_rule,)
-        IP_none
+    static const ip_func_ptr_t ip_func_ptrs[] = {
+        ip_print_help,
+        IF_FEATURE_IP_ADDRESS(do_ipaddr,)
+        IF_FEATURE_IP_ROUTE(do_iproute,)
+        IF_FEATURE_IP_ROUTE(do_iproute,)
+        IF_FEATURE_IP_LINK(do_iplink,)
+        IF_FEATURE_IP_TUNNEL(do_iptunnel,)
+        IF_FEATURE_IP_TUNNEL(do_iptunnel,)
+        IF_FEATURE_IP_RULE(do_iprule,)
     };
+    ip_func_ptr_t ip_func;
+    int key;
 
-    ip_parse_common_args(&argc, &argv);
-    if (argc > 1) {
-        int key = index_in_substrings(keywords, argv[1]);
-        argc -= 2;
-        argv += 2;
-#if ENABLE_FEATURE_IP_ADDRESS
-        if (key == IP_addr)
-            ip_func = do_ipaddr;
-#endif
-#if ENABLE_FEATURE_IP_ROUTE
-        if (key == IP_route)
-            ip_func = do_iproute;
-#endif
-#if ENABLE_FEATURE_IP_LINK
-        if (key == IP_link)
-            ip_func = do_iplink;
-#endif
-#if ENABLE_FEATURE_IP_TUNNEL
-        if (key == IP_tunnel || key == IP_tunl)
-            ip_func = do_iptunnel;
-#endif
-#if ENABLE_FEATURE_IP_RULE
-        if (key == IP_rule)
-            ip_func = do_iprule;
-#endif
-    }
-    return ip_func(argc, argv);
+    argv = ip_parse_common_args(argv + 1);
+    key = *argv ? index_in_substrings(keywords, *argv++) : -1;
+    ip_func = ip_func_ptrs[key + 1];
+
+    return ip_func(argv);
 }
 

branches/2.2.9/mindi-busybox/networking/ipcalc.c

@@ -10 +10 @@
  * is no denying that this is a loving reimplementation
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
-#include <getopt.h>
-#include <sys/socket.h>
+#include "libbb.h"
+/* After libbb.h, because on some systems it needs other includes */
 #include <arpa/inet.h>
 
-#include "libbb.h"
-
-#define CLASS_A_NETMASK ntohl(0xFF000000)
-#define CLASS_B_NETMASK ntohl(0xFFFF0000)
-#define CLASS_C_NETMASK ntohl(0xFFFFFF00)
+#define CLASS_A_NETMASK ntohl(0xFF000000)
+#define CLASS_B_NETMASK ntohl(0xFFFF0000)
+#define CLASS_C_NETMASK ntohl(0xFFFFFF00)
 
 static unsigned long get_netmask(unsigned long ipaddr)
@@ -65 +62 @@
 #if ENABLE_FEATURE_IPCALC_LONG_OPTIONS
     static const char ipcalc_longopts[] ALIGN1 =
-        "netmask\0"   No_argument "m"
-        "broadcast\0" No_argument "b"
-        "network\0"   No_argument "n"
+        "netmask\0"   No_argument "m" // netmask from IP (assuming complete class A, B, or C network)
+        "broadcast\0" No_argument "b" // broadcast from IP [netmask]
+        "network\0"   No_argument "n" // network from IP [netmask]
 # if ENABLE_FEATURE_IPCALC_FANCY
-        "prefix\0"    No_argument "p"
-        "hostname\0"  No_argument "h"
-        "silent\0"    No_argument "s"
+        "prefix\0"    No_argument "p" // prefix from IP[/prefix] [netmask]
+        "hostname\0"  No_argument "h" // hostname from IP
+        "silent\0"    No_argument "s" // don’t ever display error messages
 # endif
         ;
 #endif
 
-int ipcalc_main(int argc, char **argv);
-int ipcalc_main(int argc, char **argv)
+int ipcalc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int ipcalc_main(int argc UNUSED_PARAM, char **argv)
 {
     unsigned opt;
-    int have_netmask = 0;
-    in_addr_t netmask, broadcast, network, ipaddr;
-    struct in_addr a;
+    bool have_netmask = 0;
+    struct in_addr s_netmask, s_broadcast, s_network, s_ipaddr;
+    /* struct in_addr { in_addr_t s_addr; }  and  in_addr_t
+     * (which in turn is just a typedef to uint32_t)
+     * are essentially the same type. A few macros for less verbosity: */
+#define netmask   (s_netmask.s_addr)
+#define broadcast (s_broadcast.s_addr)
+#define network   (s_network.s_addr)
+#define ipaddr    (s_ipaddr.s_addr)
     char *ipstr;
 
@@ -88 +91 @@
     applet_long_options = ipcalc_longopts;
 #endif
-    opt = getopt32(argv, "mbn" USE_FEATURE_IPCALC_FANCY("phs"));
-    argc -= optind;
+    opt_complementary = "-1:?2"; /* minimum 1 arg, maximum 2 args */
+    opt = getopt32(argv, "mbn" IF_FEATURE_IPCALC_FANCY("phs"));
     argv += optind;
-    if (opt & (BROADCAST | NETWORK | NETPREFIX)) {
-        if (argc > 2 || argc <= 0)
-            bb_show_usage();
-    } else {
-        if (argc != 1)
+    if (opt & SILENT)
+        logmode = LOGMODE_NONE; /* suppress error_msg() output */
+    opt &= ~SILENT;
+    if (!(opt & (BROADCAST | NETWORK | NETPREFIX))) {
+        /* if no options at all or
+         * (no broadcast,network,prefix) and (two args)... */
+        if (!opt || argv[1])
             bb_show_usage();
     }
-    if (opt & SILENT)
-        logmode = LOGMODE_NONE; /* Suppress error_msg() output */
 
     ipstr = argv[0];
@@ -110 +113 @@
         while (*prefixstr) {
             if (*prefixstr == '/') {
-                *prefixstr = (char)0;
-                prefixstr++;
+                *prefixstr++ = '\0';
                 if (*prefixstr) {
                     unsigned msk;
@@ -132 +134 @@
         }
     }
-    ipaddr = inet_aton(ipstr, &a);
 
-    if (ipaddr == 0) {
+    if (inet_aton(ipstr, &s_ipaddr) == 0) {
         bb_error_msg_and_die("bad IP address: %s", argv[0]);
     }
-    ipaddr = a.s_addr;
 
-    if (argc == 2) {
+    if (argv[1]) {
         if (ENABLE_FEATURE_IPCALC_FANCY && have_netmask) {
             bb_error_msg_and_die("use prefix or netmask, not both");
         }
-
-        netmask = inet_aton(argv[1], &a);
-        if (netmask == 0) {
+        if (inet_aton(argv[1], &s_netmask) == 0) {
             bb_error_msg_and_die("bad netmask: %s", argv[1]);
         }
-        netmask = a.s_addr;
     } else {
-
         /* JHC - If the netmask wasn't provided then calculate it */
         if (!ENABLE_FEATURE_IPCALC_FANCY || !have_netmask)
@@ -157 +153 @@
 
     if (opt & NETMASK) {
-        printf("NETMASK=%s\n", inet_ntoa((*(struct in_addr *) &netmask)));
+        printf("NETMASK=%s\n", inet_ntoa(s_netmask));
     }
 
     if (opt & BROADCAST) {
         broadcast = (ipaddr & netmask) | ~netmask;
-        printf("BROADCAST=%s\n", inet_ntoa((*(struct in_addr *) &broadcast)));
+        printf("BROADCAST=%s\n", inet_ntoa(s_broadcast));
     }
 
     if (opt & NETWORK) {
         network = ipaddr & netmask;
-        printf("NETWORK=%s\n", inet_ntoa((*(struct in_addr *) &network)));
+        printf("NETWORK=%s\n", inet_ntoa(s_network));
     }
 
@@ -177 +173 @@
         if (opt & HOSTNAME) {
             struct hostent *hostinfo;
-            int x;
 
             hostinfo = gethostbyaddr((char *) &ipaddr, sizeof(ipaddr), AF_INET);
             if (!hostinfo) {
-                bb_herror_msg_and_die("cannot find hostname for %s", argv[0]);
+                bb_herror_msg_and_die("can't find hostname for %s", argv[0]);
             }
-            for (x = 0; hostinfo->h_name[x]; x++) {
-                hostinfo->h_name[x] = tolower(hostinfo->h_name[x]);
-            }
+            str_tolower(hostinfo->h_name);
 
             printf("HOSTNAME=%s\n", hostinfo->h_name);

branches/2.2.9/mindi-busybox/networking/isrv.c

@@ -4 +4 @@
  * Intended to make writing telnetd-type servers easier.
  *
- * Copyright (C) 2007 Denis Vlasenko
+ * Copyright (C) 2007 Denys Vlasenko
  *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 

branches/2.2.9/mindi-busybox/networking/isrv.h

@@ -4 +4 @@
  * Intended to make writing telnetd-type servers easier.
  *
- * Copyright (C) 2007 Denis Vlasenko
+ * Copyright (C) 2007 Denys Vlasenko
  *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
+
+PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 
 /* opaque structure */
@@ -32 +34 @@
     int linger_timeout
 );
+
+POP_SAVED_FUNCTION_VISIBILITY

branches/2.2.9/mindi-busybox/networking/isrv_identd.c

@@ -3 +3 @@
  * Fake identd server.
  *
- * Copyright (C) 2007 Denis Vlasenko
+ * Copyright (C) 2007 Denys Vlasenko
  *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
+#include "libbb.h"
 #include <syslog.h>
-#include "libbb.h"
 #include "isrv.h"
 
@@ -62 +62 @@
     if (p)
         *p = '\0';
-    if (!p && sz && buf->pos <= sizeof(buf->buf))
+    if (!p && sz && buf->pos <= (int)sizeof(buf->buf))
         goto ok;
     /* Terminate session. If we are in server mode, then
@@ -77 +77 @@
 }
 
-static int do_timeout(void **paramp)
+static int do_timeout(void **paramp UNUSED_PARAM)
 {
     return 1; /* terminate session */
@@ -93 +93 @@
 }
 
-int fakeidentd_main(int argc, char **argv);
-int fakeidentd_main(int argc, char **argv)
+int fakeidentd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int fakeidentd_main(int argc UNUSED_PARAM, char **argv)
 {
     enum {
@@ -114 +114 @@
 
     /* Daemonize if no -f and no -i and no -w */
-    if (!(opt & OPT_fiw));
+    if (!(opt & OPT_fiw))
         bb_daemonize_or_rexec(0, argv);
 
@@ -123 +123 @@
      * (Or maybe we need yet another option "log to syslog") */
     if (!(opt & OPT_fiw) /* || (opt & OPT_syslog) */) {
-        openlog(applet_name, 0, LOG_DAEMON);
+        openlog(applet_name, LOG_PID, LOG_DAEMON);
         logmode = LOGMODE_SYSLOG;
     }

branches/2.2.9/mindi-busybox/networking/libiproute/Kbuild

@@ +1 @@
+# DO NOT EDIT. This file is generated from Kbuild.src
 # Makefile for busybox
 #
 # Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 #
-# Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+# Licensed under GPLv2 or later, see file LICENSE in this source tree.
 #
 
 lib-y:=
+
+
 
 lib-$(CONFIG_SLATTACH) += \
@@ -63 +66 @@
     rt_names.o \
     utils.o
-

branches/2.2.9/mindi-busybox/networking/libiproute/ip_common.h

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
-#ifndef _IP_COMMON_H
-#define _IP_COMMON_H 1
+#ifndef IP_COMMON_H
+#define IP_COMMON_H 1
 
 #include "libbb.h"
@@ -14 +14 @@
 #endif
 
-extern void ip_parse_common_args(int *argcp, char ***argvp);
-extern int print_neigh(struct sockaddr_nl *who, struct nlmsghdr *n, void *arg);
-extern int ipaddr_list_or_flush(int argc, char **argv, int flush);
-extern int iproute_monitor(int argc, char **argv);
-extern void iplink_usage(void) ATTRIBUTE_NORETURN;
-extern void ipneigh_reset_filter(void);
+PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 
-extern int do_ipaddr(int argc, char **argv);
-extern int do_iproute(int argc, char **argv);
-extern int do_iprule(int argc, char **argv);
-extern int do_ipneigh(int argc, char **argv);
-extern int do_iptunnel(int argc, char **argv);
-extern int do_iplink(int argc, char **argv);
-extern int do_ipmonitor(int argc, char **argv);
-extern int do_multiaddr(int argc, char **argv);
-extern int do_multiroute(int argc, char **argv);
-#endif /* ip_common.h */
+char FAST_FUNC **ip_parse_common_args(char **argv);
+//int FAST_FUNC print_neigh(struct sockaddr_nl *who, struct nlmsghdr *n, void *arg);
+int FAST_FUNC ipaddr_list_or_flush(char **argv, int flush);
+//int FAST_FUNC iproute_monitor(char **argv);
+//void FAST_FUNC ipneigh_reset_filter(void);
+
+int FAST_FUNC do_ipaddr(char **argv);
+int FAST_FUNC do_iproute(char **argv);
+int FAST_FUNC do_iprule(char **argv);
+//int FAST_FUNC do_ipneigh(char **argv);
+int FAST_FUNC do_iptunnel(char **argv);
+int FAST_FUNC do_iplink(char **argv);
+//int FAST_FUNC do_ipmonitor(char **argv);
+//int FAST_FUNC do_multiaddr(char **argv);
+//int FAST_FUNC do_multiroute(char **argv);
+
+POP_SAVED_FUNCTION_VISIBILITY
+
+#endif

branches/2.2.9/mindi-busybox/networking/libiproute/ip_parse_common_args.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * ip.c     "ip" utility frontend.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
  *
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License
- *      as published by the Free Software Foundation; either version
- *      2 of the License, or (at your option) any later version.
- *
- * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
  * Changes:
  *
- * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
+ * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
  */
 
@@ -19 +16 @@
 #include "utils.h"
 
-int preferred_family = AF_UNSPEC;
+family_t preferred_family = AF_UNSPEC;
 smallint oneline;
 char _SL_;
 
-void ip_parse_common_args(int *argcp, char ***argvp)
+char** FAST_FUNC ip_parse_common_args(char **argv)
 {
-    int argc = *argcp;
-    char **argv = *argvp;
     static const char ip_common_commands[] ALIGN1 =
-        "-family\0""inet\0""inet6\0""link\0"
-        "-4\0""-6\0""-0\0""-oneline\0";
+        "oneline" "\0"
+        "family" "\0"
+        "4" "\0"
+        "6" "\0"
+        "0" "\0"
+        ;
     enum {
-        ARG_family = 1,
-        ARG_inet,
-        ARG_inet6,
-        ARG_link,
+        ARG_oneline,
+        ARG_family,
         ARG_IPv4,
         ARG_IPv6,
         ARG_packet,
-        ARG_oneline
     };
-    smalluint arg;
+    static const family_t af_numbers[] = { AF_INET, AF_INET6, AF_PACKET };
+    int arg;
 
-    while (argc > 1) {
-        char *opt = argv[1];
+    while (*argv) {
+        char *opt = *argv;
 
-        if (strcmp(opt,"--") == 0) {
-            argc--;
-            argv++;
-            break;
-        }
         if (opt[0] != '-')
             break;
-        if (opt[1] == '-')
+        opt++;
+        if (opt[0] == '-') {
             opt++;
-        arg = index_in_strings(ip_common_commands, opt) + 1;
+            if (!opt[0]) { /* "--" */
+                argv++;
+                break;
+            }
+        }
+        arg = index_in_substrings(ip_common_commands, opt);
+        if (arg < 0)
+            bb_show_usage();
+        if (arg == ARG_oneline) {
+            oneline = 1;
+            argv++;
+            continue;
+        }
         if (arg == ARG_family) {
-            argc--;
+            static const char families[] ALIGN1 =
+                "inet" "\0" "inet6" "\0" "link" "\0";
             argv++;
-            if (!argv[1])
+            if (!*argv)
                 bb_show_usage();
-            arg = index_in_strings(ip_common_commands, argv[1]) + 1;
-            if (arg == ARG_inet)
-                preferred_family = AF_INET;
-            else if (arg == ARG_inet6)
-                preferred_family = AF_INET6;
-            else if (arg == ARG_link)
-                preferred_family = AF_PACKET;
-            else
-                invarg(argv[1], "protocol family");
-        } else if (arg == ARG_IPv4) {
-            preferred_family = AF_INET;
-        } else if (arg == ARG_IPv6) {
-            preferred_family = AF_INET6;
-        } else if (arg == ARG_packet) {
-            preferred_family = AF_PACKET;
-        } else if (arg == ARG_oneline) {
-            ++oneline;
+            arg = index_in_strings(families, *argv);
+            if (arg < 0)
+                invarg(*argv, "protocol family");
+            /* now arg == 0, 1 or 2 */
         } else {
-            bb_show_usage();
+            arg -= ARG_IPv4;
+            /* now arg == 0, 1 or 2 */
         }
-        argc--;
+        preferred_family = af_numbers[arg];
         argv++;
     }
     _SL_ = oneline ? '\\' : '\n';
-    *argcp = argc;
-    *argvp = argv;
+    return argv;
 }

branches/2.2.9/mindi-busybox/networking/libiproute/ipaddress.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * ipaddress.c      "ip address".
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
- *
- * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
  * Changes:
- *  Laszlo Valko <valko@linux.karinthy.hu> 990223: address label must be zero terminated
+ * Laszlo Valko <valko@linux.karinthy.hu> 990223: address label must be zero terminated
  */
 
-//#include <sys/socket.h>
-//#include <sys/ioctl.h>
 #include <fnmatch.h>
 #include <net/if.h>
@@ -21 +17 @@
 #include "utils.h"
 
-
-typedef struct filter_t {
-    int ifindex;
-    int family;
-    int oneline;
-    int showqueue;
-    inet_prefix pfx;
+#ifndef IFF_LOWER_UP
+/* from linux/if.h */
+#define IFF_LOWER_UP  0x10000  /* driver signals L1 up */
+#endif
+
+struct filter_t {
+    char *label;
+    char *flushb;
+    struct rtnl_handle *rth;
     int scope, scopemask;
     int flags, flagmask;
-    int up;
-    char *label;
-    int flushed;
-    char *flushb;
     int flushp;
     int flushe;
-    struct rtnl_handle *rth;
-} filter_t;
-
-#define filter (*(filter_t*)&bb_common_bufsiz1)
-
-
-static void print_link_flags(FILE *fp, unsigned flags, unsigned mdown)
-{
-    fprintf(fp, "<");
+    int ifindex;
+    family_t family;
+    smallint showqueue;
+    smallint oneline;
+    smallint up;
+    smallint flushed;
+    inet_prefix pfx;
+} FIX_ALIASING;
+typedef struct filter_t filter_t;
+
+#define G_filter (*(filter_t*)&bb_common_bufsiz1)
+
+
+static void print_link_flags(unsigned flags, unsigned mdown)
+{
+    static const int flag_masks[] = {
+        IFF_LOOPBACK, IFF_BROADCAST, IFF_POINTOPOINT,
+        IFF_MULTICAST, IFF_NOARP, IFF_UP, IFF_LOWER_UP };
+    static const char flag_labels[] ALIGN1 =
+        "LOOPBACK\0""BROADCAST\0""POINTOPOINT\0"
+        "MULTICAST\0""NOARP\0""UP\0""LOWER_UP\0";
+
+    bb_putchar('<');
+    if (flags & IFF_UP && !(flags & IFF_RUNNING))
+        printf("NO-CARRIER,");
     flags &= ~IFF_RUNNING;
-#define _PF(f) if (flags&IFF_##f) { \
-          flags &= ~IFF_##f; \
-          fprintf(fp, #f "%s", flags ? "," : ""); }
-    _PF(LOOPBACK);
-    _PF(BROADCAST);
-    _PF(POINTOPOINT);
-    _PF(MULTICAST);
-    _PF(NOARP);
 #if 0
     _PF(ALLMULTI);
@@ -65 +67 @@
     _PF(NOTRAILERS);
 #endif
-    _PF(UP);
-#undef _PF
+    flags = print_flags_separated(flag_masks, flag_labels, flags, ",");
     if (flags)
-        fprintf(fp, "%x", flags);
+        printf("%x", flags);
     if (mdown)
-        fprintf(fp, ",M-DOWN");
-    fprintf(fp, "> ");
+        printf(",M-DOWN");
+    printf("> ");
 }
 
@@ -84 +85 @@
 
     memset(&ifr, 0, sizeof(ifr));
-    strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
+    strncpy_IFNAMSIZ(ifr.ifr_name, name);
     if (ioctl_or_warn(s, SIOCGIFTXQLEN, &ifr) < 0) {
         close(s);
@@ -95 +96 @@
 }
 
-static int print_linkinfo(struct sockaddr_nl ATTRIBUTE_UNUSED *who,
-        const struct nlmsghdr *n, void ATTRIBUTE_UNUSED *arg)
-{
-    FILE *fp = (FILE*)arg;
+static NOINLINE int print_linkinfo(const struct nlmsghdr *n)
+{
     struct ifinfomsg *ifi = NLMSG_DATA(n);
-    struct rtattr * tb[IFLA_MAX+1];
+    struct rtattr *tb[IFLA_MAX+1];
     int len = n->nlmsg_len;
-    unsigned m_flag = 0;
 
     if (n->nlmsg_type != RTM_NEWLINK && n->nlmsg_type != RTM_DELLINK)
@@ -111 +109 @@
         return -1;
 
-    if (filter.ifindex && ifi->ifi_index != filter.ifindex)
-        return 0;
-    if (filter.up && !(ifi->ifi_flags&IFF_UP))
+    if (G_filter.ifindex && ifi->ifi_index != G_filter.ifindex)
+        return 0;
+    if (G_filter.up && !(ifi->ifi_flags & IFF_UP))
         return 0;
 
@@ -122 +120 @@
         return -1;
     }
-    if (filter.label
-     && (!filter.family || filter.family == AF_PACKET)
-     && fnmatch(filter.label, RTA_DATA(tb[IFLA_IFNAME]), 0)
+    if (G_filter.label
+     && (!G_filter.family || G_filter.family == AF_PACKET)
+     && fnmatch(G_filter.label, RTA_DATA(tb[IFLA_IFNAME]), 0)
     ) {
         return 0;
@@ -130 +128 @@
 
     if (n->nlmsg_type == RTM_DELLINK)
-        fprintf(fp, "Deleted ");
-
-    fprintf(fp, "%d: %s", ifi->ifi_index,
-        tb[IFLA_IFNAME] ? (char*)RTA_DATA(tb[IFLA_IFNAME]) : "<nil>");
-
-    if (tb[IFLA_LINK]) {
-        SPRINT_BUF(b1);
-        int iflink = *(int*)RTA_DATA(tb[IFLA_LINK]);
-        if (iflink == 0)
-            fprintf(fp, "@NONE: ");
-        else {
-            fprintf(fp, "@%s: ", ll_idx_n2a(iflink, b1));
-            m_flag = ll_index_to_flags(iflink);
-            m_flag = !(m_flag & IFF_UP);
-        }
-    } else {
-        fprintf(fp, ": ");
-    }
-    print_link_flags(fp, ifi->ifi_flags, m_flag);
+        printf("Deleted ");
+
+    printf("%d: %s", ifi->ifi_index,
+        /*tb[IFLA_IFNAME] ? (char*)RTA_DATA(tb[IFLA_IFNAME]) : "<nil>" - we checked tb[IFLA_IFNAME] above*/
+        (char*)RTA_DATA(tb[IFLA_IFNAME])
+    );
+
+    {
+        unsigned m_flag = 0;
+        if (tb[IFLA_LINK]) {
+            SPRINT_BUF(b1);
+            int iflink = *(int*)RTA_DATA(tb[IFLA_LINK]);
+            if (iflink == 0)
+                printf("@NONE: ");
+            else {
+                printf("@%s: ", ll_idx_n2a(iflink, b1));
+                m_flag = ll_index_to_flags(iflink);
+                m_flag = !(m_flag & IFF_UP);
+            }
+        } else {
+            printf(": ");
+        }
+        print_link_flags(ifi->ifi_flags, m_flag);
+    }
 
     if (tb[IFLA_MTU])
-        fprintf(fp, "mtu %u ", *(int*)RTA_DATA(tb[IFLA_MTU]));
+        printf("mtu %u ", *(int*)RTA_DATA(tb[IFLA_MTU]));
     if (tb[IFLA_QDISC])
-        fprintf(fp, "qdisc %s ", (char*)RTA_DATA(tb[IFLA_QDISC]));
+        printf("qdisc %s ", (char*)RTA_DATA(tb[IFLA_QDISC]));
 #ifdef IFLA_MASTER
     if (tb[IFLA_MASTER]) {
         SPRINT_BUF(b1);
-        fprintf(fp, "master %s ", ll_idx_n2a(*(int*)RTA_DATA(tb[IFLA_MASTER]), b1));
+        printf("master %s ", ll_idx_n2a(*(int*)RTA_DATA(tb[IFLA_MASTER]), b1));
     }
 #endif
-    if (filter.showqueue)
+    if (tb[IFLA_OPERSTATE]) {
+        static const char operstate_labels[] ALIGN1 =
+            "UNKNOWN\0""NOTPRESENT\0""DOWN\0""LOWERLAYERDOWN\0"
+            "TESTING\0""DORMANT\0""UP\0";
+        printf("state %s ", nth_string(operstate_labels,
+                    *(uint8_t *)RTA_DATA(tb[IFLA_OPERSTATE])));
+    }
+    if (G_filter.showqueue)
         print_queuelen((char*)RTA_DATA(tb[IFLA_IFNAME]));
 
-    if (!filter.family || filter.family == AF_PACKET) {
+    if (!G_filter.family || G_filter.family == AF_PACKET) {
         SPRINT_BUF(b1);
-        fprintf(fp, "%c    link/%s ", _SL_, ll_type_n2a(ifi->ifi_type, b1, sizeof(b1)));
+        printf("%c    link/%s ", _SL_, ll_type_n2a(ifi->ifi_type, b1));
 
         if (tb[IFLA_ADDRESS]) {
-            fprintf(fp, "%s", ll_addr_n2a(RTA_DATA(tb[IFLA_ADDRESS]),
+            fputs(ll_addr_n2a(RTA_DATA(tb[IFLA_ADDRESS]),
                               RTA_PAYLOAD(tb[IFLA_ADDRESS]),
                               ifi->ifi_type,
-                              b1, sizeof(b1)));
+                              b1, sizeof(b1)), stdout);
         }
         if (tb[IFLA_BROADCAST]) {
-            if (ifi->ifi_flags&IFF_POINTOPOINT)
-                fprintf(fp, " peer ");
+            if (ifi->ifi_flags & IFF_POINTOPOINT)
+                printf(" peer ");
             else
-                fprintf(fp, " brd ");
-            fprintf(fp, "%s", ll_addr_n2a(RTA_DATA(tb[IFLA_BROADCAST]),
+                printf(" brd ");
+            fputs(ll_addr_n2a(RTA_DATA(tb[IFLA_BROADCAST]),
                               RTA_PAYLOAD(tb[IFLA_BROADCAST]),
                               ifi->ifi_type,
-                              b1, sizeof(b1)));
-        }
-    }
-    fputc('\n', fp);
-    fflush(fp);
+                              b1, sizeof(b1)), stdout);
+        }
+    }
+    bb_putchar('\n');
+    /*fflush_all();*/
     return 0;
 }
@@ -191 +201 @@
 static int flush_update(void)
 {
-    if (rtnl_send(filter.rth, filter.flushb, filter.flushp) < 0) {
-        bb_perror_msg("failed to send flush request");
+    if (rtnl_send(G_filter.rth, G_filter.flushb, G_filter.flushp) < 0) {
+        bb_perror_msg("can't send flush request");
         return -1;
     }
-    filter.flushp = 0;
+    G_filter.flushp = 0;
     return 0;
 }
 
-static int print_addrinfo(struct sockaddr_nl ATTRIBUTE_UNUSED *who,
-        struct nlmsghdr *n, void ATTRIBUTE_UNUSED *arg)
-{
-    FILE *fp = (FILE*)arg;
+static int FAST_FUNC print_addrinfo(const struct sockaddr_nl *who UNUSED_PARAM,
+        struct nlmsghdr *n, void *arg UNUSED_PARAM)
+{
     struct ifaddrmsg *ifa = NLMSG_DATA(n);
     int len = n->nlmsg_len;
@@ -217 +226 @@
     }
 
-    if (filter.flushb && n->nlmsg_type != RTM_NEWADDR)
+    if (G_filter.flushb && n->nlmsg_type != RTM_NEWADDR)
         return 0;
 
@@ -228 +237 @@
         rta_tb[IFA_ADDRESS] = rta_tb[IFA_LOCAL];
 
-    if (filter.ifindex && filter.ifindex != ifa->ifa_index)
-        return 0;
-    if ((filter.scope^ifa->ifa_scope)&filter.scopemask)
-        return 0;
-    if ((filter.flags^ifa->ifa_flags)&filter.flagmask)
-        return 0;
-    if (filter.label) {
+    if (G_filter.ifindex && G_filter.ifindex != ifa->ifa_index)
+        return 0;
+    if ((G_filter.scope ^ ifa->ifa_scope) & G_filter.scopemask)
+        return 0;
+    if ((G_filter.flags ^ ifa->ifa_flags) & G_filter.flagmask)
+        return 0;
+    if (G_filter.label) {
         const char *label;
         if (rta_tb[IFA_LABEL])
@@ -240 +249 @@
         else
             label = ll_idx_n2a(ifa->ifa_index, b1);
-        if (fnmatch(filter.label, label, 0) != 0)
+        if (fnmatch(G_filter.label, label, 0) != 0)
             return 0;
     }
-    if (filter.pfx.family) {
+    if (G_filter.pfx.family) {
         if (rta_tb[IFA_LOCAL]) {
             inet_prefix dst;
@@ -249 +258 @@
             dst.family = ifa->ifa_family;
             memcpy(&dst.data, RTA_DATA(rta_tb[IFA_LOCAL]), RTA_PAYLOAD(rta_tb[IFA_LOCAL]));
-            if (inet_addr_match(&dst, &filter.pfx, filter.pfx.bitlen))
+            if (inet_addr_match(&dst, &G_filter.pfx, G_filter.pfx.bitlen))
                 return 0;
         }
     }
 
-    if (filter.flushb) {
+    if (G_filter.flushb) {
         struct nlmsghdr *fn;
-        if (NLMSG_ALIGN(filter.flushp) + n->nlmsg_len > filter.flushe) {
+        if (NLMSG_ALIGN(G_filter.flushp) + n->nlmsg_len > G_filter.flushe) {
             if (flush_update())
                 return -1;
         }
-        fn = (struct nlmsghdr*)(filter.flushb + NLMSG_ALIGN(filter.flushp));
+        fn = (struct nlmsghdr*)(G_filter.flushb + NLMSG_ALIGN(G_filter.flushp));
         memcpy(fn, n, n->nlmsg_len);
         fn->nlmsg_type = RTM_DELADDR;
         fn->nlmsg_flags = NLM_F_REQUEST;
-        fn->nlmsg_seq = ++filter.rth->seq;
-        filter.flushp = (((char*)fn) + n->nlmsg_len) - filter.flushb;
-        filter.flushed++;
+        fn->nlmsg_seq = ++G_filter.rth->seq;
+        G_filter.flushp = (((char*)fn) + n->nlmsg_len) - G_filter.flushb;
+        G_filter.flushed = 1;
         return 0;
     }
 
     if (n->nlmsg_type == RTM_DELADDR)
-        fprintf(fp, "Deleted ");
-
-    if (filter.oneline)
-        fprintf(fp, "%u: %s", ifa->ifa_index, ll_index_to_name(ifa->ifa_index));
+        printf("Deleted ");
+
+    if (G_filter.oneline)
+        printf("%u: %s", ifa->ifa_index, ll_index_to_name(ifa->ifa_index));
     if (ifa->ifa_family == AF_INET)
-        fprintf(fp, "    inet ");
+        printf("    inet ");
     else if (ifa->ifa_family == AF_INET6)
-        fprintf(fp, "    inet6 ");
+        printf("    inet6 ");
     else
-        fprintf(fp, "    family %d ", ifa->ifa_family);
+        printf("    family %d ", ifa->ifa_family);
 
     if (rta_tb[IFA_LOCAL]) {
-        fprintf(fp, "%s", rt_addr_n2a(ifa->ifa_family,
-                          RTA_PAYLOAD(rta_tb[IFA_LOCAL]),
+        fputs(rt_addr_n2a(ifa->ifa_family,
                           RTA_DATA(rta_tb[IFA_LOCAL]),
-                          abuf, sizeof(abuf)));
-
-        if (rta_tb[IFA_ADDRESS] == NULL ||
-            memcmp(RTA_DATA(rta_tb[IFA_ADDRESS]), RTA_DATA(rta_tb[IFA_LOCAL]), 4) == 0) {
-            fprintf(fp, "/%d ", ifa->ifa_prefixlen);
+                          abuf, sizeof(abuf)), stdout);
+
+        if (rta_tb[IFA_ADDRESS] == NULL
+         || memcmp(RTA_DATA(rta_tb[IFA_ADDRESS]), RTA_DATA(rta_tb[IFA_LOCAL]), 4) == 0
+        ) {
+            printf("/%d ", ifa->ifa_prefixlen);
         } else {
-            fprintf(fp, " peer %s/%d ",
+            printf(" peer %s/%d ",
                 rt_addr_n2a(ifa->ifa_family,
-                        RTA_PAYLOAD(rta_tb[IFA_ADDRESS]),
                         RTA_DATA(rta_tb[IFA_ADDRESS]),
                         abuf, sizeof(abuf)),
@@ -302 +310 @@
 
     if (rta_tb[IFA_BROADCAST]) {
-        fprintf(fp, "brd %s ",
+        printf("brd %s ",
             rt_addr_n2a(ifa->ifa_family,
-                    RTA_PAYLOAD(rta_tb[IFA_BROADCAST]),
                     RTA_DATA(rta_tb[IFA_BROADCAST]),
                     abuf, sizeof(abuf)));
     }
     if (rta_tb[IFA_ANYCAST]) {
-        fprintf(fp, "any %s ",
+        printf("any %s ",
             rt_addr_n2a(ifa->ifa_family,
-                    RTA_PAYLOAD(rta_tb[IFA_ANYCAST]),
                     RTA_DATA(rta_tb[IFA_ANYCAST]),
                     abuf, sizeof(abuf)));
     }
-    fprintf(fp, "scope %s ", rtnl_rtscope_n2a(ifa->ifa_scope, b1, sizeof(b1)));
-    if (ifa->ifa_flags&IFA_F_SECONDARY) {
+    printf("scope %s ", rtnl_rtscope_n2a(ifa->ifa_scope, b1));
+    if (ifa->ifa_flags & IFA_F_SECONDARY) {
         ifa->ifa_flags &= ~IFA_F_SECONDARY;
-        fprintf(fp, "secondary ");
-    }
-    if (ifa->ifa_flags&IFA_F_TENTATIVE) {
+        printf("secondary ");
+    }
+    if (ifa->ifa_flags & IFA_F_TENTATIVE) {
         ifa->ifa_flags &= ~IFA_F_TENTATIVE;
-        fprintf(fp, "tentative ");
-    }
-    if (ifa->ifa_flags&IFA_F_DEPRECATED) {
+        printf("tentative ");
+    }
+    if (ifa->ifa_flags & IFA_F_DEPRECATED) {
         ifa->ifa_flags &= ~IFA_F_DEPRECATED;
-        fprintf(fp, "deprecated ");
-    }
-    if (!(ifa->ifa_flags&IFA_F_PERMANENT)) {
-        fprintf(fp, "dynamic ");
+        printf("deprecated ");
+    }
+    if (!(ifa->ifa_flags & IFA_F_PERMANENT)) {
+        printf("dynamic ");
     } else
         ifa->ifa_flags &= ~IFA_F_PERMANENT;
     if (ifa->ifa_flags)
-        fprintf(fp, "flags %02x ", ifa->ifa_flags);
+        printf("flags %02x ", ifa->ifa_flags);
     if (rta_tb[IFA_LABEL])
-        fprintf(fp, "%s", (char*)RTA_DATA(rta_tb[IFA_LABEL]));
+        fputs((char*)RTA_DATA(rta_tb[IFA_LABEL]), stdout);
     if (rta_tb[IFA_CACHEINFO]) {
         struct ifa_cacheinfo *ci = RTA_DATA(rta_tb[IFA_CACHEINFO]);
         char buf[128];
-        fputc(_SL_, fp);
+        bb_putchar(_SL_);
         if (ci->ifa_valid == 0xFFFFFFFFU)
             sprintf(buf, "valid_lft forever");
@@ -348 +354 @@
         else
             sprintf(buf+strlen(buf), " preferred_lft %dsec", ci->ifa_prefered);
-        fprintf(fp, "       %s", buf);
-    }
-    fputc('\n', fp);
-    fflush(fp);
+        printf("       %s", buf);
+    }
+    bb_putchar('\n');
+    /*fflush_all();*/
     return 0;
 }
 
 
-struct nlmsg_list
-{
+struct nlmsg_list {
     struct nlmsg_list *next;
-    struct nlmsghdr   h;
+    struct nlmsghdr   h;
 };
 
-static int print_selected_addrinfo(int ifindex, struct nlmsg_list *ainfo, FILE *fp)
+static int print_selected_addrinfo(int ifindex, struct nlmsg_list *ainfo)
 {
     for (; ainfo; ainfo = ainfo->next) {
@@ -370 +375 @@
         if (n->nlmsg_type != RTM_NEWADDR)
             continue;
-
         if (n->nlmsg_len < NLMSG_LENGTH(sizeof(ifa)))
             return -1;
-
-        if (ifa->ifa_index != ifindex ||
-            (filter.family && filter.family != ifa->ifa_family))
+        if (ifa->ifa_index != ifindex
+         || (G_filter.family && G_filter.family != ifa->ifa_family)
+        ) {
             continue;
-
-        print_addrinfo(NULL, n, fp);
+        }
+        print_addrinfo(NULL, n, NULL);
     }
     return 0;
@@ -384 +388 @@
 
 
-static int store_nlmsg(struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
+static int FAST_FUNC store_nlmsg(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
 {
     struct nlmsg_list **linfo = (struct nlmsg_list**)arg;
@@ -390 +394 @@
     struct nlmsg_list **lp;
 
-    h = malloc(n->nlmsg_len+sizeof(void*));
-    if (h == NULL)
-        return -1;
+    h = xzalloc(n->nlmsg_len + sizeof(void*));
 
     memcpy(&h->h, n, n->nlmsg_len);
-    h->next = NULL;
-
-    for (lp = linfo; *lp; lp = &(*lp)->next) /* NOTHING */;
+    /*h->next = NULL; - xzalloc did it */
+
+    for (lp = linfo; *lp; lp = &(*lp)->next)
+        continue;
     *lp = h;
 
@@ -406 +409 @@
 static void ipaddr_reset_filter(int _oneline)
 {
-    memset(&filter, 0, sizeof(filter));
-    filter.oneline = _oneline;
+    memset(&G_filter, 0, sizeof(G_filter));
+    G_filter.oneline = _oneline;
 }
 
 /* Return value becomes exitcode. It's okay to not return at all */
-int ipaddr_list_or_flush(int argc, char **argv, int flush)
+int FAST_FUNC ipaddr_list_or_flush(char **argv, int flush)
 {
     static const char option[] ALIGN1 = "to\0""scope\0""up\0""label\0""dev\0";
@@ -423 +426 @@
 
     ipaddr_reset_filter(oneline);
-    filter.showqueue = 1;
-
-    if (filter.family == AF_UNSPEC)
-        filter.family = preferred_family;
+    G_filter.showqueue = 1;
+
+    if (G_filter.family == AF_UNSPEC)
+        G_filter.family = preferred_family;
 
     if (flush) {
-        if (argc <= 0) {
+        if (!*argv) {
             bb_error_msg_and_die(bb_msg_requires_arg, "flush");
         }
-        if (filter.family == AF_PACKET) {
-            bb_error_msg_and_die("cannot flush link addresses");
-        }
-    }
-
-    while (argc > 0) {
-        const int option_num = index_in_strings(option, *argv);
-        switch (option_num) {
-            case 0: /* to */
+        if (G_filter.family == AF_PACKET) {
+            bb_error_msg_and_die("can't flush link addresses");
+        }
+    }
+
+    while (*argv) {
+        const smalluint key = index_in_strings(option, *argv);
+        if (key == 0) { /* to */
+            NEXT_ARG();
+            get_prefix(&G_filter.pfx, *argv, G_filter.family);
+            if (G_filter.family == AF_UNSPEC) {
+                G_filter.family = G_filter.pfx.family;
+            }
+        } else if (key == 1) { /* scope */
+            uint32_t scope = 0;
+            NEXT_ARG();
+            G_filter.scopemask = -1;
+            if (rtnl_rtscope_a2n(&scope, *argv)) {
+                if (strcmp(*argv, "all") != 0) {
+                    invarg(*argv, "scope");
+                }
+                scope = RT_SCOPE_NOWHERE;
+                G_filter.scopemask = 0;
+            }
+            G_filter.scope = scope;
+        } else if (key == 2) { /* up */
+            G_filter.up = 1;
+        } else if (key == 3) { /* label */
+            NEXT_ARG();
+            G_filter.label = *argv;
+        } else {
+            if (key == 4) /* dev */
                 NEXT_ARG();
-                get_prefix(&filter.pfx, *argv, filter.family);
-                if (filter.family == AF_UNSPEC) {
-                    filter.family = filter.pfx.family;
-                }
-                break;
-            case 1: /* scope */
-            {
-                uint32_t scope = 0;
-                NEXT_ARG();
-                filter.scopemask = -1;
-                if (rtnl_rtscope_a2n(&scope, *argv)) {
-                    if (strcmp(*argv, "all") != 0) {
-                        invarg(*argv, "scope");
-                    }
-                    scope = RT_SCOPE_NOWHERE;
-                    filter.scopemask = 0;
-                }
-                filter.scope = scope;
-                break;
-            }
-            case 2: /* up */
-                filter.up = 1;
-                break;
-            case 3: /* label */
-                NEXT_ARG();
-                filter.label = *argv;
-                break;
-            case 4: /* dev */
-                NEXT_ARG();
-            default:
-                if (filter_dev) {
-                    duparg2("dev", *argv);
-                }
-                filter_dev = *argv;
+            if (filter_dev)
+                duparg2("dev", *argv);
+            filter_dev = *argv;
         }
         argv++;
-        argc--;
     }
 
@@ -487 +481 @@
 
     if (filter_dev) {
-        filter.ifindex = xll_name_to_index(filter_dev);
+        G_filter.ifindex = xll_name_to_index(filter_dev);
     }
 
@@ -493 +487 @@
         char flushb[4096-512];
 
-        filter.flushb = flushb;
-        filter.flushp = 0;
-        filter.flushe = sizeof(flushb);
-        filter.rth = &rth;
+        G_filter.flushb = flushb;
+        G_filter.flushp = 0;
+        G_filter.flushe = sizeof(flushb);
+        G_filter.rth = &rth;
 
         for (;;) {
-            xrtnl_wilddump_request(&rth, filter.family, RTM_GETADDR);
-            filter.flushed = 0;
-            xrtnl_dump_filter(&rth, print_addrinfo, stdout);
-            if (filter.flushed == 0) {
+            xrtnl_wilddump_request(&rth, G_filter.family, RTM_GETADDR);
+            G_filter.flushed = 0;
+            xrtnl_dump_filter(&rth, print_addrinfo, NULL);
+            if (G_filter.flushed == 0) {
                 return 0;
             }
-            if (flush_update() < 0)
+            if (flush_update() < 0) {
                 return 1;
-        }
-    }
-
-    if (filter.family != AF_PACKET) {
-        xrtnl_wilddump_request(&rth, filter.family, RTM_GETADDR);
+            }
+        }
+    }
+
+    if (G_filter.family != AF_PACKET) {
+        xrtnl_wilddump_request(&rth, G_filter.family, RTM_GETADDR);
         xrtnl_dump_filter(&rth, store_nlmsg, &ainfo);
     }
 
 
-    if (filter.family && filter.family != AF_PACKET) {
+    if (G_filter.family && G_filter.family != AF_PACKET) {
         struct nlmsg_list **lp;
-        lp=&linfo;
-
-        if (filter.oneline)
+        lp = &linfo;
+
+        if (G_filter.oneline)
             no_link = 1;
 
-        while ((l=*lp)!=NULL) {
+        while ((l = *lp) != NULL) {
             int ok = 0;
             struct ifinfomsg *ifi = NLMSG_DATA(&l->h);
             struct nlmsg_list *a;
 
-            for (a=ainfo; a; a=a->next) {
+            for (a = ainfo; a; a = a->next) {
                 struct nlmsghdr *n = &a->h;
                 struct ifaddrmsg *ifa = NLMSG_DATA(n);
 
-                if (ifa->ifa_index != ifi->ifi_index ||
-                    (filter.family && filter.family != ifa->ifa_family))
+                if (ifa->ifa_index != ifi->ifi_index
+                 || (G_filter.family && G_filter.family != ifa->ifa_family)
+                ) {
                     continue;
-                if ((filter.scope^ifa->ifa_scope)&filter.scopemask)
+                }
+                if ((G_filter.scope ^ ifa->ifa_scope) & G_filter.scopemask)
                     continue;
-                if ((filter.flags^ifa->ifa_flags)&filter.flagmask)
+                if ((G_filter.flags ^ ifa->ifa_flags) & G_filter.flagmask)
                     continue;
-                if (filter.pfx.family || filter.label) {
+                if (G_filter.pfx.family || G_filter.label) {
                     struct rtattr *tb[IFA_MAX+1];
                     memset(tb, 0, sizeof(tb));
@@ -546 +543 @@
                         tb[IFA_LOCAL] = tb[IFA_ADDRESS];
 
-                    if (filter.pfx.family && tb[IFA_LOCAL]) {
+                    if (G_filter.pfx.family && tb[IFA_LOCAL]) {
                         inet_prefix dst;
                         memset(&dst, 0, sizeof(dst));
                         dst.family = ifa->ifa_family;
                         memcpy(&dst.data, RTA_DATA(tb[IFA_LOCAL]), RTA_PAYLOAD(tb[IFA_LOCAL]));
-                        if (inet_addr_match(&dst, &filter.pfx, filter.pfx.bitlen))
+                        if (inet_addr_match(&dst, &G_filter.pfx, G_filter.pfx.bitlen))
                             continue;
                     }
-                    if (filter.label) {
+                    if (G_filter.label) {
                         SPRINT_BUF(b1);
                         const char *label;
@@ -561 +558 @@
                         else
                             label = ll_idx_n2a(ifa->ifa_index, b1);
-                        if (fnmatch(filter.label, label, 0) != 0)
+                        if (fnmatch(G_filter.label, label, 0) != 0)
                             continue;
                     }
@@ -577 +574 @@
 
     for (l = linfo; l; l = l->next) {
-        if (no_link || print_linkinfo(NULL, &l->h, stdout) == 0) {
+        if (no_link || print_linkinfo(&l->h) == 0) {
             struct ifinfomsg *ifi = NLMSG_DATA(&l->h);
-            if (filter.family != AF_PACKET)
-                print_selected_addrinfo(ifi->ifi_index, ainfo, stdout);
-        }
-        fflush(stdout); /* why? */
+            if (G_filter.family != AF_PACKET)
+                print_selected_addrinfo(ifi->ifi_index, ainfo);
+        }
     }
 
@@ -598 +594 @@
 
 /* Return value becomes exitcode. It's okay to not return at all */
-static int ipaddr_modify(int cmd, int argc, char **argv)
+static int ipaddr_modify(int cmd, char **argv)
 {
     static const char option[] ALIGN1 =
@@ -626 +622 @@
     req.ifa.ifa_family = preferred_family;
 
-    while (argc > 0) {
-        const int option_num = index_in_strings(option, *argv);
-        switch (option_num) {
-            case 0: /* peer */
-            case 1: /* remote */
+    while (*argv) {
+        const smalluint arg = index_in_strings(option, *argv);
+        if (arg <= 1) { /* peer, remote */
+            NEXT_ARG();
+
+            if (peer_len) {
+                duparg("peer", *argv);
+            }
+            get_prefix(&peer, *argv, req.ifa.ifa_family);
+            peer_len = peer.bytelen;
+            if (req.ifa.ifa_family == AF_UNSPEC) {
+                req.ifa.ifa_family = peer.family;
+            }
+            addattr_l(&req.n, sizeof(req), IFA_ADDRESS, &peer.data, peer.bytelen);
+            req.ifa.ifa_prefixlen = peer.bitlen;
+        } else if (arg <= 3) { /* broadcast, brd */
+            inet_prefix addr;
+            NEXT_ARG();
+            if (brd_len) {
+                duparg("broadcast", *argv);
+            }
+            if (LONE_CHAR(*argv, '+')) {
+                brd_len = -1;
+            } else if (LONE_DASH(*argv)) {
+                brd_len = -2;
+            } else {
+                get_addr(&addr, *argv, req.ifa.ifa_family);
+                if (req.ifa.ifa_family == AF_UNSPEC)
+                    req.ifa.ifa_family = addr.family;
+                addattr_l(&req.n, sizeof(req), IFA_BROADCAST, &addr.data, addr.bytelen);
+                brd_len = addr.bytelen;
+            }
+        } else if (arg == 4) { /* anycast */
+            inet_prefix addr;
+            NEXT_ARG();
+            if (any_len) {
+                duparg("anycast", *argv);
+            }
+            get_addr(&addr, *argv, req.ifa.ifa_family);
+            if (req.ifa.ifa_family == AF_UNSPEC) {
+                req.ifa.ifa_family = addr.family;
+            }
+            addattr_l(&req.n, sizeof(req), IFA_ANYCAST, &addr.data, addr.bytelen);
+            any_len = addr.bytelen;
+        } else if (arg == 5) { /* scope */
+            uint32_t scope = 0;
+            NEXT_ARG();
+            if (rtnl_rtscope_a2n(&scope, *argv)) {
+                invarg(*argv, "scope");
+            }
+            req.ifa.ifa_scope = scope;
+            scoped = 1;
+        } else if (arg == 6) { /* dev */
+            NEXT_ARG();
+            d = *argv;
+        } else if (arg == 7) { /* label */
+            NEXT_ARG();
+            l = *argv;
+            addattr_l(&req.n, sizeof(req), IFA_LABEL, l, strlen(l) + 1);
+        } else {
+            if (arg == 8) /* local */
                 NEXT_ARG();
-
-                if (peer_len) {
-                    duparg("peer", *argv);
-                }
-                get_prefix(&peer, *argv, req.ifa.ifa_family);
-                peer_len = peer.bytelen;
-                if (req.ifa.ifa_family == AF_UNSPEC) {
-                    req.ifa.ifa_family = peer.family;
-                }
-                addattr_l(&req.n, sizeof(req), IFA_ADDRESS, &peer.data, peer.bytelen);
-                req.ifa.ifa_prefixlen = peer.bitlen;
-                break;
-            case 2: /* broadcast */
-            case 3: /* brd */
-            {
-                inet_prefix addr;
-                NEXT_ARG();
-                if (brd_len) {
-                    duparg("broadcast", *argv);
-                }
-                if (LONE_CHAR(*argv, '+')) {
-                    brd_len = -1;
-                }
-                else if (LONE_DASH(*argv)) {
-                    brd_len = -2;
-                } else {
-                    get_addr(&addr, *argv, req.ifa.ifa_family);
-                    if (req.ifa.ifa_family == AF_UNSPEC)
-                        req.ifa.ifa_family = addr.family;
-                    addattr_l(&req.n, sizeof(req), IFA_BROADCAST, &addr.data, addr.bytelen);
-                    brd_len = addr.bytelen;
-                }
-                break;
-            }
-            case 4: /* anycast */
-            {
-                inet_prefix addr;
-                NEXT_ARG();
-                if (any_len) {
-                    duparg("anycast", *argv);
-                }
-                get_addr(&addr, *argv, req.ifa.ifa_family);
-                if (req.ifa.ifa_family == AF_UNSPEC) {
-                    req.ifa.ifa_family = addr.family;
-                }
-                addattr_l(&req.n, sizeof(req), IFA_ANYCAST, &addr.data, addr.bytelen);
-                any_len = addr.bytelen;
-                break;
-            }
-            case 5: /* scope */
-            {
-                uint32_t scope = 0;
-                NEXT_ARG();
-                if (rtnl_rtscope_a2n(&scope, *argv)) {
-                    invarg(*argv, "scope");
-                }
-                req.ifa.ifa_scope = scope;
-                scoped = 1;
-                break;
-            }
-            case 6: /* dev */
-                NEXT_ARG();
-                d = *argv;
-                break;
-            case 7: /* label */
-                NEXT_ARG();
-                l = *argv;
-                addattr_l(&req.n, sizeof(req), IFA_LABEL, l, strlen(l)+1);
-                break;
-            case 8: /* local */
-                NEXT_ARG();
-            default:
-                if (local_len) {
-                    duparg2("local", *argv);
-                }
-                get_prefix(&lcl, *argv, req.ifa.ifa_family);
-                if (req.ifa.ifa_family == AF_UNSPEC) {
-                    req.ifa.ifa_family = lcl.family;
-                }
-                addattr_l(&req.n, sizeof(req), IFA_LOCAL, &lcl.data, lcl.bytelen);
-                local_len = lcl.bytelen;
-        }
-        argc--;
+            if (local_len) {
+                duparg2("local", *argv);
+            }
+            get_prefix(&lcl, *argv, req.ifa.ifa_family);
+            if (req.ifa.ifa_family == AF_UNSPEC) {
+                req.ifa.ifa_family = lcl.family;
+            }
+            addattr_l(&req.n, sizeof(req), IFA_LOCAL, &lcl.data, lcl.bytelen);
+            local_len = lcl.bytelen;
+        }
         argv++;
     }
 
-    if (d == NULL) {
-        bb_error_msg(bb_msg_requires_arg,"\"dev\"");
-        return -1;
+    if (!d) {
+        /* There was no "dev IFACE", but we need that */
+        bb_error_msg_and_die("need \"dev IFACE\"");
     }
     if (l && strncmp(d, l, strlen(d)) != 0) {
@@ -767 +746 @@
 
 /* Return value becomes exitcode. It's okay to not return at all */
-int do_ipaddr(int argc, char **argv)
+int FAST_FUNC do_ipaddr(char **argv)
 {
     static const char commands[] ALIGN1 =
         "add\0""delete\0""list\0""show\0""lst\0""flush\0";
-
-    int command_num = 2; /* default command is list */
-
+    smalluint cmd = 2;
     if (*argv) {
-        command_num = index_in_substrings(commands, *argv);
-    }
-    if (command_num < 0 || command_num > 5)
-        bb_error_msg_and_die("unknown command %s", *argv);
-    --argc;
-    ++argv;
-    if (command_num == 0) /* add */
-        return ipaddr_modify(RTM_NEWADDR, argc, argv);
-    else if (command_num == 1) /* delete */
-        return ipaddr_modify(RTM_DELADDR, argc, argv);
-    else if (command_num == 5) /* flush */
-        return ipaddr_list_or_flush(argc, argv, 1);
-    else /* 2 == list, 3 == show, 4 == lst */
-        return ipaddr_list_or_flush(argc, argv, 0);
-}
+        cmd = index_in_substrings(commands, *argv);
+        if (cmd > 5)
+            bb_error_msg_and_die(bb_msg_invalid_arg, *argv, applet_name);
+        argv++;
+        if (cmd <= 1)
+            return ipaddr_modify((cmd == 0) ? RTM_NEWADDR : RTM_DELADDR, argv);
+    }
+    /* 2 == list, 3 == show, 4 == lst */
+    return ipaddr_list_or_flush(argv, cmd == 5);
+}

branches/2.2.9/mindi-busybox/networking/libiproute/iplink.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * iplink.c "ip link".
- *
  * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
-//#include <sys/ioctl.h>
-//#include <sys/socket.h>
 #include <net/if.h>
 #include <net/if_packet.h>
@@ -19 +14 @@
 #include "utils.h"
 
+#ifndef IFLA_LINKINFO
+# define IFLA_LINKINFO 18
+# define IFLA_INFO_KIND 1
+#endif
+
 /* taken from linux/sockios.h */
-#define SIOCSIFNAME 0x8923      /* set interface name */
-
-static void on_off(const char *msg) ATTRIBUTE_NORETURN;
-static void on_off(const char *msg)
-{
-    bb_error_msg_and_die("error: argument of \"%s\" must be \"on\" or \"off\"", msg);
-}
+#define SIOCSIFNAME  0x8923  /* set interface name */
 
 /* Exits on error */
@@ -48 +42 @@
     int fd;
 
-    strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
+    strncpy_IFNAMSIZ(ifr.ifr_name, dev);
     fd = get_ctl_fd();
     xioctl(fd, SIOCGIFFLAGS, &ifr);
@@ -65 +59 @@
     int fd;
 
-    strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
-    strncpy(ifr.ifr_newname, newdev, sizeof(ifr.ifr_newname));
+    strncpy_IFNAMSIZ(ifr.ifr_name, dev);
+    strncpy_IFNAMSIZ(ifr.ifr_newname, newdev);
     fd = get_ctl_fd();
     xioctl(fd, SIOCSIFNAME, &ifr);
@@ -80 +74 @@
     s = get_ctl_fd();
     memset(&ifr, 0, sizeof(ifr));
-    strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
+    strncpy_IFNAMSIZ(ifr.ifr_name, dev);
     ifr.ifr_qlen = qlen;
     xioctl(s, SIOCSIFTXQLEN, &ifr);
@@ -94 +88 @@
     s = get_ctl_fd();
     memset(&ifr, 0, sizeof(ifr));
-    strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
+    strncpy_IFNAMSIZ(ifr.ifr_name, dev);
     ifr.ifr_mtu = mtu;
     xioctl(s, SIOCSIFMTU, &ifr);
@@ -111 +105 @@
 
     memset(&ifr, 0, sizeof(ifr));
-    strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
+    strncpy_IFNAMSIZ(ifr.ifr_name, dev);
     xioctl(s, SIOCGIFINDEX, &ifr);
 
@@ -119 +113 @@
     me.sll_protocol = htons(ETH_P_LOOP);
     xbind(s, (struct sockaddr*)&me, sizeof(me));
-
     alen = sizeof(me);
-    if (getsockname(s, (struct sockaddr*)&me, &alen) == -1) {
-        bb_perror_msg_and_die("getsockname");
-    }
+    getsockname(s, (struct sockaddr*)&me, &alen);
+    //never happens:
+    //if (getsockname(s, (struct sockaddr*)&me, &alen) == -1)
+    //  bb_perror_msg_and_die("getsockname");
     close(s);
     *htype = me.sll_hatype;
@@ -135 +129 @@
 
     memset(ifr, 0, sizeof(*ifr));
-    strncpy(ifr->ifr_name, dev, sizeof(ifr->ifr_name));
+    strncpy_IFNAMSIZ(ifr->ifr_name, dev);
     ifr->ifr_hwaddr.sa_family = hatype;
-    alen = ll_addr_a2n((unsigned char *)(ifr->ifr_hwaddr.sa_data), 14, lla);
+
+    alen = hatype == 1/*ARPHRD_ETHER*/ ? 14/*ETH_HLEN*/ : 19/*INFINIBAND_HLEN*/;
+    alen = ll_addr_a2n((unsigned char *)(ifr->ifr_hwaddr.sa_data), alen, lla);
     if (alen < 0)
-        exit(1);
+        exit(EXIT_FAILURE);
     if (alen != halen) {
         bb_error_msg_and_die("wrong address (%s) length: expected %d bytes", lla, halen);
@@ -159 +155 @@
 
 
+static void die_must_be_on_off(const char *msg) NORETURN;
+static void die_must_be_on_off(const char *msg)
+{
+    bb_error_msg_and_die("argument of \"%s\" must be \"on\" or \"off\"", msg);
+}
+
 /* Return value becomes exitcode. It's okay to not return at all */
-static int do_set(int argc, char **argv)
+static int do_set(char **argv)
 {
     char *dev = NULL;
@@ -173 +175 @@
     int htype, halen;
     static const char keywords[] ALIGN1 =
-        "up\0""down\0""name\0""mtu\0""multicast\0""arp\0""addr\0""dev\0"
-        "on\0""off\0";
-    enum { ARG_up = 1, ARG_down, ARG_name, ARG_mtu, ARG_multicast, ARG_arp,
-        ARG_addr, ARG_dev, PARM_on, PARM_off };
+        "up\0""down\0""name\0""mtu\0""qlen\0""multicast\0"
+        "arp\0""address\0""dev\0";
+    enum { ARG_up = 0, ARG_down, ARG_name, ARG_mtu, ARG_qlen, ARG_multicast,
+        ARG_arp, ARG_addr, ARG_dev };
+    static const char str_on_off[] ALIGN1 = "on\0""off\0";
+    enum { PARM_on = 0, PARM_off };
     smalluint key;
 
-    while (argc > 0) {
-        key = index_in_strings(keywords, *argv) + 1;
+    while (*argv) {
+        /* substring search ensures that e.g. "addr" and "address"
+         * are both accepted */
+        key = index_in_substrings(keywords, *argv);
         if (key == ARG_up) {
             mask |= IFF_UP;
@@ -194 +200 @@
             if (mtu != -1)
                 duparg("mtu", *argv);
-            if (get_integer(&mtu, *argv, 0))
-                invarg(*argv, "mtu");
-        } else if (key == ARG_multicast) {
-            NEXT_ARG();
-            mask |= IFF_MULTICAST;
-            key = index_in_strings(keywords, *argv) + 1;
-            if (key == PARM_on) {
-                flags |= IFF_MULTICAST;
-            } else if (key == PARM_off) {
-                flags &= ~IFF_MULTICAST;
-            } else
-                on_off("multicast");
-        } else if (key == ARG_arp) {
-            NEXT_ARG();
-            mask |= IFF_NOARP;
-            key = index_in_strings(keywords, *argv) + 1;
-            if (key == PARM_on) {
-                flags &= ~IFF_NOARP;
-            } else if (key == PARM_off) {
-                flags |= IFF_NOARP;
-            } else
-                on_off("arp");
+            mtu = get_unsigned(*argv, "mtu");
+        } else if (key == ARG_qlen) {
+            NEXT_ARG();
+            if (qlen != -1)
+                duparg("qlen", *argv);
+            qlen = get_unsigned(*argv, "qlen");
         } else if (key == ARG_addr) {
             NEXT_ARG();
             newaddr = *argv;
-        } else {
+        } else if (key >= ARG_dev) {
             if (key == ARG_dev) {
                 NEXT_ARG();
@@ -226 +216 @@
                 duparg2("dev", *argv);
             dev = *argv;
-        }
-        argc--; argv++;
+        } else {
+            int param;
+            NEXT_ARG();
+            param = index_in_strings(str_on_off, *argv);
+            if (key == ARG_multicast) {
+                if (param < 0)
+                    die_must_be_on_off("multicast");
+                mask |= IFF_MULTICAST;
+                if (param == PARM_on)
+                    flags |= IFF_MULTICAST;
+                else
+                    flags &= ~IFF_MULTICAST;
+            } else if (key == ARG_arp) {
+                if (param < 0)
+                    die_must_be_on_off("arp");
+                mask |= IFF_NOARP;
+                if (param == PARM_on)
+                    flags &= ~IFF_NOARP;
+                else
+                    flags |= IFF_NOARP;
+            }
+        }
+        argv++;
     }
 
@@ -238 +249 @@
         if (newaddr) {
             parse_address(dev, htype, halen, newaddr, &ifr0);
+            set_address(&ifr0, 0);
         }
         if (newbrd) {
             parse_address(dev, htype, halen, newbrd, &ifr1);
+            set_address(&ifr1, 1);
         }
     }
@@ -254 +267 @@
         set_mtu(dev, mtu);
     }
-    if (newaddr || newbrd) {
-        if (newbrd) {
-            set_address(&ifr1, 1);
-        }
-        if (newaddr) {
-            set_address(&ifr0, 0);
-        }
-    }
     if (mask)
         do_chflags(dev, flags, mask);
@@ -267 +272 @@
 }
 
-static int ipaddr_list_link(int argc, char **argv)
+static int ipaddr_list_link(char **argv)
 {
     preferred_family = AF_PACKET;
-    return ipaddr_list_or_flush(argc, argv, 0);
-}
-
+    return ipaddr_list_or_flush(argv, 0);
+}
+
+#ifndef NLMSG_TAIL
+#define NLMSG_TAIL(nmsg) \
+    ((struct rtattr *) (((void *) (nmsg)) + NLMSG_ALIGN((nmsg)->nlmsg_len)))
+#endif
 /* Return value becomes exitcode. It's okay to not return at all */
-int do_iplink(int argc, char **argv)
+static int do_change(char **argv, const unsigned rtm)
 {
     static const char keywords[] ALIGN1 =
-        "set\0""show\0""lst\0""list\0";
-    smalluint key;
-    if (argc <= 0)
-        return ipaddr_list_link(0, NULL);
-    key = index_in_substrings(keywords, *argv) + 1;
-    if (key == 0)
-        bb_error_msg_and_die(bb_msg_invalid_arg, *argv, applet_name);
-    argc--; argv++;
-    if (key == 1) /* set */
-        return do_set(argc, argv);
-    else /* show, lst, list */
-        return ipaddr_list_link(argc, argv);
-}
+        "link\0""name\0""type\0""dev\0";
+    enum {
+        ARG_link,
+        ARG_name,
+        ARG_type,
+        ARG_dev,
+    };
+    struct rtnl_handle rth;
+    struct {
+        struct nlmsghdr  n;
+        struct ifinfomsg i;
+        char             buf[1024];
+    } req;
+    smalluint arg;
+    char *name_str = NULL, *link_str = NULL, *type_str = NULL, *dev_str = NULL;
+
+    memset(&req, 0, sizeof(req));
+
+    req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifinfomsg));
+    req.n.nlmsg_flags = NLM_F_REQUEST;
+    req.n.nlmsg_type = rtm;
+    req.i.ifi_family = preferred_family;
+    if (rtm == RTM_NEWLINK)
+        req.n.nlmsg_flags |= NLM_F_CREATE|NLM_F_EXCL;
+
+    while (*argv) {
+        arg = index_in_substrings(keywords, *argv);
+        if (arg == ARG_link) {
+            NEXT_ARG();
+            link_str = *argv;
+        } else if (arg == ARG_name) {
+            NEXT_ARG();
+            name_str = *argv;
+        } else if (arg == ARG_type) {
+            NEXT_ARG();
+            type_str = *argv;
+        } else {
+            if (arg == ARG_dev) {
+                if (dev_str)
+                    duparg(*argv, "dev");
+                NEXT_ARG();
+            }
+            dev_str = *argv;
+        }
+        argv++;
+    }
+    xrtnl_open(&rth);
+    ll_init_map(&rth);
+    if (type_str) {
+        struct rtattr *linkinfo = NLMSG_TAIL(&req.n);
+
+        addattr_l(&req.n, sizeof(req), IFLA_LINKINFO, NULL, 0);
+        addattr_l(&req.n, sizeof(req), IFLA_INFO_KIND, type_str,
+                strlen(type_str));
+        linkinfo->rta_len = (void *)NLMSG_TAIL(&req.n) - (void *)linkinfo;
+    }
+    if (rtm != RTM_NEWLINK) {
+        if (!dev_str)
+            return 1; /* Need a device to delete */
+        req.i.ifi_index = xll_name_to_index(dev_str);
+    } else {
+        if (!name_str)
+            name_str = dev_str;
+        if (link_str) {
+            int idx = xll_name_to_index(link_str);
+            addattr_l(&req.n, sizeof(req), IFLA_LINK, &idx, 4);
+        }
+    }
+    if (name_str) {
+        const size_t name_len = strlen(name_str) + 1;
+        if (name_len < 2 || name_len > IFNAMSIZ)
+            invarg(name_str, "name");
+        addattr_l(&req.n, sizeof(req), IFLA_IFNAME, name_str, name_len);
+    }
+    if (rtnl_talk(&rth, &req.n, 0, 0, NULL, NULL, NULL) < 0)
+        return 2;
+    return 0;
+}
+
+/* Return value becomes exitcode. It's okay to not return at all */
+int FAST_FUNC do_iplink(char **argv)
+{
+    static const char keywords[] ALIGN1 =
+        "add\0""delete\0""set\0""show\0""lst\0""list\0";
+    if (*argv) {
+        smalluint key = index_in_substrings(keywords, *argv);
+        if (key > 5) /* invalid argument */
+            bb_error_msg_and_die(bb_msg_invalid_arg, *argv, applet_name);
+        argv++;
+        if (key <= 1) /* add/delete */
+            return do_change(argv, key ? RTM_DELLINK : RTM_NEWLINK);
+        else if (key == 2) /* set */
+            return do_set(argv);
+    }
+    /* show, lst, list */
+    return ipaddr_list_link(argv);
+}

branches/2.2.9/mindi-busybox/networking/libiproute/iproute.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * iproute.c        "ip route".
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
- *
- * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
  * Changes:
  *
- * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
+ * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
  * Kunihiro Ishiguro <kunihiro@zebra.org> 001102: rtnh_ifindex was not initialized
  */
 
-#include "ip_common.h"  /* #include "libbb.h" is inside */
+#include "ip_common.h"  /* #include "libbb.h" is inside */
 #include "rt_names.h"
 #include "utils.h"
@@ -23 +20 @@
 
 
-typedef struct filter_t {
+struct filter_t {
     int tb;
-    int flushed;
+    smallint flushed;
     char *flushb;
     int flushp;
     int flushe;
     struct rtnl_handle *rth;
-    int protocol, protocolmask;
-    int scope, scopemask;
-    int type, typemask;
-    int tos, tosmask;
+    //int protocol, protocolmask; - write-only fields?!
+    //int scope, scopemask; - unused
+    //int type; - read-only
+    //int typemask; - unused
+    //int tos, tosmask; - unused
     int iif, iifmask;
     int oif, oifmask;
-    int realm, realmmask;
-    inet_prefix rprefsrc;
+    //int realm, realmmask; - unused
+    //inet_prefix rprefsrc; - read-only
     inet_prefix rvia;
     inet_prefix rdst;
@@ -43 +41 @@
     inet_prefix rsrc;
     inet_prefix msrc;
-} filter_t;
-
-#define filter (*(filter_t*)&bb_common_bufsiz1)
+} FIX_ALIASING;
+typedef struct filter_t filter_t;
+
+#define G_filter (*(filter_t*)&bb_common_bufsiz1)
 
 static int flush_update(void)
 {
-    if (rtnl_send(filter.rth, filter.flushb, filter.flushp) < 0) {
-        bb_perror_msg("failed to send flush request");
+    if (rtnl_send(G_filter.rth, G_filter.flushb, G_filter.flushp) < 0) {
+        bb_perror_msg("can't send flush request");
         return -1;
     }
-    filter.flushp = 0;
+    G_filter.flushp = 0;
     return 0;
 }
@@ -65 +64 @@
         return hz_internal;
 
-    fp = fopen("/proc/net/psched", "r");
+    fp = fopen_for_read("/proc/net/psched");
     if (fp) {
         unsigned nom, denom;
@@ -79 +78 @@
 }
 
-static int print_route(struct sockaddr_nl *who ATTRIBUTE_UNUSED,
-        struct nlmsghdr *n, void *arg)
+static int FAST_FUNC print_route(const struct sockaddr_nl *who UNUSED_PARAM,
+        struct nlmsghdr *n, void *arg UNUSED_PARAM)
 {
-    FILE *fp = (FILE*)arg;
     struct rtmsg *r = NLMSG_DATA(n);
     int len = n->nlmsg_len;
@@ -92 +90 @@
     SPRINT_BUF(b1);
 
-
     if (n->nlmsg_type != RTM_NEWROUTE && n->nlmsg_type != RTM_DELROUTE) {
         fprintf(stderr, "Not a route: %08x %08x %08x\n",
@@ -98 +95 @@
         return 0;
     }
-    if (filter.flushb && n->nlmsg_type != RTM_NEWROUTE)
+    if (G_filter.flushb && n->nlmsg_type != RTM_NEWROUTE)
         return 0;
     len -= NLMSG_LENGTH(sizeof(*r));
@@ -110 +107 @@
 
     if (r->rtm_family == AF_INET6) {
-        if (filter.tb) {
-            if (filter.tb < 0) {
-                if (!(r->rtm_flags&RTM_F_CLONED)) {
+        if (G_filter.tb) {
+            if (G_filter.tb < 0) {
+                if (!(r->rtm_flags & RTM_F_CLONED)) {
                     return 0;
                 }
             } else {
-                if (r->rtm_flags&RTM_F_CLONED) {
+                if (r->rtm_flags & RTM_F_CLONED) {
                     return 0;
                 }
-                if (filter.tb == RT_TABLE_LOCAL) {
+                if (G_filter.tb == RT_TABLE_LOCAL) {
                     if (r->rtm_type != RTN_LOCAL) {
                         return 0;
                     }
-                } else if (filter.tb == RT_TABLE_MAIN) {
+                } else if (G_filter.tb == RT_TABLE_MAIN) {
                     if (r->rtm_type == RTN_LOCAL) {
                         return 0;
@@ -133 +130 @@
         }
     } else {
-        if (filter.tb > 0 && filter.tb != r->rtm_table) {
+        if (G_filter.tb > 0 && G_filter.tb != r->rtm_table) {
             return 0;
         }
     }
-    if (filter.rdst.family &&
-        (r->rtm_family != filter.rdst.family || filter.rdst.bitlen > r->rtm_dst_len)) {
-        return 0;
-    }
-    if (filter.mdst.family &&
-        (r->rtm_family != filter.mdst.family ||
-         (filter.mdst.bitlen >= 0 && filter.mdst.bitlen < r->rtm_dst_len))) {
-        return 0;
-    }
-    if (filter.rsrc.family &&
-        (r->rtm_family != filter.rsrc.family || filter.rsrc.bitlen > r->rtm_src_len)) {
-        return 0;
-    }
-    if (filter.msrc.family &&
-        (r->rtm_family != filter.msrc.family ||
-         (filter.msrc.bitlen >= 0 && filter.msrc.bitlen < r->rtm_src_len))) {
+    if (G_filter.rdst.family
+     && (r->rtm_family != G_filter.rdst.family || G_filter.rdst.bitlen > r->rtm_dst_len)
+    ) {
+        return 0;
+    }
+    if (G_filter.mdst.family
+     && (r->rtm_family != G_filter.mdst.family
+        || (G_filter.mdst.bitlen >= 0 && G_filter.mdst.bitlen < r->rtm_dst_len)
+        )
+    ) {
+        return 0;
+    }
+    if (G_filter.rsrc.family
+     && (r->rtm_family != G_filter.rsrc.family || G_filter.rsrc.bitlen > r->rtm_src_len)
+    ) {
+        return 0;
+    }
+    if (G_filter.msrc.family
+     && (r->rtm_family != G_filter.msrc.family
+        || (G_filter.msrc.bitlen >= 0 && G_filter.msrc.bitlen < r->rtm_src_len)
+        )
+    ) {
         return 0;
     }
@@ -159 +162 @@
     parse_rtattr(tb, RTA_MAX, RTM_RTA(r), len);
 
-    if (filter.rdst.family && inet_addr_match(&dst, &filter.rdst, filter.rdst.bitlen))
-        return 0;
-    if (filter.mdst.family && filter.mdst.bitlen >= 0 &&
-        inet_addr_match(&dst, &filter.mdst, r->rtm_dst_len))
-        return 0;
-
-    if (filter.rsrc.family && inet_addr_match(&src, &filter.rsrc, filter.rsrc.bitlen))
-        return 0;
-    if (filter.msrc.family && filter.msrc.bitlen >= 0 &&
-        inet_addr_match(&src, &filter.msrc, r->rtm_src_len))
-        return 0;
-
-    if (filter.flushb &&
-        r->rtm_family == AF_INET6 &&
-        r->rtm_dst_len == 0 &&
-        r->rtm_type == RTN_UNREACHABLE &&
-        tb[RTA_PRIORITY] &&
-        *(int*)RTA_DATA(tb[RTA_PRIORITY]) == -1)
-        return 0;
-
-    if (filter.flushb) {
+    if (G_filter.rdst.family
+     && inet_addr_match(&dst, &G_filter.rdst, G_filter.rdst.bitlen)
+    ) {
+        return 0;
+    }
+    if (G_filter.mdst.family
+     && G_filter.mdst.bitlen >= 0
+     && inet_addr_match(&dst, &G_filter.mdst, r->rtm_dst_len)
+    ) {
+        return 0;
+    }
+    if (G_filter.rsrc.family
+     && inet_addr_match(&src, &G_filter.rsrc, G_filter.rsrc.bitlen)
+    ) {
+        return 0;
+    }
+    if (G_filter.msrc.family && G_filter.msrc.bitlen >= 0
+     && inet_addr_match(&src, &G_filter.msrc, r->rtm_src_len)
+    ) {
+        return 0;
+    }
+    if (G_filter.flushb
+     && r->rtm_family == AF_INET6
+     && r->rtm_dst_len == 0
+     && r->rtm_type == RTN_UNREACHABLE
+     && tb[RTA_PRIORITY]
+     && *(int*)RTA_DATA(tb[RTA_PRIORITY]) == -1
+    ) {
+        return 0;
+    }
+
+    if (G_filter.flushb) {
         struct nlmsghdr *fn;
-        if (NLMSG_ALIGN(filter.flushp) + n->nlmsg_len > filter.flushe) {
+        if (NLMSG_ALIGN(G_filter.flushp) + n->nlmsg_len > G_filter.flushe) {
             if (flush_update())
                 bb_error_msg_and_die("flush");
         }
-        fn = (struct nlmsghdr*)(filter.flushb + NLMSG_ALIGN(filter.flushp));
+        fn = (struct nlmsghdr*)(G_filter.flushb + NLMSG_ALIGN(G_filter.flushp));
         memcpy(fn, n, n->nlmsg_len);
         fn->nlmsg_type = RTM_DELROUTE;
         fn->nlmsg_flags = NLM_F_REQUEST;
-        fn->nlmsg_seq = ++filter.rth->seq;
-        filter.flushp = (((char*)fn) + n->nlmsg_len) - filter.flushb;
-        filter.flushed++;
+        fn->nlmsg_seq = ++G_filter.rth->seq;
+        G_filter.flushp = (((char*)fn) + n->nlmsg_len) - G_filter.flushb;
+        G_filter.flushed = 1;
         return 0;
     }
 
     if (n->nlmsg_type == RTM_DELROUTE) {
-        fprintf(fp, "Deleted ");
-    }
-    if (r->rtm_type != RTN_UNICAST && !filter.type) {
-        fprintf(fp, "%s ", rtnl_rtntype_n2a(r->rtm_type, b1, sizeof(b1)));
+        printf("Deleted ");
+    }
+    if (r->rtm_type != RTN_UNICAST /* && !G_filter.type - always 0 */) {
+        printf("%s ", rtnl_rtntype_n2a(r->rtm_type, b1));
     }
 
     if (tb[RTA_DST]) {
         if (r->rtm_dst_len != host_len) {
-            fprintf(fp, "%s/%u ", rt_addr_n2a(r->rtm_family,
-                             RTA_PAYLOAD(tb[RTA_DST]),
-                             RTA_DATA(tb[RTA_DST]),
-                             abuf, sizeof(abuf)),
-                r->rtm_dst_len
-                );
+            printf("%s/%u ", rt_addr_n2a(r->rtm_family,
+                        RTA_DATA(tb[RTA_DST]),
+                        abuf, sizeof(abuf)),
+                    r->rtm_dst_len
+                    );
         } else {
-            fprintf(fp, "%s ", format_host(r->rtm_family,
-                               RTA_PAYLOAD(tb[RTA_DST]),
-                               RTA_DATA(tb[RTA_DST]),
-                               abuf, sizeof(abuf))
-                );
+            printf("%s ", format_host(r->rtm_family,
+                        RTA_PAYLOAD(tb[RTA_DST]),
+                        RTA_DATA(tb[RTA_DST]),
+                        abuf, sizeof(abuf))
+                    );
         }
     } else if (r->rtm_dst_len) {
-        fprintf(fp, "0/%d ", r->rtm_dst_len);
+        printf("0/%d ", r->rtm_dst_len);
     } else {
-        fprintf(fp, "default ");
+        printf("default ");
     }
     if (tb[RTA_SRC]) {
         if (r->rtm_src_len != host_len) {
-            fprintf(fp, "from %s/%u ", rt_addr_n2a(r->rtm_family,
-                             RTA_PAYLOAD(tb[RTA_SRC]),
-                             RTA_DATA(tb[RTA_SRC]),
-                             abuf, sizeof(abuf)),
-                r->rtm_src_len
-                );
+            printf("from %s/%u ", rt_addr_n2a(r->rtm_family,
+                        RTA_DATA(tb[RTA_SRC]),
+                        abuf, sizeof(abuf)),
+                    r->rtm_src_len
+                    );
         } else {
-            fprintf(fp, "from %s ", format_host(r->rtm_family,
-                               RTA_PAYLOAD(tb[RTA_SRC]),
-                               RTA_DATA(tb[RTA_SRC]),
-                               abuf, sizeof(abuf))
-                );
+            printf("from %s ", format_host(r->rtm_family,
+                        RTA_PAYLOAD(tb[RTA_SRC]),
+                        RTA_DATA(tb[RTA_SRC]),
+                        abuf, sizeof(abuf))
+                    );
         }
     } else if (r->rtm_src_len) {
-        fprintf(fp, "from 0/%u ", r->rtm_src_len);
-    }
-    if (tb[RTA_GATEWAY] && filter.rvia.bitlen != host_len) {
-        fprintf(fp, "via %s ",
-            format_host(r->rtm_family,
-                    RTA_PAYLOAD(tb[RTA_GATEWAY]),
-                    RTA_DATA(tb[RTA_GATEWAY]),
-                    abuf, sizeof(abuf)));
-    }
-    if (tb[RTA_OIF] && filter.oifmask != -1) {
-        fprintf(fp, "dev %s ", ll_index_to_name(*(int*)RTA_DATA(tb[RTA_OIF])));
-    }
-
-    if (tb[RTA_PREFSRC] && filter.rprefsrc.bitlen != host_len) {
+        printf("from 0/%u ", r->rtm_src_len);
+    }
+    if (tb[RTA_GATEWAY] && G_filter.rvia.bitlen != host_len) {
+        printf("via %s ", format_host(r->rtm_family,
+                    RTA_PAYLOAD(tb[RTA_GATEWAY]),
+                    RTA_DATA(tb[RTA_GATEWAY]),
+                    abuf, sizeof(abuf)));
+    }
+    if (tb[RTA_OIF] && G_filter.oifmask != -1) {
+        printf("dev %s ", ll_index_to_name(*(int*)RTA_DATA(tb[RTA_OIF])));
+    }
+
+    if (tb[RTA_PREFSRC] && /*G_filter.rprefsrc.bitlen - always 0*/ 0 != host_len) {
         /* Do not use format_host(). It is our local addr
            and symbolic name will not be useful.
          */
-        fprintf(fp, " src %s ",
-            rt_addr_n2a(r->rtm_family,
-                    RTA_PAYLOAD(tb[RTA_PREFSRC]),
-                    RTA_DATA(tb[RTA_PREFSRC]),
-                    abuf, sizeof(abuf)));
+        printf(" src %s ", rt_addr_n2a(r->rtm_family,
+                    RTA_DATA(tb[RTA_PREFSRC]),
+                    abuf, sizeof(abuf)));
     }
     if (tb[RTA_PRIORITY]) {
-        fprintf(fp, " metric %d ", *(uint32_t*)RTA_DATA(tb[RTA_PRIORITY]));
+        printf(" metric %d ", *(uint32_t*)RTA_DATA(tb[RTA_PRIORITY]));
     }
     if (r->rtm_family == AF_INET6) {
@@ -271 +280 @@
         if ((r->rtm_flags & RTM_F_CLONED) || (ci && ci->rta_expires)) {
             if (r->rtm_flags & RTM_F_CLONED) {
-                fprintf(fp, "%c    cache ", _SL_);
+                printf("%c    cache ", _SL_);
             }
             if (ci->rta_expires) {
-                fprintf(fp, " expires %dsec", ci->rta_expires / get_hz());
+                printf(" expires %dsec", ci->rta_expires / get_hz());
             }
             if (ci->rta_error != 0) {
-                fprintf(fp, " error %d", ci->rta_error);
+                printf(" error %d", ci->rta_error);
             }
         } else if (ci) {
             if (ci->rta_error != 0)
-                fprintf(fp, " error %d", ci->rta_error);
-        }
-    }
-    if (tb[RTA_IIF] && filter.iifmask != -1) {
-        fprintf(fp, " iif %s", ll_index_to_name(*(int*)RTA_DATA(tb[RTA_IIF])));
-    }
-    fputc('\n', fp);
-    fflush(fp);
+                printf(" error %d", ci->rta_error);
+        }
+    }
+    if (tb[RTA_IIF] && G_filter.iifmask != -1) {
+        printf(" iif %s", ll_index_to_name(*(int*)RTA_DATA(tb[RTA_IIF])));
+    }
+    bb_putchar('\n');
     return 0;
 }
 
 /* Return value becomes exitcode. It's okay to not return at all */
-static int iproute_modify(int cmd, unsigned flags, int argc, char **argv)
+static int iproute_modify(int cmd, unsigned flags, char **argv)
 {
     static const char keywords[] ALIGN1 =
-        "src\0""via\0""mtu\0""lock\0""protocol\0"USE_FEATURE_IP_RULE("table\0")
-        "dev\0""oif\0""to\0";
+        "src\0""via\0""mtu\0""lock\0""protocol\0"IF_FEATURE_IP_RULE("table\0")
+        "dev\0""oif\0""to\0""metric\0";
     enum {
         ARG_src,
@@ -303 +311 @@
         ARG_mtu, PARM_lock,
         ARG_protocol,
-USE_FEATURE_IP_RULE(ARG_table,)
+IF_FEATURE_IP_RULE(ARG_table,)
         ARG_dev,
         ARG_oif,
-        ARG_to
+        ARG_to,
+        ARG_metric,
     };
     enum {
@@ -316 +325 @@
     struct rtnl_handle rth;
     struct {
-        struct nlmsghdr     n;
-        struct rtmsg        r;
-        char            buf[1024];
+        struct nlmsghdr n;
+        struct rtmsg    r;
+        char            buf[1024];
     } req;
     char mxbuf[256];
@@ -330 +339 @@
 
     req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct rtmsg));
-    req.n.nlmsg_flags = NLM_F_REQUEST|flags;
+    req.n.nlmsg_flags = NLM_F_REQUEST | flags;
     req.n.nlmsg_type = cmd;
     req.r.rtm_family = preferred_family;
-    req.r.rtm_table = RT_TABLE_MAIN;
-    req.r.rtm_scope = RT_SCOPE_NOWHERE;
+    if (RT_TABLE_MAIN) /* if it is zero, memset already did it */
+        req.r.rtm_table = RT_TABLE_MAIN;
+    if (RT_SCOPE_NOWHERE)
+        req.r.rtm_scope = RT_SCOPE_NOWHERE;
 
     if (cmd != RTM_DELROUTE) {
@@ -345 +356 @@
     mxrta->rta_len = RTA_LENGTH(0);
 
-    while (argc > 0) {
+    while (*argv) {
         arg = index_in_substrings(keywords, *argv);
         if (arg == ARG_src) {
@@ -367 +378 @@
             NEXT_ARG();
             if (index_in_strings(keywords, *argv) == PARM_lock) {
-                mxlock |= (1<<RTAX_MTU);
-                NEXT_ARG();
-            }
-            if (get_unsigned(&mtu, *argv, 0))
-                invarg(*argv, "mtu");
+                mxlock |= (1 << RTAX_MTU);
+                NEXT_ARG();
+            }
+            mtu = get_unsigned(*argv, "mtu");
             rta_addattr32(mxrta, sizeof(mxbuf), RTAX_MTU, mtu);
         } else if (arg == ARG_protocol) {
@@ -391 +401 @@
             NEXT_ARG();
             d = *argv;
+        } else if (arg == ARG_metric) {
+            uint32_t metric;
+            NEXT_ARG();
+            metric = get_u32(*argv, "metric");
+            addattr32(&req.n, sizeof(req), RTA_PRIORITY, metric);
         } else {
             int type;
@@ -399 +414 @@
             }
             if ((**argv < '0' || **argv > '9')
-                && rtnl_rtntype_a2n(&type, *argv) == 0) {
+             && rtnl_rtntype_a2n(&type, *argv) == 0) {
                 NEXT_ARG();
                 req.r.rtm_type = type;
@@ -418 +433 @@
             }
         }
-        argc--; argv++;
+        argv++;
     }
 
@@ -443 +458 @@
     if (req.r.rtm_type == RTN_LOCAL || req.r.rtm_type == RTN_NAT)
         req.r.rtm_scope = RT_SCOPE_HOST;
-    else if (req.r.rtm_type == RTN_BROADCAST ||
-            req.r.rtm_type == RTN_MULTICAST ||
-            req.r.rtm_type == RTN_ANYCAST)
+    else
+    if (req.r.rtm_type == RTN_BROADCAST
+     || req.r.rtm_type == RTN_MULTICAST
+     || req.r.rtm_type == RTN_ANYCAST
+    ) {
         req.r.rtm_scope = RT_SCOPE_LINK;
+    }
     else if (req.r.rtm_type == RTN_UNICAST || req.r.rtm_type == RTN_UNSPEC) {
         if (cmd == RTM_DELROUTE)
@@ -478 +496 @@
 
     req.nlh.nlmsg_len = sizeof(req);
-    req.nlh.nlmsg_type = RTM_GETROUTE;
-    req.nlh.nlmsg_flags = NLM_F_ROOT|NLM_F_REQUEST;
-    req.nlh.nlmsg_pid = 0;
+    if (RTM_GETROUTE)
+        req.nlh.nlmsg_type = RTM_GETROUTE;
+    if (NLM_F_ROOT | NLM_F_REQUEST)
+        req.nlh.nlmsg_flags = NLM_F_ROOT | NLM_F_REQUEST;
+    /*req.nlh.nlmsg_pid = 0; - memset did it already */
     req.nlh.nlmsg_seq = rth->dump = ++rth->seq;
     req.rtm.rtm_family = family;
-    req.rtm.rtm_flags |= RTM_F_CLONED;
+    if (RTM_F_CLONED)
+        req.rtm.rtm_flags = RTM_F_CLONED;
 
     return xsendto(rth->fd, (void*)&req, sizeof(req), (struct sockaddr*)&nladdr, sizeof(nladdr));
@@ -498 +519 @@
 
     if (write(flush_fd, "-1", 2) < 2) {
-        bb_perror_msg("cannot flush routing cache");
+        bb_perror_msg("can't flush routing cache");
         return;
     }
@@ -506 +527 @@
 static void iproute_reset_filter(void)
 {
-    memset(&filter, 0, sizeof(filter));
-    filter.mdst.bitlen = -1;
-    filter.msrc.bitlen = -1;
+    memset(&G_filter, 0, sizeof(G_filter));
+    G_filter.mdst.bitlen = -1;
+    G_filter.msrc.bitlen = -1;
 }
 
 /* Return value becomes exitcode. It's okay to not return at all */
-static int iproute_list_or_flush(int argc, char **argv, int flush)
+static int iproute_list_or_flush(char **argv, int flush)
 {
     int do_ipv6 = preferred_family;
@@ -519 +540 @@
     char *od = NULL;
     static const char keywords[] ALIGN1 =
-        "protocol\0""all\0""dev\0""oif\0""iif\0""via\0""table\0""cache\0" /*all*/
-        "from\0""root\0""match\0""exact\0""to\0"/*root match exact*/;
+        /* "ip route list/flush" parameters: */
+        "protocol\0" "dev\0"   "oif\0"   "iif\0"
+        "via\0"      "table\0" "cache\0"
+        "from\0"     "to\0"
+        /* and possible further keywords */
+        "all\0"
+        "root\0"
+        "match\0"
+        "exact\0"
+        "main\0"
+        ;
     enum {
-        ARG_proto, PARM_all,
-        ARG_dev,
-        ARG_oif,
-        ARG_iif,
-        ARG_via,
-        ARG_table, PARM_cache, /*PARM_all,*/
-        ARG_from, PARM_root, PARM_match, PARM_exact,
-        ARG_to  /*PARM_root, PARM_match, PARM_exact*/
+        KW_proto, KW_dev,   KW_oif,  KW_iif,
+        KW_via,   KW_table, KW_cache,
+        KW_from,  KW_to,
+        /* */
+        KW_all,
+        KW_root,
+        KW_match,
+        KW_exact,
+        KW_main,
     };
     int arg, parm;
+
     iproute_reset_filter();
-    filter.tb = RT_TABLE_MAIN;
-
-    if (flush && argc <= 0)
+    G_filter.tb = RT_TABLE_MAIN;
+
+    if (flush && !*argv)
         bb_error_msg_and_die(bb_msg_requires_arg, "\"ip route flush\"");
 
-    while (argc > 0) {
+    while (*argv) {
         arg = index_in_substrings(keywords, *argv);
-        if (arg == ARG_proto) {
+        if (arg == KW_proto) {
             uint32_t prot = 0;
             NEXT_ARG();
-            filter.protocolmask = -1;
+            //G_filter.protocolmask = -1;
             if (rtnl_rtprot_a2n(&prot, *argv)) {
-                if (index_in_strings(keywords, *argv) != PARM_all)
+                if (index_in_strings(keywords, *argv) != KW_all)
                     invarg(*argv, "protocol");
                 prot = 0;
-                filter.protocolmask = 0;
-            }
-            filter.protocol = prot;
-        } else if (arg == ARG_dev || arg == ARG_oif) {
+                //G_filter.protocolmask = 0;
+            }
+            //G_filter.protocol = prot;
+        } else if (arg == KW_dev || arg == KW_oif) {
             NEXT_ARG();
             od = *argv;
-        } else if (arg == ARG_iif) {
+        } else if (arg == KW_iif) {
             NEXT_ARG();
             id = *argv;
-        } else if (arg == ARG_via) {
-            NEXT_ARG();
-            get_prefix(&filter.rvia, *argv, do_ipv6);
-        } else if (arg == ARG_table) {
+        } else if (arg == KW_via) {
+            NEXT_ARG();
+            get_prefix(&G_filter.rvia, *argv, do_ipv6);
+        } else if (arg == KW_table) { /* table all/cache/main */
             NEXT_ARG();
             parm = index_in_substrings(keywords, *argv);
-            if (parm == PARM_cache)
-                filter.tb = -1;
-            else if (parm == PARM_all)
-                filter.tb = 0;
-            else
+            if (parm == KW_cache)
+                G_filter.tb = -1;
+            else if (parm == KW_all)
+                G_filter.tb = 0;
+            else if (parm != KW_main) {
+#if ENABLE_FEATURE_IP_RULE
+                uint32_t tid;
+                if (rtnl_rttable_a2n(&tid, *argv))
+                    invarg(*argv, "table");
+                G_filter.tb = tid;
+#else
                 invarg(*argv, "table");
-        } else if (arg == ARG_from) {
+#endif
+            }
+        } else if (arg == KW_cache) {
+            /* The command 'ip route flush cache' is used by OpenSWAN.
+             * Assuming it's a synonym for 'ip route flush table cache' */
+            G_filter.tb = -1;
+        } else if (arg == KW_from) {
             NEXT_ARG();
             parm = index_in_substrings(keywords, *argv);
-            if (parm == PARM_root) {
-                NEXT_ARG();
-                get_prefix(&filter.rsrc, *argv, do_ipv6);
-            } else if (parm == PARM_match) {
-                NEXT_ARG();
-                get_prefix(&filter.msrc, *argv, do_ipv6);
+            if (parm == KW_root) {
+                NEXT_ARG();
+                get_prefix(&G_filter.rsrc, *argv, do_ipv6);
+            } else if (parm == KW_match) {
+                NEXT_ARG();
+                get_prefix(&G_filter.msrc, *argv, do_ipv6);
             } else {
-                if (parm == PARM_exact)
+                if (parm == KW_exact)
                     NEXT_ARG();
-                get_prefix(&filter.msrc, *argv, do_ipv6);
-                filter.rsrc = filter.msrc;
-            }
-        } else {
-            /* parm = arg; // would be more plausible, we reuse arg here */
-            if (arg == ARG_to) {
+                get_prefix(&G_filter.msrc, *argv, do_ipv6);
+                G_filter.rsrc = G_filter.msrc;
+            }
+        } else { /* "to" is the default parameter */
+            if (arg == KW_to) {
                 NEXT_ARG();
                 arg = index_in_substrings(keywords, *argv);
             }
-            if (arg == PARM_root) {
-                NEXT_ARG();
-                get_prefix(&filter.rdst, *argv, do_ipv6);
-            } else if (arg == PARM_match) {
-                NEXT_ARG();
-                get_prefix(&filter.mdst, *argv, do_ipv6);
-            } else {
-                if (arg == PARM_exact)
+            /* parm = arg; - would be more plausible, but we reuse 'arg' here */
+            if (arg == KW_root) {
+                NEXT_ARG();
+                get_prefix(&G_filter.rdst, *argv, do_ipv6);
+            } else if (arg == KW_match) {
+                NEXT_ARG();
+                get_prefix(&G_filter.mdst, *argv, do_ipv6);
+            } else { /* "to exact" is the default */
+                if (arg == KW_exact)
                     NEXT_ARG();
-                get_prefix(&filter.mdst, *argv, do_ipv6);
-                filter.rdst = filter.mdst;
-            }
-        }
-        argc--;
+                get_prefix(&G_filter.mdst, *argv, do_ipv6);
+                G_filter.rdst = G_filter.mdst;
+            }
+        }
         argv++;
     }
 
-    if (do_ipv6 == AF_UNSPEC && filter.tb) {
+    if (do_ipv6 == AF_UNSPEC && G_filter.tb) {
         do_ipv6 = AF_INET;
     }
 
     xrtnl_open(&rth);
-
     ll_init_map(&rth);
 
@@ -620 +662 @@
         if (id) {
             idx = xll_name_to_index(id);
-            filter.iif = idx;
-            filter.iifmask = -1;
+            G_filter.iif = idx;
+            G_filter.iifmask = -1;
         }
         if (od) {
             idx = xll_name_to_index(od);
-            filter.oif = idx;
-            filter.oifmask = -1;
+            G_filter.oif = idx;
+            G_filter.oifmask = -1;
         }
     }
@@ -633 +675 @@
         char flushb[4096-512];
 
-        if (filter.tb == -1) {
+        if (G_filter.tb == -1) { /* "flush table cache" */
             if (do_ipv6 != AF_INET6)
                 iproute_flush_cache();
@@ -640 +682 @@
         }
 
-        filter.flushb = flushb;
-        filter.flushp = 0;
-        filter.flushe = sizeof(flushb);
-        filter.rth = &rth;
+        G_filter.flushb = flushb;
+        G_filter.flushp = 0;
+        G_filter.flushe = sizeof(flushb);
+        G_filter.rth = &rth;
 
         for (;;) {
             xrtnl_wilddump_request(&rth, do_ipv6, RTM_GETROUTE);
-            filter.flushed = 0;
-            xrtnl_dump_filter(&rth, print_route, stdout);
-            if (filter.flushed == 0)
+            G_filter.flushed = 0;
+            xrtnl_dump_filter(&rth, print_route, NULL);
+            if (G_filter.flushed == 0)
                 return 0;
             if (flush_update())
@@ -656 +698 @@
     }
 
-    if (filter.tb != -1) {
+    if (G_filter.tb != -1) {
         xrtnl_wilddump_request(&rth, do_ipv6, RTM_GETROUTE);
     } else if (rtnl_rtcache_request(&rth, do_ipv6) < 0) {
-        bb_perror_msg_and_die("cannot send dump request");
-    }
-    xrtnl_dump_filter(&rth, print_route, stdout);
+        bb_perror_msg_and_die("can't send dump request");
+    }
+    xrtnl_dump_filter(&rth, print_route, NULL);
 
     return 0;
@@ -668 +710 @@
 
 /* Return value becomes exitcode. It's okay to not return at all */
-static int iproute_get(int argc, char **argv)
+static int iproute_get(char **argv)
 {
     struct rtnl_handle rth;
@@ -688 +730 @@
 
     req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct rtmsg));
-    req.n.nlmsg_flags = NLM_F_REQUEST;
-    req.n.nlmsg_type = RTM_GETROUTE;
+    if (NLM_F_REQUEST)
+        req.n.nlmsg_flags = NLM_F_REQUEST;
+    if (RTM_GETROUTE)
+        req.n.nlmsg_type = RTM_GETROUTE;
     req.r.rtm_family = preferred_family;
-    req.r.rtm_table = 0;
-    req.r.rtm_protocol = 0;
-    req.r.rtm_scope = 0;
-    req.r.rtm_type = 0;
-    req.r.rtm_src_len = 0;
-    req.r.rtm_dst_len = 0;
-    req.r.rtm_tos = 0;
-
-    while (argc > 0) {
+    /*req.r.rtm_table = 0; - memset did this already */
+    /*req.r.rtm_protocol = 0;*/
+    /*req.r.rtm_scope = 0;*/
+    /*req.r.rtm_type = 0;*/
+    /*req.r.rtm_src_len = 0;*/
+    /*req.r.rtm_dst_len = 0;*/
+    /*req.r.rtm_tos = 0;*/
+
+    while (*argv) {
         switch (index_in_strings(options, *argv)) {
             case 0: /* from */
@@ -745 +789 @@
                 req.r.rtm_dst_len = addr.bitlen;
             }
-            argc--; argv++;
-        }
+        }
+        argv++;
     }
 
@@ -783 +827 @@
         struct rtattr * tb[RTA_MAX+1];
 
-        print_route(NULL, &req.n, (void*)stdout);
+        print_route(NULL, &req.n, NULL);
 
         if (req.n.nlmsg_type != RTM_NEWROUTE) {
@@ -800 +844 @@
             r->rtm_src_len = 8*RTA_PAYLOAD(tb[RTA_PREFSRC]);
         } else if (!tb[RTA_SRC]) {
-            bb_error_msg_and_die("failed to connect the route");
+            bb_error_msg_and_die("can't connect the route");
         }
         if (!odev && tb[RTA_OIF]) {
@@ -818 +862 @@
         }
     }
-    print_route(NULL, &req.n, (void*)stdout);
+    print_route(NULL, &req.n, NULL);
     return 0;
 }
 
 /* Return value becomes exitcode. It's okay to not return at all */
-int do_iproute(int argc, char **argv)
+int FAST_FUNC do_iproute(char **argv)
 {
     static const char ip_route_commands[] ALIGN1 =
@@ -829 +873 @@
     /*4-7*/ "delete\0""get\0""list\0""show\0"
     /*8..*/ "prepend\0""replace\0""test\0""flush\0";
-    int command_num = 6;
+    int command_num;
     unsigned flags = 0;
     int cmd = RTM_NEWROUTE;
 
+    if (!*argv)
+        return iproute_list_or_flush(argv, 0);
+
     /* "Standard" 'ip r a' treats 'a' as 'add', not 'append' */
     /* It probably means that it is using "first match" rule */
-    if (*argv) {
-        command_num = index_in_substrings(ip_route_commands, *argv);
-    }
+    command_num = index_in_substrings(ip_route_commands, *argv);
+
     switch (command_num) {
         case 0: /* add */
@@ -853 +899 @@
             break;
         case 5: /* get */
-            return iproute_get(argc-1, argv+1);
+            return iproute_get(argv+1);
         case 6: /* list */
         case 7: /* show */
-            return iproute_list_or_flush(argc-1, argv+1, 0);
+            return iproute_list_or_flush(argv+1, 0);
         case 8: /* prepend */
             flags = NLM_F_CREATE;
+            break;
         case 9: /* replace */
             flags = NLM_F_CREATE|NLM_F_REPLACE;
+            break;
         case 10: /* test */
             flags = NLM_F_EXCL;
+            break;
         case 11: /* flush */
-            return iproute_list_or_flush(argc-1, argv+1, 1);
+            return iproute_list_or_flush(argv+1, 1);
         default:
             bb_error_msg_and_die("unknown command %s", *argv);
     }
 
-    return iproute_modify(cmd, flags, argc-1, argv+1);
+    return iproute_modify(cmd, flags, argv+1);
 }

branches/2.2.9/mindi-busybox/networking/libiproute/iprule.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * iprule.c     "ip rule".
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
  *
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License
- *      as published by the Free Software Foundation; either version
- *      2 of the License, or (at your option) any later version.
- *
- * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
  * Changes:
  *
- * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
- * initially integrated into busybox by Bernhard Fischer
+ * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
+ * initially integrated into busybox by Bernhard Reutner-Fischer
  */
 
-#include <syslog.h>
-//#include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
@@ -43 +38 @@
 */
 
-static int print_rule(struct sockaddr_nl *who ATTRIBUTE_UNUSED,
-                    struct nlmsghdr *n, void *arg)
-{
-    FILE *fp = (FILE*)arg;
+static int FAST_FUNC print_rule(const struct sockaddr_nl *who UNUSED_PARAM,
+                    struct nlmsghdr *n, void *arg UNUSED_PARAM)
+{
     struct rtmsg *r = NLMSG_DATA(n);
     int len = n->nlmsg_len;
@@ -73 +67 @@
         host_len = 80;
 */
-    if (tb[RTA_PRIORITY])
-        fprintf(fp, "%u:\t", *(unsigned*)RTA_DATA(tb[RTA_PRIORITY]));
-    else
-        fprintf(fp, "0:\t");
-
-    fprintf(fp, "from ");
+    printf("%u:\t", tb[RTA_PRIORITY] ?
+                    *(unsigned*)RTA_DATA(tb[RTA_PRIORITY])
+                    : 0);
+    printf("from ");
     if (tb[RTA_SRC]) {
         if (r->rtm_src_len != host_len) {
-            fprintf(fp, "%s/%u", rt_addr_n2a(r->rtm_family,
-                             RTA_PAYLOAD(tb[RTA_SRC]),
+            printf("%s/%u", rt_addr_n2a(r->rtm_family,
                              RTA_DATA(tb[RTA_SRC]),
                              abuf, sizeof(abuf)),
@@ -88 +79 @@
                 );
         } else {
-            fprintf(fp, "%s", format_host(r->rtm_family,
+            fputs(format_host(r->rtm_family,
                                RTA_PAYLOAD(tb[RTA_SRC]),
                                RTA_DATA(tb[RTA_SRC]),
-                               abuf, sizeof(abuf))
-                );
+                               abuf, sizeof(abuf)), stdout);
         }
     } else if (r->rtm_src_len) {
-        fprintf(fp, "0/%d", r->rtm_src_len);
+        printf("0/%d", r->rtm_src_len);
     } else {
-        fprintf(fp, "all");
-    }
-    fprintf(fp, " ");
+        printf("all");
+    }
+    bb_putchar(' ');
 
     if (tb[RTA_DST]) {
         if (r->rtm_dst_len != host_len) {
-            fprintf(fp, "to %s/%u ", rt_addr_n2a(r->rtm_family,
-                             RTA_PAYLOAD(tb[RTA_DST]),
+            printf("to %s/%u ", rt_addr_n2a(r->rtm_family,
                              RTA_DATA(tb[RTA_DST]),
                              abuf, sizeof(abuf)),
@@ -110 +99 @@
                 );
         } else {
-            fprintf(fp, "to %s ", format_host(r->rtm_family,
+            printf("to %s ", format_host(r->rtm_family,
                                RTA_PAYLOAD(tb[RTA_DST]),
                                RTA_DATA(tb[RTA_DST]),
@@ -116 +105 @@
         }
     } else if (r->rtm_dst_len) {
-        fprintf(fp, "to 0/%d ", r->rtm_dst_len);
+        printf("to 0/%d ", r->rtm_dst_len);
     }
 
     if (r->rtm_tos) {
-        fprintf(fp, "tos %s ", rtnl_dsfield_n2a(r->rtm_tos, b1, sizeof(b1)));
+        printf("tos %s ", rtnl_dsfield_n2a(r->rtm_tos, b1));
     }
     if (tb[RTA_PROTOINFO]) {
-        fprintf(fp, "fwmark %#x ", *(uint32_t*)RTA_DATA(tb[RTA_PROTOINFO]));
+        printf("fwmark %#x ", *(uint32_t*)RTA_DATA(tb[RTA_PROTOINFO]));
     }
 
     if (tb[RTA_IIF]) {
-        fprintf(fp, "iif %s ", (char*)RTA_DATA(tb[RTA_IIF]));
+        printf("iif %s ", (char*)RTA_DATA(tb[RTA_IIF]));
     }
 
     if (r->rtm_table)
-        fprintf(fp, "lookup %s ", rtnl_rttable_n2a(r->rtm_table, b1, sizeof(b1)));
+        printf("lookup %s ", rtnl_rttable_n2a(r->rtm_table, b1));
 
     if (tb[RTA_FLOW]) {
@@ -138 +127 @@
         to &= 0xFFFF;
         if (from) {
-            fprintf(fp, "realms %s/",
-                rtnl_rtrealm_n2a(from, b1, sizeof(b1)));
+            printf("realms %s/",
+                rtnl_rtrealm_n2a(from, b1));
         }
-        fprintf(fp, "%s ",
-            rtnl_rtrealm_n2a(to, b1, sizeof(b1)));
+        printf("%s ",
+            rtnl_rtrealm_n2a(to, b1));
     }
 
     if (r->rtm_type == RTN_NAT) {
         if (tb[RTA_GATEWAY]) {
-            fprintf(fp, "map-to %s ",
+            printf("map-to %s ",
                 format_host(r->rtm_family,
                         RTA_PAYLOAD(tb[RTA_GATEWAY]),
@@ -153 +142 @@
                         abuf, sizeof(abuf)));
         } else
-            fprintf(fp, "masquerade");
+            printf("masquerade");
     } else if (r->rtm_type != RTN_UNICAST)
-        fprintf(fp, "%s", rtnl_rtntype_n2a(r->rtm_type, b1, sizeof(b1)));
-
-    fputc('\n', fp);
-    fflush(fp);
+        fputs(rtnl_rtntype_n2a(r->rtm_type, b1), stdout);
+
+    bb_putchar('\n');
+    /*fflush_all();*/
     return 0;
 }
 
 /* Return value becomes exitcode. It's okay to not return at all */
-static int iprule_list(int argc, char **argv)
+static int iprule_list(char **argv)
 {
     struct rtnl_handle rth;
@@ -171 +160 @@
         af = AF_INET;
 
-    if (argc > 0) {
+    if (*argv) {
         //bb_error_msg("\"rule show\" needs no arguments");
-        bb_warn_ignoring_args(argc);
+        bb_warn_ignoring_args(*argv);
         return -1;
     }
@@ -180 +169 @@
 
     xrtnl_wilddump_request(&rth, af, RTM_GETRULE);
-    xrtnl_dump_filter(&rth, print_rule, stdout);
+    xrtnl_dump_filter(&rth, print_rule, NULL);
 
     return 0;
@@ -186 +175 @@
 
 /* Return value becomes exitcode. It's okay to not return at all */
-static int iprule_modify(int cmd, int argc, char **argv)
+static int iprule_modify(int cmd, char **argv)
 {
     static const char keywords[] ALIGN1 =
@@ -200 +189 @@
     struct rtnl_handle rth;
     struct {
-        struct nlmsghdr n;
-        struct rtmsg    r;
-        char        buf[1024];
+        struct nlmsghdr n;
+        struct rtmsg    r;
+        char            buf[1024];
     } req;
     smalluint key;
@@ -222 +211 @@
     }
 
-    while (argc > 0) {
+    while (*argv) {
         key = index_in_substrings(keywords, *argv) + 1;
         if (key == 0) /* no match found in keywords array, bail out. */
@@ -240 +229 @@
         } else if (key == ARG_preference ||
                key == ARG_order ||
-               key == ARG_priority) {
+               key == ARG_priority
+        ) {
             uint32_t pref;
             NEXT_ARG();
-            if (get_u32(&pref, *argv, 0))
-                invarg(*argv, "preference");
+            pref = get_u32(*argv, "preference");
             addattr32(&req.n, sizeof(req), RTA_PRIORITY, pref);
         } else if (key == ARG_tos) {
@@ -255 +244 @@
             uint32_t fwmark;
             NEXT_ARG();
-            if (get_u32(&fwmark, *argv, 0))
-                invarg(*argv, "fwmark");
+            fwmark = get_u32(*argv, "fwmark");
             addattr32(&req.n, sizeof(req), RTA_PROTOINFO, fwmark);
         } else if (key == ARG_realms) {
@@ -265 +253 @@
             addattr32(&req.n, sizeof(req), RTA_FLOW, realm);
         } else if (key == ARG_table ||
-               key == ARG_lookup) {
+               key == ARG_lookup
+        ) {
             uint32_t tid;
             NEXT_ARG();
@@ -273 +262 @@
             table_ok = 1;
         } else if (key == ARG_dev ||
-               key == ARG_iif) {
+               key == ARG_iif
+        ) {
             NEXT_ARG();
             addattr_l(&req.n, sizeof(req), RTA_IIF, *argv, strlen(*argv)+1);
         } else if (key == ARG_nat ||
-               key == ARG_map_to) {
+               key == ARG_map_to
+        ) {
             NEXT_ARG();
             addattr32(&req.n, sizeof(req), RTA_GATEWAY, get_addr32(*argv));
@@ -293 +284 @@
             req.r.rtm_type = type;
         }
-        argc--;
         argv++;
     }
@@ -312 +302 @@
 
 /* Return value becomes exitcode. It's okay to not return at all */
-int do_iprule(int argc, char **argv)
+int FAST_FUNC do_iprule(char **argv)
 {
     static const char ip_rule_commands[] ALIGN1 =
         "add\0""delete\0""list\0""show\0";
-    int cmd = 2; /* list */
-
-    if (argc < 1)
-        return iprule_list(0, NULL);
-    if (*argv)
-        cmd = index_in_substrings(ip_rule_commands, *argv);
-
-    switch (cmd) {
-        case 0: /* add */
-            cmd = RTM_NEWRULE;
-            break;
-        case 1: /* delete */
-            cmd = RTM_DELRULE;
-            break;
-        case 2: /* list */
-        case 3: /* show */
-            return iprule_list(argc-1, argv+1);
-            break;
-        default:
-            bb_error_msg_and_die("unknown command %s", *argv);
-    }
-    return iprule_modify(cmd, argc-1, argv+1);
-}
+    if (*argv) {
+        smalluint cmd = index_in_substrings(ip_rule_commands, *argv);
+        if (cmd > 3)
+            bb_error_msg_and_die(bb_msg_invalid_arg, *argv, applet_name);
+        argv++;
+        if (cmd < 2)
+            return iprule_modify((cmd == 0) ? RTM_NEWRULE : RTM_DELRULE, argv);
+    }
+    return iprule_list(argv);
+}

branches/2.2.9/mindi-busybox/networking/libiproute/iptunnel.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * iptunnel.c          "ip tunnel"
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
- *
- * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
  * Changes:
  *
- * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
- * Rani Assaf <rani@magic.metawire.com> 980930: do not allow key for ipip/sit
- * Phil Karn <karn@ka9q.ampr.org>   990408: "pmtudisc" flag
+ * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
+ * Rani Assaf <rani@magic.metawire.com> 980930: do not allow key for ipip/sit
+ * Phil Karn <karn@ka9q.ampr.org>       990408: "pmtudisc" flag
  */
 
@@ -19 +16 @@
 #include <net/if_arp.h>
 #include <asm/types.h>
+
 #ifndef __constant_htons
 #define __constant_htons htons
 #endif
-#include <linux/if_tunnel.h>
+
+// FYI: #define SIOCDEVPRIVATE 0x89F0
+
+/* From linux/if_tunnel.h. #including it proved troublesome
+ * (redefiniton errors due to name collisions in linux/ and net[inet]/) */
+#define SIOCGETTUNNEL   (SIOCDEVPRIVATE + 0)
+#define SIOCADDTUNNEL   (SIOCDEVPRIVATE + 1)
+#define SIOCDELTUNNEL   (SIOCDEVPRIVATE + 2)
+#define SIOCCHGTUNNEL   (SIOCDEVPRIVATE + 3)
+//#define SIOCGETPRL      (SIOCDEVPRIVATE + 4)
+//#define SIOCADDPRL      (SIOCDEVPRIVATE + 5)
+//#define SIOCDELPRL      (SIOCDEVPRIVATE + 6)
+//#define SIOCCHGPRL      (SIOCDEVPRIVATE + 7)
+#define GRE_CSUM        __constant_htons(0x8000)
+//#define GRE_ROUTING     __constant_htons(0x4000)
+#define GRE_KEY         __constant_htons(0x2000)
+#define GRE_SEQ         __constant_htons(0x1000)
+//#define GRE_STRICT      __constant_htons(0x0800)
+//#define GRE_REC         __constant_htons(0x0700)
+//#define GRE_FLAGS       __constant_htons(0x00F8)
+//#define GRE_VERSION     __constant_htons(0x0007)
+struct ip_tunnel_parm {
+    char            name[IFNAMSIZ];
+    int             link;
+    uint16_t        i_flags;
+    uint16_t        o_flags;
+    uint32_t        i_key;
+    uint32_t        o_key;
+    struct iphdr    iph;
+};
+/* SIT-mode i_flags */
+//#define SIT_ISATAP 0x0001
+//struct ip_tunnel_prl {
+//  uint32_t          addr;
+//  uint16_t          flags;
+//  uint16_t          __reserved;
+//  uint32_t          datalen;
+//  uint32_t          __reserved2;
+//  /* data follows */
+//};
+///* PRL flags */
+//#define PRL_DEFAULT 0x0001
 
 #include "ip_common.h"  /* #include "libbb.h" is inside */
@@ -35 +74 @@
     int fd;
 
-    strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
+    strncpy_IFNAMSIZ(ifr.ifr_name, dev);
     fd = xsocket(AF_INET, SOCK_DGRAM, 0);
     xioctl(fd, SIOCGIFINDEX, &ifr);
@@ -48 +87 @@
     int err;
 
-    strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
+    strncpy_IFNAMSIZ(ifr.ifr_name, dev);
     fd = xsocket(AF_INET, SOCK_DGRAM, 0);
     err = ioctl_or_warn(fd, SIOCGIFHWADDR, &ifr);
@@ -74 +113 @@
     int err;
 
-    strncpy(ifr.ifr_name, basedev, sizeof(ifr.ifr_name));
+    strncpy_IFNAMSIZ(ifr.ifr_name, basedev);
     ifr.ifr_ifru.ifru_data = (void*)p;
     fd = xsocket(AF_INET, SOCK_DGRAM, 0);
@@ -89 +128 @@
 
     if (cmd == SIOCCHGTUNNEL && p->name[0]) {
-        strncpy(ifr.ifr_name, p->name, sizeof(ifr.ifr_name));
+        strncpy_IFNAMSIZ(ifr.ifr_name, p->name);
     } else {
-        strncpy(ifr.ifr_name, basedev, sizeof(ifr.ifr_name));
+        strncpy_IFNAMSIZ(ifr.ifr_name, basedev);
     }
     ifr.ifr_ifru.ifru_data = (void*)p;
@@ -115 +154 @@
 
     if (p->name[0]) {
-        strncpy(ifr.ifr_name, p->name, sizeof(ifr.ifr_name));
+        strncpy_IFNAMSIZ(ifr.ifr_name, p->name);
     } else {
-        strncpy(ifr.ifr_name, basedev, sizeof(ifr.ifr_name));
+        strncpy_IFNAMSIZ(ifr.ifr_name, basedev);
     }
     ifr.ifr_ifru.ifru_data = (void*)p;
@@ -127 +166 @@
 
 /* Dies on error */
-static void parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p)
+static void parse_args(char **argv, int cmd, struct ip_tunnel_parm *p)
 {
     static const char keywords[] ALIGN1 =
@@ -149 +188 @@
 
     memset(p, 0, sizeof(*p));
-    memset(&medium, 0, sizeof(medium));
+    medium[0] = '\0';
 
     p->iph.version = 4;
@@ -158 +197 @@
     p->iph.frag_off = htons(IP_DF);
 
-    while (argc > 0) {
+    while (*argv) {
         key = index_in_strings(keywords, *argv);
         if (key == ARG_mode) {
@@ -164 +203 @@
             key = index_in_strings(keywords, *argv);
             if (key == ARG_ipip ||
-                key == ARG_ip_ip) {
+                key == ARG_ip_ip
+            ) {
                 if (p->iph.protocol && p->iph.protocol != IPPROTO_IPIP) {
-                    bb_error_msg_and_die("you managed to ask for more than one tunnel mode");
+                    bb_error_msg_and_die("%s tunnel mode", "you managed to ask for more than one");
                 }
                 p->iph.protocol = IPPROTO_IPIP;
             } else if (key == ARG_gre ||
-                   key == ARG_gre_ip) {
+                   key == ARG_gre_ip
+            ) {
                 if (p->iph.protocol && p->iph.protocol != IPPROTO_GRE) {
-                    bb_error_msg_and_die("you managed to ask for more than one tunnel mode");
+                    bb_error_msg_and_die("%s tunnel mode", "you managed to ask for more than one");
                 }
                 p->iph.protocol = IPPROTO_GRE;
             } else if (key == ARG_sit ||
-                   key == ARG_ip6_ip) {
+                   key == ARG_ip6_ip
+            ) {
                 if (p->iph.protocol && p->iph.protocol != IPPROTO_IPV6) {
-                    bb_error_msg_and_die("you managed to ask for more than one tunnel mode");
+                    bb_error_msg_and_die("%s tunnel mode", "you managed to ask for more than one");
                 }
                 p->iph.protocol = IPPROTO_IPV6;
             } else {
-                bb_error_msg_and_die("cannot guess tunnel mode");
+                bb_error_msg_and_die("%s tunnel mode", "can't guess");
             }
         } else if (key == ARG_key) {
@@ -192 +234 @@
                 p->i_key = p->o_key = get_addr32(*argv);
             else {
-                if (get_unsigned(&uval, *argv, 0)<0) {
-                    bb_error_msg_and_die("invalid value of \"key\"");
-                }
+                uval = get_unsigned(*argv, "key");
                 p->i_key = p->o_key = htonl(uval);
             }
@@ -204 +244 @@
                 p->o_key = get_addr32(*argv);
             else {
-                if (get_unsigned(&uval, *argv, 0)<0) {
-                    bb_error_msg_and_die("invalid value of \"ikey\"");
-                }
+                uval = get_unsigned(*argv, "ikey");
                 p->i_key = htonl(uval);
             }
@@ -216 +254 @@
                 p->o_key = get_addr32(*argv);
             else {
-                if (get_unsigned(&uval, *argv, 0)<0) {
-                    bb_error_msg_and_die("invalid value of \"okey\"");
-                }
+                uval = get_unsigned(*argv, "okey");
                 p->o_key = htonl(uval);
             }
@@ -251 +287 @@
         } else if (key == ARG_dev) {
             NEXT_ARG();
-            strncpy(medium, *argv, IFNAMSIZ-1);
+            strncpy_IFNAMSIZ(medium, *argv);
         } else if (key == ARG_ttl) {
             unsigned uval;
@@ -257 +293 @@
             key = index_in_strings(keywords, *argv);
             if (key != ARG_inherit) {
-                if (get_unsigned(&uval, *argv, 0))
-                    invarg(*argv, "TTL");
+                uval = get_unsigned(*argv, "TTL");
                 if (uval > 255)
                     invarg(*argv, "TTL must be <=255");
@@ -264 +299 @@
             }
         } else if (key == ARG_tos ||
-               key == ARG_dsfield) {
+               key == ARG_dsfield
+        ) {
             uint32_t uval;
             NEXT_ARG();
@@ -280 +316 @@
             if (p->name[0])
                 duparg2("name", *argv);
-            strncpy(p->name, *argv, IFNAMSIZ);
+            strncpy_IFNAMSIZ(p->name, *argv);
             if (cmd == SIOCCHGTUNNEL && count == 0) {
                 struct ip_tunnel_parm old_p;
                 memset(&old_p, 0, sizeof(old_p));
                 if (do_get_ioctl(*argv, &old_p))
-                    exit(1);
+                    exit(EXIT_FAILURE);
                 *p = old_p;
             }
         }
         count++;
-        argc--;
         argv++;
     }
@@ -326 +361 @@
 }
 
-
 /* Return value becomes exitcode. It's okay to not return at all */
-static int do_add(int cmd, int argc, char **argv)
+static int do_add(int cmd, char **argv)
 {
     struct ip_tunnel_parm p;
 
-    parse_args(argc, argv, cmd, &p);
+    parse_args(argv, cmd, &p);
 
     if (p.iph.ttl && p.iph.frag_off == 0) {
@@ -346 +380 @@
         return do_add_ioctl(cmd, "sit0", &p);
     default:
-        bb_error_msg_and_die("cannot determine tunnel mode (ipip, gre or sit)");
+        bb_error_msg_and_die("can't determine tunnel mode (ipip, gre or sit)");
     }
 }
 
 /* Return value becomes exitcode. It's okay to not return at all */
-static int do_del(int argc, char **argv)
+static int do_del(char **argv)
 {
     struct ip_tunnel_parm p;
 
-    parse_args(argc, argv, SIOCDELTUNNEL, &p);
+    parse_args(argv, SIOCDELTUNNEL, &p);
 
     switch (p.iph.protocol) {
@@ -405 +439 @@
         if (p->iph.tos & ~1)
             printf("%c%s ", p->iph.tos & 1 ? '/' : ' ',
-                   rtnl_dsfield_n2a(p->iph.tos & ~1, b1, sizeof(b1)));
+                   rtnl_dsfield_n2a(p->iph.tos & ~1, b1));
     }
     if (!(p->iph.frag_off & htons(IP_DF)))
@@ -444 +478 @@
         return;
     }
-
+    /* skip headers */
     fgets(buf, sizeof(buf), fp);
     fgets(buf, sizeof(buf), fp);
@@ -454 +488 @@
         ptr = strchr(buf, ':');
         if (ptr == NULL ||
-            (*ptr++ = 0, sscanf(buf, "%s", name) != 1)) {
+            (*ptr++ = 0, sscanf(buf, "%s", name) != 1)
+        ) {
             bb_error_msg("wrong format of /proc/net/dev");
             return;
@@ -468 +503 @@
         type = do_ioctl_get_iftype(name);
         if (type == -1) {
-            bb_error_msg("cannot get type of [%s]", name);
+            bb_error_msg("can't get type of [%s]", name);
             continue;
         }
@@ -480 +515 @@
             (p->iph.daddr && p1.iph.daddr != p->iph.daddr) ||
             (p->iph.saddr && p1.iph.saddr != p->iph.saddr) ||
-            (p->i_key && p1.i_key != p->i_key))
+            (p->i_key && p1.i_key != p->i_key)
+        ) {
             continue;
+        }
         print_tunnel(&p1);
-        puts("");
+        bb_putchar('\n');
     }
 }
 
 /* Return value becomes exitcode. It's okay to not return at all */
-static int do_show(int argc, char **argv)
+static int do_show(char **argv)
 {
     int err;
     struct ip_tunnel_parm p;
 
-    parse_args(argc, argv, SIOCGETTUNNEL, &p);
+    parse_args(argv, SIOCGETTUNNEL, &p);
 
     switch (p.iph.protocol) {
@@ -513 +550 @@
 
     print_tunnel(&p);
-    puts("");
+    bb_putchar('\n');
     return 0;
 }
 
 /* Return value becomes exitcode. It's okay to not return at all */
-int do_iptunnel(int argc, char **argv)
+int FAST_FUNC do_iptunnel(char **argv)
 {
     static const char keywords[] ALIGN1 =
         "add\0""change\0""delete\0""show\0""list\0""lst\0";
     enum { ARG_add = 0, ARG_change, ARG_del, ARG_show, ARG_list, ARG_lst };
-    int key;
-
-    if (argc) {
-        key = index_in_substrings(keywords, *argv);
-        if (key < 0)
+
+    if (*argv) {
+        smalluint key = index_in_substrings(keywords, *argv);
+        if (key > 5)
             bb_error_msg_and_die(bb_msg_invalid_arg, *argv, applet_name);
-        --argc;
-        ++argv;
+        argv++;
         if (key == ARG_add)
-            return do_add(SIOCADDTUNNEL, argc, argv);
+            return do_add(SIOCADDTUNNEL, argv);
         if (key == ARG_change)
-            return do_add(SIOCCHGTUNNEL, argc, argv);
+            return do_add(SIOCCHGTUNNEL, argv);
         if (key == ARG_del)
-            return do_del(argc, argv);
-    }
-    return do_show(argc, argv);
-}
+            return do_del(argv);
+    }
+    return do_show(argv);
+}

branches/2.2.9/mindi-busybox/networking/libiproute/libnetlink.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * libnetlink.c RTnetlink service routines.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
  *
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License
- *      as published by the Free Software Foundation; either version
- *      2 of the License, or (at your option) any later version.
- *
- * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 
@@ -18 +15 @@
 #include "libnetlink.h"
 
-void rtnl_close(struct rtnl_handle *rth)
-{
-    close(rth->fd);
-}
-
-int xrtnl_open(struct rtnl_handle *rth/*, unsigned subscriptions*/)
+void FAST_FUNC xrtnl_open(struct rtnl_handle *rth/*, unsigned subscriptions*/)
 {
     socklen_t addr_len;
 
-    memset(rth, 0, sizeof(rth));
-
+    memset(rth, 0, sizeof(*rth));
     rth->fd = xsocket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
-
-    memset(&rth->local, 0, sizeof(rth->local));
     rth->local.nl_family = AF_NETLINK;
     /*rth->local.nl_groups = subscriptions;*/
@@ -37 +26 @@
     xbind(rth->fd, (struct sockaddr*)&rth->local, sizeof(rth->local));
     addr_len = sizeof(rth->local);
+    getsockname(rth->fd, (struct sockaddr*)&rth->local, &addr_len);
+
+/* too much paranoia
     if (getsockname(rth->fd, (struct sockaddr*)&rth->local, &addr_len) < 0)
-        bb_perror_msg_and_die("cannot getsockname");
+        bb_perror_msg_and_die("getsockname");
     if (addr_len != sizeof(rth->local))
         bb_error_msg_and_die("wrong address length %d", addr_len);
     if (rth->local.nl_family != AF_NETLINK)
         bb_error_msg_and_die("wrong address family %d", rth->local.nl_family);
+*/
     rth->seq = time(NULL);
-    return 0;
-}
-
-int xrtnl_wilddump_request(struct rtnl_handle *rth, int family, int type)
+}
+
+int FAST_FUNC xrtnl_wilddump_request(struct rtnl_handle *rth, int family, int type)
 {
     struct {
@@ -53 +45 @@
         struct rtgenmsg g;
     } req;
-    struct sockaddr_nl nladdr;
-
-    memset(&nladdr, 0, sizeof(nladdr));
-    nladdr.nl_family = AF_NETLINK;
 
     req.nlh.nlmsg_len = sizeof(req);
@@ -65 +53 @@
     req.g.rtgen_family = family;
 
-    return xsendto(rth->fd, (void*)&req, sizeof(req),
-                 (struct sockaddr*)&nladdr, sizeof(nladdr));
-}
-
-int rtnl_send(struct rtnl_handle *rth, char *buf, int len)
+    return rtnl_send(rth, (void*)&req, sizeof(req));
+}
+
+int FAST_FUNC rtnl_send(struct rtnl_handle *rth, char *buf, int len)
 {
     struct sockaddr_nl nladdr;
@@ -79 +66 @@
 }
 
-int rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, int len)
+int FAST_FUNC rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, int len)
 {
     struct nlmsghdr nlh;
@@ -86 +73 @@
     struct msghdr msg = {
         (void*)&nladdr, sizeof(nladdr),
-        iov,    2,
-        NULL,   0,
+        iov,  2,
+        NULL, 0,
         0
     };
@@ -104 +91 @@
 
 static int rtnl_dump_filter(struct rtnl_handle *rth,
-        int (*filter)(struct sockaddr_nl *, struct nlmsghdr *n, void *),
+        int (*filter)(const struct sockaddr_nl *, struct nlmsghdr *n, void *) FAST_FUNC,
         void *arg1/*,
         int (*junk)(struct sockaddr_nl *, struct nlmsghdr *n, void *),
         void *arg2*/)
 {
-    char buf[8192];
+    int retval = -1;
+    char *buf = xmalloc(8*1024); /* avoid big stack buffer */
     struct sockaddr_nl nladdr;
-    struct iovec iov = { buf, sizeof(buf) };
+    struct iovec iov = { buf, 8*1024 };
 
     while (1) {
@@ -119 +107 @@
         struct msghdr msg = {
             (void*)&nladdr, sizeof(nladdr),
-            &iov,   1,
-            NULL,   0,
+            &iov, 1,
+            NULL, 0,
             0
         };
@@ -134 +122 @@
         if (status == 0) {
             bb_error_msg("EOF on netlink");
-            return -1;
+            goto ret;
         }
         if (msg.msg_namelen != sizeof(nladdr)) {
@@ -146 +134 @@
             if (nladdr.nl_pid != 0 ||
                 h->nlmsg_pid != rth->local.nl_pid ||
-                h->nlmsg_seq != rth->dump) {
-/*              if (junk) {
-                    err = junk(&nladdr, h, arg2);
-                    if (err < 0)
-                        return err;
-                } */
+                h->nlmsg_seq != rth->dump
+            ) {
+//              if (junk) {
+//                  err = junk(&nladdr, h, arg2);
+//                  if (err < 0) {
+//                      retval = err;
+//                      goto ret;
+//                  }
+//              }
                 goto skip_it;
             }
 
             if (h->nlmsg_type == NLMSG_DONE) {
-                return 0;
+                goto ret_0;
             }
             if (h->nlmsg_type == NLMSG_ERROR) {
@@ -166 +157 @@
                     bb_perror_msg("RTNETLINK answers");
                 }
-                return -1;
+                goto ret;
             }
             err = filter(&nladdr, h, arg1);
-            if (err < 0)
-                return err;
-
-skip_it:
+            if (err < 0) {
+                retval = err;
+                goto ret;
+            }
+
+ skip_it:
             h = NLMSG_NEXT(h, status);
         }
@@ -182 +175 @@
             bb_error_msg_and_die("remnant of size %d!", status);
         }
-    }
-}
-
-int xrtnl_dump_filter(struct rtnl_handle *rth,
-        int (*filter)(struct sockaddr_nl *, struct nlmsghdr *n, void *),
+    } /* while (1) */
+ ret_0:
+    retval++; /* = 0 */
+ ret:
+    free(buf);
+    return retval;
+}
+
+int FAST_FUNC xrtnl_dump_filter(struct rtnl_handle *rth,
+        int (*filter)(const struct sockaddr_nl *, struct nlmsghdr *, void *) FAST_FUNC,
         void *arg1)
 {
@@ -195 +193 @@
 }
 
-int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
-          unsigned groups, struct nlmsghdr *answer,
-          int (*junk)(struct sockaddr_nl *,struct nlmsghdr *n, void *),
-          void *jarg)
-{
+int FAST_FUNC rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n,
+        pid_t peer, unsigned groups,
+        struct nlmsghdr *answer,
+        int (*junk)(struct sockaddr_nl *, struct nlmsghdr *, void *),
+        void *jarg)
+{
+/* bbox doesn't use parameters no. 3, 4, 6, 7, they are stubbed out */
+#define peer   0
+#define groups 0
+#define junk   NULL
+#define jarg   NULL
+    int retval = -1;
     int status;
     unsigned seq;
@@ -205 +210 @@
     struct sockaddr_nl nladdr;
     struct iovec iov = { (void*)n, n->nlmsg_len };
-    char   buf[8192];
+    char   *buf = xmalloc(8*1024); /* avoid big stack buffer */
     struct msghdr msg = {
         (void*)&nladdr, sizeof(nladdr),
-        &iov,   1,
-        NULL,   0,
+        &iov, 1,
+        NULL, 0,
         0
     };
@@ -215 +220 @@
     memset(&nladdr, 0, sizeof(nladdr));
     nladdr.nl_family = AF_NETLINK;
-    nladdr.nl_pid = peer;
-    nladdr.nl_groups = groups;
+//  nladdr.nl_pid = peer;
+//  nladdr.nl_groups = groups;
 
     n->nlmsg_seq = seq = ++rtnl->seq;
@@ -225 +230 @@
 
     if (status < 0) {
-        bb_perror_msg("cannot talk to rtnetlink");
-        return -1;
+        bb_perror_msg("can't talk to rtnetlink");
+        goto ret;
     }
 
@@ -232 +237 @@
 
     while (1) {
-        iov.iov_len = sizeof(buf);
+        iov.iov_len = 8*1024;
         status = recvmsg(rtnl->fd, &msg, 0);
 
@@ -244 +249 @@
         if (status == 0) {
             bb_error_msg("EOF on netlink");
-            return -1;
+            goto ret;
         }
         if (msg.msg_namelen != sizeof(nladdr)) {
             bb_error_msg_and_die("sender address length == %d", msg.msg_namelen);
         }
-        for (h = (struct nlmsghdr*)buf; status >= sizeof(*h); ) {
-            int l_err;
+        for (h = (struct nlmsghdr*)buf; status >= (int)sizeof(*h); ) {
+//          int l_err;
             int len = h->nlmsg_len;
             int l = len - sizeof(*h);
 
-            if (l<0 || len>status) {
+            if (l < 0 || len > status) {
                 if (msg.msg_flags & MSG_TRUNC) {
                     bb_error_msg("truncated message");
-                    return -1;
+                    goto ret;
                 }
                 bb_error_msg_and_die("malformed message: len=%d!", len);
@@ -264 +269 @@
             if (nladdr.nl_pid != peer ||
                 h->nlmsg_pid != rtnl->local.nl_pid ||
-                h->nlmsg_seq != seq) {
-                if (junk) {
-                    l_err = junk(&nladdr, h, jarg);
-                    if (l_err < 0) {
-                        return l_err;
-                    }
-                }
+                h->nlmsg_seq != seq
+            ) {
+//              if (junk) {
+//                  l_err = junk(&nladdr, h, jarg);
+//                  if (l_err < 0) {
+//                      retval = l_err;
+//                      goto ret;
+//                  }
+//              }
                 continue;
             }
@@ -276 +283 @@
             if (h->nlmsg_type == NLMSG_ERROR) {
                 struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(h);
-                if (l < sizeof(struct nlmsgerr)) {
+                if (l < (int)sizeof(struct nlmsgerr)) {
                     bb_error_msg("ERROR truncated");
                 } else {
-                    errno = -err->error;
+                    errno = - err->error;
                     if (errno == 0) {
                         if (answer) {
                             memcpy(answer, h, h->nlmsg_len);
                         }
-                        return 0;
+                        goto ret_0;
                     }
                     bb_perror_msg("RTNETLINK answers");
                 }
-                return -1;
+                goto ret;
             }
             if (answer) {
                 memcpy(answer, h, h->nlmsg_len);
-                return 0;
+                goto ret_0;
             }
 
@@ -307 +314 @@
             bb_error_msg_and_die("remnant of size %d!", status);
         }
-    }
-}
-
-int addattr32(struct nlmsghdr *n, int maxlen, int type, uint32_t data)
+    } /* while (1) */
+ ret_0:
+    retval++; /* = 0 */
+ ret:
+    free(buf);
+    return retval;
+}
+
+int FAST_FUNC addattr32(struct nlmsghdr *n, int maxlen, int type, uint32_t data)
 {
     int len = RTA_LENGTH(4);
     struct rtattr *rta;
-    if (NLMSG_ALIGN(n->nlmsg_len) + len > maxlen)
+
+    if ((int)(NLMSG_ALIGN(n->nlmsg_len) + len) > maxlen) {
         return -1;
+    }
     rta = (struct rtattr*)(((char*)n) + NLMSG_ALIGN(n->nlmsg_len));
     rta->rta_type = type;
     rta->rta_len = len;
-    memcpy(RTA_DATA(rta), &data, 4);
+    move_to_unaligned32(RTA_DATA(rta), data);
     n->nlmsg_len = NLMSG_ALIGN(n->nlmsg_len) + len;
     return 0;
 }
 
-int addattr_l(struct nlmsghdr *n, int maxlen, int type, void *data, int alen)
+int FAST_FUNC addattr_l(struct nlmsghdr *n, int maxlen, int type, void *data, int alen)
 {
     int len = RTA_LENGTH(alen);
     struct rtattr *rta;
 
-    if (NLMSG_ALIGN(n->nlmsg_len) + len > maxlen)
+    if ((int)(NLMSG_ALIGN(n->nlmsg_len) + len) > maxlen) {
         return -1;
+    }
     rta = (struct rtattr*)(((char*)n) + NLMSG_ALIGN(n->nlmsg_len));
     rta->rta_type = type;
@@ -339 +354 @@
 }
 
-int rta_addattr32(struct rtattr *rta, int maxlen, int type, uint32_t data)
+int FAST_FUNC rta_addattr32(struct rtattr *rta, int maxlen, int type, uint32_t data)
 {
     int len = RTA_LENGTH(4);
@@ -350 +365 @@
     subrta->rta_type = type;
     subrta->rta_len = len;
-    memcpy(RTA_DATA(subrta), &data, 4);
+    move_to_unaligned32(RTA_DATA(subrta), data);
     rta->rta_len = NLMSG_ALIGN(rta->rta_len) + len;
     return 0;
 }
 
-int rta_addattr_l(struct rtattr *rta, int maxlen, int type, void *data, int alen)
+int FAST_FUNC rta_addattr_l(struct rtattr *rta, int maxlen, int type, void *data, int alen)
 {
     struct rtattr *subrta;
@@ -372 +387 @@
 
 
-int parse_rtattr(struct rtattr *tb[], int max, struct rtattr *rta, int len)
+void FAST_FUNC parse_rtattr(struct rtattr *tb[], int max, struct rtattr *rta, int len)
 {
     while (RTA_OK(rta, len)) {
@@ -383 +398 @@
         bb_error_msg("deficit %d, rta_len=%d!", len, rta->rta_len);
     }
-    return 0;
-}
+}

branches/2.2.9/mindi-busybox/networking/libiproute/libnetlink.h

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
-#ifndef __LIBNETLINK_H__
-#define __LIBNETLINK_H__ 1
+#ifndef LIBNETLINK_H
+#define LIBNETLINK_H 1
 
 #include <linux/types.h>
@@ -9 +9 @@
 #include <linux/rtnetlink.h>
 
-struct rtnl_handle
-{
-    int         fd;
-    struct sockaddr_nl  local;
-    struct sockaddr_nl  peer;
-    uint32_t        seq;
-    uint32_t        dump;
+PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
+
+struct rtnl_handle {
+    int                fd;
+    struct sockaddr_nl local;
+    struct sockaddr_nl peer;
+    uint32_t           seq;
+    uint32_t           dump;
 };
 
-extern int xrtnl_open(struct rtnl_handle *rth);
-extern void rtnl_close(struct rtnl_handle *rth);
-extern int xrtnl_wilddump_request(struct rtnl_handle *rth, int fam, int type);
-extern int rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, int len);
+extern void xrtnl_open(struct rtnl_handle *rth) FAST_FUNC;
+#define rtnl_close(rth) (close((rth)->fd))
+extern int xrtnl_wilddump_request(struct rtnl_handle *rth, int fam, int type) FAST_FUNC;
+extern int rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, int len) FAST_FUNC;
 extern int xrtnl_dump_filter(struct rtnl_handle *rth,
-            int (*filter)(struct sockaddr_nl*, struct nlmsghdr *n, void*),
-            void *arg1);
+        int (*filter)(const struct sockaddr_nl*, struct nlmsghdr *n, void*) FAST_FUNC,
+        void *arg1) FAST_FUNC;
+
+/* bbox doesn't use parameters no. 3, 4, 6, 7, stub them out */
+#define rtnl_talk(rtnl, n, peer, groups, answer, junk, jarg) \
+    rtnl_talk(rtnl, n, answer)
 extern int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
-            unsigned groups, struct nlmsghdr *answer,
-            int (*junk)(struct sockaddr_nl *,struct nlmsghdr *n, void *),
-            void *jarg);
-extern int rtnl_send(struct rtnl_handle *rth, char *buf, int);
+        unsigned groups, struct nlmsghdr *answer,
+        int (*junk)(struct sockaddr_nl *,struct nlmsghdr *n, void *),
+        void *jarg) FAST_FUNC;
+
+extern int rtnl_send(struct rtnl_handle *rth, char *buf, int) FAST_FUNC;
 
 
-extern int addattr32(struct nlmsghdr *n, int maxlen, int type, uint32_t data);
-extern int addattr_l(struct nlmsghdr *n, int maxlen, int type, void *data, int alen);
-extern int rta_addattr32(struct rtattr *rta, int maxlen, int type, uint32_t data);
-extern int rta_addattr_l(struct rtattr *rta, int maxlen, int type, void *data, int alen);
+extern int addattr32(struct nlmsghdr *n, int maxlen, int type, uint32_t data) FAST_FUNC;
+extern int addattr_l(struct nlmsghdr *n, int maxlen, int type, void *data, int alen) FAST_FUNC;
+extern int rta_addattr32(struct rtattr *rta, int maxlen, int type, uint32_t data) FAST_FUNC;
+extern int rta_addattr_l(struct rtattr *rta, int maxlen, int type, void *data, int alen) FAST_FUNC;
 
-extern int parse_rtattr(struct rtattr *tb[], int max, struct rtattr *rta, int len);
+extern void parse_rtattr(struct rtattr *tb[], int max, struct rtattr *rta, int len) FAST_FUNC;
 
-#endif /* __LIBNETLINK_H__ */
+POP_SAVED_FUNCTION_VISIBILITY
+
+#endif

branches/2.2.9/mindi-busybox/networking/libiproute/ll_addr.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * ll_addr.c
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
  *
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License
- *      as published by the Free Software Foundation; either version
- *      2 of the License, or (at your option) any later version.
- *
- * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 
@@ -18 +16 @@
 
 
-const char *ll_addr_n2a(unsigned char *addr, int alen, int type, char *buf, int blen)
+const char* FAST_FUNC ll_addr_n2a(unsigned char *addr, int alen, int type, char *buf, int blen)
 {
     int i;
     int l;
 
-    if (alen == 4 &&
-        (type == ARPHRD_TUNNEL || type == ARPHRD_SIT || type == ARPHRD_IPGRE)) {
+    if (alen == 4
+     && (type == ARPHRD_TUNNEL || type == ARPHRD_SIT || type == ARPHRD_IPGRE)
+    ) {
         return inet_ntop(AF_INET, addr, buf, blen);
     }
     l = 0;
-    for (i=0; i<alen; i++) {
-        if (i==0) {
-            snprintf(buf+l, blen, ":%02x"+1, addr[i]);
+    for (i = 0; i < alen; i++) {
+        if (i == 0) {
+            snprintf(buf + l, blen, ":%02x"+1, addr[i]);
             blen -= 2;
             l += 2;
         } else {
-            snprintf(buf+l, blen, ":%02x", addr[i]);
+            snprintf(buf + l, blen, ":%02x", addr[i]);
             blen -= 3;
             l += 3;
@@ -42 +41 @@
 }
 
-int ll_addr_a2n(unsigned char *lladdr, int len, char *arg)
+int FAST_FUNC ll_addr_a2n(unsigned char *lladdr, int len, char *arg)
 {
+    int i;
+
     if (strchr(arg, '.')) {
         inet_prefix pfx;
@@ -55 +56 @@
         memcpy(lladdr, pfx.data, 4);
         return 4;
-    } else {
-        int i;
+    }
 
-        for (i=0; i<len; i++) {
-            int temp;
-            char *cp = strchr(arg, ':');
-            if (cp) {
-                *cp = 0;
-                cp++;
-            }
-            if (sscanf(arg, "%x", &temp) != 1) {
-                bb_error_msg("\"%s\" is invalid lladdr", arg);
-                return -1;
-            }
-            if (temp < 0 || temp > 255) {
-                bb_error_msg("\"%s\" is invalid lladdr", arg);
-                return -1;
-            }
-            lladdr[i] = temp;
-            if (!cp) {
-                break;
-            }
-            arg = cp;
+    for (i = 0; i < len; i++) {
+        int temp;
+        char *cp = strchr(arg, ':');
+        if (cp) {
+            *cp = 0;
+            cp++;
         }
-        return i+1;
+        if (sscanf(arg, "%x", &temp) != 1 || (temp < 0 || temp > 255)) {
+            bb_error_msg("\"%s\" is invalid lladdr", arg);
+            return -1;
+        }
+        lladdr[i] = temp;
+        if (!cp) {
+            break;
+        }
+        arg = cp;
     }
+    return i+1;
 }

branches/2.2.9/mindi-busybox/networking/libiproute/ll_map.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * ll_map.c
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
  *
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License
- *      as published by the Free Software Foundation; either version
- *      2 of the License, or (at your option) any later version.
- *
- * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 
-#include <net/if.h> /* struct ifreq and co. */
+#include <net/if.h>  /* struct ifreq and co. */
 
 #include "libbb.h"
@@ -28 +25 @@
 };
 
-static struct idxmap *idxmap[16];
+static struct idxmap **idxmap; /* treat as *idxmap[16] */
 
 static struct idxmap *find_by_index(int idx)
@@ -34 +31 @@
     struct idxmap *im;
 
-    for (im = idxmap[idx & 0xF]; im; im = im->next)
-        if (im->index == idx)
-            return im;
+    if (idxmap)
+        for (im = idxmap[idx & 0xF]; im; im = im->next)
+            if (im->index == idx)
+                return im;
     return NULL;
 }
 
-int ll_remember_index(struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
+int FAST_FUNC ll_remember_index(const struct sockaddr_nl *who UNUSED_PARAM,
+        struct nlmsghdr *n,
+        void *arg UNUSED_PARAM)
 {
     int h;
@@ -58 +58 @@
         return 0;
 
+    if (!idxmap)
+        idxmap = xzalloc(sizeof(idxmap[0]) * 16);
+
     h = ifi->ifi_index & 0xF;
-
     for (imp = &idxmap[h]; (im = *imp) != NULL; imp = &im->next)
         if (im->index == ifi->ifi_index)
@@ -74 +76 @@
         int alen;
         im->alen = alen = RTA_PAYLOAD(tb[IFLA_ADDRESS]);
-        if (alen > sizeof(im->addr))
+        if (alen > (int)sizeof(im->addr))
             alen = sizeof(im->addr);
         memcpy(im->addr, RTA_DATA(tb[IFLA_ADDRESS]), alen);
@@ -85 +87 @@
 }
 
-const char *ll_idx_n2a(int idx, char *buf)
+const char FAST_FUNC *ll_idx_n2a(int idx, char *buf)
 {
     struct idxmap *im;
@@ -99 +101 @@
 
 
-const char *ll_index_to_name(int idx)
+const char FAST_FUNC *ll_index_to_name(int idx)
 {
     static char nbuf[16];
@@ -120 +122 @@
 #endif
 
-unsigned ll_index_to_flags(int idx)
+unsigned FAST_FUNC ll_index_to_flags(int idx)
 {
     struct idxmap *im;
@@ -132 +134 @@
 }
 
-int xll_name_to_index(const char *const name)
+int FAST_FUNC xll_name_to_index(const char *name)
 {
     int ret = 0;
@@ -151 +153 @@
         goto out;
     }
-    for (i = 0; i < 16; i++) {
-        for (im = idxmap[i]; im; im = im->next) {
-            if (strcmp(im->name, name) == 0) {
-                icache = im->index;
-                strcpy(ncache, name);
-                ret = im->index;
-                goto out;
+    if (idxmap) {
+        for (i = 0; i < 16; i++) {
+            for (im = idxmap[i]; im; im = im->next) {
+                if (strcmp(im->name, name) == 0) {
+                    icache = im->index;
+                    strcpy(ncache, name);
+                    ret = im->index;
+                    goto out;
+                }
             }
         }
@@ -171 +175 @@
 
     sock_fd = socket(AF_INET, SOCK_DGRAM, 0);
-    if (sock_fd) {
+    if (sock_fd >= 0) {
         struct ifreq ifr;
         int tmp;
 
-        strncpy(ifr.ifr_name, name, IFNAMSIZ);
+        strncpy_IFNAMSIZ(ifr.ifr_name, name);
         ifr.ifr_ifindex = -1;
         tmp = ioctl(sock_fd, SIOCGIFINDEX, &ifr);
@@ -187 +191 @@
 /* out:*/
     if (ret <= 0)
-        bb_error_msg_and_die("cannot find device \"%s\"", name);
+        bb_error_msg_and_die("can't find device '%s'", name);
     return ret;
 }
 
-int ll_init_map(struct rtnl_handle *rth)
+int FAST_FUNC ll_init_map(struct rtnl_handle *rth)
 {
     xrtnl_wilddump_request(rth, AF_UNSPEC, RTM_GETLINK);
-    xrtnl_dump_filter(rth, ll_remember_index, &idxmap);
+    xrtnl_dump_filter(rth, ll_remember_index, NULL);
     return 0;
 }

branches/2.2.9/mindi-busybox/networking/libiproute/ll_map.h

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
-#ifndef __LL_MAP_H__
-#define __LL_MAP_H__ 1
+#ifndef LL_MAP_H
+#define LL_MAP_H 1
 
-int ll_remember_index(struct sockaddr_nl *who, struct nlmsghdr *n, void *arg);
-int ll_init_map(struct rtnl_handle *rth);
-int xll_name_to_index(const char *const name);
-const char *ll_index_to_name(int idx);
-const char *ll_idx_n2a(int idx, char *buf);
+PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
+
+int ll_remember_index(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) FAST_FUNC;
+int ll_init_map(struct rtnl_handle *rth) FAST_FUNC;
+int xll_name_to_index(const char *name) FAST_FUNC;
+const char *ll_index_to_name(int idx) FAST_FUNC;
+const char *ll_idx_n2a(int idx, char *buf) FAST_FUNC;
 /* int ll_index_to_type(int idx); */
-unsigned ll_index_to_flags(int idx);
+unsigned ll_index_to_flags(int idx) FAST_FUNC;
 
-#endif /* __LL_MAP_H__ */
+POP_SAVED_FUNCTION_VISIBILITY
+
+#endif

branches/2.2.9/mindi-busybox/networking/libiproute/ll_proto.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * ll_proto.c
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
  *
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License
- *      as published by the Free Software Foundation; either version
- *      2 of the License, or (at your option) any later version.
- *
- * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 
@@ -20 +18 @@
 #include <linux/if_ether.h>
 #endif
+
+#if !ENABLE_WERROR
+#warning de-bloat
+#endif
+/* Before re-enabling this, please (1) conditionalize exotic protocols
+ * on CONFIG_something, and (2) decouple strings and numbers
+ * (use llproto_ids[] = n,n,n..; and llproto_names[] = "loop\0" "pup\0" ...;)
+ */
 
 #define __PF(f,n) { ETH_P_##f, #n },
@@ -91 +97 @@
 
 
-const char * ll_proto_n2a(unsigned short id, char *buf, int len)
+const char* FAST_FUNC ll_proto_n2a(unsigned short id, char *buf, int len)
 {
-    int i;
-
+    unsigned i;
     id = ntohs(id);
-
-    for (i=0; i < ARRAY_SIZE(llproto_names); i++) {
+    for (i = 0; i < ARRAY_SIZE(llproto_names); i++) {
          if (llproto_names[i].id == id)
             return llproto_names[i].name;
@@ -105 +109 @@
 }
 
-int ll_proto_a2n(unsigned short *id, char *buf)
+int FAST_FUNC ll_proto_a2n(unsigned short *id, char *buf)
 {
-    int i;
-    for (i=0; i < ARRAY_SIZE(llproto_names); i++) {
+    unsigned i;
+    for (i = 0; i < ARRAY_SIZE(llproto_names); i++) {
          if (strcasecmp(llproto_names[i].name, buf) == 0) {
-             *id = htons(llproto_names[i].id);
-             return 0;
+             i = llproto_names[i].id;
+             goto good;
          }
     }
-    if (get_u16(id, buf, 0))
+    i = bb_strtou(buf, NULL, 0);
+    if (errno || i > 0xffff)
         return -1;
-    *id = htons(*id);
+ good:
+    *id = htons(i);
     return 0;
 }

branches/2.2.9/mindi-busybox/networking/libiproute/ll_types.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * ll_types.c
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
  *
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License
- *      as published by the Free Software Foundation; either version
- *      2 of the License, or (at your option) any later version.
- *
- * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 #include <arpa/inet.h>
@@ -16 +14 @@
 #include "rt_names.h"
 
-const char* ll_type_n2a(int type, char *buf, int len)
+const char* FAST_FUNC ll_type_n2a(int type, char *buf)
 {
-#define __PF(f,n) { ARPHRD_##f, #n },
-static const struct {
-    int type;
-    const char *name;
-} arphrd_names[] = {
-{ 0, "generic" },
-__PF(ETHER,ether)
-__PF(EETHER,eether)
-__PF(AX25,ax25)
-__PF(PRONET,pronet)
-__PF(CHAOS,chaos)
+    static const char arphrd_name[] =
+    /* 0,                  */ "generic" "\0"
+    /* ARPHRD_LOOPBACK,    */ "loopback" "\0"
+    /* ARPHRD_ETHER,       */ "ether" "\0"
+#ifdef ARPHRD_INFINIBAND
+    /* ARPHRD_INFINIBAND,  */ "infiniband" "\0"
+#endif
 #ifdef ARPHRD_IEEE802_TR
-__PF(IEEE802,ieee802)
+    /* ARPHRD_IEEE802,     */ "ieee802" "\0"
+    /* ARPHRD_IEEE802_TR,  */ "tr" "\0"
 #else
-__PF(IEEE802,tr)
-#endif
-__PF(ARCNET,arcnet)
-__PF(APPLETLK,atalk)
-__PF(DLCI,dlci)
+    /* ARPHRD_IEEE802,     */ "tr" "\0"
+#endif
+#ifdef ARPHRD_IEEE80211
+    /* ARPHRD_IEEE80211,   */ "ieee802.11" "\0"
+#endif
+#ifdef ARPHRD_IEEE1394
+    /* ARPHRD_IEEE1394,    */ "ieee1394" "\0"
+#endif
+    /* ARPHRD_IRDA,        */ "irda" "\0"
+    /* ARPHRD_SLIP,        */ "slip" "\0"
+    /* ARPHRD_CSLIP,       */ "cslip" "\0"
+    /* ARPHRD_SLIP6,       */ "slip6" "\0"
+    /* ARPHRD_CSLIP6,      */ "cslip6" "\0"
+    /* ARPHRD_PPP,         */ "ppp" "\0"
+    /* ARPHRD_TUNNEL,      */ "ipip" "\0"
+    /* ARPHRD_TUNNEL6,     */ "tunnel6" "\0"
+    /* ARPHRD_SIT,         */ "sit" "\0"
+    /* ARPHRD_IPGRE,       */ "gre" "\0"
+#ifdef ARPHRD_VOID
+    /* ARPHRD_VOID,        */ "void" "\0"
+#endif
+
+#if ENABLE_FEATURE_IP_RARE_PROTOCOLS
+    /* ARPHRD_EETHER,      */ "eether" "\0"
+    /* ARPHRD_AX25,        */ "ax25" "\0"
+    /* ARPHRD_PRONET,      */ "pronet" "\0"
+    /* ARPHRD_CHAOS,       */ "chaos" "\0"
+    /* ARPHRD_ARCNET,      */ "arcnet" "\0"
+    /* ARPHRD_APPLETLK,    */ "atalk" "\0"
+    /* ARPHRD_DLCI,        */ "dlci" "\0"
 #ifdef ARPHRD_ATM
-__PF(ATM,atm)
-#endif
-__PF(METRICOM,metricom)
+    /* ARPHRD_ATM,         */ "atm" "\0"
+#endif
+    /* ARPHRD_METRICOM,    */ "metricom" "\0"
+    /* ARPHRD_RSRVD,       */ "rsrvd" "\0"
+    /* ARPHRD_ADAPT,       */ "adapt" "\0"
+    /* ARPHRD_ROSE,        */ "rose" "\0"
+    /* ARPHRD_X25,         */ "x25" "\0"
+#ifdef ARPHRD_HWX25
+    /* ARPHRD_HWX25,       */ "hwx25" "\0"
+#endif
+    /* ARPHRD_HDLC,        */ "hdlc" "\0"
+    /* ARPHRD_LAPB,        */ "lapb" "\0"
+#ifdef ARPHRD_DDCMP
+    /* ARPHRD_DDCMP,       */ "ddcmp" "\0"
+    /* ARPHRD_RAWHDLC,     */ "rawhdlc" "\0"
+#endif
+    /* ARPHRD_FRAD,        */ "frad" "\0"
+    /* ARPHRD_SKIP,        */ "skip" "\0"
+    /* ARPHRD_LOCALTLK,    */ "ltalk" "\0"
+    /* ARPHRD_FDDI,        */ "fddi" "\0"
+    /* ARPHRD_BIF,         */ "bif" "\0"
+    /* ARPHRD_IPDDP,       */ "ip/ddp" "\0"
+    /* ARPHRD_PIMREG,      */ "pimreg" "\0"
+    /* ARPHRD_HIPPI,       */ "hippi" "\0"
+    /* ARPHRD_ASH,         */ "ash" "\0"
+    /* ARPHRD_ECONET,      */ "econet" "\0"
+    /* ARPHRD_FCPP,        */ "fcpp" "\0"
+    /* ARPHRD_FCAL,        */ "fcal" "\0"
+    /* ARPHRD_FCPL,        */ "fcpl" "\0"
+    /* ARPHRD_FCFABRIC,    */ "fcfb0" "\0"
+    /* ARPHRD_FCFABRIC+1,  */ "fcfb1" "\0"
+    /* ARPHRD_FCFABRIC+2,  */ "fcfb2" "\0"
+    /* ARPHRD_FCFABRIC+3,  */ "fcfb3" "\0"
+    /* ARPHRD_FCFABRIC+4,  */ "fcfb4" "\0"
+    /* ARPHRD_FCFABRIC+5,  */ "fcfb5" "\0"
+    /* ARPHRD_FCFABRIC+6,  */ "fcfb6" "\0"
+    /* ARPHRD_FCFABRIC+7,  */ "fcfb7" "\0"
+    /* ARPHRD_FCFABRIC+8,  */ "fcfb8" "\0"
+    /* ARPHRD_FCFABRIC+9,  */ "fcfb9" "\0"
+    /* ARPHRD_FCFABRIC+10, */ "fcfb10" "\0"
+    /* ARPHRD_FCFABRIC+11, */ "fcfb11" "\0"
+    /* ARPHRD_FCFABRIC+12, */ "fcfb12" "\0"
+#endif /* FEATURE_IP_RARE_PROTOCOLS */
+    ;
+
+    /* Keep these arrays in sync! */
+
+    static const uint16_t arphrd_type[] = {
+    0,                  /* "generic" "\0" */
+    ARPHRD_LOOPBACK,    /* "loopback" "\0" */
+    ARPHRD_ETHER,       /* "ether" "\0" */
+#ifdef ARPHRD_INFINIBAND
+    ARPHRD_INFINIBAND,  /* "infiniband" "\0" */
+#endif
+#ifdef ARPHRD_IEEE802_TR
+    ARPHRD_IEEE802,     /* "ieee802" "\0" */
+    ARPHRD_IEEE802_TR,  /* "tr" "\0" */
+#else
+    ARPHRD_IEEE802,     /* "tr" "\0" */
+#endif
+#ifdef ARPHRD_IEEE80211
+    ARPHRD_IEEE80211,   /* "ieee802.11" "\0" */
+#endif
 #ifdef ARPHRD_IEEE1394
-__PF(IEEE1394,ieee1394)
-#endif
-
-__PF(SLIP,slip)
-__PF(CSLIP,cslip)
-__PF(SLIP6,slip6)
-__PF(CSLIP6,cslip6)
-__PF(RSRVD,rsrvd)
-__PF(ADAPT,adapt)
-__PF(ROSE,rose)
-__PF(X25,x25)
+    ARPHRD_IEEE1394,    /* "ieee1394" "\0" */
+#endif
+    ARPHRD_IRDA,        /* "irda" "\0" */
+    ARPHRD_SLIP,        /* "slip" "\0" */
+    ARPHRD_CSLIP,       /* "cslip" "\0" */
+    ARPHRD_SLIP6,       /* "slip6" "\0" */
+    ARPHRD_CSLIP6,      /* "cslip6" "\0" */
+    ARPHRD_PPP,         /* "ppp" "\0" */
+    ARPHRD_TUNNEL,      /* "ipip" "\0" */
+    ARPHRD_TUNNEL6,     /* "tunnel6" "\0" */
+    ARPHRD_SIT,         /* "sit" "\0" */
+    ARPHRD_IPGRE,       /* "gre" "\0" */
+#ifdef ARPHRD_VOID
+    ARPHRD_VOID,        /* "void" "\0" */
+#endif
+
+#if ENABLE_FEATURE_IP_RARE_PROTOCOLS
+    ARPHRD_EETHER,      /* "eether" "\0" */
+    ARPHRD_AX25,        /* "ax25" "\0" */
+    ARPHRD_PRONET,      /* "pronet" "\0" */
+    ARPHRD_CHAOS,       /* "chaos" "\0" */
+    ARPHRD_ARCNET,      /* "arcnet" "\0" */
+    ARPHRD_APPLETLK,    /* "atalk" "\0" */
+    ARPHRD_DLCI,        /* "dlci" "\0" */
+#ifdef ARPHRD_ATM
+    ARPHRD_ATM,         /* "atm" "\0" */
+#endif
+    ARPHRD_METRICOM,    /* "metricom" "\0" */
+    ARPHRD_RSRVD,       /* "rsrvd" "\0" */
+    ARPHRD_ADAPT,       /* "adapt" "\0" */
+    ARPHRD_ROSE,        /* "rose" "\0" */
+    ARPHRD_X25,         /* "x25" "\0" */
 #ifdef ARPHRD_HWX25
-__PF(HWX25,hwx25)
-#endif
-__PF(PPP,ppp)
-__PF(HDLC,hdlc)
-__PF(LAPB,lapb)
+    ARPHRD_HWX25,       /* "hwx25" "\0" */
+#endif
+    ARPHRD_HDLC,        /* "hdlc" "\0" */
+    ARPHRD_LAPB,        /* "lapb" "\0" */
 #ifdef ARPHRD_DDCMP
-__PF(DDCMP,ddcmp)
-__PF(RAWHDLC,rawhdlc)
-#endif
-
-__PF(TUNNEL,ipip)
-__PF(TUNNEL6,tunnel6)
-__PF(FRAD,frad)
-__PF(SKIP,skip)
-__PF(LOOPBACK,loopback)
-__PF(LOCALTLK,ltalk)
-__PF(FDDI,fddi)
-__PF(BIF,bif)
-__PF(SIT,sit)
-__PF(IPDDP,ip/ddp)
-__PF(IPGRE,gre)
-__PF(PIMREG,pimreg)
-__PF(HIPPI,hippi)
-__PF(ASH,ash)
-__PF(ECONET,econet)
-__PF(IRDA,irda)
-__PF(FCPP,fcpp)
-__PF(FCAL,fcal)
-__PF(FCPL,fcpl)
-__PF(FCFABRIC,fcfb0)
-__PF(FCFABRIC+1,fcfb1)
-__PF(FCFABRIC+2,fcfb2)
-__PF(FCFABRIC+3,fcfb3)
-__PF(FCFABRIC+4,fcfb4)
-__PF(FCFABRIC+5,fcfb5)
-__PF(FCFABRIC+6,fcfb6)
-__PF(FCFABRIC+7,fcfb7)
-__PF(FCFABRIC+8,fcfb8)
-__PF(FCFABRIC+9,fcfb9)
-__PF(FCFABRIC+10,fcfb10)
-__PF(FCFABRIC+11,fcfb11)
-__PF(FCFABRIC+12,fcfb12)
-#ifdef ARPHRD_IEEE802_TR
-__PF(IEEE802_TR,tr)
-#endif
-#ifdef ARPHRD_IEEE80211
-__PF(IEEE80211,ieee802.11)
-#endif
-#ifdef ARPHRD_VOID
-__PF(VOID,void)
-#endif
-};
-#undef __PF
-
-    int i;
-    for (i = 0; i < ARRAY_SIZE(arphrd_names); i++) {
-         if (arphrd_names[i].type == type)
-            return arphrd_names[i].name;
+    ARPHRD_DDCMP,       /* "ddcmp" "\0" */
+    ARPHRD_RAWHDLC,     /* "rawhdlc" "\0" */
+#endif
+    ARPHRD_FRAD,        /* "frad" "\0" */
+    ARPHRD_SKIP,        /* "skip" "\0" */
+    ARPHRD_LOCALTLK,    /* "ltalk" "\0" */
+    ARPHRD_FDDI,        /* "fddi" "\0" */
+    ARPHRD_BIF,         /* "bif" "\0" */
+    ARPHRD_IPDDP,       /* "ip/ddp" "\0" */
+    ARPHRD_PIMREG,      /* "pimreg" "\0" */
+    ARPHRD_HIPPI,       /* "hippi" "\0" */
+    ARPHRD_ASH,         /* "ash" "\0" */
+    ARPHRD_ECONET,      /* "econet" "\0" */
+    ARPHRD_FCPP,        /* "fcpp" "\0" */
+    ARPHRD_FCAL,        /* "fcal" "\0" */
+    ARPHRD_FCPL,        /* "fcpl" "\0" */
+    ARPHRD_FCFABRIC,    /* "fcfb0" "\0" */
+    ARPHRD_FCFABRIC+1,  /* "fcfb1" "\0" */
+    ARPHRD_FCFABRIC+2,  /* "fcfb2" "\0" */
+    ARPHRD_FCFABRIC+3,  /* "fcfb3" "\0" */
+    ARPHRD_FCFABRIC+4,  /* "fcfb4" "\0" */
+    ARPHRD_FCFABRIC+5,  /* "fcfb5" "\0" */
+    ARPHRD_FCFABRIC+6,  /* "fcfb6" "\0" */
+    ARPHRD_FCFABRIC+7,  /* "fcfb7" "\0" */
+    ARPHRD_FCFABRIC+8,  /* "fcfb8" "\0" */
+    ARPHRD_FCFABRIC+9,  /* "fcfb9" "\0" */
+    ARPHRD_FCFABRIC+10, /* "fcfb10" "\0" */
+    ARPHRD_FCFABRIC+11, /* "fcfb11" "\0" */
+    ARPHRD_FCFABRIC+12, /* "fcfb12" "\0" */
+#endif /* FEATURE_IP_RARE_PROTOCOLS */
+    };
+
+    unsigned i;
+    const char *aname = arphrd_name;
+    for (i = 0; i < ARRAY_SIZE(arphrd_type); i++) {
+        if (arphrd_type[i] == type)
+            return aname;
+        aname += strlen(aname) + 1;
     }
-    snprintf(buf, len, "[%d]", type);
+    sprintf(buf, "[%d]", type);
     return buf;
 }

branches/2.2.9/mindi-busybox/networking/libiproute/rt_names.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * rt_names.c       rtnetlink names DB.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
  *
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License
- *      as published by the Free Software Foundation; either version
- *      2 of the License, or (at your option) any later version.
- *
- * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
-
 #include "libbb.h"
 #include "rt_names.h"
 
-static void rtnl_tab_initialize(const char *file, const char **tab, int size)
-{
-    char buf[512];
-    FILE *fp;
-
-    fp = fopen(file, "r");
-    if (!fp)
-        return;
-    while (fgets(buf, sizeof(buf), fp)) {
-        char *p = buf;
-        int id;
-        char namebuf[512];
-
-        while (*p == ' ' || *p == '\t')
-            p++;
-        if (*p == '#' || *p == '\n' || *p == 0)
-            continue;
-        if (sscanf(p, "0x%x %s\n", &id, namebuf) != 2
-         && sscanf(p, "0x%x %s #", &id, namebuf) != 2
-         && sscanf(p, "%d %s\n", &id, namebuf) != 2
-         && sscanf(p, "%d %s #", &id, namebuf) != 2
+typedef struct rtnl_tab_t {
+    const char *cached_str;
+    unsigned cached_result;
+    const char *tab[256];
+} rtnl_tab_t;
+
+static void rtnl_tab_initialize(const char *file, const char **tab)
+{
+    char *token[2];
+    parser_t *parser = config_open2(file, fopen_for_read);
+
+    while (config_read(parser, token, 2, 2, "# \t", PARSE_NORMAL)) {
+        unsigned id = bb_strtou(token[0], NULL, 0);
+        if (id > 256) {
+            bb_error_msg("database %s is corrupted at line %d",
+                file, parser->lineno);
+            break;
+        }
+        tab[id] = xstrdup(token[1]);
+    }
+    config_close(parser);
+}
+
+static int rtnl_a2n(rtnl_tab_t *tab, uint32_t *id, const char *arg, int base)
+{
+    unsigned i;
+
+    if (tab->cached_str && strcmp(tab->cached_str, arg) == 0) {
+        *id = tab->cached_result;
+        return 0;
+    }
+
+    for (i = 0; i < 256; i++) {
+        if (tab->tab[i]
+         && strcmp(tab->tab[i], arg) == 0
         ) {
-            bb_error_msg("database %s is corrupted at %s",
-                file, p);
-            return;
+            tab->cached_str = tab->tab[i];
+            tab->cached_result = i;
+            *id = i;
+            return 0;
         }
-
-        if (id < 0 || id > size)
-            continue;
-
-        tab[id] = xstrdup(namebuf);
-    }
-    fclose(fp);
-}
-
-
-static const char **rtnl_rtprot_tab; /* [256] */
+    }
+
+    i = bb_strtou(arg, NULL, base);
+    if (i > 255)
+        return -1;
+    *id = i;
+    return 0;
+}
+
+
+static rtnl_tab_t *rtnl_rtprot_tab;
 
 static void rtnl_rtprot_initialize(void)
@@ -69 +81 @@
         "bird",
     };
-    if (rtnl_rtprot_tab) return;
-    rtnl_rtprot_tab = xzalloc(256 * sizeof(rtnl_rtprot_tab[0]));
-    memcpy(rtnl_rtprot_tab, init_tab, sizeof(init_tab));
-    rtnl_tab_initialize("/etc/iproute2/rt_protos",
-                rtnl_rtprot_tab, 256);
-}
-
-
-const char* rtnl_rtprot_n2a(int id, char *buf, int len)
-{
-    if (id < 0 || id >= 256) {
-        snprintf(buf, len, "%d", id);
+
+    if (rtnl_rtprot_tab)
+        return;
+    rtnl_rtprot_tab = xzalloc(sizeof(*rtnl_rtprot_tab));
+    memcpy(rtnl_rtprot_tab->tab, init_tab, sizeof(init_tab));
+    rtnl_tab_initialize("/etc/iproute2/rt_protos", rtnl_rtprot_tab->tab);
+}
+
+const char* FAST_FUNC rtnl_rtprot_n2a(int id, char *buf)
+{
+    if (id < 0 || id >= 256) {
+        sprintf(buf, "%d", id);
         return buf;
     }
@@ -86 +98 @@
     rtnl_rtprot_initialize();
 
-    if (rtnl_rtprot_tab[id])
-        return rtnl_rtprot_tab[id];
-    snprintf(buf, len, "%d", id);
-    return buf;
-}
-
-int rtnl_rtprot_a2n(uint32_t *id, char *arg)
-{
-    static const char *cache = NULL;
-    static unsigned long res;
-    int i;
-
-    if (cache && strcmp(cache, arg) == 0) {
-        *id = res;
-        return 0;
-    }
-
+    if (rtnl_rtprot_tab->tab[id])
+        return rtnl_rtprot_tab->tab[id];
+    /* buf is SPRINT_BSIZE big */
+    sprintf(buf, "%d", id);
+    return buf;
+}
+
+int FAST_FUNC rtnl_rtprot_a2n(uint32_t *id, char *arg)
+{
     rtnl_rtprot_initialize();
-
-    for (i = 0; i < 256; i++) {
-        if (rtnl_rtprot_tab[i] &&
-            strcmp(rtnl_rtprot_tab[i], arg) == 0) {
-            cache = rtnl_rtprot_tab[i];
-            res = i;
-            *id = res;
-            return 0;
-        }
-    }
-
-    res = bb_strtoul(arg, NULL, 0);
-    if (errno || res > 255)
-        return -1;
-    *id = res;
-    return 0;
-}
-
-
-static const char **rtnl_rtscope_tab; /* [256] */
+    return rtnl_a2n(rtnl_rtprot_tab, id, arg, 0);
+}
+
+
+static rtnl_tab_t *rtnl_rtscope_tab;
 
 static void rtnl_rtscope_initialize(void)
 {
-    if (rtnl_rtscope_tab) return;
-    rtnl_rtscope_tab = xzalloc(256 * sizeof(rtnl_rtscope_tab[0]));
-    rtnl_rtscope_tab[0] = "global";
-    rtnl_rtscope_tab[255] = "nowhere";
-    rtnl_rtscope_tab[254] = "host";
-    rtnl_rtscope_tab[253] = "link";
-    rtnl_rtscope_tab[200] = "site";
-    rtnl_tab_initialize("/etc/iproute2/rt_scopes",
-                rtnl_rtscope_tab, 256);
-}
-
-
-const char* rtnl_rtscope_n2a(int id, char *buf, int len)
-{
-    if (id < 0 || id >= 256) {
-        snprintf(buf, len, "%d", id);
+    if (rtnl_rtscope_tab)
+        return;
+    rtnl_rtscope_tab = xzalloc(sizeof(*rtnl_rtscope_tab));
+    rtnl_rtscope_tab->tab[0] = "global";
+    rtnl_rtscope_tab->tab[255] = "nowhere";
+    rtnl_rtscope_tab->tab[254] = "host";
+    rtnl_rtscope_tab->tab[253] = "link";
+    rtnl_rtscope_tab->tab[200] = "site";
+    rtnl_tab_initialize("/etc/iproute2/rt_scopes", rtnl_rtscope_tab->tab);
+}
+
+const char* FAST_FUNC rtnl_rtscope_n2a(int id, char *buf)
+{
+    if (id < 0 || id >= 256) {
+        sprintf(buf, "%d", id);
         return buf;
     }
@@ -148 +136 @@
     rtnl_rtscope_initialize();
 
-    if (rtnl_rtscope_tab[id])
-        return rtnl_rtscope_tab[id];
-    snprintf(buf, len, "%d", id);
-    return buf;
-}
-
-int rtnl_rtscope_a2n(uint32_t *id, char *arg)
-{
-    static const char *cache = NULL;
-    static unsigned long res;
-    int i;
-
-    if (cache && strcmp(cache, arg) == 0) {
-        *id = res;
-        return 0;
-    }
-
+    if (rtnl_rtscope_tab->tab[id])
+        return rtnl_rtscope_tab->tab[id];
+    /* buf is SPRINT_BSIZE big */
+    sprintf(buf, "%d", id);
+    return buf;
+}
+
+int FAST_FUNC rtnl_rtscope_a2n(uint32_t *id, char *arg)
+{
     rtnl_rtscope_initialize();
-
-    for (i = 0; i < 256; i++) {
-        if (rtnl_rtscope_tab[i] &&
-            strcmp(rtnl_rtscope_tab[i], arg) == 0) {
-            cache = rtnl_rtscope_tab[i];
-            res = i;
-            *id = res;
-            return 0;
-        }
-    }
-
-    res = bb_strtoul(arg, NULL, 0);
-    if (errno || res > 255)
-        return -1;
-    *id = res;
-    return 0;
-}
-
-
-static const char **rtnl_rtrealm_tab; /* [256] */
+    return rtnl_a2n(rtnl_rtscope_tab, id, arg, 0);
+}
+
+
+static rtnl_tab_t *rtnl_rtrealm_tab;
 
 static void rtnl_rtrealm_initialize(void)
 {
     if (rtnl_rtrealm_tab) return;
-    rtnl_rtrealm_tab = xzalloc(256 * sizeof(rtnl_rtrealm_tab[0]));
-    rtnl_rtrealm_tab[0] = "unknown";
-    rtnl_tab_initialize("/etc/iproute2/rt_realms",
-                rtnl_rtrealm_tab, 256);
-}
-
-
-int rtnl_rtrealm_a2n(uint32_t *id, char *arg)
-{
-    static const char *cache = NULL;
-    static unsigned long res;
-    int i;
-
-    if (cache && strcmp(cache, arg) == 0) {
-        *id = res;
-        return 0;
-    }
-
+    rtnl_rtrealm_tab = xzalloc(sizeof(*rtnl_rtrealm_tab));
+    rtnl_rtrealm_tab->tab[0] = "unknown";
+    rtnl_tab_initialize("/etc/iproute2/rt_realms", rtnl_rtrealm_tab->tab);
+}
+
+int FAST_FUNC rtnl_rtrealm_a2n(uint32_t *id, char *arg)
+{
     rtnl_rtrealm_initialize();
-
-    for (i = 0; i < 256; i++) {
-        if (rtnl_rtrealm_tab[i] &&
-            strcmp(rtnl_rtrealm_tab[i], arg) == 0) {
-            cache = rtnl_rtrealm_tab[i];
-            res = i;
-            *id = res;
-            return 0;
-        }
-    }
-
-    res = bb_strtoul(arg, NULL, 0);
-    if (errno || res > 255)
-        return -1;
-    *id = res;
-    return 0;
+    return rtnl_a2n(rtnl_rtrealm_tab, id, arg, 0);
 }
 
 #if ENABLE_FEATURE_IP_RULE
-const char* rtnl_rtrealm_n2a(int id, char *buf, int len)
-{
-    if (id < 0 || id >= 256) {
-        snprintf(buf, len, "%d", id);
+const char* FAST_FUNC rtnl_rtrealm_n2a(int id, char *buf)
+{
+    if (id < 0 || id >= 256) {
+        sprintf(buf, "%d", id);
         return buf;
     }
@@ -237 +176 @@
     rtnl_rtrealm_initialize();
 
-    if (rtnl_rtrealm_tab[id])
-        return rtnl_rtrealm_tab[id];
-    snprintf(buf, len, "%d", id);
+    if (rtnl_rtrealm_tab->tab[id])
+        return rtnl_rtrealm_tab->tab[id];
+    /* buf is SPRINT_BSIZE big */
+    sprintf(buf, "%d", id);
     return buf;
 }
@@ -245 +185 @@
 
 
-static const char **rtnl_rtdsfield_tab; /* [256] */
+static rtnl_tab_t *rtnl_rtdsfield_tab;
 
 static void rtnl_rtdsfield_initialize(void)
 {
     if (rtnl_rtdsfield_tab) return;
-    rtnl_rtdsfield_tab = xzalloc(256 * sizeof(rtnl_rtdsfield_tab[0]));
-    rtnl_rtdsfield_tab[0] = "0";
-    rtnl_tab_initialize("/etc/iproute2/rt_dsfield",
-                rtnl_rtdsfield_tab, 256);
-}
-
-
-const char * rtnl_dsfield_n2a(int id, char *buf, int len)
-{
-    if (id < 0 || id >= 256) {
-        snprintf(buf, len, "%d", id);
+    rtnl_rtdsfield_tab = xzalloc(sizeof(*rtnl_rtdsfield_tab));
+    rtnl_rtdsfield_tab->tab[0] = "0";
+    rtnl_tab_initialize("/etc/iproute2/rt_dsfield", rtnl_rtdsfield_tab->tab);
+}
+
+const char* FAST_FUNC rtnl_dsfield_n2a(int id, char *buf)
+{
+    if (id < 0 || id >= 256) {
+        sprintf(buf, "%d", id);
         return buf;
     }
@@ -266 +204 @@
     rtnl_rtdsfield_initialize();
 
-    if (rtnl_rtdsfield_tab[id])
-        return rtnl_rtdsfield_tab[id];
-    snprintf(buf, len, "0x%02x", id);
-    return buf;
-}
-
-
-int rtnl_dsfield_a2n(uint32_t *id, char *arg)
-{
-    static const char *cache = NULL;
-    static unsigned long res;
-    int i;
-
-    if (cache && strcmp(cache, arg) == 0) {
-        *id = res;
-        return 0;
-    }
-
+    if (rtnl_rtdsfield_tab->tab[id])
+        return rtnl_rtdsfield_tab->tab[id];
+    /* buf is SPRINT_BSIZE big */
+    sprintf(buf, "0x%02x", id);
+    return buf;
+}
+
+int FAST_FUNC rtnl_dsfield_a2n(uint32_t *id, char *arg)
+{
     rtnl_rtdsfield_initialize();
-
-    for (i = 0; i < 256; i++) {
-        if (rtnl_rtdsfield_tab[i] &&
-            strcmp(rtnl_rtdsfield_tab[i], arg) == 0) {
-            cache = rtnl_rtdsfield_tab[i];
-            res = i;
-            *id = res;
-            return 0;
-        }
-    }
-
-    res = bb_strtoul(arg, NULL, 16);
-    if (errno || res > 255)
-        return -1;
-    *id = res;
-    return 0;
+    return rtnl_a2n(rtnl_rtdsfield_tab, id, arg, 16);
 }
 
 
 #if ENABLE_FEATURE_IP_RULE
-static const char **rtnl_rttable_tab; /* [256] */
+static rtnl_tab_t *rtnl_rttable_tab;
 
 static void rtnl_rttable_initialize(void)
 {
     if (rtnl_rtdsfield_tab) return;
-    rtnl_rttable_tab = xzalloc(256 * sizeof(rtnl_rttable_tab[0]));
-    rtnl_rttable_tab[0] = "unspec";
-    rtnl_rttable_tab[255] = "local";
-    rtnl_rttable_tab[254] = "main";
-    rtnl_rttable_tab[253] = "default";
-    rtnl_tab_initialize("/etc/iproute2/rt_tables", rtnl_rttable_tab, 256);
-}
-
-
-const char *rtnl_rttable_n2a(int id, char *buf, int len)
-{
-    if (id < 0 || id >= 256) {
-        snprintf(buf, len, "%d", id);
+    rtnl_rttable_tab = xzalloc(sizeof(*rtnl_rttable_tab));
+    rtnl_rttable_tab->tab[0] = "unspec";
+    rtnl_rttable_tab->tab[255] = "local";
+    rtnl_rttable_tab->tab[254] = "main";
+    rtnl_rttable_tab->tab[253] = "default";
+    rtnl_tab_initialize("/etc/iproute2/rt_tables", rtnl_rttable_tab->tab);
+}
+
+const char* FAST_FUNC rtnl_rttable_n2a(int id, char *buf)
+{
+    if (id < 0 || id >= 256) {
+        sprintf(buf, "%d", id);
         return buf;
     }
@@ -328 +241 @@
     rtnl_rttable_initialize();
 
-    if (rtnl_rttable_tab[id])
-        return rtnl_rttable_tab[id];
-    snprintf(buf, len, "%d", id);
-    return buf;
-}
-
-int rtnl_rttable_a2n(uint32_t * id, char *arg)
-{
-    static char *cache = NULL;
-    static unsigned long res;
-    int i;
-
-    if (cache && strcmp(cache, arg) == 0) {
-        *id = res;
-        return 0;
-    }
-
+    if (rtnl_rttable_tab->tab[id])
+        return rtnl_rttable_tab->tab[id];
+    /* buf is SPRINT_BSIZE big */
+    sprintf(buf, "%d", id);
+    return buf;
+}
+
+int FAST_FUNC rtnl_rttable_a2n(uint32_t *id, char *arg)
+{
     rtnl_rttable_initialize();
-
-    for (i = 0; i < 256; i++) {
-        if (rtnl_rttable_tab[i] && strcmp(rtnl_rttable_tab[i], arg) == 0) {
-            cache = (char*)rtnl_rttable_tab[i];
-            res = i;
-            *id = res;
-            return 0;
-        }
-    }
-
-    i = bb_strtoul(arg, NULL, 0);
-    if (errno || i > 255)
-        return -1;
-    *id = i;
-    return 0;
+    return rtnl_a2n(rtnl_rttable_tab, id, arg, 0);
 }
 

branches/2.2.9/mindi-busybox/networking/libiproute/rt_names.h

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
-#ifndef RT_NAMES_H_
-#define RT_NAMES_H_ 1
+#ifndef RT_NAMES_H
+#define RT_NAMES_H 1
 
-#include <stdint.h>
+PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 
-extern const char* rtnl_rtprot_n2a(int id, char *buf, int len);
-extern const char* rtnl_rtscope_n2a(int id, char *buf, int len);
-extern const char* rtnl_rtrealm_n2a(int id, char *buf, int len);
-extern const char* rtnl_dsfield_n2a(int id, char *buf, int len);
-extern const char* rtnl_rttable_n2a(int id, char *buf, int len);
-extern int rtnl_rtprot_a2n(uint32_t *id, char *arg);
-extern int rtnl_rtscope_a2n(uint32_t *id, char *arg);
-extern int rtnl_rtrealm_a2n(uint32_t *id, char *arg);
-extern int rtnl_dsfield_a2n(uint32_t *id, char *arg);
-extern int rtnl_rttable_a2n(uint32_t *id, char *arg);
+/* buf is SPRINT_BSIZE big */
+extern const char* rtnl_rtprot_n2a(int id, char *buf) FAST_FUNC;
+extern const char* rtnl_rtscope_n2a(int id, char *buf) FAST_FUNC;
+extern const char* rtnl_rtrealm_n2a(int id, char *buf) FAST_FUNC;
+extern const char* rtnl_dsfield_n2a(int id, char *buf) FAST_FUNC;
+extern const char* rtnl_rttable_n2a(int id, char *buf) FAST_FUNC;
+extern int rtnl_rtprot_a2n(uint32_t *id, char *arg) FAST_FUNC;
+extern int rtnl_rtscope_a2n(uint32_t *id, char *arg) FAST_FUNC;
+extern int rtnl_rtrealm_a2n(uint32_t *id, char *arg) FAST_FUNC;
+extern int rtnl_dsfield_a2n(uint32_t *id, char *arg) FAST_FUNC;
+extern int rtnl_rttable_a2n(uint32_t *id, char *arg) FAST_FUNC;
 
-
-extern const char* ll_type_n2a(int type, char *buf, int len);
+extern const char* ll_type_n2a(int type, char *buf) FAST_FUNC;
 
 extern const char* ll_addr_n2a(unsigned char *addr, int alen, int type,
-                char *buf, int blen);
-extern int ll_addr_a2n(unsigned char *lladdr, int len, char *arg);
+                char *buf, int blen) FAST_FUNC;
+extern int ll_addr_a2n(unsigned char *lladdr, int len, char *arg) FAST_FUNC;
 
-extern const char* ll_proto_n2a(unsigned short id, char *buf, int len);
-extern int ll_proto_a2n(unsigned short *id, char *buf);
+extern const char* ll_proto_n2a(unsigned short id, char *buf, int len) FAST_FUNC;
+extern int ll_proto_a2n(unsigned short *id, char *buf) FAST_FUNC;
+
+POP_SAVED_FUNCTION_VISIBILITY
 
 #endif

branches/2.2.9/mindi-busybox/networking/libiproute/rtm_map.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * rtm_map.c
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
  *
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License
- *      as published by the Free Software Foundation; either version
- *      2 of the License, or (at your option) any later version.
- *
- * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 
@@ -16 +13 @@
 #include "utils.h"
 
-const char *rtnl_rtntype_n2a(int id, char *buf, int len)
+const char* FAST_FUNC rtnl_rtntype_n2a(int id, char *buf)
 {
     switch (id) {
@@ -44 +41 @@
         return "xresolve";
     default:
-        snprintf(buf, len, "%d", id);
+        /* buf is SPRINT_BSIZE big */
+        sprintf(buf, "%d", id);
         return buf;
     }
@@ -50 +48 @@
 
 
-int rtnl_rtntype_a2n(int *id, char *arg)
+int FAST_FUNC rtnl_rtntype_a2n(int *id, char *arg)
 {
     static const char keywords[] ALIGN1 =
@@ -89 +87 @@
     else {
         res = strtoul(arg, &end, 0);
-        if (!end || end == arg || *end || res > 255)
+        if (end == arg || *end || res > 255)
             return -1;
     }
@@ -96 +94 @@
 }
 
-int get_rt_realms(uint32_t *realms, char *arg)
+int FAST_FUNC get_rt_realms(uint32_t *realms, char *arg)
 {
     uint32_t realm = 0;

branches/2.2.9/mindi-busybox/networking/libiproute/rtm_map.h

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
-#ifndef __RTM_MAP_H__
-#define __RTM_MAP_H__ 1
+#ifndef RTM_MAP_H
+#define RTM_MAP_H 1
 
-const char *rtnl_rtntype_n2a(int id, char *buf, int len);
-int rtnl_rtntype_a2n(int *id, char *arg);
+PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 
-int get_rt_realms(uint32_t *realms, char *arg);
+const char *rtnl_rtntype_n2a(int id, char *buf) FAST_FUNC;
+int rtnl_rtntype_a2n(int *id, char *arg) FAST_FUNC;
 
+int get_rt_realms(uint32_t *realms, char *arg) FAST_FUNC;
 
-#endif /* __RTM_MAP_H__ */
+POP_SAVED_FUNCTION_VISIBILITY
+
+#endif

branches/2.2.9/mindi-busybox/networking/libiproute/utils.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * utils.c
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
- *
- * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
  * Changes:
  *
- * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
+ * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
  */
 
@@ -16 +14 @@
 #include "inet_common.h"
 
-int get_integer(int *val, char *arg, int base)
-{
-    long res;
-    char *ptr;
-
-    if (!arg || !*arg)
-        return -1;
-    res = strtol(arg, &ptr, base);
-    if (!ptr || ptr == arg || *ptr || res > INT_MAX || res < INT_MIN)
-        return -1;
-    *val = res;
-    return 0;
-}
-//XXX: FIXME: use some libbb function instead
-int get_unsigned(unsigned *val, char *arg, int base)
+unsigned get_unsigned(char *arg, const char *errmsg)
 {
     unsigned long res;
     char *ptr;
 
-    if (!arg || !*arg)
-        return -1;
-    res = strtoul(arg, &ptr, base);
-    if (!ptr || ptr == arg || *ptr || res > UINT_MAX)
-        return -1;
-    *val = res;
-    return 0;
-}
-
-int get_u32(uint32_t * val, char *arg, int base)
+    if (*arg) {
+        res = strtoul(arg, &ptr, 0);
+//FIXME: "" will be accepted too, is it correct?!
+        if (!*ptr && res <= UINT_MAX) {
+            return res;
+        }
+    }
+    invarg(arg, errmsg); /* does not return */
+}
+
+uint32_t get_u32(char *arg, const char *errmsg)
 {
     unsigned long res;
     char *ptr;
 
-    if (!arg || !*arg)
-        return -1;
-    res = strtoul(arg, &ptr, base);
-    if (!ptr || ptr == arg || *ptr || res > 0xFFFFFFFFUL)
-        return -1;
-    *val = res;
-    return 0;
-}
-
-int get_u16(uint16_t * val, char *arg, int base)
+    if (*arg) {
+        res = strtoul(arg, &ptr, 0);
+//FIXME: "" will be accepted too, is it correct?!
+        if (!*ptr && res <= 0xFFFFFFFFUL) {
+            return res;
+        }
+    }
+    invarg(arg, errmsg); /* does not return */
+}
+
+uint16_t get_u16(char *arg, const char *errmsg)
 {
     unsigned long res;
     char *ptr;
 
-    if (!arg || !*arg)
-        return -1;
-    res = strtoul(arg, &ptr, base);
-    if (!ptr || ptr == arg || *ptr || res > 0xFFFF)
-        return -1;
-    *val = res;
-    return 0;
-}
-
-int get_u8(uint8_t * val, char *arg, int base)
-{
-    unsigned long res;
-    char *ptr;
-
-    if (!arg || !*arg)
-        return -1;
-    res = strtoul(arg, &ptr, base);
-    if (!ptr || ptr == arg || *ptr || res > 0xFF)
-        return -1;
-    *val = res;
-    return 0;
-}
-
-int get_s16(int16_t * val, char *arg, int base)
-{
-    long res;
-    char *ptr;
-
-    if (!arg || !*arg)
-        return -1;
-    res = strtol(arg, &ptr, base);
-    if (!ptr || ptr == arg || *ptr || res > 0x7FFF || res < -0x8000)
-        return -1;
-    *val = res;
-    return 0;
-}
-
-int get_s8(int8_t * val, char *arg, int base)
-{
-    long res;
-    char *ptr;
-
-    if (!arg || !*arg)
-        return -1;
-    res = strtol(arg, &ptr, base);
-    if (!ptr || ptr == arg || *ptr || res > 0x7F || res < -0x80)
-        return -1;
-    *val = res;
-    return 0;
-}
-
-int get_addr_1(inet_prefix * addr, char *name, int family)
-{
-    char *cp;
-    unsigned char *ap = (unsigned char *) addr->data;
-    int i;
-
+    if (*arg) {
+        res = strtoul(arg, &ptr, 0);
+//FIXME: "" will be accepted too, is it correct?!
+        if (!*ptr && res <= 0xFFFF) {
+            return res;
+        }
+    }
+    invarg(arg, errmsg); /* does not return */
+}
+
+int get_addr_1(inet_prefix *addr, char *name, int family)
+{
     memset(addr, 0, sizeof(*addr));
 
-    if (strcmp(name, bb_str_default) == 0 ||
-        strcmp(name, "all") == 0 || strcmp(name, "any") == 0) {
+    if (strcmp(name, "default") == 0
+     || strcmp(name, "all") == 0
+     || strcmp(name, "any") == 0
+    ) {
         addr->family = family;
         addr->bytelen = (family == AF_INET6 ? 16 : 4);
@@ -144 +87 @@
     if (family != AF_UNSPEC && family != AF_INET)
         return -1;
+    if (inet_pton(AF_INET, name, addr->data) <= 0)
+        return -1;
     addr->bytelen = 4;
     addr->bitlen = -1;
-    for (cp = name, i = 0; *cp; cp++) {
-        if (*cp <= '9' && *cp >= '0') {
-            ap[i] = 10 * ap[i] + (*cp - '0');
-            continue;
-        }
-        if (*cp == '.' && ++i <= 3)
-            continue;
-        return -1;
-    }
-    return 0;
-}
-
-int get_prefix_1(inet_prefix * dst, char *arg, int family)
+    return 0;
+}
+
+static int get_prefix_1(inet_prefix *dst, char *arg, int family)
 {
     int err;
-    int plen;
+    unsigned plen;
     char *slash;
 
     memset(dst, 0, sizeof(*dst));
 
-    if (strcmp(arg, bb_str_default) == 0 || strcmp(arg, "any") == 0) {
+    if (strcmp(arg, "default") == 0
+     || strcmp(arg, "all") == 0
+     || strcmp(arg, "any") == 0
+    ) {
         dst->family = family;
-        dst->bytelen = 0;
-        dst->bitlen = 0;
+        /*dst->bytelen = 0; - done by memset */
+        /*dst->bitlen = 0;*/
         return 0;
     }
@@ -178 +117 @@
     err = get_addr_1(dst, arg, family);
     if (err == 0) {
-        switch (dst->family) {
-        case AF_INET6:
-            dst->bitlen = 128;
-            break;
-        default:
-        case AF_INET:
-            dst->bitlen = 32;
-        }
+        dst->bitlen = (dst->family == AF_INET6) ? 128 : 32;
         if (slash) {
-            if (get_integer(&plen, slash + 1, 0) || plen > dst->bitlen) {
+            inet_prefix netmask_pfx;
+
+            netmask_pfx.family = AF_UNSPEC;
+            plen = bb_strtou(slash + 1, NULL, 0);
+            if ((errno || plen > dst->bitlen)
+             && (get_addr_1(&netmask_pfx, slash + 1, family)))
                 err = -1;
-                goto done;
+            else if (netmask_pfx.family == AF_INET) {
+                /* fill in prefix length of dotted quad */
+                uint32_t mask = ntohl(netmask_pfx.data[0]);
+                uint32_t host = ~mask;
+
+                /* a valid netmask must be 2^n - 1 */
+                if (!(host & (host + 1))) {
+                    for (plen = 0; mask; mask <<= 1)
+                        ++plen;
+                    if (plen <= dst->bitlen) {
+                        dst->bitlen = plen;
+                        /* dst->flags |= PREFIXLEN_SPECIFIED; */
+                    } else
+                        err = -1;
+                } else
+                    err = -1;
+            } else {
+                /* plain prefix */
+                dst->bitlen = plen;
             }
-            dst->bitlen = plen;
-        }
-    }
- done:
+        }
+    }
     if (slash)
         *slash = '/';
@@ -200 +153 @@
 }
 
-int get_addr(inet_prefix * dst, char *arg, int family)
+int get_addr(inet_prefix *dst, char *arg, int family)
 {
     if (family == AF_PACKET) {
-        bb_error_msg_and_die("\"%s\" may be inet address, but it is not allowed in this context", arg);
+        bb_error_msg_and_die("\"%s\" may be inet %s, but it is not allowed in this context", arg, "address");
     }
     if (get_addr_1(dst, arg, family)) {
-        bb_error_msg_and_die("an inet address is expected rather than \"%s\"", arg);
-    }
-    return 0;
-}
-
-int get_prefix(inet_prefix * dst, char *arg, int family)
+        bb_error_msg_and_die("an %s %s is expected rather than \"%s\"", "inet", "address", arg);
+    }
+    return 0;
+}
+
+int get_prefix(inet_prefix *dst, char *arg, int family)
 {
     if (family == AF_PACKET) {
-        bb_error_msg_and_die("\"%s\" may be inet address, but it is not allowed in this context", arg);
+        bb_error_msg_and_die("\"%s\" may be inet %s, but it is not allowed in this context", arg, "prefix");
     }
     if (get_prefix_1(dst, arg, family)) {
-        bb_error_msg_and_die("an inet address is expected rather than \"%s\"", arg);
+        bb_error_msg_and_die("an %s %s is expected rather than \"%s\"", "inet", "prefix", arg);
     }
     return 0;
@@ -227 +180 @@
 
     if (get_addr_1(&addr, name, AF_INET)) {
-        bb_error_msg_and_die("an IP address is expected rather than \"%s\"", name);
+        bb_error_msg_and_die("an %s %s is expected rather than \"%s\"", "IP", "address", name);
     }
     return addr.data[0];
@@ -252 +205 @@
 }
 
-int inet_addr_match(inet_prefix * a, inet_prefix * b, int bits)
+int inet_addr_match(inet_prefix *a, inet_prefix *b, int bits)
 {
     uint32_t *a1 = a->data;
     uint32_t *a2 = b->data;
-    int words = bits >> 0x05;
+    int words = bits >> 5;
 
     bits &= 0x1f;
@@ -280 +233 @@
 }
 
-const char *rt_addr_n2a(int af, int ATTRIBUTE_UNUSED len,
+const char *rt_addr_n2a(int af,
         void *addr, char *buf, int buflen)
 {
@@ -292 +245 @@
 }
 
-
+#ifdef RESOLVE_HOSTNAMES
 const char *format_host(int af, int len, void *addr, char *buf, int buflen)
 {
-#ifdef RESOLVE_HOSTNAMES
     if (resolve_hosts) {
         struct hostent *h_ent;
@@ -318 +270 @@
         }
     }
+    return rt_addr_n2a(af, addr, buf, buflen);
+}
 #endif
-    return rt_addr_n2a(af, len, addr, buf, buflen);
-}

branches/2.2.9/mindi-busybox/networking/libiproute/utils.h

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
-#ifndef __UTILS_H__
-#define __UTILS_H__ 1
+#ifndef UTILS_H
+#define UTILS_H 1
 
 #include "libnetlink.h"
@@ -7 +7 @@
 #include "rtm_map.h"
 
-extern int preferred_family;
+PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
+
+extern family_t preferred_family;
 extern smallint show_stats;    /* UNUSED */
 extern smallint show_details;  /* UNUSED */
@@ -16 +18 @@
 
 #ifndef IPPROTO_ESP
-#define IPPROTO_ESP 50
+#define IPPROTO_ESP  50
 #endif
 #ifndef IPPROTO_AH
-#define IPPROTO_AH  51
+#define IPPROTO_AH  51
 #endif
 
 #define SPRINT_BSIZE 64
-#define SPRINT_BUF(x)   char x[SPRINT_BSIZE]
+#define SPRINT_BUF(x)  char x[SPRINT_BSIZE]
 
-extern void incomplete_command(void) ATTRIBUTE_NORETURN;
+extern void incomplete_command(void) NORETURN;
 
-#define NEXT_ARG() do { argv++; if (--argc <= 0) incomplete_command(); } while (0)
+#define NEXT_ARG() do { if (!*++argv) incomplete_command(); } while (0)
 
-typedef struct
-{
+typedef struct {
     uint8_t family;
     uint8_t bytelen;
@@ -36 +37 @@
     uint32_t data[4];
 } inet_prefix;
+
+#define PREFIXLEN_SPECIFIED 1
 
 #define DN_MAXADDL 20
@@ -43 +46 @@
 
 struct dn_naddr {
-    unsigned short          a_len;
-    unsigned char a_addr[DN_MAXADDL];
+    unsigned short a_len;
+    unsigned char  a_addr[DN_MAXADDL];
 };
 
@@ -56 +59 @@
 extern uint32_t get_addr32(char *name);
 extern int get_addr_1(inet_prefix *dst, char *arg, int family);
-extern int get_prefix_1(inet_prefix *dst, char *arg, int family);
+/*extern int get_prefix_1(inet_prefix *dst, char *arg, int family);*/
 extern int get_addr(inet_prefix *dst, char *arg, int family);
 extern int get_prefix(inet_prefix *dst, char *arg, int family);
 
-extern int get_integer(int *val, char *arg, int base);
-extern int get_unsigned(unsigned *val, char *arg, int base);
-#define get_byte get_u8
-#define get_ushort get_u16
-#define get_short get_s16
-extern int get_u32(uint32_t *val, char *arg, int base);
-extern int get_u16(uint16_t *val, char *arg, int base);
-extern int get_s16(int16_t *val, char *arg, int base);
-extern int get_u8(uint8_t *val, char *arg, int base);
-extern int get_s8(int8_t *val, char *arg, int base);
+extern unsigned get_unsigned(char *arg, const char *errmsg);
+extern uint32_t get_u32(char *arg, const char *errmsg);
+extern uint16_t get_u16(char *arg, const char *errmsg);
 
+extern const char *rt_addr_n2a(int af, void *addr, char *buf, int buflen);
+#ifdef RESOLVE_HOSTNAMES
 extern const char *format_host(int af, int len, void *addr, char *buf, int buflen);
-extern const char *rt_addr_n2a(int af, int len, void *addr, char *buf, int buflen);
+#else
+#define format_host(af, len, addr, buf, buflen) \
+    rt_addr_n2a(af, addr, buf, buflen)
+#endif
 
-void invarg(const char *, const char *) ATTRIBUTE_NORETURN;
-void duparg(const char *, const char *) ATTRIBUTE_NORETURN;
-void duparg2(const char *, const char *) ATTRIBUTE_NORETURN;
+void invarg(const char *, const char *) NORETURN;
+void duparg(const char *, const char *) NORETURN;
+void duparg2(const char *, const char *) NORETURN;
 int inet_addr_match(inet_prefix *a, inet_prefix *b, int bits);
 
@@ -85 +86 @@
 int ipx_pton(int af, const char *src, void *addr);
 
-#endif /* __UTILS_H__ */
+POP_SAVED_FUNCTION_VISIBILITY
+
+#endif

branches/2.2.9/mindi-busybox/networking/nameif.c

@@ -5 +5 @@
  * Written 2000 by Andi Kleen.
  * Busybox port 2002 by Nick Fedchik <nick@fedchik.org.ua>
- *          Glenn McGrath <bug1@iinet.net.au>
+ *          Glenn McGrath
+ * Extended matching support 2008 by Nico Erfurth <masta@perlgolf.de>
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
@@ -14 +15 @@
 #include <net/if.h>
 #include <netinet/ether.h>
-
-
-/* Older versions of net/if.h do not appear to define IF_NAMESIZE. */
-#ifndef IF_NAMESIZE
-#  ifdef IFNAMSIZ
-#    define IF_NAMESIZE IFNAMSIZ
-#  else
-#    define IF_NAMESIZE 16
-#  endif
-#endif
-
-/* take from linux/sockios.h */
-#define SIOCSIFNAME 0x8923  /* set interface name */
+#include <linux/sockios.h>
+
+#ifndef IFNAMSIZ
+#define IFNAMSIZ 16
+#endif
+
+/* Taken from linux/sockios.h */
+#define SIOCSIFNAME  0x8923  /* set interface name */
 
 /* Octets in one Ethernet addr, from <linux/if_ether.h> */
-#define ETH_ALEN    6
+#define ETH_ALEN     6
 
 #ifndef ifr_newname
@@ -35 +31 @@
 #endif
 
-typedef struct mactable_s {
-    struct mactable_s *next;
-    struct mactable_s *prev;
+typedef struct ethtable_s {
+    struct ethtable_s *next;
+    struct ethtable_s *prev;
     char *ifname;
     struct ether_addr *mac;
-} mactable_t;
-
-/* Check ascii str_macaddr, convert and copy to *mac */
-static struct ether_addr *cc_macaddr(const char *str_macaddr)
-{
-    struct ether_addr *lmac, *mac;
-
-    lmac = ether_aton(str_macaddr);
-    if (lmac == NULL)
-        bb_error_msg_and_die("cannot parse MAC %s", str_macaddr);
-    mac = xmalloc(ETH_ALEN);
-    memcpy(mac, lmac, ETH_ALEN);
-
-    return mac;
+#if ENABLE_FEATURE_NAMEIF_EXTENDED
+    char *bus_info;
+    char *driver;
+#endif
+} ethtable_t;
+
+#if ENABLE_FEATURE_NAMEIF_EXTENDED
+/* Cut'n'paste from ethtool.h */
+#define ETHTOOL_BUSINFO_LEN 32
+/* these strings are set to whatever the driver author decides... */
+struct ethtool_drvinfo {
+    uint32_t cmd;
+    char  driver[32]; /* driver short name, "tulip", "eepro100" */
+    char  version[32];  /* driver version string */
+    char  fw_version[32]; /* firmware version string, if applicable */
+    char  bus_info[ETHTOOL_BUSINFO_LEN];  /* Bus info for this IF. */
+    /* For PCI devices, use pci_dev->slot_name. */
+    char  reserved1[32];
+    char  reserved2[16];
+    uint32_t n_stats;  /* number of u64's from ETHTOOL_GSTATS */
+    uint32_t testinfo_len;
+    uint32_t eedump_len; /* Size of data from ETHTOOL_GEEPROM (bytes) */
+    uint32_t regdump_len;  /* Size of data from ETHTOOL_GREGS (bytes) */
+};
+#define ETHTOOL_GDRVINFO  0x00000003 /* Get driver info. */
+#endif
+
+
+static void nameif_parse_selector(ethtable_t *ch, char *selector)
+{
+    struct ether_addr *lmac;
+#if ENABLE_FEATURE_NAMEIF_EXTENDED
+    int found_selector = 0;
+
+    while (*selector) {
+        char *next;
+#endif
+        selector = skip_whitespace(selector);
+#if ENABLE_FEATURE_NAMEIF_EXTENDED
+        if (*selector == '\0')
+            break;
+        /* Search for the end .... */
+        next = skip_non_whitespace(selector);
+        if (*next)
+            *next++ = '\0';
+        /* Check for selectors, mac= is assumed */
+        if (strncmp(selector, "bus=", 4) == 0) {
+            ch->bus_info = xstrdup(selector + 4);
+            found_selector++;
+        } else if (strncmp(selector, "driver=", 7) == 0) {
+            ch->driver = xstrdup(selector + 7);
+            found_selector++;
+        } else {
+#endif
+            lmac = xmalloc(ETH_ALEN);
+            ch->mac = ether_aton_r(selector + (strncmp(selector, "mac=", 4) != 0 ? 0 : 4), lmac);
+            if (ch->mac == NULL)
+                bb_error_msg_and_die("can't parse %s", selector);
+#if  ENABLE_FEATURE_NAMEIF_EXTENDED
+            found_selector++;
+        };
+        selector = next;
+    }
+    if (found_selector == 0)
+        bb_error_msg_and_die("no selectors found for %s", ch->ifname);
+#endif
 }
 
-int nameif_main(int argc, char **argv);
+static void prepend_new_eth_table(ethtable_t **clist, char *ifname, char *selector)
+{
+    ethtable_t *ch;
+    if (strlen(ifname) >= IFNAMSIZ)
+        bb_error_msg_and_die("interface name '%s' too long", ifname);
+    ch = xzalloc(sizeof(*ch));
+    ch->ifname = xstrdup(ifname);
+    nameif_parse_selector(ch, selector);
+    ch->next = *clist;
+    if (*clist)
+        (*clist)->prev = ch;
+    *clist = ch;
+}
+
+#if ENABLE_FEATURE_CLEAN_UP
+static void delete_eth_table(ethtable_t *ch)
+{
+    free(ch->ifname);
+#if ENABLE_FEATURE_NAMEIF_EXTENDED
+    free(ch->bus_info);
+    free(ch->driver);
+#endif
+    free(ch->mac);
+    free(ch);
+};
+#else
+void delete_eth_table(ethtable_t *ch);
+#endif
+
+int nameif_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int nameif_main(int argc, char **argv)
 {
-    mactable_t *clist = NULL;
-    FILE *ifh;
+    ethtable_t *clist = NULL;
     const char *fname = "/etc/mactab";
-    char *line;
     int ctl_sk;
-    int if_index = 1;
-    mactable_t *ch;
+    ethtable_t *ch;
+    parser_t *parser;
+    char *token[2];
 
     if (1 & getopt32(argv, "sc:", &fname)) {
         openlog(applet_name, 0, LOG_LOCAL0);
-        logmode = LOGMODE_SYSLOG;
-    }
-
-    if ((argc - optind) & 1)
+        /* Why not just "="? I assume logging to stderr
+         * can't hurt. 2>/dev/null if you don't like it: */
+        logmode |= LOGMODE_SYSLOG;
+    }
+    argc -= optind;
+    argv += optind;
+
+    if (argc & 1)
         bb_show_usage();
 
-    if (optind < argc) {
-        char **a = argv + optind;
-
-        while (*a) {
-            if (strlen(*a) > IF_NAMESIZE)
-                bb_error_msg_and_die("interface name '%s' "
-                        "too long", *a);
-            ch = xzalloc(sizeof(mactable_t));
-            ch->ifname = xstrdup(*a++);
-            ch->mac = cc_macaddr(*a++);
-            if (clist)
-                clist->prev = ch;
-            ch->next = clist;
-            clist = ch;
+    if (argc) {
+        while (*argv) {
+            char *ifname = xstrdup(*argv++);
+            prepend_new_eth_table(&clist, ifname, *argv++);
         }
     } else {
-        ifh = xfopen(fname, "r");
-
-        while ((line = xmalloc_fgets(ifh)) != NULL) {
-            char *line_ptr;
-            size_t name_length;
-
-            line_ptr = line + strspn(line, " \t");
-            if ((line_ptr[0] == '#') || (line_ptr[0] == '\n')) {
-                free(line);
+        parser = config_open(fname);
+        while (config_read(parser, token, 2, 2, "# \t", PARSE_NORMAL))
+            prepend_new_eth_table(&clist, token[0], token[1]);
+        config_close(parser);
+    }
+
+    ctl_sk = xsocket(PF_INET, SOCK_DGRAM, 0);
+    parser = config_open2("/proc/net/dev", xfopen_for_read);
+
+    while (clist && config_read(parser, token, 2, 2, "\0: \t", PARSE_NORMAL)) {
+        struct ifreq ifr;
+#if  ENABLE_FEATURE_NAMEIF_EXTENDED
+        struct ethtool_drvinfo drvinfo;
+#endif
+        if (parser->lineno < 2)
+            continue; /* Skip the first two lines */
+
+        /* Find the current interface name and copy it to ifr.ifr_name */
+        memset(&ifr, 0, sizeof(struct ifreq));
+        strncpy_IFNAMSIZ(ifr.ifr_name, token[0]);
+
+#if ENABLE_FEATURE_NAMEIF_EXTENDED
+        /* Check for driver etc. */
+        memset(&drvinfo, 0, sizeof(struct ethtool_drvinfo));
+        drvinfo.cmd = ETHTOOL_GDRVINFO;
+        ifr.ifr_data = (caddr_t) &drvinfo;
+        /* Get driver and businfo first, so we have it in drvinfo */
+        ioctl(ctl_sk, SIOCETHTOOL, &ifr);
+#endif
+        ioctl(ctl_sk, SIOCGIFHWADDR, &ifr);
+
+        /* Search the list for a matching device */
+        for (ch = clist; ch; ch = ch->next) {
+#if ENABLE_FEATURE_NAMEIF_EXTENDED
+            if (ch->bus_info && strcmp(ch->bus_info, drvinfo.bus_info) != 0)
                 continue;
-            }
-            name_length = strcspn(line_ptr, " \t");
-            ch = xzalloc(sizeof(mactable_t));
-            ch->ifname = xstrndup(line_ptr, name_length);
-            if (name_length > IF_NAMESIZE)
-                bb_error_msg_and_die("interface name '%s' "
-                        "too long", ch->ifname);
-            line_ptr += name_length;
-            line_ptr += strspn(line_ptr, " \t");
-            name_length = strspn(line_ptr, "0123456789ABCDEFabcdef:");
-            line_ptr[name_length] = '\0';
-            ch->mac = cc_macaddr(line_ptr);
-            if (clist)
-                clist->prev = ch;
-            ch->next = clist;
-            clist = ch;
-            free(line);
+            if (ch->driver && strcmp(ch->driver, drvinfo.driver) != 0)
+                continue;
+#endif
+            if (ch->mac && memcmp(ch->mac, ifr.ifr_hwaddr.sa_data, ETH_ALEN) != 0)
+                continue;
+            /* if we came here, all selectors have matched */
+            break;
         }
-        fclose(ifh);
-    }
-
-    ctl_sk = xsocket(PF_INET, SOCK_DGRAM, 0);
-
-    while (clist) {
-        struct ifreq ifr;
-
-        memset(&ifr, 0, sizeof(struct ifreq));
-        if_index++;
-        ifr.ifr_ifindex = if_index;
-
-        /* Get ifname by index or die */
-        if (ioctl(ctl_sk, SIOCGIFNAME, &ifr))
-            break;
-
-        /* Has this device hwaddr? */
-        if (ioctl(ctl_sk, SIOCGIFHWADDR, &ifr))
+        /* Nothing found for current interface */
+        if (!ch)
             continue;
 
-        /* Search for mac like in ifr.ifr_hwaddr.sa_data */
+        if (strcmp(ifr.ifr_name, ch->ifname) != 0) {
+            strcpy(ifr.ifr_newname, ch->ifname);
+            ioctl_or_perror_and_die(ctl_sk, SIOCSIFNAME, &ifr,
+                    "can't change ifname %s to %s",
+                    ifr.ifr_name, ch->ifname);
+        }
+        /* Remove list entry of renamed interface */
+        if (ch->prev != NULL)
+            ch->prev->next = ch->next;
+        else
+            clist = ch->next;
+        if (ch->next != NULL)
+            ch->next->prev = ch->prev;
+        if (ENABLE_FEATURE_CLEAN_UP)
+            delete_eth_table(ch);
+    }
+    if (ENABLE_FEATURE_CLEAN_UP) {
         for (ch = clist; ch; ch = ch->next)
-            if (!memcmp(ch->mac, ifr.ifr_hwaddr.sa_data, ETH_ALEN))
-                break;
-
-        /* Nothing found for current ifr.ifr_hwaddr.sa_data */
-        if (ch == NULL)
-            continue;
-
-        strcpy(ifr.ifr_newname, ch->ifname);
-        ioctl_or_perror_and_die(ctl_sk, SIOCSIFNAME, &ifr,
-                    "cannot change ifname %s to %s",
-                    ifr.ifr_name, ch->ifname);
-
-        /* Remove list entry of renamed interface */
-        if (ch->prev != NULL) {
-            (ch->prev)->next = ch->next;
-        } else {
-            clist = ch->next;
-        }
-        if (ch->next != NULL)
-            (ch->next)->prev = ch->prev;
-        if (ENABLE_FEATURE_CLEAN_UP) {
-            free(ch->ifname);
-            free(ch->mac);
-            free(ch);
-        }
-    }
+            delete_eth_table(ch);
+        config_close(parser);
+    };
 
     return 0;

branches/2.2.9/mindi-busybox/networking/nc.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
-/*  nc: mini-netcat - built from the ground up for LRP
+/* nc: mini-netcat - built from the ground up for LRP
  *
- *  Copyright (C) 1998, 1999  Charles P. Wright
- *  Copyright (C) 1998  Dave Cinege
+ * Copyright (C) 1998, 1999  Charles P. Wright
+ * Copyright (C) 1998  Dave Cinege
  *
- *  Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
 
-#if ENABLE_DESKTOP
-#include "nc_bloaty.c"
+//config:config NC
+//config:   bool "nc"
+//config:   default y
+//config:   help
+//config:     A simple Unix utility which reads and writes data across network
+//config:     connections.
+//config:
+//config:config NC_SERVER
+//config:   bool "Netcat server options (-l)"
+//config:   default y
+//config:   depends on NC
+//config:   help
+//config:     Allow netcat to act as a server.
+//config:
+//config:config NC_EXTRA
+//config:   bool "Netcat extensions (-eiw and filename)"
+//config:   default y
+//config:   depends on NC
+//config:   help
+//config:     Add -e (support for executing the rest of the command line after
+//config:     making or receiving a successful connection), -i (delay interval for
+//config:     lines sent), -w (timeout for initial connection).
+//config:
+//config:config NC_110_COMPAT
+//config:   bool "Netcat 1.10 compatibility (+2.5k)"
+//config:   default n  # off specially for Rob
+//config:   depends on NC
+//config:   help
+//config:     This option makes nc closely follow original nc-1.10.
+//config:     The code is about 2.5k bigger. It enables
+//config:     -s ADDR, -n, -u, -v, -o FILE, -z options, but loses
+//config:     busybox-specific extensions: -f FILE and -ll.
+
+#if ENABLE_NC_110_COMPAT
+# include "nc_bloaty.c"
 #else
+
+//usage:#if !ENABLE_NC_110_COMPAT
+//usage:
+//usage:#if ENABLE_NC_SERVER || ENABLE_NC_EXTRA
+//usage:#define NC_OPTIONS_STR "\n\nOptions:"
+//usage:#else
+//usage:#define NC_OPTIONS_STR
+//usage:#endif
+//usage:
+//usage:#define nc_trivial_usage
+//usage:    IF_NC_EXTRA("[-iN] [-wN] ")IF_NC_SERVER("[-l] [-p PORT] ")
+//usage:       "["IF_NC_EXTRA("-f FILE|")"IPADDR PORT]"IF_NC_EXTRA(" [-e PROG]")
+//usage:#define nc_full_usage "\n\n"
+//usage:       "Open a pipe to IP:PORT" IF_NC_EXTRA(" or FILE")
+//usage:    NC_OPTIONS_STR
+//usage:    IF_NC_EXTRA(
+//usage:     "\n    -e PROG Run PROG after connect"
+//usage:    IF_NC_SERVER(
+//usage:     "\n    -l  Listen mode, for inbound connects"
+//usage:    IF_NC_EXTRA(
+//usage:     "\n        (use -l twice with -e for persistent server)")
+//usage:     "\n    -p PORT Local port"
+//usage:    )
+//usage:     "\n    -w SEC  Timeout for connect"
+//usage:     "\n    -i SEC  Delay interval for lines sent"
+//usage:     "\n    -f FILE Use file (ala /dev/ttyS0) instead of network"
+//usage:    )
+//usage:
+//usage:#define nc_notes_usage ""
+//usage:    IF_NC_EXTRA(
+//usage:       "To use netcat as a terminal emulator on a serial port:\n\n"
+//usage:       "$ stty 115200 -F /dev/ttyS0\n"
+//usage:       "$ stty raw -echo -ctlecho && nc -f /dev/ttyS0\n"
+//usage:    )
+//usage:
+//usage:#define nc_example_usage
+//usage:       "$ nc foobar.somedomain.com 25\n"
+//usage:       "220 foobar ESMTP Exim 3.12 #1 Sat, 15 Apr 2000 00:03:02 -0600\n"
+//usage:       "help\n"
+//usage:       "214-Commands supported:\n"
+//usage:       "214-    HELO EHLO MAIL RCPT DATA AUTH\n"
+//usage:       "214     NOOP QUIT RSET HELP\n"
+//usage:       "quit\n"
+//usage:       "221 foobar closing connection\n"
+//usage:
+//usage:#endif
 
 /* Lots of small differences in features
@@ -18 +97 @@
  */
 
-static void timeout(int signum)
+static void timeout(int signum UNUSED_PARAM)
 {
     bb_error_msg_and_die("timed out");
 }
 
-int nc_main(int argc, char **argv);
+int nc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int nc_main(int argc, char **argv)
 {
@@ -30 +109 @@
     int cfd = 0;
     unsigned lport = 0;
-    SKIP_NC_SERVER(const) unsigned do_listen = 0;
-    SKIP_NC_EXTRA (const) unsigned wsecs = 0;
-    SKIP_NC_EXTRA (const) unsigned delay = 0;
-    SKIP_NC_EXTRA (const int execparam = 0;)
-    USE_NC_EXTRA  (char **execparam = NULL;)
-    len_and_sockaddr *lsa;
+    IF_NOT_NC_SERVER(const) unsigned do_listen = 0;
+    IF_NOT_NC_EXTRA (const) unsigned wsecs = 0;
+    IF_NOT_NC_EXTRA (const) unsigned delay = 0;
+    IF_NOT_NC_EXTRA (const int execparam = 0;)
+    IF_NC_EXTRA     (char **execparam = NULL;)
     fd_set readfds, testfds;
     int opt; /* must be signed (getopt returns -1) */
@@ -41 +119 @@
     if (ENABLE_NC_SERVER || ENABLE_NC_EXTRA) {
         /* getopt32 is _almost_ usable:
-        ** it cannot handle "... -e prog -prog-opt" */
+        ** it cannot handle "... -e PROG -prog-opt" */
         while ((opt = getopt(argc, argv,
-                "" USE_NC_SERVER("lp:") USE_NC_EXTRA("w:i:f:e:") )) > 0
+                "" IF_NC_SERVER("lp:") IF_NC_EXTRA("w:i:f:e:") )) > 0
         ) {
-            if (ENABLE_NC_SERVER && opt=='l')      USE_NC_SERVER(do_listen++);
-            else if (ENABLE_NC_SERVER && opt=='p') {
-                USE_NC_SERVER(lport = bb_lookup_port(optarg, "tcp", 0));
-            }
-            else if (ENABLE_NC_EXTRA && opt=='w') USE_NC_EXTRA( wsecs = xatou(optarg));
-            else if (ENABLE_NC_EXTRA && opt=='i') USE_NC_EXTRA( delay = xatou(optarg));
-            else if (ENABLE_NC_EXTRA && opt=='f') USE_NC_EXTRA( cfd = xopen(optarg, O_RDWR));
-            else if (ENABLE_NC_EXTRA && opt=='e' && optind<=argc) {
+            if (ENABLE_NC_SERVER && opt == 'l')
+                IF_NC_SERVER(do_listen++);
+            else if (ENABLE_NC_SERVER && opt == 'p')
+                IF_NC_SERVER(lport = bb_lookup_port(optarg, "tcp", 0));
+            else if (ENABLE_NC_EXTRA && opt == 'w')
+                IF_NC_EXTRA( wsecs = xatou(optarg));
+            else if (ENABLE_NC_EXTRA && opt == 'i')
+                IF_NC_EXTRA( delay = xatou(optarg));
+            else if (ENABLE_NC_EXTRA && opt == 'f')
+                IF_NC_EXTRA( cfd = xopen(optarg, O_RDWR));
+            else if (ENABLE_NC_EXTRA && opt == 'e' && optind <= argc) {
                 /* We cannot just 'break'. We should let getopt finish.
                 ** Or else we won't be able to find where
                 ** 'host' and 'port' params are
-                ** (think "nc -w 60 host port -e prog"). */
-                USE_NC_EXTRA(
+                ** (think "nc -w 60 host port -e PROG"). */
+                IF_NC_EXTRA(
                     char **p;
                     // +2: one for progname (optarg) and one for NULL
@@ -69 +150 @@
                 /* optind points to argv[arvc] (NULL) now.
                 ** FIXME: we assume that getopt will not count options
-                ** possibly present on "-e prog args" and will not
+                ** possibly present on "-e PROG ARGS" and will not
                 ** include them into final value of optind
                 ** which is to be used ...  */
@@ -78 +159 @@
         // -l and -f don't mix
         if (do_listen && cfd) bb_show_usage();
-        // Listen or file modes need zero arguments, client mode needs 2
-        if (do_listen || cfd) {
+        // File mode needs need zero arguments, listen mode needs zero or one,
+        // client mode needs one or two
+        if (cfd) {
             if (argc) bb_show_usage();
+        } else if (do_listen) {
+            if (argc > 1) bb_show_usage();
         } else {
             if (!argc || argc > 2) bb_show_usage();
@@ -97 +181 @@
     if (!cfd) {
         if (do_listen) {
-            /* create_and_bind_stream_or_die(NULL, lport)
-             * would've work wonderfully, but we need
-             * to know lsa */
-            sfd = xsocket_stream(&lsa);
-            if (lport)
-                set_nport(lsa, htons(lport));
-            setsockopt_reuseaddr(sfd);
-            xbind(sfd, &lsa->sa, lsa->len);
+            sfd = create_and_bind_stream_or_die(argv[0], lport);
             xlisten(sfd, do_listen); /* can be > 1 */
+#if 0  /* nc-1.10 does not do this (without -v) */
             /* If we didn't specify a port number,
              * query and print it after listen() */
             if (!lport) {
-                socklen_t addrlen = lsa->len;
-                getsockname(sfd, &lsa->sa, &addrlen);
-                lport = get_nport(&lsa->sa);
+                len_and_sockaddr lsa;
+                lsa.len = LSA_SIZEOF_SA;
+                getsockname(sfd, &lsa.u.sa, &lsa.len);
+                lport = get_nport(&lsa.u.sa);
                 fdprintf(2, "%d\n", ntohs(lport));
             }
-            fcntl(sfd, F_SETFD, FD_CLOEXEC);
+#endif
+            close_on_exec_on(sfd);
  accept_again:
             cfd = accept(sfd, NULL, 0);
@@ -129 +209 @@
     if (wsecs) {
         alarm(0);
-        signal(SIGALRM, SIG_DFL);
+        /* Non-ignored signals revert to SIG_DFL on exec anyway */
+        /*signal(SIGALRM, SIG_DFL);*/
     }
 
     /* -e given? */
     if (execparam) {
-        signal(SIGCHLD, SIG_IGN);
-        // With more than one -l, repeatedly act as server.
-        if (do_listen > 1 && vfork()) {
+        pid_t pid;
+        /* With more than one -l, repeatedly act as server */
+        if (do_listen > 1 && (pid = xvfork()) != 0) {
             /* parent */
-            // This is a bit weird as cleanup goes, since we wind up with no
-            // stdin/stdout/stderr.  But it's small and shouldn't hurt anything.
-            // We check for cfd == 0 above.
-            logmode = LOGMODE_NONE;
-            close(0);
-            close(1);
-            close(2);
+            /* prevent zombies */
+            signal(SIGCHLD, SIG_IGN);
+            close(cfd);
             goto accept_again;
         }
-        /* child (or main thread if no multiple -l) */
-        if (cfd) {
-            dup2(cfd, 0);
-            close(cfd);
-        }
-        dup2(0, 1);
-        dup2(0, 2);
-        USE_NC_EXTRA(BB_EXECVP(execparam[0], execparam);)
-        /* Don't print stuff or it will go over the wire.... */
+        /* child, or main thread if only one -l */
+        xmove_fd(cfd, 0);
+        xdup2(0, 1);
+        xdup2(0, 2);
+        IF_NC_EXTRA(BB_EXECVP(execparam[0], execparam);)
+        /* Don't print stuff or it will go over the wire... */
         _exit(127);
     }
 
-    // Select loop copying stdin to cfd, and cfd to stdout.
+    /* Select loop copying stdin to cfd, and cfd to stdout */
 
     FD_ZERO(&readfds);
@@ -172 +246 @@
         testfds = readfds;
 
-        if (select(FD_SETSIZE, &testfds, NULL, NULL, NULL) < 0)
+        if (select(cfd + 1, &testfds, NULL, NULL, NULL) < 0)
             bb_perror_msg_and_die("select");
 
 #define iobuf bb_common_bufsiz1
-        for (fd = 0; fd < FD_SETSIZE; fd++) {
+        fd = STDIN_FILENO;
+        while (1) {
             if (FD_ISSET(fd, &testfds)) {
                 nread = safe_read(fd, iobuf, sizeof(iobuf));
                 if (fd == cfd) {
                     if (nread < 1)
-                        exit(0);
+                        exit(EXIT_SUCCESS);
                     ofd = STDOUT_FILENO;
                 } else {
-                    if (nread<1) {
-                        // Close outgoing half-connection so they get EOF, but
-                        // leave incoming alone so we can see response.
+                    if (nread < 1) {
+                        /* Close outgoing half-connection so they get EOF,
+                         * but leave incoming alone so we can see response */
                         shutdown(cfd, 1);
                         FD_CLR(STDIN_FILENO, &readfds);
@@ -193 +268 @@
                 }
                 xwrite(ofd, iobuf, nread);
-                if (delay > 0) sleep(delay);
+                if (delay > 0)
+                    sleep(delay);
             }
+            if (fd == cfd)
+                break;
+            fd = cfd;
         }
     }

branches/2.2.9/mindi-busybox/networking/nc_bloaty.c

@@ -2 +2 @@
  * Released into public domain by the author.
  *
- * Copyright (C) 2007 Denis Vlasenko.
+ * Copyright (C) 2007 Denys Vlasenko.
  *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
@@ -37 +37 @@
  * - multiple DNS checks
  * Functionalty which is different from nc 1.10:
- * - Prog in '-e prog' can have prog's parameters and options.
+ * - PROG in '-e PROG' can have ARGS (and options).
  *   Because of this -e option must be last.
- * - nc doesn't redirect stderr to the network socket for the -e prog.
+//TODO: remove -e incompatibility?
+ * - we don't redirect stderr to the network socket for the -e PROG.
+ *   (PROG can do it itself if needed, but sometimes it is NOT wanted!)
  * - numeric addresses are printed in (), not [] (IPv6 looks better),
  *   port numbers are inside (): (1.2.3.4:5678)
@@ -46 +48 @@
  * - TCP connects from wrong ip/ports (if peer ip:port is specified
  *   on the command line, but accept() says that it came from different addr)
- *   are closed, but nc doesn't exit - continues to listen/accept.
+ *   are closed, but we don't exit - we continue to listen/accept.
  */
 
 /* done in nc.c: #include "libbb.h" */
+
+//usage:#if ENABLE_NC_110_COMPAT
+//usage:
+//usage:#define nc_trivial_usage
+//usage:       "[OPTIONS] HOST PORT  - connect"
+//usage:    IF_NC_SERVER("\n"
+//usage:       "nc [OPTIONS] -l -p PORT [HOST] [PORT]  - listen"
+//usage:    )
+//usage:#define nc_full_usage "\n\n"
+//usage:       "Options:"
+//usage:     "\n    -e PROG Run PROG after connect (must be last)"
+//usage:    IF_NC_SERVER(
+//usage:     "\n    -l  Listen mode, for inbound connects"
+//usage:    )
+//usage:     "\n    -p PORT Local port"
+//usage:     "\n    -s ADDR Local address"
+//usage:     "\n    -w SEC  Timeout for connects and final net reads"
+//usage:    IF_NC_EXTRA(
+//usage:     "\n    -i SEC  Delay interval for lines sent" /* ", ports scanned" */
+//usage:    )
+//usage:     "\n    -n  Don't do DNS resolution"
+//usage:     "\n    -u  UDP mode"
+//usage:     "\n    -v  Verbose"
+//usage:    IF_NC_EXTRA(
+//usage:     "\n    -o FILE Hex dump traffic"
+//usage:     "\n    -z  Zero-I/O mode (scanning)"
+//usage:    )
+//usage:#endif
+
+/*   "\n    -r      Randomize local and remote ports" */
+/*   "\n    -g gateway  Source-routing hop point[s], up to 8" */
+/*   "\n    -G num      Source-routing pointer: 4, 8, 12, ..." */
+/*   "\nport numbers can be individual or ranges: lo-hi [inclusive]" */
+
+/* -e PROG can take ARGS too: "nc ... -e ls -l", but we don't document it
+ * in help text: nc 1.10 does not allow that. We don't want to entice
+ * users to use this incompatibility */
 
 enum {
@@ -78 +117 @@
     unsigned wrote_net;          /* total net bytes */
 #endif
-    /* ouraddr is never NULL and goes thru three states as we progress:
+    /* ouraddr is never NULL and goes through three states as we progress:
      1 - local address before bind (IP/port possibly zero)
      2 - local address after bind (port is nonzero)
@@ -98 +137 @@
 
 #define G (*ptr_to_globals)
-
 #define wrote_out  (G.wrote_out )
 #define wrote_net  (G.wrote_net )
@@ -116 +154 @@
 #define o_interval 0
 #endif
+#define INIT_G() do { \
+    SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
+} while (0)
+
 
 /* Must match getopt32 call! */
@@ -150 +192 @@
 /* Beware: writes to stdOUT... */
 #if 0
-#define Debug(...) do { printf(__VA_ARGS__); printf("\n"); fflush(stdout); sleep(1); } while (0)
+#define Debug(...) do { printf(__VA_ARGS__); printf("\n"); fflush_all(); sleep(1); } while (0)
 #else
 #define Debug(...) do { } while (0)
@@ -164 +206 @@
         fprintf(stderr, SENT_N_RECV_M, wrote_net, wrote_out);
     fprintf(stderr, "punt!\n");
-    exit(1);
+    kill_myself_with_sig(sig);
 }
 
@@ -175 +217 @@
 
 /* timeout and other signal handling cruft */
-static void tmtravel(int sig)
+static void tmtravel(int sig UNUSED_PARAM)
 {
     unarm();
@@ -220 +262 @@
  Use at your own hairy risk; if you leave shells lying around behind open
  listening ports you deserve to lose!! */
-static int doexec(char **proggie) ATTRIBUTE_NORETURN;
+static int doexec(char **proggie) NORETURN;
 static int doexec(char **proggie)
 {
@@ -228 +270 @@
      * exec'ed prog can do it yourself, if needed */
     execvp(proggie[0], proggie);
-    bb_perror_msg_and_die("exec");
+    bb_perror_msg_and_die("can't execute '%s'", proggie[0]);
 }
 
@@ -244 +286 @@
     arm(o_wait);
     if (setjmp(jbuf) == 0) {
-        rr = connect(fd, &themaddr->sa, themaddr->len);
+        rr = connect(fd, &themaddr->u.sa, themaddr->len);
         unarm();
     } else { /* setjmp: connect failed... */
@@ -276 +318 @@
     if (o_verbose) {
         char *addr;
-        rr = getsockname(netfd, &ouraddr->sa, &ouraddr->len);
-        if (rr < 0)
-            bb_perror_msg_and_die("getsockname after bind");
-        addr = xmalloc_sockaddr2dotted(&ouraddr->sa);
+        getsockname(netfd, &ouraddr->u.sa, &ouraddr->len);
+        //if (rr < 0)
+        //  bb_perror_msg_and_die("getsockname after bind");
+        addr = xmalloc_sockaddr2dotted(&ouraddr->u.sa);
         fprintf(stderr, "listening on %s ...\n", addr);
         free(addr);
@@ -307 +349 @@
         if (themaddr) {
             remend = *themaddr;
-            xconnect(netfd, &themaddr->sa, themaddr->len);
+            xconnect(netfd, &themaddr->u.sa, themaddr->len);
         }
         /* peek first packet and remember peer addr */
@@ -315 +357 @@
             /* and here we block... */
             rr = recv_from_to(netfd, NULL, 0, MSG_PEEK, /*was bigbuf_net, BIGSIZ*/
-                &remend.sa, &ouraddr->sa, ouraddr->len);
+                &remend.u.sa, &ouraddr->u.sa, ouraddr->len);
             if (rr < 0)
                 bb_perror_msg_and_die("recvfrom");
@@ -324 +366 @@
 our socket on it, so that our outbound packets will have correct local IP.
 Unfortunately, bind() on already bound socket will fail now (EINVAL):
-    xbind(netfd, &ouraddr->sa, ouraddr->len);
+    xbind(netfd, &ouraddr->u.sa, ouraddr->len);
 Need to read the packet, save data, close this socket and
 create new one, and bind() it. TODO */
         if (!themaddr)
-            xconnect(netfd, &remend.sa, ouraddr->len);
+            xconnect(netfd, &remend.u.sa, ouraddr->len);
     } else {
         /* TCP */
@@ -335 +377 @@
  again:
             remend.len = LSA_SIZEOF_SA;
-            rr = accept(netfd, &remend.sa, &remend.len);
+            rr = accept(netfd, &remend.u.sa, &remend.len);
             if (rr < 0)
                 bb_perror_msg_and_die("accept");
-            if (themaddr && memcmp(&remend.sa, &themaddr->sa, remend.len) != 0) {
-                /* nc 1.10 bails out instead, and its error message
-                 * is not suppressed by o_verbose */
-                if (o_verbose) {
-                    char *remaddr = xmalloc_sockaddr2dotted(&remend.sa);
-                    bb_error_msg("connect from wrong ip/port %s ignored", remaddr);
-                    free(remaddr);
+            if (themaddr) {
+                int sv_port, port, r;
+
+                sv_port = get_nport(&remend.u.sa); /* save */
+                port = get_nport(&themaddr->u.sa);
+                if (port == 0) {
+                    /* "nc -nl -p LPORT RHOST" (w/o RPORT!):
+                     * we should accept any remote port */
+                    set_nport(&remend, 0); /* blot out remote port# */
                 }
-                close(rr);
-                goto again;
+                r = memcmp(&remend.u.sa, &themaddr->u.sa, remend.len);
+                set_nport(&remend, sv_port); /* restore */
+                if (r != 0) {
+                    /* nc 1.10 bails out instead, and its error message
+                     * is not suppressed by o_verbose */
+                    if (o_verbose) {
+                        char *remaddr = xmalloc_sockaddr2dotted(&remend.u.sa);
+                        bb_error_msg("connect from wrong ip/port %s ignored", remaddr);
+                        free(remaddr);
+                    }
+                    close(rr);
+                    goto again;
+                }
             }
             unarm();
@@ -357 +412 @@
          offer different services via different alias addresses, such as the
          "virtual web site" hack. */
-        rr = getsockname(netfd, &ouraddr->sa, &ouraddr->len);
-        if (rr < 0)
-            bb_perror_msg_and_die("getsockname after accept");
+        getsockname(netfd, &ouraddr->u.sa, &ouraddr->len);
+        //if (rr < 0)
+        //  bb_perror_msg_and_die("getsockname after accept");
     }
 
@@ -372 +427 @@
      any machines I've tested, but feel free to surprise me. */
         char optbuf[40];
-        int x = sizeof(optbuf);
+        socklen_t x = sizeof(optbuf);
 
         rr = getsockopt(netfd, IPPROTO_IP, IP_OPTIONS, optbuf, &x);
-        if (rr < 0)
-            bb_perror_msg("getsockopt failed");
-        else if (x) {    /* we've got options, lessee em... */
+        if (rr >= 0 && x) {    /* we've got options, lessee em... */
             bin2hex(bigbuf_net, optbuf, x);
             bigbuf_net[2*x] = '\0';
@@ -394 +447 @@
      In other words, we need a TCP MSG_PEEK. */
     /* bbox: removed most of it */
-        lcladdr = xmalloc_sockaddr2dotted(&ouraddr->sa);
-        remaddr = xmalloc_sockaddr2dotted(&remend.sa);
-        remhostname = o_nflag ? remaddr : xmalloc_sockaddr2host(&remend.sa);
+        lcladdr = xmalloc_sockaddr2dotted(&ouraddr->u.sa);
+        remaddr = xmalloc_sockaddr2dotted(&remend.u.sa);
+        remhostname = o_nflag ? remaddr : xmalloc_sockaddr2host(&remend.u.sa);
         fprintf(stderr, "connect to %s from %s (%s)\n",
                 lcladdr, remhostname, remaddr);
@@ -434 +487 @@
      us to hang forever, and hit it */
         o_wait = 5;                     /* enough that we'll notice?? */
-        rr = xsocket(ouraddr->sa.sa_family, SOCK_STREAM, 0);
+        rr = xsocket(ouraddr->u.sa.sa_family, SOCK_STREAM, 0);
         set_nport(themaddr, htons(SLEAZE_PORT));
         connect_w_timeout(rr);
@@ -485 +538 @@
             x = bc;
         }
-        sprintf(&stage[1], " %8.8x ", obc);  /* xxx: still slow? */
+        sprintf((char *)&stage[1], " %8.8x ", obc);  /* xxx: still slow? */
         bc -= x;          /* fix current count */
         obc += x;         /* fix current offset */
@@ -560 +613 @@
      from the net during that time, assume it's dead and close it too. */
         if (rr == 0) {
-            if (!FD_ISSET(0, &ding1))
+            if (!FD_ISSET(STDIN_FILENO, &ding1))
                 netretry--;                        /* we actually try a coupla times. */
             if (!netretry) {
@@ -595 +648 @@
 
     /* okay, suck more stdin */
-        if (FD_ISSET(0, &ding2)) {                /* stdin: ding! */
-            rr = read(0, bigbuf_in, BIGSIZ);
+        if (FD_ISSET(STDIN_FILENO, &ding2)) {                /* stdin: ding! */
+            rr = read(STDIN_FILENO, bigbuf_in, BIGSIZ);
     /* Considered making reads here smaller for UDP mode, but 8192-byte
      mobygrams are kinda fun and exercise the reassembler. */
             if (rr <= 0) {                        /* at end, or fukt, or ... */
-                FD_CLR(0, &ding1);                /* disable and close stdin */
-                close(0);
+                FD_CLR(STDIN_FILENO, &ding1);                /* disable and close stdin */
+                close(STDIN_FILENO);
+// Does it make sense to shutdown(net_fd, SHUT_WR)
+// to let other side know that we won't write anything anymore?
+// (and what about keeping compat if we do that?)
             } else {
                 rzleft = rr;
@@ -623 +679 @@
         }
         if (rnleft) {
-            rr = write(1, np, rnleft);
+            rr = write(STDOUT_FILENO, np, rnleft);
             if (rr > 0) {
-                if (o_ofile)
-                    oprint('<', np, rr);                /* log the stdout */
+                if (o_ofile) /* log the stdout */
+                    oprint('<', (unsigned char *)np, rr);
                 np += rr;                        /* fix up ptrs and whatnot */
                 rnleft -= rr;                        /* will get sanity-checked above */
@@ -640 +696 @@
             rr = write(netfd, zp, rr);        /* one line, or the whole buffer */
             if (rr > 0) {
-                if (o_ofile)
-                    oprint('>', zp, rr);                /* log what got sent */
+                if (o_ofile) /* log what got sent */
+                    oprint('>', (unsigned char *)zp, rr);
                 zp += rr;
                 rzleft -= rr;
@@ -669 +725 @@
 
 /* main: now we pull it all together... */
-int nc_main(int argc, char **argv);
-int nc_main(int argc, char **argv)
-{
-    char *str_p, *str_s, *str_w;
-    USE_NC_EXTRA(char *str_i, *str_o;)
+int nc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int nc_main(int argc UNUSED_PARAM, char **argv)
+{
+    char *str_p, *str_s;
+    IF_NC_EXTRA(char *str_i, *str_o;)
     char *themdotted = themdotted; /* gcc */
     char **proggie;
@@ -679 +735 @@
     unsigned o_lport = 0;
 
-    /* I was in this barbershop quartet in Skokie IL ... */
-    /* round up the usual suspects, i.e. malloc up all the stuff we need */
-    PTR_TO_GLOBALS = xzalloc(sizeof(G));
+    INIT_G();
 
     /* catch a signal or two for cleanup */
-    signal(SIGINT, catch);
-    signal(SIGQUIT, catch);
-    signal(SIGTERM, catch);
+    bb_signals(0
+        + (1 << SIGINT)
+        + (1 << SIGQUIT)
+        + (1 << SIGTERM)
+        , catch);
     /* and suppress others... */
+    bb_signals(0
 #ifdef SIGURG
-    signal(SIGURG, SIG_IGN);
-#endif
-    signal(SIGPIPE, SIG_IGN); /* important! */
+        + (1 << SIGURG)
+#endif
+        + (1 << SIGPIPE) /* important! */
+        , SIG_IGN);
 
     proggie = argv;
@@ -697 +755 @@
         if (strcmp(*proggie, "-e") == 0) {
             *proggie = NULL;
-            argc = proggie - argv;
             proggie++;
             goto e_found;
@@ -706 +763 @@
 
     // -g -G -t -r deleted, unimplemented -a deleted too
-    opt_complementary = "?2:vv"; /* max 2 params, -v is a counter */
-    getopt32(argv, "hnp:s:uvw:" USE_NC_SERVER("l")
-            USE_NC_EXTRA("i:o:z"),
-            &str_p, &str_s, &str_w
-            USE_NC_EXTRA(, &str_i, &str_o, &o_verbose));
+    opt_complementary = "?2:vv:w+"; /* max 2 params; -v is a counter; -w N */
+    getopt32(argv, "hnp:s:uvw:" IF_NC_SERVER("l")
+            IF_NC_EXTRA("i:o:z"),
+            &str_p, &str_s, &o_wait
+            IF_NC_EXTRA(, &str_i, &str_o), &o_verbose);
     argv += optind;
 #if ENABLE_NC_EXTRA
@@ -727 +784 @@
     //if (option_mask32 & OPT_u) /* use UDP */
     //if (option_mask32 & OPT_v) /* verbose */
-    if (option_mask32 & OPT_w) { /* wait time */
-        o_wait = xatoi_u(str_w);
-    }
+    //if (option_mask32 & OPT_w) /* wait time */
     //if (option_mask32 & OPT_z) /* little or no data xfer */
 
@@ -747 +802 @@
         /* if o_lport is still 0, then we will use random port */
         ouraddr = xhost2sockaddr(str_s, o_lport);
-        x = xsocket(ouraddr->sa.sa_family, x, 0);
+#ifdef BLOAT
+        /* prevent spurious "UDP listen needs !0 port" */
+        o_lport = get_nport(ouraddr);
+        o_lport = ntohs(o_lport);
+#endif
+        x = xsocket(ouraddr->u.sa.sa_family, x, 0);
     } else {
         /* We try IPv6, then IPv4, unless addr family is
          * implicitly set by way of remote addr/port spec */
         x = xsocket_type(&ouraddr,
-                USE_FEATURE_IPV6((themaddr ? themaddr->sa.sa_family : AF_UNSPEC),)
+                (themaddr ? themaddr->u.sa.sa_family : AF_UNSPEC),
                 x);
         if (o_lport)
@@ -761 +821 @@
     if (o_udpmode)
         socket_want_pktinfo(netfd);
-    xbind(netfd, &ouraddr->sa, ouraddr->len);
+    if (!ENABLE_FEATURE_UNIX_LOCAL
+     || o_listen
+     || ouraddr->u.sa.sa_family != AF_UNIX
+    ) {
+        xbind(netfd, &ouraddr->u.sa, ouraddr->len);
+    }
 #if 0
     setsockopt(netfd, SOL_SOCKET, SO_RCVBUF, &o_rcvbuf, sizeof o_rcvbuf);
@@ -767 +832 @@
 #endif
 
+#ifdef BLOAT
     if (OPT_l && (option_mask32 & (OPT_u|OPT_l)) == (OPT_u|OPT_l)) {
         /* apparently UDP can listen ON "port 0",
@@ -773 +839 @@
             bb_error_msg_and_die("UDP listen needs nonzero -p port");
     }
-
-    FD_SET(0, &ding1);                        /* stdin *is* initially open */
+#endif
+
+    FD_SET(STDIN_FILENO, &ding1);                        /* stdin *is* initially open */
     if (proggie) {
         close(0); /* won't need stdin */
@@ -793 +860 @@
         /* Outbound connects.  Now we're more picky about args... */
         if (!themaddr)
-            bb_error_msg_and_die("no destination");
+            bb_show_usage();
 
         remend = *themaddr;
         if (o_verbose)
-            themdotted = xmalloc_sockaddr2dotted(&themaddr->sa);
+            themdotted = xmalloc_sockaddr2dotted(&themaddr->u.sa);
 
         x = connect_w_timeout(netfd);

branches/2.2.9/mindi-busybox/networking/netstat.c

@@ -9 +9 @@
  * IPV6 support added by Bart Visscher <magick@linux-fan.com>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * 2008-07-10
+ * optional '-p' flag support ported from net-tools by G. Somlo <somlo@cmu.edu>
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
@@ -15 +18 @@
 #include "inet_common.h"
 
+//usage:#define netstat_trivial_usage
+//usage:       "[-"IF_ROUTE("r")"al] [-tuwx] [-en"IF_FEATURE_NETSTAT_WIDE("W")IF_FEATURE_NETSTAT_PRG("p")"]"
+//usage:#define netstat_full_usage "\n\n"
+//usage:       "Display networking information\n"
+//usage:     "\nOptions:"
+//usage:    IF_ROUTE(
+//usage:     "\n    -r  Routing table"
+//usage:    )
+//usage:     "\n    -a  All sockets"
+//usage:     "\n    -l  Listening sockets"
+//usage:     "\n        Else: connected sockets"
+//usage:     "\n    -t  TCP sockets"
+//usage:     "\n    -u  UDP sockets"
+//usage:     "\n    -w  Raw sockets"
+//usage:     "\n    -x  Unix sockets"
+//usage:     "\n        Else: all socket types"
+//usage:     "\n    -e  Other/more information"
+//usage:     "\n    -n  Don't resolve names"
+//usage:    IF_FEATURE_NETSTAT_WIDE(
+//usage:     "\n    -W  Wide display"
+//usage:    )
+//usage:    IF_FEATURE_NETSTAT_PRG(
+//usage:     "\n    -p  Show PID/program name for sockets"
+//usage:    )
+
+#define NETSTAT_OPTS "laentuwx" \
+    IF_ROUTE(               "r") \
+    IF_FEATURE_NETSTAT_WIDE("W") \
+    IF_FEATURE_NETSTAT_PRG( "p")
+
 enum {
-    OPT_extended = 0x4,
-    OPT_showroute = 0x100,
-    OPT_widedisplay = 0x200 * ENABLE_FEATURE_NETSTAT_WIDE,
+    OPT_sock_listen = 1 << 0, // l
+    OPT_sock_all    = 1 << 1, // a
+    OPT_extended    = 1 << 2, // e
+    OPT_noresolve   = 1 << 3, // n
+    OPT_sock_tcp    = 1 << 4, // t
+    OPT_sock_udp    = 1 << 5, // u
+    OPT_sock_raw    = 1 << 6, // w
+    OPT_sock_unix   = 1 << 7, // x
+    OPTBIT_x        = 7,
+    IF_ROUTE(               OPTBIT_ROUTE,)
+    IF_FEATURE_NETSTAT_WIDE(OPTBIT_WIDE ,)
+    IF_FEATURE_NETSTAT_PRG( OPTBIT_PRG  ,)
+    OPT_route       = IF_ROUTE(               (1 << OPTBIT_ROUTE)) + 0, // r
+    OPT_wide        = IF_FEATURE_NETSTAT_WIDE((1 << OPTBIT_WIDE )) + 0, // W
+    OPT_prg         = IF_FEATURE_NETSTAT_PRG( (1 << OPTBIT_PRG  )) + 0, // p
 };
-# define NETSTAT_OPTS "laentuwxr"USE_FEATURE_NETSTAT_WIDE("W")
 
 #define NETSTAT_CONNECTED 0x01
@@ -32 +76 @@
 #define NETSTAT_ALLPROTO  (NETSTAT_TCP|NETSTAT_UDP|NETSTAT_RAW|NETSTAT_UNIX)
 
-static smallint flags = NETSTAT_CONNECTED | NETSTAT_ALLPROTO;
 
 enum {
@@ -45 +88 @@
     TCP_LAST_ACK,
     TCP_LISTEN,
-    TCP_CLOSING /* now a valid state */
+    TCP_CLOSING, /* now a valid state */
 };
 
@@ -71 +114 @@
 } socket_state;
 
-#define SO_ACCEPTCON (1<<16)    /* performed a listen           */
-#define SO_WAITDATA  (1<<17)    /* wait data to read            */
-#define SO_NOSPACE   (1<<18)    /* no space to write            */
-
-/* Standard printout size */
-#define PRINT_IP_MAX_SIZE           23
-#define PRINT_NET_CONN              "%s   %6ld %6ld %-23s %-23s %-12s\n"
-#define PRINT_NET_CONN_HEADER       "\nProto Recv-Q Send-Q %-23s %-23s State\n"
-
+#define SO_ACCEPTCON (1<<16)  /* performed a listen           */
+#define SO_WAITDATA  (1<<17)  /* wait data to read            */
+#define SO_NOSPACE   (1<<18)  /* no space to write            */
+
+#define ADDR_NORMAL_WIDTH        23
 /* When there are IPv6 connections the IPv6 addresses will be
  * truncated to none-recognition. The '-W' option makes the
@@ -86 +125 @@
  * xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:ddd.ddd.ddd.ddd
  */
-#define PRINT_IP_MAX_SIZE_WIDE      51  /* INET6_ADDRSTRLEN + 5 for the port number */
-#define PRINT_NET_CONN_WIDE         "%s   %6ld %6ld %-51s %-51s %-12s\n"
-#define PRINT_NET_CONN_HEADER_WIDE  "\nProto Recv-Q Send-Q %-51s %-51s State\n"
-
-static const char *net_conn_line = PRINT_NET_CONN;
+#define ADDR_WIDE                51  /* INET6_ADDRSTRLEN + 5 for the port number */
+#if ENABLE_FEATURE_NETSTAT_WIDE
+# define FMT_NET_CONN_DATA       "%s   %6ld %6ld %-*s %-*s %-12s"
+# define FMT_NET_CONN_HEADER     "\nProto Recv-Q Send-Q %-*s %-*s State       %s\n"
+#else
+# define FMT_NET_CONN_DATA       "%s   %6ld %6ld %-23s %-23s %-12s"
+# define FMT_NET_CONN_HEADER     "\nProto Recv-Q Send-Q %-23s %-23s State       %s\n"
+#endif
+
+#define PROGNAME_WIDTH     20
+#define PROGNAME_WIDTH_STR "20"
+/* PROGNAME_WIDTH chars: 12345678901234567890 */
+#define PROGNAME_BANNER "PID/Program name    "
+
+struct prg_node {
+    struct prg_node *next;
+    long inode;
+    char name[PROGNAME_WIDTH];
+};
+
+#define PRG_HASH_SIZE 211
+
+struct globals {
+    smallint flags;
+#if ENABLE_FEATURE_NETSTAT_PRG
+    smallint prg_cache_loaded;
+    struct prg_node *prg_hash[PRG_HASH_SIZE];
+#endif
+#if ENABLE_FEATURE_NETSTAT_PRG
+    const char *progname_banner;
+#endif
+#if ENABLE_FEATURE_NETSTAT_WIDE
+    unsigned addr_width;
+#endif
+};
+#define G (*ptr_to_globals)
+#define flags            (G.flags           )
+#define prg_cache_loaded (G.prg_cache_loaded)
+#define prg_hash         (G.prg_hash        )
+#if ENABLE_FEATURE_NETSTAT_PRG
+# define progname_banner (G.progname_banner )
+#else
+# define progname_banner ""
+#endif
+#define INIT_G() do { \
+    SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
+    flags = NETSTAT_CONNECTED | NETSTAT_ALLPROTO; \
+} while (0)
+
+
+#if ENABLE_FEATURE_NETSTAT_PRG
+
+/* Deliberately truncating long to unsigned *int* */
+#define PRG_HASHIT(x) ((unsigned)(x) % PRG_HASH_SIZE)
+
+static void prg_cache_add(long inode, char *name)
+{
+    unsigned hi = PRG_HASHIT(inode);
+    struct prg_node **pnp, *pn;
+
+    prg_cache_loaded = 2;
+    for (pnp = prg_hash + hi; (pn = *pnp) != NULL; pnp = &pn->next) {
+        if (pn->inode == inode) {
+            /* Some warning should be appropriate here
+               as we got multiple processes for one i-node */
+            return;
+        }
+    }
+    *pnp = xzalloc(sizeof(struct prg_node));
+    pn = *pnp;
+    pn->inode = inode;
+    safe_strncpy(pn->name, name, PROGNAME_WIDTH);
+}
+
+static const char *prg_cache_get(long inode)
+{
+    unsigned hi = PRG_HASHIT(inode);
+    struct prg_node *pn;
+
+    for (pn = prg_hash[hi]; pn; pn = pn->next)
+        if (pn->inode == inode)
+            return pn->name;
+    return "-";
+}
+
+#if ENABLE_FEATURE_CLEAN_UP
+static void prg_cache_clear(void)
+{
+    struct prg_node **pnp, *pn;
+
+    for (pnp = prg_hash; pnp < prg_hash + PRG_HASH_SIZE; pnp++) {
+        while ((pn = *pnp) != NULL) {
+            *pnp = pn->next;
+            free(pn);
+        }
+    }
+}
+#else
+#define prg_cache_clear() ((void)0)
+#endif
+
+static long extract_socket_inode(const char *lname)
+{
+    long inode = -1;
+
+    if (strncmp(lname, "socket:[", sizeof("socket:[")-1) == 0) {
+        /* "socket:[12345]", extract the "12345" as inode */
+        inode = bb_strtoul(lname + sizeof("socket:[")-1, (char**)&lname, 0);
+        if (*lname != ']')
+            inode = -1;
+    } else if (strncmp(lname, "[0000]:", sizeof("[0000]:")-1) == 0) {
+        /* "[0000]:12345", extract the "12345" as inode */
+        inode = bb_strtoul(lname + sizeof("[0000]:")-1, NULL, 0);
+        if (errno) /* not NUL terminated? */
+            inode = -1;
+    }
+
+#if 0 /* bb_strtol returns all-ones bit pattern on ERANGE anyway */
+    if (errno == ERANGE)
+        inode = -1;
+#endif
+    return inode;
+}
+
+static int FAST_FUNC add_to_prg_cache_if_socket(const char *fileName,
+        struct stat *statbuf UNUSED_PARAM,
+        void *pid_slash_progname,
+        int depth UNUSED_PARAM)
+{
+    char *linkname;
+    long inode;
+
+    linkname = xmalloc_readlink(fileName);
+    if (linkname != NULL) {
+        inode = extract_socket_inode(linkname);
+        free(linkname);
+        if (inode >= 0)
+            prg_cache_add(inode, (char *)pid_slash_progname);
+    }
+    return TRUE;
+}
+
+static int FAST_FUNC dir_act(const char *fileName,
+        struct stat *statbuf UNUSED_PARAM,
+        void *userData UNUSED_PARAM,
+        int depth)
+{
+    const char *pid;
+    char *pid_slash_progname;
+    char proc_pid_fname[sizeof("/proc/%u/cmdline") + sizeof(long)*3];
+    char cmdline_buf[512];
+    int n, len;
+
+    if (depth == 0) /* "/proc" itself */
+        return TRUE; /* continue looking one level below /proc */
+
+    pid = fileName + sizeof("/proc/")-1; /* point after "/proc/" */
+    if (!isdigit(pid[0])) /* skip /proc entries which aren't processes */
+        return SKIP;
+
+    len = snprintf(proc_pid_fname, sizeof(proc_pid_fname), "%s/cmdline", fileName);
+    n = open_read_close(proc_pid_fname, cmdline_buf, sizeof(cmdline_buf) - 1);
+    if (n < 0)
+        return FALSE;
+    cmdline_buf[n] = '\0';
+
+    /* go through all files in /proc/PID/fd and check whether they are sockets */
+    strcpy(proc_pid_fname + len - (sizeof("cmdline")-1), "fd");
+    pid_slash_progname = concat_path_file(pid, bb_basename(cmdline_buf)); /* "PID/argv0" */
+    n = recursive_action(proc_pid_fname,
+            ACTION_RECURSE | ACTION_QUIET,
+            add_to_prg_cache_if_socket,
+            NULL,
+            (void *)pid_slash_progname,
+            0);
+    free(pid_slash_progname);
+
+    if (!n)
+        return FALSE; /* signal permissions error to caller */
+
+    return SKIP; /* caller should not recurse further into this dir */
+}
+
+static void prg_cache_load(void)
+{
+    int load_ok;
+
+    prg_cache_loaded = 1;
+    load_ok = recursive_action("/proc", ACTION_RECURSE | ACTION_QUIET,
+                NULL, dir_act, NULL, 0);
+    if (load_ok)
+        return;
+
+    if (prg_cache_loaded == 1)
+        bb_error_msg("can't scan /proc - are you root?");
+    else
+        bb_error_msg("showing only processes with your user ID");
+}
+
+#else
+
+#define prg_cache_clear()       ((void)0)
+
+#endif //ENABLE_FEATURE_NETSTAT_PRG
 
 
@@ -103 +341 @@
            &in6.s6_addr32[2], &in6.s6_addr32[3]);
     inet_ntop(AF_INET6, &in6, addr6, sizeof(addr6));
-    inet_pton(AF_INET6, addr6, (struct sockaddr *) &localaddr->sin6_addr);
+    inet_pton(AF_INET6, addr6, &localaddr->sin6_addr);
 
     localaddr->sin6_family = AF_INET6;
@@ -109 +347 @@
 #endif
 
-#if ENABLE_FEATURE_IPV6
-static void build_ipv4_addr(char* local_addr, struct sockaddr_in6* localaddr)
-#else
 static void build_ipv4_addr(char* local_addr, struct sockaddr_in* localaddr)
-#endif
-{
-    sscanf(local_addr, "%X",
-           &((struct sockaddr_in *) localaddr)->sin_addr.s_addr);
-    ((struct sockaddr *) localaddr)->sa_family = AF_INET;
+{
+    sscanf(local_addr, "%X", &localaddr->sin_addr.s_addr);
+    localaddr->sin_family = AF_INET;
 }
 
@@ -135 +368 @@
 static char *ip_port_str(struct sockaddr *addr, int port, const char *proto, int numeric)
 {
-    enum { salen = USE_FEATURE_IPV6(sizeof(struct sockaddr_in6)) SKIP_FEATURE_IPV6(sizeof(struct sockaddr_in)) };
     char *host, *host_port;
 
-    /* Code which used "*" for INADDR_ANY is removed: it's ambiguous in IPv6,
-     * while "0.0.0.0" is not. */
+    /* Code which used "*" for INADDR_ANY is removed: it's ambiguous
+     * in IPv6, while "0.0.0.0" is not. */
 
     host = numeric ? xmalloc_sockaddr2dotted_noport(addr)
@@ -149 +381 @@
 }
 
-static void tcp_do_one(int lnr, const char *line)
-{
-    char local_addr[64], rem_addr[64];
-    char more[512];
-    int num, local_port, rem_port, d, state, timer_run, uid, timeout;
+struct inet_params {
+    int local_port, rem_port, state, uid;
+    union {
+        struct sockaddr     sa;
+        struct sockaddr_in  sin;
 #if ENABLE_FEATURE_IPV6
-    struct sockaddr_in6 localaddr, remaddr;
-#else
-    struct sockaddr_in localaddr, remaddr;
-#endif
-    unsigned long rxq, txq, time_len, retr, inode;
-
-    if (lnr == 0)
-        return;
-
-    more[0] = '\0';
+        struct sockaddr_in6 sin6;
+#endif
+    } localaddr, remaddr;
+    unsigned long rxq, txq, inode;
+};
+
+static int scan_inet_proc_line(struct inet_params *param, char *line)
+{
+    int num;
+    /* IPv6 /proc files use 32-char hex representation
+     * of IPv6 address, followed by :PORT_IN_HEX
+     */
+    char local_addr[33], rem_addr[33]; /* 32 + 1 for NUL */
+
     num = sscanf(line,
-            "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n",
-            &d, local_addr, &local_port,
-            rem_addr, &rem_port, &state,
-            &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
+            "%*d: %32[0-9A-Fa-f]:%X "
+            "%32[0-9A-Fa-f]:%X %X "
+            "%lX:%lX %*X:%*X "
+            "%*X %d %*d %ld ",
+            local_addr, &param->local_port,
+            rem_addr, &param->rem_port, &param->state,
+            &param->txq, &param->rxq,
+            &param->uid, &param->inode);
+    if (num < 9) {
+        return 1; /* error */
+    }
 
     if (strlen(local_addr) > 8) {
 #if ENABLE_FEATURE_IPV6
-        build_ipv6_addr(local_addr, &localaddr);
-        build_ipv6_addr(rem_addr, &remaddr);
+        build_ipv6_addr(local_addr, &param->localaddr.sin6);
+        build_ipv6_addr(rem_addr, &param->remaddr.sin6);
 #endif
     } else {
-        build_ipv4_addr(local_addr, &localaddr);
-        build_ipv4_addr(rem_addr, &remaddr);
-    }
-
-    if (num < 10) {
-        bb_error_msg("warning, got bogus tcp line");
-        return;
-    }
-
-    if ((rem_port && (flags & NETSTAT_CONNECTED))
-     || (!rem_port && (flags & NETSTAT_LISTENING))
+        build_ipv4_addr(local_addr, &param->localaddr.sin);
+        build_ipv4_addr(rem_addr, &param->remaddr.sin);
+    }
+    return 0;
+}
+
+static void print_inet_line(struct inet_params *param,
+        const char *state_str, const char *proto, int is_connected)
+{
+    if ((is_connected && (flags & NETSTAT_CONNECTED))
+     || (!is_connected && (flags & NETSTAT_LISTENING))
     ) {
         char *l = ip_port_str(
-                (struct sockaddr *) &localaddr, local_port,
-                "tcp", flags & NETSTAT_NUMERIC);
+                &param->localaddr.sa, param->local_port,
+                proto, flags & NETSTAT_NUMERIC);
         char *r = ip_port_str(
-                (struct sockaddr *) &remaddr, rem_port,
-                "tcp", flags & NETSTAT_NUMERIC);
-        printf(net_conn_line,
-            "tcp", rxq, txq, l, r, tcp_state[state]);
+                &param->remaddr.sa, param->rem_port,
+                proto, flags & NETSTAT_NUMERIC);
+        printf(FMT_NET_CONN_DATA,
+            proto, param->rxq, param->txq,
+            IF_FEATURE_NETSTAT_WIDE(G.addr_width,) l,
+            IF_FEATURE_NETSTAT_WIDE(G.addr_width,) r,
+            state_str);
+#if ENABLE_FEATURE_NETSTAT_PRG
+        if (option_mask32 & OPT_prg)
+            printf("%."PROGNAME_WIDTH_STR"s", prg_cache_get(param->inode));
+#endif
+        bb_putchar('\n');
         free(l);
         free(r);
@@ -202 +453 @@
 }
 
-static void udp_do_one(int lnr, const char *line)
-{
-    char local_addr[64], rem_addr[64];
-    const char *state_str;
-    char more[512];
-    int num, local_port, rem_port, d, state, timer_run, uid, timeout;
+static int FAST_FUNC tcp_do_one(char *line)
+{
+    struct inet_params param;
+
+    memset(&param, 0, sizeof(param));
+    if (scan_inet_proc_line(&param, line))
+        return 1;
+
+    print_inet_line(&param, tcp_state[param.state], "tcp", param.rem_port);
+    return 0;
+}
+
 #if ENABLE_FEATURE_IPV6
-    struct sockaddr_in6 localaddr, remaddr;
-#else
-    struct sockaddr_in localaddr, remaddr;
-#endif
-    unsigned long rxq, txq, time_len, retr, inode;
-
-    if (lnr == 0)
-        return;
-
-    more[0] = '\0';
-    num = sscanf(line,
-            "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n",
-            &d, local_addr, &local_port,
-            rem_addr, &rem_port, &state,
-            &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
-
-    if (strlen(local_addr) > 8) {
-#if ENABLE_FEATURE_IPV6
-        /* Demangle what the kernel gives us */
-        build_ipv6_addr(local_addr, &localaddr);
-        build_ipv6_addr(rem_addr, &remaddr);
-#endif
-    } else {
-        build_ipv4_addr(local_addr, &localaddr);
-        build_ipv4_addr(rem_addr, &remaddr);
-    }
-
-    if (num < 10) {
-        bb_error_msg("warning, got bogus udp line");
-        return;
-    }
-    switch (state) {
-        case TCP_ESTABLISHED:
-            state_str = "ESTABLISHED";
-            break;
-        case TCP_CLOSE:
-            state_str = "";
-            break;
-        default:
-            state_str = "UNKNOWN";
-            break;
-    }
-
-#if ENABLE_FEATURE_IPV6
-# define notnull(A) ( \
-    ( (A.sin6_family == AF_INET6)                               \
-      && (A.sin6_addr.s6_addr32[0] | A.sin6_addr.s6_addr32[1] | \
-          A.sin6_addr.s6_addr32[2] | A.sin6_addr.s6_addr32[3])  \
-    ) || (                                                      \
-      (A.sin6_family == AF_INET)                                \
-      && ((struct sockaddr_in*)&A)->sin_addr.s_addr             \
-    )                                                           \
+# define NOT_NULL_ADDR(A) ( \
+    ( (A.sa.sa_family == AF_INET6) \
+      && (A.sin6.sin6_addr.s6_addr32[0] | A.sin6.sin6_addr.s6_addr32[1] | \
+          A.sin6.sin6_addr.s6_addr32[2] | A.sin6.sin6_addr.s6_addr32[3])  \
+    ) || ( \
+      (A.sa.sa_family == AF_INET) \
+      && A.sin.sin_addr.s_addr != 0 \
+    ) \
 )
 #else
-# define notnull(A) (A.sin_addr.s_addr)
-#endif
-    {
-        int have_remaddr = notnull(remaddr);
-        if ((have_remaddr && (flags & NETSTAT_CONNECTED))
-         || (!have_remaddr && (flags & NETSTAT_LISTENING))
-        ) {
-            char *l = ip_port_str(
-                (struct sockaddr *) &localaddr, local_port,
-                "udp", flags & NETSTAT_NUMERIC);
-            char *r = ip_port_str(
-                (struct sockaddr *) &remaddr, rem_port,
-                "udp", flags & NETSTAT_NUMERIC);
-            printf(net_conn_line,
-                "udp", rxq, txq, l, r, state_str);
-            free(l);
-            free(r);
-        }
-    }
-}
-
-static void raw_do_one(int lnr, const char *line)
-{
-    char local_addr[64], rem_addr[64];
-    char more[512];
-    int num, local_port, rem_port, d, state, timer_run, uid, timeout;
-#if ENABLE_FEATURE_IPV6
-    struct sockaddr_in6 localaddr, remaddr;
-#else
-    struct sockaddr_in localaddr, remaddr;
-#endif
-    unsigned long rxq, txq, time_len, retr, inode;
-
-    if (lnr == 0)
-        return;
-
-    more[0] = '\0';
-    num = sscanf(line,
-            "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n",
-            &d, local_addr, &local_port,
-            rem_addr, &rem_port, &state,
-            &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
-
-    if (strlen(local_addr) > 8) {
-#if ENABLE_FEATURE_IPV6
-        build_ipv6_addr(local_addr, &localaddr);
-        build_ipv6_addr(rem_addr, &remaddr);
-#endif
-    } else {
-        build_ipv4_addr(local_addr, &localaddr);
-        build_ipv4_addr(rem_addr, &remaddr);
-    }
-
-    if (num < 10) {
-        bb_error_msg("warning, got bogus raw line");
-        return;
-    }
-
-    {
-        int have_remaddr = notnull(remaddr);
-        if ((have_remaddr && (flags & NETSTAT_CONNECTED))
-         || (!have_remaddr && (flags & NETSTAT_LISTENING))
-        ) {
-            char *l = ip_port_str(
-                (struct sockaddr *) &localaddr, local_port,
-                "raw", flags & NETSTAT_NUMERIC);
-            char *r = ip_port_str(
-                (struct sockaddr *) &remaddr, rem_port,
-                "raw", flags & NETSTAT_NUMERIC);
-            printf(net_conn_line,
-                "raw", rxq, txq, l, r, itoa(state));
-            free(l);
-            free(r);
-        }
-    }
-}
-
-static void unix_do_one(int nr, const char *line)
-{
-    static smallint has_inode = 0;
-
-    char path[PATH_MAX], ss_flags[32];
+# define NOT_NULL_ADDR(A) (A.sin.sin_addr.s_addr)
+#endif
+
+static int FAST_FUNC udp_do_one(char *line)
+{
+    int have_remaddr;
+    const char *state_str;
+    struct inet_params param;
+
+    memset(&param, 0, sizeof(param)); /* otherwise we display garbage IPv6 scope_ids */
+    if (scan_inet_proc_line(&param, line))
+        return 1;
+
+    state_str = "UNKNOWN";
+    switch (param.state) {
+    case TCP_ESTABLISHED:
+        state_str = "ESTABLISHED";
+        break;
+    case TCP_CLOSE:
+        state_str = "";
+        break;
+    }
+
+    have_remaddr = NOT_NULL_ADDR(param.remaddr);
+    print_inet_line(&param, state_str, "udp", have_remaddr);
+    return 0;
+}
+
+static int FAST_FUNC raw_do_one(char *line)
+{
+    int have_remaddr;
+    struct inet_params param;
+
+    if (scan_inet_proc_line(&param, line))
+        return 1;
+
+    have_remaddr = NOT_NULL_ADDR(param.remaddr);
+    print_inet_line(&param, itoa(param.state), "raw", have_remaddr);
+    return 0;
+}
+
+static int FAST_FUNC unix_do_one(char *line)
+{
+    unsigned long refcnt, proto, unix_flags;
+    unsigned long inode;
+    int type, state;
+    int num, path_ofs;
     const char *ss_proto, *ss_state, *ss_type;
-    int num, state, type, inode;
-    void *d;
-    unsigned long refcnt, proto, unix_flags;
-
-    if (nr == 0) {
-        if (strstr(line, "Inode"))
-            has_inode = 1;
-        return;
-    }
-    path[0] = '\0';
-    num = sscanf(line, "%p: %lX %lX %lX %X %X %d %s",
-            &d, &refcnt, &proto, &unix_flags, &type, &state, &inode, path);
+    char ss_flags[32];
+
+    /* 2.6.15 may report lines like "... @/tmp/fam-user-^@^@^@^@^@^@^@..."
+     * Other users report long lines filled by NUL bytes.
+     * (those ^@ are NUL bytes too). We see them as empty lines. */
+    if (!line[0])
+        return 0;
+
+    path_ofs = 0; /* paranoia */
+    num = sscanf(line, "%*p: %lX %lX %lX %X %X %lu %n",
+            &refcnt, &proto, &unix_flags, &type, &state, &inode, &path_ofs);
     if (num < 6) {
-        bb_error_msg("warning, got bogus unix line");
-        return;
-    }
-    if (!has_inode)
-        sprintf(path, "%d", inode);
-
+        return 1; /* error */
+    }
     if ((flags & (NETSTAT_LISTENING|NETSTAT_CONNECTED)) != (NETSTAT_LISTENING|NETSTAT_CONNECTED)) {
         if ((state == SS_UNCONNECTED) && (unix_flags & SO_ACCEPTCON)) {
             if (!(flags & NETSTAT_LISTENING))
-                return;
+                return 0;
         } else {
             if (!(flags & NETSTAT_CONNECTED))
-                return;
+                return 0;
         }
     }
@@ -440 +613 @@
     strcat(ss_flags, "]");
 
-    printf("%-5s %-6ld %-11s %-10s %-13s ",
-           ss_proto, refcnt, ss_flags, ss_type, ss_state);
-    if (has_inode)
-        printf("%-6d ", inode);
-    else
-        printf("-      ");
-    puts(path);
-}
-
-#define _PATH_PROCNET_UDP "/proc/net/udp"
-#define _PATH_PROCNET_UDP6 "/proc/net/udp6"
-#define _PATH_PROCNET_TCP "/proc/net/tcp"
-#define _PATH_PROCNET_TCP6 "/proc/net/tcp6"
-#define _PATH_PROCNET_RAW "/proc/net/raw"
-#define _PATH_PROCNET_RAW6 "/proc/net/raw6"
-#define _PATH_PROCNET_UNIX "/proc/net/unix"
-
-static void do_info(const char *file, const char *name, void (*proc)(int, const char *))
-{
-    int lnr = 0;
+    printf("%-5s %-6ld %-11s %-10s %-13s %6lu ",
+        ss_proto, refcnt, ss_flags, ss_type, ss_state, inode
+        );
+
+#if ENABLE_FEATURE_NETSTAT_PRG
+    if (option_mask32 & OPT_prg)
+        printf("%-"PROGNAME_WIDTH_STR"s", prg_cache_get(inode));
+#endif
+
+    /* TODO: currently we stop at first NUL byte. Is it a problem? */
+    line += path_ofs;
+    *strchrnul(line, '\n') = '\0';
+    while (*line)
+        fputc_printable(*line++, stdout);
+    bb_putchar('\n');
+    return 0;
+}
+
+static void do_info(const char *file, int FAST_FUNC (*proc)(char *))
+{
+    int lnr;
     FILE *procinfo;
-
-    procinfo = fopen(file, "r");
+    char *buffer;
+
+    /* _stdin is just to save "r" param */
+    procinfo = fopen_or_warn_stdin(file);
     if (procinfo == NULL) {
-        if (errno != ENOENT) {
-            bb_perror_msg("%s", file);
-        } else {
-            bb_error_msg("no support for '%s' on this system", name);
-        }
         return;
     }
-    do {
-        char *buffer = xmalloc_fgets(procinfo);
-        if (buffer) {
-            (proc)(lnr++, buffer);
-            free(buffer);
-        }
-    } while (!feof(procinfo));
+    lnr = 0;
+    /* Why xmalloc_fgets_str? because it doesn't stop on NULs */
+    while ((buffer = xmalloc_fgets_str(procinfo, "\n")) != NULL) {
+        /* line 0 is skipped */
+        if (lnr && proc(buffer))
+            bb_error_msg("%s: bogus data on line %d", file, lnr + 1);
+        lnr++;
+        free(buffer);
+    }
     fclose(procinfo);
 }
 
-/*
- * Our main function.
- */
-
-int netstat_main(int argc, char **argv);
-int netstat_main(int argc, char **argv)
-{
-    const char *net_conn_line_header = PRINT_NET_CONN_HEADER;
+int netstat_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int netstat_main(int argc UNUSED_PARAM, char **argv)
+{
     unsigned opt;
-#if ENABLE_FEATURE_IPV6
-    smallint inet = 1;
-    smallint inet6 = 1;
-#else
-    enum { inet = 1, inet6 = 0 };
-#endif
+
+    INIT_G();
 
     /* Option string must match NETSTAT_xxx constants */
     opt = getopt32(argv, NETSTAT_OPTS);
-    if (opt & 0x1) { // -l
+    if (opt & OPT_sock_listen) { // -l
         flags &= ~NETSTAT_CONNECTED;
         flags |= NETSTAT_LISTENING;
     }
-    if (opt & 0x2) flags |= NETSTAT_LISTENING | NETSTAT_CONNECTED; // -a
-    //if (opt & 0x4) // -e
-    if (opt & 0x8) flags |= NETSTAT_NUMERIC; // -n
-    //if (opt & 0x10) // -t: NETSTAT_TCP
-    //if (opt & 0x20) // -u: NETSTAT_UDP
-    //if (opt & 0x40) // -w: NETSTAT_RAW
-    //if (opt & 0x80) // -x: NETSTAT_UNIX
-    if (opt & OPT_showroute) { // -r
+    if (opt & OPT_sock_all) flags |= NETSTAT_LISTENING | NETSTAT_CONNECTED; // -a
+    //if (opt & OPT_extended) // -e
+    if (opt & OPT_noresolve) flags |= NETSTAT_NUMERIC; // -n
+    //if (opt & OPT_sock_tcp) // -t: NETSTAT_TCP
+    //if (opt & OPT_sock_udp) // -u: NETSTAT_UDP
+    //if (opt & OPT_sock_raw) // -w: NETSTAT_RAW
+    //if (opt & OPT_sock_unix) // -x: NETSTAT_UNIX
 #if ENABLE_ROUTE
+    if (opt & OPT_route) { // -r
         bb_displayroutes(flags & NETSTAT_NUMERIC, !(opt & OPT_extended));
         return 0;
-#else
-        bb_show_usage();
-#endif
-    }
-
-    if (opt & OPT_widedisplay) { // -W
-        net_conn_line = PRINT_NET_CONN_WIDE;
-        net_conn_line_header = PRINT_NET_CONN_HEADER_WIDE;
-    }
+    }
+#endif
+#if ENABLE_FEATURE_NETSTAT_WIDE
+    G.addr_width = ADDR_NORMAL_WIDTH;
+    if (opt & OPT_wide) { // -W
+        G.addr_width = ADDR_WIDE;
+    }
+#endif
+#if ENABLE_FEATURE_NETSTAT_PRG
+    progname_banner = "";
+    if (opt & OPT_prg) { // -p
+        progname_banner = PROGNAME_BANNER;
+        prg_cache_load();
+    }
+#endif
 
     opt &= NETSTAT_ALLPROTO;
@@ -530 +700 @@
     }
     if (flags & (NETSTAT_TCP|NETSTAT_UDP|NETSTAT_RAW)) {
-        printf("Active Internet connections "); /* xxx */
+        printf("Active Internet connections "); /* xxx */
 
         if ((flags & (NETSTAT_LISTENING|NETSTAT_CONNECTED)) == (NETSTAT_LISTENING|NETSTAT_CONNECTED))
@@ -538 +708 @@
         else
             printf("(w/o servers)");
-        printf(net_conn_line_header, "Local Address", "Foreign Address");
-    }
-    if (inet && flags & NETSTAT_TCP)
-        do_info(_PATH_PROCNET_TCP, "AF INET (tcp)", tcp_do_one);
+        printf(FMT_NET_CONN_HEADER,
+                IF_FEATURE_NETSTAT_WIDE(G.addr_width,) "Local Address",
+                IF_FEATURE_NETSTAT_WIDE(G.addr_width,) "Foreign Address",
+                progname_banner
+        );
+    }
+    if (flags & NETSTAT_TCP) {
+        do_info("/proc/net/tcp", tcp_do_one);
 #if ENABLE_FEATURE_IPV6
-    if (inet6 && flags & NETSTAT_TCP)
-        do_info(_PATH_PROCNET_TCP6, "AF INET6 (tcp)", tcp_do_one);
-#endif
-    if (inet && flags & NETSTAT_UDP)
-        do_info(_PATH_PROCNET_UDP, "AF INET (udp)", udp_do_one);
+        do_info("/proc/net/tcp6", tcp_do_one);
+#endif
+    }
+    if (flags & NETSTAT_UDP) {
+        do_info("/proc/net/udp", udp_do_one);
 #if ENABLE_FEATURE_IPV6
-    if (inet6 && flags & NETSTAT_UDP)
-        do_info(_PATH_PROCNET_UDP6, "AF INET6 (udp)", udp_do_one);
-#endif
-    if (inet && flags & NETSTAT_RAW)
-        do_info(_PATH_PROCNET_RAW, "AF INET (raw)", raw_do_one);
+        do_info("/proc/net/udp6", udp_do_one);
+#endif
+    }
+    if (flags & NETSTAT_RAW) {
+        do_info("/proc/net/raw", raw_do_one);
 #if ENABLE_FEATURE_IPV6
-    if (inet6 && flags & NETSTAT_RAW)
-        do_info(_PATH_PROCNET_RAW6, "AF INET6 (raw)", raw_do_one);
-#endif
+        do_info("/proc/net/raw6", raw_do_one);
+#endif
+    }
     if (flags & NETSTAT_UNIX) {
         printf("Active UNIX domain sockets ");
@@ -566 +740 @@
         else
             printf("(w/o servers)");
-        printf("\nProto RefCnt Flags       Type       State         I-Node Path\n");
-        do_info(_PATH_PROCNET_UNIX, "AF UNIX", unix_do_one);
-    }
+        printf("\nProto RefCnt Flags       Type       State         I-Node %sPath\n", progname_banner);
+        do_info("/proc/net/unix", unix_do_one);
+    }
+    prg_cache_clear();
     return 0;
 }

branches/2.2.9/mindi-busybox/networking/nslookup.c

@@ -9 +9 @@
  * added by Ben Zeckel <bzeckel@hmc.edu> June 2001
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
@@ -16 +16 @@
 
 /*
- *  I'm only implementing non-interactive mode;
- *  I totally forgot nslookup even had an interactive mode.
+ * I'm only implementing non-interactive mode;
+ * I totally forgot nslookup even had an interactive mode.
+ *
+ * This applet is the only user of res_init(). Without it,
+ * you may avoid pulling in _res global from libc.
  */
 
@@ -52 +55 @@
     /* We can't use xhost2sockaddr() - we want to get ALL addresses,
      * not just one */
-
     struct addrinfo *result = NULL;
     int rc;
@@ -70 +72 @@
 
         printf("%-10s %s\n", header, hostname);
-        // printf("%s\n", cur->ai_canonname); ?
+        // puts(cur->ai_canonname); ?
         while (cur) {
             char *dotted, *revhost;
@@ -102 +104 @@
 {
     char *server;
+    struct sockaddr *sa;
 
-    server = xmalloc_sockaddr2dotted_noport((struct sockaddr*)&_res.nsaddr_list[0]);
-    /* I honestly don't know what to do if DNS server has _IPv6 address_.
-     * Probably it is listed in
-     * _res._u._ext_.nsaddrs[MAXNS] (of type "struct sockaddr_in6*" each)
-     * but how to find out whether resolver uses
-     * _res.nsaddr_list[] or _res._u._ext_.nsaddrs[], or both?
-     * Looks like classic design from hell, BIND-grade. Hard to surpass. */
+#if ENABLE_FEATURE_IPV6
+    sa = (struct sockaddr*)_res._u._ext.nsaddrs[0];
+    if (!sa)
+#endif
+        sa = (struct sockaddr*)&_res.nsaddr_list[0];
+    server = xmalloc_sockaddr2dotted_noport(sa);
+
     print_host(server, "Server:");
     if (ENABLE_FEATURE_CLEAN_UP)
         free(server);
-    puts("");
+    bb_putchar('\n');
 }
 
 /* alter the global _res nameserver structure to use
-   an explicit dns server instead of what is in /etc/resolv.h */
-static void set_default_dns(char *server)
+   an explicit dns server instead of what is in /etc/resolv.conf */
+static void set_default_dns(const char *server)
 {
-    struct in_addr server_in_addr;
+    len_and_sockaddr *lsa;
 
-    if (inet_pton(AF_INET, server, &server_in_addr) > 0) {
+    /* NB: this works even with, say, "[::1]:5353"! :) */
+    lsa = xhost2sockaddr(server, 53);
+
+    if (lsa->u.sa.sa_family == AF_INET) {
         _res.nscount = 1;
-        _res.nsaddr_list[0].sin_addr = server_in_addr;
+        /* struct copy */
+        _res.nsaddr_list[0] = lsa->u.sin;
     }
+#if ENABLE_FEATURE_IPV6
+    /* Hoped libc can cope with IPv4 address there too.
+     * No such luck, glibc 2.4 segfaults even with IPv6,
+     * maybe I misunderstand how to make glibc use IPv6 addr?
+     * (uclibc 0.9.31+ should work) */
+    if (lsa->u.sa.sa_family == AF_INET6) {
+        // glibc neither SEGVs nor sends any dgrams with this
+        // (strace shows no socket ops):
+        //_res.nscount = 0;
+        _res._u._ext.nscount = 1;
+        /* store a pointer to part of malloc'ed lsa */
+        _res._u._ext.nsaddrs[0] = &lsa->u.sin6;
+        /* must not free(lsa)! */
+    }
+#endif
 }
 
-int nslookup_main(int argc, char **argv);
+int nslookup_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int nslookup_main(int argc, char **argv)
 {
@@ -136 +158 @@
      * More than 3 arguments is an error to follow the pattern of the
      * standard nslookup */
-
-    if (argc < 2 || *argv[1] == '-' || argc > 3)
+    if (!argv[1] || argv[1][0] == '-' || argc > 3)
         bb_show_usage();
 
@@ -144 +165 @@
     res_init();
     /* rfc2133 says this enables IPv6 lookups */
-    /* (but it also says "may be enabled in /etc/resolv.conf|) */
+    /* (but it also says "may be enabled in /etc/resolv.conf") */
     /*_res.options |= RES_USE_INET6;*/
 
-    if (argc == 3)
+    if (argv[2])
         set_default_dns(argv[2]);
 

branches/2.2.9/mindi-busybox/networking/ping.c

@@ -12 +12 @@
  * Mike Muuss.
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 /* from ping6.c:
@@ -31 +31 @@
 
 #if ENABLE_PING6
-#include <netinet/icmp6.h>
+# include <netinet/icmp6.h>
 /* I see RENUMBERED constants in bits/in.h - !!?
  * What a fuck is going on with libc? Is it a glibc joke? */
-#ifdef IPV6_2292HOPLIMIT
-#undef IPV6_HOPLIMIT
-#define IPV6_HOPLIMIT IPV6_2292HOPLIMIT
-#endif
+# ifdef IPV6_2292HOPLIMIT
+#  undef IPV6_HOPLIMIT
+#  define IPV6_HOPLIMIT IPV6_2292HOPLIMIT
+# endif
 #endif
 
@@ -44 +44 @@
     MAXIPLEN = 60,
     MAXICMPLEN = 76,
-    MAXPACKET = 65468,
     MAX_DUP_CHK = (8 * 128),
     MAXWAIT = 10,
@@ -50 +49 @@
 };
 
-/* common routines */
+/* Common routines */
 
 static int in_cksum(unsigned short *buf, int sz)
@@ -77 +76 @@
 #if !ENABLE_FEATURE_FANCY_PING
 
-/* simple version */
-
-static char *hostname;
-
-static void noresp(int ign ATTRIBUTE_UNUSED)
-{
-    printf("No response from %s\n", hostname);
+/* Simple version */
+
+struct globals {
+    char *hostname;
+    char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN];
+} FIX_ALIASING;
+#define G (*(struct globals*)&bb_common_bufsiz1)
+#define INIT_G() do { } while (0)
+
+static void noresp(int ign UNUSED_PARAM)
+{
+    printf("No response from %s\n", G.hostname);
     exit(EXIT_FAILURE);
 }
@@ -89 +93 @@
 static void ping4(len_and_sockaddr *lsa)
 {
-    struct sockaddr_in pingaddr;
     struct icmp *pkt;
     int pingsock, c;
-    char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN];
 
     pingsock = create_icmp_socket();
-    pingaddr = lsa->sin;
-
-    pkt = (struct icmp *) packet;
-    memset(pkt, 0, sizeof(packet));
+
+    pkt = (struct icmp *) G.packet;
+    memset(pkt, 0, sizeof(G.packet));
     pkt->icmp_type = ICMP_ECHO;
-    pkt->icmp_cksum = in_cksum((unsigned short *) pkt, sizeof(packet));
-
-    c = xsendto(pingsock, packet, DEFDATALEN + ICMP_MINLEN,
-               (struct sockaddr *) &pingaddr, sizeof(pingaddr));
+    pkt->icmp_cksum = in_cksum((unsigned short *) pkt, sizeof(G.packet));
+
+    xsendto(pingsock, G.packet, DEFDATALEN + ICMP_MINLEN, &lsa->u.sa, lsa->len);
 
     /* listen for replies */
@@ -110 +110 @@
         socklen_t fromlen = sizeof(from);
 
-        c = recvfrom(pingsock, packet, sizeof(packet), 0,
+        c = recvfrom(pingsock, G.packet, sizeof(G.packet), 0,
                 (struct sockaddr *) &from, &fromlen);
         if (c < 0) {
@@ -118 +118 @@
         }
         if (c >= 76) {          /* ip + icmp */
-            struct iphdr *iphdr = (struct iphdr *) packet;
-
-            pkt = (struct icmp *) (packet + (iphdr->ihl << 2)); /* skip ip hdr */
+            struct iphdr *iphdr = (struct iphdr *) G.packet;
+
+            pkt = (struct icmp *) (G.packet + (iphdr->ihl << 2));   /* skip ip hdr */
             if (pkt->icmp_type == ICMP_ECHOREPLY)
                 break;
@@ -132 +132 @@
 static void ping6(len_and_sockaddr *lsa)
 {
-    struct sockaddr_in6 pingaddr;
     struct icmp6_hdr *pkt;
     int pingsock, c;
     int sockopt;
-    char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN];
 
     pingsock = create_icmp6_socket();
-    pingaddr = lsa->sin6;
-
-    pkt = (struct icmp6_hdr *) packet;
-    memset(pkt, 0, sizeof(packet));
+
+    pkt = (struct icmp6_hdr *) G.packet;
+    memset(pkt, 0, sizeof(G.packet));
     pkt->icmp6_type = ICMP6_ECHO_REQUEST;
 
@@ -148 +145 @@
     setsockopt(pingsock, SOL_RAW, IPV6_CHECKSUM, &sockopt, sizeof(sockopt));
 
-    c = xsendto(pingsock, packet, DEFDATALEN + sizeof (struct icmp6_hdr),
-               (struct sockaddr *) &pingaddr, sizeof(pingaddr));
+    xsendto(pingsock, G.packet, DEFDATALEN + sizeof(struct icmp6_hdr), &lsa->u.sa, lsa->len);
 
     /* listen for replies */
@@ -156 +152 @@
         socklen_t fromlen = sizeof(from);
 
-        c = recvfrom(pingsock, packet, sizeof(packet), 0,
+        c = recvfrom(pingsock, G.packet, sizeof(G.packet), 0,
                 (struct sockaddr *) &from, &fromlen);
         if (c < 0) {
@@ -163 +159 @@
             continue;
         }
-        if (c >= 8) {           /* icmp6_hdr */
-            pkt = (struct icmp6_hdr *) packet;
+        if (c >= ICMP_MINLEN) {         /* icmp6_hdr */
+            pkt = (struct icmp6_hdr *) G.packet;
             if (pkt->icmp6_type == ICMP6_ECHO_REPLY)
                 break;
@@ -174 +170 @@
 #endif
 
-int ping_main(int argc, char **argv);
-int ping_main(int argc, char **argv)
+#if !ENABLE_PING6
+# define common_ping_main(af, argv) common_ping_main(argv)
+#endif
+static int common_ping_main(sa_family_t af, char **argv)
 {
     len_and_sockaddr *lsa;
-#if ENABLE_PING6
-    sa_family_t af = AF_UNSPEC;
-
+
+    INIT_G();
+
+#if ENABLE_PING6
     while ((++argv)[0] && argv[0][0] == '-') {
         if (argv[0][1] == '4') {
@@ -196 +195 @@
 #endif
 
-    hostname = *argv;
-    if (!hostname)
+    G.hostname = *argv;
+    if (!G.hostname)
         bb_show_usage();
 
 #if ENABLE_PING6
-    lsa = xhost_and_af2sockaddr(hostname, 0, af);
+    lsa = xhost_and_af2sockaddr(G.hostname, 0, af);
 #else
-    lsa = xhost_and_af2sockaddr(hostname, 0, AF_INET);
+    lsa = xhost_and_af2sockaddr(G.hostname, 0, AF_INET);
 #endif
     /* Set timer _after_ DNS resolution */
@@ -210 +209 @@
 
 #if ENABLE_PING6
-    if (lsa->sa.sa_family == AF_INET6)
+    if (lsa->u.sa.sa_family == AF_INET6)
         ping6(lsa);
     else
 #endif
         ping4(lsa);
-    printf("%s is alive!\n", hostname);
+    printf("%s is alive!\n", G.hostname);
     return EXIT_SUCCESS;
 }
@@ -223 +222 @@
 
 
-/* full(er) version */
-
-#define OPT_STRING ("qvc:s:I:4" USE_PING6("6"))
+/* Full(er) version */
+
+#define OPT_STRING ("qvc:s:w:W:I:4" IF_PING6("6"))
 enum {
     OPT_QUIET = 1 << 0,
@@ -231 +230 @@
     OPT_c = 1 << 2,
     OPT_s = 1 << 3,
-    OPT_I = 1 << 4,
-    OPT_IPV4 = 1 << 5,
-    OPT_IPV6 = (1 << 6) * ENABLE_PING6,
+    OPT_w = 1 << 4,
+    OPT_W = 1 << 5,
+    OPT_I = 1 << 6,
+    OPT_IPV4 = 1 << 7,
+    OPT_IPV6 = (1 << 8) * ENABLE_PING6,
 };
 
@@ -239 +240 @@
 struct globals {
     int pingsock;
+    int if_index;
+    char *str_I;
     len_and_sockaddr *source_lsa;
     unsigned datalen;
-    int if_index;
-    unsigned long ntransmitted, nreceived, nrepeats, pingcount;
+    unsigned pingcount; /* must be int-sized */
+    unsigned long ntransmitted, nreceived, nrepeats;
     uint16_t myid;
     unsigned tmin, tmax; /* in us */
     unsigned long long tsum; /* in us, sum of all times */
+    unsigned deadline;
+    unsigned timeout;
+    unsigned total_secs;
+    unsigned sizeof_rcv_packet;
+    char *rcv_packet; /* [datalen + MAXIPLEN + MAXICMPLEN] */
+    void *snd_packet; /* [datalen + ipv4/ipv6_const] */
     const char *hostname;
     const char *dotted;
@@ -256 +265 @@
     } pingaddr;
     char rcvd_tbl[MAX_DUP_CHK / 8];
-};
+} FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
 #define pingsock     (G.pingsock    )
+#define if_index     (G.if_index    )
 #define source_lsa   (G.source_lsa  )
+#define str_I        (G.str_I       )
 #define datalen      (G.datalen     )
-#define if_index     (G.if_index    )
 #define ntransmitted (G.ntransmitted)
 #define nreceived    (G.nreceived   )
@@ -270 +280 @@
 #define tmax         (G.tmax        )
 #define tsum         (G.tsum        )
+#define deadline     (G.deadline    )
+#define timeout      (G.timeout     )
+#define total_secs   (G.total_secs  )
 #define hostname     (G.hostname    )
 #define dotted       (G.dotted      )
@@ -276 +289 @@
 void BUG_ping_globals_too_big(void);
 #define INIT_G() do { \
-        if (sizeof(G) > COMMON_BUFSIZE) \
-                BUG_ping_globals_too_big(); \
+    if (sizeof(G) > COMMON_BUFSIZE) \
+        BUG_ping_globals_too_big(); \
     pingsock = -1; \
+    datalen = DEFDATALEN; \
+    timeout = MAXWAIT; \
     tmin = UINT_MAX; \
 } while (0)
 
 
-#define A(bit)      rcvd_tbl[(bit)>>3]  /* identify byte in array */
-#define B(bit)      (1 << ((bit) & 0x07))   /* identify bit in byte */
-#define SET(bit)    (A(bit) |= B(bit))
-#define CLR(bit)    (A(bit) &= (~B(bit)))
-#define TST(bit)    (A(bit) & B(bit))
+#define A(bit)      rcvd_tbl[(bit)>>3]  /* identify byte in array */
+#define B(bit)      (1 << ((bit) & 0x07))   /* identify bit in byte */
+#define SET(bit)    (A(bit) |= B(bit))
+#define CLR(bit)    (A(bit) &= (~B(bit)))
+#define TST(bit)    (A(bit) & B(bit))
 
 /**************************************************************************/
 
-static void pingstats(int junk ATTRIBUTE_UNUSED)
+static void print_stats_and_exit(int junk) NORETURN;
+static void print_stats_and_exit(int junk UNUSED_PARAM)
 {
     signal(SIGINT, SIG_IGN);
@@ -310 +326 @@
             tmax / 1000, tmax % 1000);
     }
-    exit(nreceived == 0); /* (nreceived == 0) is true (1) -- 'failure' */
+    /* if condition is true, exit with 1 -- 'failure' */
+    exit(nreceived == 0 || (deadline && nreceived < pingcount));
 }
 
@@ -326 +343 @@
         bb_error_msg_and_die(bb_msg_write_error);
 
-    signal(SIGALRM, sp);
-    if (pingcount == 0 || ntransmitted < pingcount) { /* schedule next in 1s */
+    if (pingcount == 0 || deadline || ntransmitted < pingcount) {
+        /* Didn't send all pings yet - schedule next in 1s */
+        signal(SIGALRM, sp);
+        if (deadline) {
+            total_secs += PINGINTERVAL;
+            if (total_secs >= deadline)
+                signal(SIGALRM, print_stats_and_exit);
+        }
         alarm(PINGINTERVAL);
-    } else { /* done, wait for the last ping to come back */
-        /* todo, don't necessarily need to wait so long... */
-        signal(SIGALRM, pingstats);
-        alarm(MAXWAIT);
-    }
-}
-
-static void sendping4(int junk ATTRIBUTE_UNUSED)
-{
-    /* +4 reserves a place for timestamp, which may end up sitting
-     * *after* packet. Saves one if() */
-    struct icmp *pkt = alloca(datalen + ICMP_MINLEN + 4);
-
+    } else { /* -c NN, and all NN are sent (and no deadline) */
+        /* Wait for the last ping to come back.
+         * -W timeout: wait for a response in seconds.
+         * Affects only timeout in absense of any responses,
+         * otherwise ping waits for two RTTs. */
+        unsigned expire = timeout;
+
+        if (nreceived) {
+            /* approx. 2*tmax, in seconds (2 RTT) */
+            expire = tmax / (512*1024);
+            if (expire == 0)
+                expire = 1;
+        }
+        signal(SIGALRM, print_stats_and_exit);
+        alarm(expire);
+    }
+}
+
+static void sendping4(int junk UNUSED_PARAM)
+{
+    struct icmp *pkt = G.snd_packet;
+
+    //memset(pkt, 0, datalen + ICMP_MINLEN + 4); - G.snd_packet was xzalloced
     pkt->icmp_type = ICMP_ECHO;
-    pkt->icmp_code = 0;
-    pkt->icmp_cksum = 0;
+    /*pkt->icmp_code = 0;*/
+    pkt->icmp_cksum = 0; /* cksum is calculated with this field set to 0 */
     pkt->icmp_seq = htons(ntransmitted); /* don't ++ here, it can be a macro */
     pkt->icmp_id = myid;
 
-    /* We don't do hton, because we will read it back on the same machine */
+    /* If datalen < 4, we store timestamp _past_ the packet,
+     * but it's ok - we allocated 4 extra bytes in xzalloc() just in case.
+     */
     /*if (datalen >= 4)*/
+        /* No hton: we'll read it back on the same machine */
         *(uint32_t*)&pkt->icmp_dun = monotonic_us();
 
@@ -357 +393 @@
 }
 #if ENABLE_PING6
-static void sendping6(int junk ATTRIBUTE_UNUSED)
-{
-    struct icmp6_hdr *pkt = alloca(datalen + sizeof(struct icmp6_hdr) + 4);
-
+static void sendping6(int junk UNUSED_PARAM)
+{
+    struct icmp6_hdr *pkt = G.snd_packet;
+
+    //memset(pkt, 0, datalen + sizeof(struct icmp6_hdr) + 4);
     pkt->icmp6_type = ICMP6_ECHO_REQUEST;
-    pkt->icmp6_code = 0;
-    pkt->icmp6_cksum = 0;
+    /*pkt->icmp6_code = 0;*/
+    /*pkt->icmp6_cksum = 0;*/
     pkt->icmp6_seq = htons(ntransmitted); /* don't ++ here, it can be a macro */
     pkt->icmp6_id = myid;
@@ -369 +406 @@
     /*if (datalen >= 4)*/
         *(uint32_t*)(&pkt->icmp6_data8[4]) = monotonic_us();
+
+    //TODO? pkt->icmp_cksum = in_cksum(...);
 
     sendping_tail(sendping6, pkt, datalen + sizeof(struct icmp6_hdr));
@@ -458 +497 @@
         printf(" time=%u.%03u ms", triptime / 1000, triptime % 1000);
     puts(dupmsg);
-    fflush(stdout);
+    fflush_all();
 }
 static void unpack4(char *buf, int sz, struct sockaddr_in *from)
@@ -494 +533 @@
 }
 #if ENABLE_PING6
-static void unpack6(char *packet, int sz, struct sockaddr_in6 *from, int hoplimit)
+static void unpack6(char *packet, int sz, /*struct sockaddr_in6 *from,*/ int hoplimit)
 {
     struct icmp6_hdr *icmppkt;
@@ -527 +566 @@
 static void ping4(len_and_sockaddr *lsa)
 {
-    char packet[datalen + MAXIPLEN + MAXICMPLEN];
     int sockopt;
 
     pingsock = create_icmp_socket();
-    pingaddr.sin = lsa->sin;
+    pingaddr.sin = lsa->u.sin;
     if (source_lsa) {
         if (setsockopt(pingsock, IPPROTO_IP, IP_MULTICAST_IF,
-                &source_lsa->sa, source_lsa->len))
+                &source_lsa->u.sa, source_lsa->len))
             bb_error_msg_and_die("can't set multicast source interface");
-        xbind(pingsock, &source_lsa->sa, source_lsa->len);
-    }
+        xbind(pingsock, &source_lsa->u.sa, source_lsa->len);
+    }
+    if (str_I)
+        setsockopt_bindtodevice(pingsock, str_I);
 
     /* enable broadcast pings */
     setsockopt_broadcast(pingsock);
 
-    /* set recv buf for broadcast pings */
-    sockopt = 48 * 1024; /* explain why 48k? */
+    /* set recv buf (needed if we can get lots of responses: flood ping,
+     * broadcast ping etc) */
+    sockopt = (datalen * 2) + 7 * 1024; /* giving it a bit of extra room */
     setsockopt(pingsock, SOL_SOCKET, SO_RCVBUF, &sockopt, sizeof(sockopt));
 
-    signal(SIGINT, pingstats);
+    signal(SIGINT, print_stats_and_exit);
 
     /* start the ping's going ... */
@@ -557 +598 @@
         int c;
 
-        c = recvfrom(pingsock, packet, sizeof(packet), 0,
+        c = recvfrom(pingsock, G.rcv_packet, G.sizeof_rcv_packet, 0,
                 (struct sockaddr *) &from, &fromlen);
         if (c < 0) {
@@ -564 +605 @@
             continue;
         }
-        unpack4(packet, c, &from);
-        if (pingcount > 0 && nreceived >= pingcount)
+        unpack4(G.rcv_packet, c, &from);
+        if (pingcount && nreceived >= pingcount)
             break;
     }
@@ -573 +614 @@
 static void ping6(len_and_sockaddr *lsa)
 {
-    char packet[datalen + MAXIPLEN + MAXICMPLEN];
     int sockopt;
     struct msghdr msg;
@@ -581 +621 @@
 
     pingsock = create_icmp6_socket();
-    pingaddr.sin6 = lsa->sin6;
+    pingaddr.sin6 = lsa->u.sin6;
     /* untested whether "-I addr" really works for IPv6: */
     if (source_lsa)
-        xbind(pingsock, &source_lsa->sa, source_lsa->len);
+        xbind(pingsock, &source_lsa->u.sa, source_lsa->len);
+    if (str_I)
+        setsockopt_bindtodevice(pingsock, str_I);
 
 #ifdef ICMP6_FILTER
@@ -604 +646 @@
     setsockopt_broadcast(pingsock);
 
-    /* set recv buf for broadcast pings */
-    sockopt = 48 * 1024; /* explain why 48k? */
+    /* set recv buf (needed if we can get lots of responses: flood ping,
+     * broadcast ping etc) */
+    sockopt = (datalen * 2) + 7 * 1024; /* giving it a bit of extra room */
     setsockopt(pingsock, SOL_SOCKET, SO_RCVBUF, &sockopt, sizeof(sockopt));
 
@@ -619 +662 @@
         pingaddr.sin6.sin6_scope_id = if_index;
 
-    signal(SIGINT, pingstats);
+    signal(SIGINT, print_stats_and_exit);
 
     /* start the ping's going ... */
@@ -630 +673 @@
     msg.msg_iovlen = 1;
     msg.msg_control = control_buf;
-    iov.iov_base = packet;
-    iov.iov_len = sizeof(packet);
+    iov.iov_base = G.rcv_packet;
+    iov.iov_len = G.sizeof_rcv_packet;
     while (1) {
         int c;
@@ -650 +693 @@
              /* && mp->cmsg_len >= CMSG_LEN(sizeof(int)) */
             ) {
-                hoplimit = *(int*)CMSG_DATA(mp);
+                /*hoplimit = *(int*)CMSG_DATA(mp); - unaligned access */
+                move_from_unaligned_int(hoplimit, CMSG_DATA(mp));
             }
         }
-        unpack6(packet, c, &from, hoplimit);
-        if (pingcount > 0 && nreceived >= pingcount)
+        unpack6(G.rcv_packet, c, /*&from,*/ hoplimit);
+        if (pingcount && nreceived >= pingcount)
             break;
     }
@@ -665 +709 @@
     if (source_lsa) {
         printf(" from %s",
-            xmalloc_sockaddr2dotted_noport(&source_lsa->sa));
+            xmalloc_sockaddr2dotted_noport(&source_lsa->u.sa));
     }
     printf(": %d data bytes\n", datalen);
 
-#if ENABLE_PING6
-    if (lsa->sa.sa_family == AF_INET6)
+    G.sizeof_rcv_packet = datalen + MAXIPLEN + MAXICMPLEN;
+    G.rcv_packet = xzalloc(G.sizeof_rcv_packet);
+#if ENABLE_PING6
+    if (lsa->u.sa.sa_family == AF_INET6) {
+        /* +4 reserves a place for timestamp, which may end up sitting
+         * _after_ packet. Saves one if() - see sendping4/6() */
+        G.snd_packet = xzalloc(datalen + sizeof(struct icmp6_hdr) + 4);
         ping6(lsa);
-    else
-#endif
+    } else
+#endif
+    {
+        G.snd_packet = xzalloc(datalen + ICMP_MINLEN + 4);
         ping4(lsa);
-}
-
-int ping_main(int argc, char **argv);
-int ping_main(int argc, char **argv)
+    }
+}
+
+static int common_ping_main(int opt, char **argv)
 {
     len_and_sockaddr *lsa;
-    char *opt_c, *opt_s, *opt_I;
-    USE_PING6(sa_family_t af = AF_UNSPEC;)
+    char *str_s;
 
     INIT_G();
 
-    datalen = DEFDATALEN; /* initialized here rather than in global scope to work around gcc bug */
-
-    /* exactly one argument needed, -v and -q don't mix */
-    opt_complementary = "=1:q--v:v--q";
-    getopt32(argv, OPT_STRING, &opt_c, &opt_s, &opt_I);
-    if (option_mask32 & OPT_c) pingcount = xatoul(opt_c); // -c
-    if (option_mask32 & OPT_s) datalen = xatou16(opt_s); // -s
-    if (option_mask32 & OPT_I) { // -I
-        if_index = if_nametoindex(opt_I);
+    /* exactly one argument needed; -v and -q don't mix; -c NUM, -w NUM, -W NUM */
+    opt_complementary = "=1:q--v:v--q:c+:w+:W+";
+    opt |= getopt32(argv, OPT_STRING, &pingcount, &str_s, &deadline, &timeout, &str_I);
+    if (opt & OPT_s)
+        datalen = xatou16(str_s); // -s
+    if (opt & OPT_I) { // -I
+        if_index = if_nametoindex(str_I);
         if (!if_index) {
             /* TODO: I'm not sure it takes IPv6 unless in [XX:XX..] format */
-            source_lsa = xdotted2sockaddr(opt_I, 0);
+            source_lsa = xdotted2sockaddr(str_I, 0);
+            str_I = NULL; /* don't try to bind to device later */
         }
     }
@@ -703 +752 @@
     hostname = argv[optind];
 #if ENABLE_PING6
-    if (option_mask32 & OPT_IPV4)
-        af = AF_INET;
-    if (option_mask32 & OPT_IPV6)
-        af = AF_INET6;
-    lsa = xhost_and_af2sockaddr(hostname, 0, af);
+    {
+        sa_family_t af = AF_UNSPEC;
+        if (opt & OPT_IPV4)
+            af = AF_INET;
+        if (opt & OPT_IPV6)
+            af = AF_INET6;
+        lsa = xhost_and_af2sockaddr(hostname, 0, af);
+    }
 #else
     lsa = xhost_and_af2sockaddr(hostname, 0, AF_INET);
 #endif
 
-    if (source_lsa && source_lsa->sa.sa_family != lsa->sa.sa_family)
+    if (source_lsa && source_lsa->u.sa.sa_family != lsa->u.sa.sa_family)
         /* leaking it here... */
         source_lsa = NULL;
 
-    dotted = xmalloc_sockaddr2dotted_noport(&lsa->sa);
+    dotted = xmalloc_sockaddr2dotted_noport(&lsa->u.sa);
     ping(lsa);
-    pingstats(0);
-    return EXIT_SUCCESS;
+    print_stats_and_exit(EXIT_SUCCESS);
+    /*return EXIT_SUCCESS;*/
 }
 #endif /* FEATURE_FANCY_PING */
 
 
-#if ENABLE_PING6
-int ping6_main(int argc, char **argv);
-int ping6_main(int argc, char **argv)
-{
-    argv[0] = (char*)"-6";
-    return ping_main(argc + 1, argv - 1);
+int ping_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int ping_main(int argc UNUSED_PARAM, char **argv)
+{
+#if !ENABLE_FEATURE_FANCY_PING
+    return common_ping_main(AF_UNSPEC, argv);
+#else
+    return common_ping_main(0, argv);
+#endif
+}
+
+#if ENABLE_PING6
+int ping6_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int ping6_main(int argc UNUSED_PARAM, char **argv)
+{
+# if !ENABLE_FEATURE_FANCY_PING
+    return common_ping_main(AF_INET6, argv);
+# else
+    return common_ping_main(OPT_IPV6, argv);
+# endif
 }
 #endif

branches/2.2.9/mindi-busybox/networking/pscan.c

@@ -4 +4 @@
  * Copyright 2007 Tito Ragusa <farmatito@tiscali.it>
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
@@ -31 +31 @@
 #define MONOTONIC_US() ((unsigned)monotonic_us())
 
-int pscan_main(int argc, char **argv);
-int pscan_main(int argc, char **argv)
+int pscan_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int pscan_main(int argc UNUSED_PARAM, char **argv)
 {
     const char *opt_max_port = "1024";      /* -P: default max port */
@@ -43 +43 @@
      * will take N seconds at absolute minimum */
     const char *opt_min_rtt = "5";          /* -T: default min rtt in msec */
+    const char *result_str;
     len_and_sockaddr *lsap;
     int s;
+    unsigned opt;
     unsigned port, max_port, nports;
     unsigned closed_ports = 0;
@@ -52 +54 @@
     unsigned min_rtt;
     unsigned rtt_4;
-    unsigned start;
+    unsigned start, diff;
 
     opt_complementary = "=1"; /* exactly one non-option */
-    getopt32(argv, "p:P:t:T:", &opt_min_port, &opt_max_port, &opt_timeout, &opt_min_rtt);
+    opt = getopt32(argv, "cbp:P:t:T:", &opt_min_port, &opt_max_port, &opt_timeout, &opt_min_rtt);
     argv += optind;
     max_port = xatou_range(opt_max_port, 1, 65535);
     port = xatou_range(opt_min_port, 1, max_port);
     nports = max_port - port + 1;
-    rtt_4 = timeout = xatou_range(opt_timeout, 1, INT_MAX/1000 / 4) * 1000;
     min_rtt = xatou_range(opt_min_rtt, 1, INT_MAX/1000 / 4) * 1000;
+    timeout = xatou_range(opt_timeout, 1, INT_MAX/1000 / 4) * 1000;
+    /* Initial rtt is BIG: */
+    rtt_4 = timeout;
 
     DMSG("min_rtt %u timeout %u", min_rtt, timeout);
@@ -74 +78 @@
         /* The SOCK_STREAM socket type is implemented on the TCP/IP protocol. */
         set_nport(lsap, htons(port));
-        s = xsocket(lsap->sa.sa_family, SOCK_STREAM, 0);
-
+        s = xsocket(lsap->u.sa.sa_family, SOCK_STREAM, 0);
         /* We need unblocking socket so we don't need to wait for ETIMEOUT. */
         /* Nonblocking connect typically "fails" with errno == EINPROGRESS */
         ndelay_on(s);
+
         DMSG("connect to port %u", port);
+        result_str = NULL;
         start = MONOTONIC_US();
-        if (connect(s, &lsap->sa, lsap->len) == 0) {
+        if (connect(s, &lsap->u.sa, lsap->len) == 0) {
             /* Unlikely, for me even localhost fails :) */
             DMSG("connect succeeded");
@@ -93 +98 @@
         }
 
+        diff = 0;
         while (1) {
             if (errno == ECONNREFUSED) {
-                DMSG("port %u: ECONNREFUSED", port);
+                if (opt & 1) /* -c: show closed too */
+                    result_str = "closed";
                 closed_ports++;
                 break;
             }
-            DERR("port %u errno %d @%u", port, errno, MONOTONIC_US() - start);
-            if ((MONOTONIC_US() - start) > rtt_4)
+            DERR("port %u errno %d @%u", port, errno, diff);
+
+            if (diff > rtt_4) {
+                if (opt & 2) /* -b: show blocked too */
+                    result_str = "blocked";
                 break;
+            }
             /* Can sleep (much) longer than specified delay.
              * We check rtt BEFORE we usleep, otherwise
-             * on localhost we'll do zero writes done (!)
+             * on localhost we'll have no writes done (!)
              * before we exceed (rather small) rtt */
             usleep(rtt_4/8);
-            DMSG("write to port %u @%u", port, MONOTONIC_US() - start);
+ open:
+            diff = MONOTONIC_US() - start;
+            DMSG("write to port %u @%u", port, diff - start);
             if (write(s, " ", 1) >= 0) { /* We were able to write to the socket */
- open:
                 open_ports++;
-                printf("%5u\ttcp\topen\t%s\n", port, port_name(port));
+                result_str = "open";
                 break;
             }
         }
-        DMSG("out of loop @%u", MONOTONIC_US() - start);
+        DMSG("out of loop @%u", diff);
+        if (result_str)
+            printf("%5u" "\t" "tcp" "\t" "%s" "\t" "%s" "\n",
+                    port, result_str, port_name(port));
 
         /* Estimate new rtt - we don't want to wait entire timeout
          * for each port. *4 allows for rise in net delay.
-         * We increase rtt quickly (*4), decrease slowly (4/8 == 1/2)
+         * We increase rtt quickly (rtt_4*4), decrease slowly
+         * (diff is at least rtt_4/8, *4 == rtt_4/2)
          * because we don't want to accidentally miss ports. */
-        rtt_4 = (MONOTONIC_US() - start) * 4;
+        rtt_4 = diff * 4;
         if (rtt_4 < min_rtt)
             rtt_4 = min_rtt;
@@ -131 +147 @@
     if (ENABLE_FEATURE_CLEAN_UP) free(lsap);
 
-    printf("%d closed, %d open, %d timed out ports\n",
+    printf("%d closed, %d open, %d timed out (or blocked) ports\n",
                     closed_ports,
                     open_ports,

branches/2.2.9/mindi-busybox/networking/route.c

@@ -11 +11 @@
  *              (derived from FvK's 'route.c     1.70    01/04/94')
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  *
@@ -26 +26 @@
  */
 
-#include <getopt.h>
 #include <net/route.h>
 #include <net/if.h>
@@ -153 +152 @@
 /* Add or delete a route, depending on action. */
 
-static void INET_setroute(int action, char **args)
+static NOINLINE void INET_setroute(int action, char **args)
 {
     struct rtentry rt;
@@ -180 +179 @@
 
             prefix_len = xatoul_range(prefix+1, 0, 32);
-            mask_in_addr(rt) = htonl( ~ (0xffffffffUL >> prefix_len));
+            mask_in_addr(rt) = htonl( ~(0xffffffffUL >> prefix_len));
             *prefix = '\0';
 #if HAVE_NEW_ADDRT
@@ -187 +186 @@
         } else {
             /* Default netmask. */
-            netmask = bb_str_default;
+            netmask = "default";
         }
         /* Prefer hostname lookup is -host flag (xflag==1) was given. */
@@ -304 +303 @@
     /* sanity checks.. */
     if (mask_in_addr(rt)) {
-        unsigned long mask = mask_in_addr(rt);
+        uint32_t mask = mask_in_addr(rt);
 
         mask = ~ntohl(mask);
@@ -315 +314 @@
         }
         mask = ((struct sockaddr_in *) &rt.rt_dst)->sin_addr.s_addr;
-        if (mask & ~mask_in_addr(rt)) {
+        if (mask & ~(uint32_t)mask_in_addr(rt)) {
             bb_error_msg_and_die("netmask and route address conflict");
         }
@@ -338 +337 @@
 #if ENABLE_FEATURE_IPV6
 
-static void INET6_setroute(int action, char **args)
+static NOINLINE void INET6_setroute(int action, char **args)
 {
     struct sockaddr_in6 sa6;
@@ -348 +347 @@
         const char *target = *args++;
 
-        if (strcmp(target, bb_str_default) == 0) {
+        if (strcmp(target, "default") == 0) {
             prefix_len = 0;
             memset(&sa6, 0, sizeof(sa6));
         } else {
             char *cp;
-            if ((cp = strchr(target, '/'))) { /* Yes... const to non is ok. */
-                *cp = 0;
-                prefix_len = xatoul_range(cp+1, 0, 128);
+            cp = strchr(target, '/'); /* Yes... const to non is ok. */
+            if (cp) {
+                *cp = '\0';
+                prefix_len = xatoul_range(cp + 1, 0, 128);
             } else {
                 prefix_len = 128;
@@ -424 +424 @@
         struct ifreq ifr;
         memset(&ifr, 0, sizeof(ifr));
-        strncpy(ifr.ifr_name, devname, sizeof(ifr.ifr_name));
+        strncpy_IFNAMSIZ(ifr.ifr_name, devname);
         xioctl(skfd, SIOGIFINDEX, &ifr);
         rt.rtmsg_ifindex = ifr.ifr_ifindex;
@@ -477 +477 @@
 
 /* also used in netstat */
-void bb_displayroutes(int noresolve, int netstatfmt)
+void FAST_FUNC bb_displayroutes(int noresolve, int netstatfmt)
 {
     char devname[64], flags[16], *sdest, *sgw;
@@ -485 +485 @@
     struct in_addr mask;
 
-    FILE *fp = xfopen("/proc/net/route", "r");
+    FILE *fp = xfopen_for_read("/proc/net/route");
 
     printf("Kernel IP routing table\n"
@@ -539 +539 @@
 #if ENABLE_FEATURE_IPV6
 
-static void INET6_displayroutes(int noresolve)
+static void INET6_displayroutes(void)
 {
     char addr6[128], *naddr6;
@@ -553 +553 @@
     struct sockaddr_in6 snaddr6;
 
-    FILE *fp = xfopen("/proc/net/ipv6_route", "r");
+    FILE *fp = xfopen_for_read("/proc/net/ipv6_route");
 
     printf("Kernel IPv6 routing table\n%-44s%-40s"
@@ -562 +562 @@
         int r;
         r = fscanf(fp, "%32s%x%*s%x%32s%x%x%x%x%s\n",
-                   addr6x+14, &prefix_len, &slen, addr6x+40+7,
-                   &metric, &use, &refcnt, &iflags, iface);
+                addr6x+14, &prefix_len, &slen, addr6x+40+7,
+                &metric, &use, &refcnt, &iflags, iface);
         if (r != 9) {
             if ((r < 0) && feof(fp)) { /* EOF with no (nonspace) chars read. */
@@ -641 +641 @@
 ;
 
-int route_main(int argc, char **argv);
-int route_main(int argc, char **argv)
+int route_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int route_main(int argc UNUSED_PARAM, char **argv)
 {
     unsigned opt;
@@ -675 +675 @@
 #if ENABLE_FEATURE_IPV6
         if (opt & ROUTE_OPT_INET6)
-            INET6_displayroutes(noresolve);
+            INET6_displayroutes();
         else
 #endif

branches/2.2.9/mindi-busybox/networking/slattach.c

@@ -5 +5 @@
  * Author: Ignacio Garcia Perez (iggarpe at gmail dot com)
  *
- * License: GPLv2 or later, see LICENSE file in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  * There are some differences from the standard net-tools slattach:
@@ -21 +21 @@
     int saved_disc;
     struct termios saved_state;
-};
+} FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
 #define handle       (G.handle      )
 #define saved_disc   (G.saved_disc  )
 #define saved_state  (G.saved_state )
-#define INIT_G() do {} while (0)
+#define INIT_G() do { } while (0)
 
 
@@ -44 +44 @@
 }
 
-static int set_termios_state_and_warn(struct termios *state)
+static int set_termios_state_or_warn(struct termios *state)
 {
     int ret;
@@ -65 +65 @@
  * as possible.
  */
-static void restore_state_and_exit(int exitcode) ATTRIBUTE_NORETURN;
+static void restore_state_and_exit(int exitcode) NORETURN;
 static void restore_state_and_exit(int exitcode)
 {
@@ -79 +79 @@
     cfsetispeed(&state, B0);
     cfsetospeed(&state, B0);
-    if (set_termios_state_and_warn(&state))
+    if (set_termios_state_or_warn(&state))
         exitcode = 1;
     sleep(1);
 
     /* Restore line status */
-    if (set_termios_state_and_warn(&saved_state))
+    if (set_termios_state_or_warn(&saved_state))
         exit(EXIT_FAILURE);
     if (ENABLE_FEATURE_CLEAN_UP)
@@ -100 +100 @@
 
     /* Set line status */
-    if (set_termios_state_and_warn(state))
+    if (set_termios_state_or_warn(state))
         goto bad;
     /* Set line discliple (N_SLIP always) */
@@ -111 +111 @@
     if (ioctl_or_warn(handle, SIOCSIFENCAP, &encap) < 0) {
  bad:
-        restore_state_and_exit(1);
-    }
-}
-
-static void sig_handler(int signo)
-{
-    restore_state_and_exit(0);
-}
-
-int slattach_main(int argc, char **argv);
-int slattach_main(int argc, char **argv)
+        restore_state_and_exit(EXIT_FAILURE);
+    }
+}
+
+static void sig_handler(int signo UNUSED_PARAM)
+{
+    restore_state_and_exit(EXIT_SUCCESS);
+}
+
+int slattach_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int slattach_main(int argc UNUSED_PARAM, char **argv)
 {
     /* Line discipline code table */
@@ -135 +135 @@
     struct termios state;
     const char *proto = "cslip";
-    const char *extcmd;             /* Command to execute after hangup */
+    const char *extcmd;   /* Command to execute after hangup */
     const char *baud_str;
-    int baud_code = -1;             /* Line baud rate (system code) */
+    int baud_code = -1;   /* Line baud rate (system code) */
 
     enum {
@@ -176 +176 @@
     /* Trap signals in order to restore tty states upon exit */
     if (!(opt & OPT_e_quit)) {
-        signal(SIGHUP, sig_handler);
-        signal(SIGINT, sig_handler);
-        signal(SIGQUIT, sig_handler);
-        signal(SIGTERM, sig_handler);
+        bb_signals(0
+            + (1 << SIGHUP)
+            + (1 << SIGINT)
+            + (1 << SIGQUIT)
+            + (1 << SIGTERM)
+            , sig_handler);
     }
 
@@ -205 +207 @@
                       | ((opt & OPT_L_local) ? CLOCAL : 0)
                       | ((opt & OPT_F_noflow) ? 0 : CRTSCTS);
+        cfsetispeed(&state, cfgetispeed(&saved_state));
+        cfsetospeed(&state, cfgetospeed(&saved_state));
     }
 
@@ -238 +242 @@
 
     /* Restore states and exit */
-    restore_state_and_exit(0);
-}
+    restore_state_and_exit(EXIT_SUCCESS);
+}

branches/2.2.9/mindi-busybox/networking/telnet.c

@@ -9 +9 @@
  * Last modified: Fri Jun  9 14:34:24 2000 too
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  * HISTORY
@@ -22 +22 @@
  */
 
-#include <termios.h>
 #include <arpa/telnet.h>
 #include <netinet/in.h>
@@ -44 +43 @@
     UF_SGA = 0x02,
 
-    TS_0 = 1,
+    TS_NORMAL = 0,
+    TS_COPY = 1,
     TS_IAC = 2,
     TS_OPT = 3,
     TS_SUB1 = 4,
     TS_SUB2 = 5,
+    TS_CR = 6,
 };
 
 typedef unsigned char byte;
 
+enum { netfd = 3 };
+
 struct globals {
-    int netfd; /* console fd:s are 0 and 1 (and 2) */
-    short   iaclen; /* could even use byte */
+    int iaclen; /* could even use byte, but it's a loss on x86 */
     byte    telstate; /* telnet negotiation state from network input */
     byte    telwish;  /* DO, DONT, WILL, WONT */
     byte    charmode;
     byte    telflags;
-    byte    gotsig;
     byte    do_termios;
 #if ENABLE_FEATURE_TELNET_TTYPE
@@ -69 +70 @@
 #endif
 #if ENABLE_FEATURE_AUTOWIDTH
-    int win_width, win_height;
+    unsigned win_width, win_height;
 #endif
     /* same buffer used both for network and console read/write */
@@ -77 +78 @@
     struct termios termios_def;
     struct termios termios_raw;
-};
+} FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
-void BUG_telnet_globals_too_big(void);
 #define INIT_G() do { \
-    if (sizeof(G) > COMMON_BUFSIZE) \
-        BUG_telnet_globals_too_big(); \
-    /* memset(&G, 0, sizeof G); - already is */ \
+    struct G_sizecheck { \
+        char G_sizecheck[sizeof(G) > COMMON_BUFSIZE ? -1 : 1]; \
+    }; \
 } while (0)
 
-/* Function prototypes */
+
 static void rawmode(void);
 static void cookmode(void);
@@ -92 +92 @@
 static void will_charmode(void);
 static void telopt(byte c);
-static int subneg(byte c);
-
-static void iacflush(void)
-{
-    write(G.netfd, G.iacbuf, G.iaclen);
+static void subneg(byte c);
+
+static void iac_flush(void)
+{
+    write(netfd, G.iacbuf, G.iaclen);
     G.iaclen = 0;
 }
@@ -102 +102 @@
 #define write_str(fd, str) write(fd, str, sizeof(str) - 1)
 
+static void doexit(int ev) NORETURN;
 static void doexit(int ev)
 {
@@ -108 +109 @@
 }
 
-static void conescape(void)
+static void con_escape(void)
 {
     char b;
 
-    if (G.gotsig)   /* came from line  mode... go raw */
+    if (bb_got_signal) /* came from line mode... go raw */
         rawmode();
 
@@ -121 +122 @@
             " e exit telnet\r\n");
 
-    if (read(0, &b, 1) <= 0)
-        doexit(1);
+    if (read(STDIN_FILENO, &b, 1) <= 0)
+        doexit(EXIT_FAILURE);
 
     switch (b) {
     case 'l':
-        if (!G.gotsig) {
+        if (!bb_got_signal) {
             do_linemode();
-            goto rrturn;
+            goto ret;
         }
         break;
     case 'c':
-        if (G.gotsig) {
+        if (bb_got_signal) {
             will_charmode();
-            goto rrturn;
+            goto ret;
         }
         break;
@@ -143 +144 @@
         break;
     case 'e':
-        doexit(0);
+        doexit(EXIT_SUCCESS);
     }
 
     write_str(1, "continuing...\r\n");
 
-    if (G.gotsig)
+    if (bb_got_signal)
         cookmode();
-
- rrturn:
-    G.gotsig = 0;
-
-}
-
-static void handlenetoutput(int len)
-{
-    /*  here we could do smart tricks how to handle 0xFF:s in output
-     *  stream  like writing twice every sequence of FF:s (thus doing
-     *  many write()s. But I think interactive telnet application does
-     *  not need to be 100% 8-bit clean, so changing every 0xff:s to
-     *  0x7f:s
+ ret:
+    bb_got_signal = 0;
+}
+
+static void handle_net_output(int len)
+{
+    /* here we could do smart tricks how to handle 0xFF:s in output
+     * stream like writing twice every sequence of FF:s (thus doing
+     * many write()s. But I think interactive telnet application does
+     * not need to be 100% 8-bit clean, so changing every 0xff:s to
+     * 0x7f:s
      *
-     *  2002-mar-21, Przemyslaw Czerpak (druzus@polbox.com)
-     *  I don't agree.
-     *  first - I cannot use programs like sz/rz
-     *  second - the 0x0D is sent as one character and if the next
-     *       char is 0x0A then it's eaten by a server side.
-     *  third - whay doy you have to make 'many write()s'?
-     *      I don't understand.
-     *  So I implemented it. It's realy useful for me. I hope that
-     *  others people will find it interesting to.
+     * 2002-mar-21, Przemyslaw Czerpak (druzus@polbox.com)
+     * I don't agree.
+     * first - I cannot use programs like sz/rz
+     * second - the 0x0D is sent as one character and if the next
+     *  char is 0x0A then it's eaten by a server side.
+     * third - why do you have to make 'many write()s'?
+     *  I don't understand.
+     * So I implemented it. It's really useful for me. I hope that
+     * other people will find it interesting too.
      */
-
-    int i, j;
-    byte * p = (byte*)G.buf;
-    byte outbuf[4*DATABUFSIZE];
-
-    for (i = len, j = 0; i > 0; i--, p++)
-    {
-        if (*p == 0x1d)
-        {
-            conescape();
+    byte outbuf[2 * DATABUFSIZE];
+    byte *p = (byte*)G.buf;
+    int j = 0;
+
+    for (; len > 0; len--, p++) {
+        byte c = *p;
+        if (c == 0x1d) {
+            con_escape();
             return;
         }
-        outbuf[j++] = *p;
-        if (*p == 0xff)
-            outbuf[j++] = 0xff;
-        else if (*p == 0x0d)
-            outbuf[j++] = 0x00;
+        outbuf[j++] = c;
+        if (c == IAC)
+            outbuf[j++] = c; /* IAC -> IAC IAC */
+        else if (c == '\r')
+            outbuf[j++] = '\0'; /* CR -> CR NUL */
     }
     if (j > 0)
-        write(G.netfd, outbuf, j);
-}
-
-static void handlenetinput(int len)
+        full_write(netfd, outbuf, j);
+}
+
+static void handle_net_input(int len)
 {
     int i;
     int cstart = 0;
 
-    for (i = 0; i < len; i++)
-    {
+    for (i = 0; i < len; i++) {
         byte c = G.buf[i];
 
-        if (G.telstate == 0) /* most of the time state == 0 */
-        {
-            if (c == IAC)
-            {
+        if (G.telstate == TS_NORMAL) { /* most typical state */
+            if (c == IAC) {
                 cstart = i;
                 G.telstate = TS_IAC;
             }
-        }
-        else
-            switch (G.telstate)
-             {
-             case TS_0:
-                 if (c == IAC)
-                     G.telstate = TS_IAC;
-                 else
-                     G.buf[cstart++] = c;
-                 break;
-
-             case TS_IAC:
-                 if (c == IAC) /* IAC IAC -> 0xFF */
-                 {
-                     G.buf[cstart++] = c;
-                     G.telstate = TS_0;
-                     break;
-                 }
-                 /* else */
-                 switch (c)
-                 {
-                 case SB:
-                     G.telstate = TS_SUB1;
-                     break;
-                 case DO:
-                 case DONT:
-                 case WILL:
-                 case WONT:
-                     G.telwish =  c;
-                     G.telstate = TS_OPT;
-                     break;
-                 default:
-                     G.telstate = TS_0; /* DATA MARK must be added later */
-                 }
-                 break;
-             case TS_OPT: /* WILL, WONT, DO, DONT */
-                 telopt(c);
-                 G.telstate = TS_0;
-                 break;
-             case TS_SUB1: /* Subnegotiation */
-             case TS_SUB2: /* Subnegotiation */
-                 if (subneg(c))
-                     G.telstate = TS_0;
-                 break;
-             }
-    }
-    if (G.telstate)
-    {
-        if (G.iaclen)           iacflush();
-        if (G.telstate == TS_0) G.telstate = 0;
-
+            else if (c == '\r') {
+                cstart = i + 1;
+                G.telstate = TS_CR;
+            }
+            /* No IACs were seen so far, no need to copy
+             * bytes within G.buf: */
+            continue;
+        }
+
+        switch (G.telstate) {
+        case TS_CR:
+            /* Prev char was CR. If cur one is NUL, ignore it.
+             * See RFC 1123 section 3.3.1 for discussion of telnet EOL handling.
+             */
+            G.telstate = TS_COPY;
+            if (c == '\0')
+                break;
+            /* else: fall through - need to handle CR IAC ... properly */
+
+        case TS_COPY: /* Prev char was ordinary */
+            /* Similar to NORMAL, but in TS_COPY we need to copy bytes */
+            if (c == IAC)
+                G.telstate = TS_IAC;
+            else
+                G.buf[cstart++] = c;
+            if (c == '\r')
+                G.telstate = TS_CR;
+            break;
+
+        case TS_IAC: /* Prev char was IAC */
+            if (c == IAC) { /* IAC IAC -> one IAC */
+                G.buf[cstart++] = c;
+                G.telstate = TS_COPY;
+                break;
+            }
+            /* else */
+            switch (c) {
+            case SB:
+                G.telstate = TS_SUB1;
+                break;
+            case DO:
+            case DONT:
+            case WILL:
+            case WONT:
+                G.telwish = c;
+                G.telstate = TS_OPT;
+                break;
+            /* DATA MARK must be added later */
+            default:
+                G.telstate = TS_COPY;
+            }
+            break;
+
+        case TS_OPT: /* Prev chars were IAC WILL/WONT/DO/DONT */
+            telopt(c);
+            G.telstate = TS_COPY;
+            break;
+
+        case TS_SUB1: /* Subnegotiation */
+        case TS_SUB2: /* Subnegotiation */
+            subneg(c); /* can change G.telstate */
+            break;
+        }
+    }
+
+    if (G.telstate != TS_NORMAL) {
+        /* We had some IACs, or CR */
+        if (G.iaclen)
+            iac_flush();
+        if (G.telstate == TS_COPY) /* we aren't in the middle of IAC */
+            G.telstate = TS_NORMAL;
         len = cstart;
     }
 
     if (len)
-        write(1, G.buf, len);
-}
-
-static void putiac(int c)
+        full_write(STDOUT_FILENO, G.buf, len);
+}
+
+static void put_iac(int c)
 {
     G.iacbuf[G.iaclen++] = c;
 }
 
-static void putiac2(byte wwdd, byte c)
+static void put_iac2(byte wwdd, byte c)
 {
     if (G.iaclen + 3 > IACBUFSIZE)
-        iacflush();
-
-    putiac(IAC);
-    putiac(wwdd);
-    putiac(c);
+        iac_flush();
+
+    put_iac(IAC);
+    put_iac(wwdd);
+    put_iac(c);
 }
 
 #if ENABLE_FEATURE_TELNET_TTYPE
-static void putiac_subopt(byte c, char *str)
-{
-    int len = strlen(str) + 6;   // ( 2 + 1 + 1 + strlen + 2 )
+static void put_iac_subopt(byte c, char *str)
+{
+    int len = strlen(str) + 6;   // ( 2 + 1 + 1 + strlen + 2 )
 
     if (G.iaclen + len > IACBUFSIZE)
-        iacflush();
-
-    putiac(IAC);
-    putiac(SB);
-    putiac(c);
-    putiac(0);
+        iac_flush();
+
+    put_iac(IAC);
+    put_iac(SB);
+    put_iac(c);
+    put_iac(0);
 
     while (*str)
-        putiac(*str++);
-
-    putiac(IAC);
-    putiac(SE);
+        put_iac(*str++);
+
+    put_iac(IAC);
+    put_iac(SE);
 }
 #endif
 
 #if ENABLE_FEATURE_TELNET_AUTOLOGIN
-static void putiac_subopt_autologin(void)
+static void put_iac_subopt_autologin(void)
 {
     int len = strlen(G.autologin) + 6;  // (2 + 1 + 1 + strlen + 2)
-    const char *user = "USER";
+    const char *p = "USER";
 
     if (G.iaclen + len > IACBUFSIZE)
-        iacflush();
-
-    putiac(IAC);
-    putiac(SB);
-    putiac(TELOPT_NEW_ENVIRON);
-    putiac(TELQUAL_IS);
-    putiac(NEW_ENV_VAR);
-
-    while (*user)
-        putiac(*user++);
-
-    putiac(NEW_ENV_VALUE);
-
-    while (*G.autologin)
-        putiac(*G.autologin++);
-
-    putiac(IAC);
-    putiac(SE);
+        iac_flush();
+
+    put_iac(IAC);
+    put_iac(SB);
+    put_iac(TELOPT_NEW_ENVIRON);
+    put_iac(TELQUAL_IS);
+    put_iac(NEW_ENV_VAR);
+
+    while (*p)
+        put_iac(*p++);
+
+    put_iac(NEW_ENV_VALUE);
+
+    p = G.autologin;
+    while (*p)
+        put_iac(*p++);
+
+    put_iac(IAC);
+    put_iac(SE);
 }
 #endif
 
 #if ENABLE_FEATURE_AUTOWIDTH
-static void putiac_naws(byte c, int x, int y)
+static void put_iac_naws(byte c, int x, int y)
 {
     if (G.iaclen + 9 > IACBUFSIZE)
-        iacflush();
-
-    putiac(IAC);
-    putiac(SB);
-    putiac(c);
-
-    putiac((x >> 8) & 0xff);
-    putiac(x & 0xff);
-    putiac((y >> 8) & 0xff);
-    putiac(y & 0xff);
-
-    putiac(IAC);
-    putiac(SE);
+        iac_flush();
+
+    put_iac(IAC);
+    put_iac(SB);
+    put_iac(c);
+
+    put_iac((x >> 8) & 0xff);
+    put_iac(x & 0xff);
+    put_iac((y >> 8) & 0xff);
+    put_iac(y & 0xff);
+
+    put_iac(IAC);
+    put_iac(SE);
 }
 #endif
@@ -379 +394 @@
     setConMode();
 
-    putiac2(DO, TELOPT_ECHO);
-    putiac2(DO, TELOPT_SGA);
-    iacflush();
+    put_iac2(DO, TELOPT_ECHO);
+    put_iac2(DO, TELOPT_SGA);
+    iac_flush();
 }
 
@@ -390 +405 @@
     setConMode();
 
-    putiac2(DONT, TELOPT_ECHO);
-    putiac2(DONT, TELOPT_SGA);
-    iacflush();
+    put_iac2(DONT, TELOPT_ECHO);
+    put_iac2(DONT, TELOPT_SGA);
+    iac_flush();
 }
 
@@ -398 +413 @@
 {
     if (G.telwish == WILL)
-        putiac2(DONT, c);
+        put_iac2(DONT, c);
     else if (G.telwish == DO)
-        putiac2(WONT, c);
+        put_iac2(WONT, c);
 }
 
@@ -407 +422 @@
     /* if server requests ECHO, don't agree */
     if (G.telwish == DO) {
-        putiac2(WONT, TELOPT_ECHO);
+        put_iac2(WONT, TELOPT_ECHO);
         return;
     }
@@ -423 +438 @@
 
     if (G.telflags & UF_ECHO)
-        putiac2(DO, TELOPT_ECHO);
+        put_iac2(DO, TELOPT_ECHO);
     else
-        putiac2(DONT, TELOPT_ECHO);
+        put_iac2(DONT, TELOPT_ECHO);
 
     setConMode();
-    write_str(1, "\r\n");  /* sudden modec */
+    full_write1_str("\r\n");  /* sudden modec */
 }
 
@@ -441 +456 @@
         return;
 
-    if ((G.telflags ^= UF_SGA) & UF_SGA) /* toggle */
-        putiac2(DO, TELOPT_SGA);
+    G.telflags ^= UF_SGA; /* toggle */
+    if (G.telflags & UF_SGA)
+        put_iac2(DO, TELOPT_SGA);
     else
-        putiac2(DONT, TELOPT_SGA);
+        put_iac2(DONT, TELOPT_SGA);
 }
 
@@ -451 +467 @@
 {
     /* Tell server we will (or won't) do TTYPE */
-
     if (G.ttype)
-        putiac2(WILL, TELOPT_TTYPE);
+        put_iac2(WILL, TELOPT_TTYPE);
     else
-        putiac2(WONT, TELOPT_TTYPE);
+        put_iac2(WONT, TELOPT_TTYPE);
 }
 #endif
@@ -463 +478 @@
 {
     /* Tell server we will (or will not) do AUTOLOGIN */
-
     if (G.autologin)
-        putiac2(WILL, TELOPT_NEW_ENVIRON);
+        put_iac2(WILL, TELOPT_NEW_ENVIRON);
     else
-        putiac2(WONT, TELOPT_NEW_ENVIRON);
+        put_iac2(WONT, TELOPT_NEW_ENVIRON);
 }
 #endif
@@ -475 +489 @@
 {
     /* Tell server we will do NAWS */
-    putiac2(WILL, TELOPT_NAWS);
+    put_iac2(WILL, TELOPT_NAWS);
 }
 #endif
@@ -497 +511 @@
     case TELOPT_NAWS:
         to_naws();
-        putiac_naws(c, G.win_width, G.win_height);
+        put_iac_naws(c, G.win_width, G.win_height);
         break;
 #endif
@@ -507 +521 @@
 
 /* subnegotiation -- ignore all (except TTYPE,NAWS) */
-static int subneg(byte c)
+static void subneg(byte c)
 {
     switch (G.telstate) {
@@ -515 +529 @@
 #if ENABLE_FEATURE_TELNET_TTYPE
         else
-        if (c == TELOPT_TTYPE)
-            putiac_subopt(TELOPT_TTYPE, G.ttype);
+        if (c == TELOPT_TTYPE && G.ttype)
+            put_iac_subopt(TELOPT_TTYPE, G.ttype);
 #endif
 #if ENABLE_FEATURE_TELNET_AUTOLOGIN
         else
-        if (c == TELOPT_NEW_ENVIRON)
-            putiac_subopt_autologin();
+        if (c == TELOPT_NEW_ENVIRON && G.autologin)
+            put_iac_subopt_autologin();
 #endif
         break;
     case TS_SUB2:
-        if (c == SE)
-            return TRUE;
+        if (c == SE) {
+            G.telstate = TS_COPY;
+            return;
+        }
         G.telstate = TS_SUB1;
-        /* break; */
-    }
-    return FALSE;
-}
-
-static void fgotsig(int sig)
-{
-    G.gotsig = sig;
-}
-
+        break;
+    }
+}
 
 static void rawmode(void)
@@ -551 +560 @@
 }
 
-int telnet_main(int argc, char** argv);
-int telnet_main(int argc, char** argv)
+int telnet_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int telnet_main(int argc UNUSED_PARAM, char **argv)
 {
     char *host;
     int port;
     int len;
-#ifdef USE_POLL
     struct pollfd ufds[2];
-#else
-    fd_set readfds;
-    int maxfd;
-#endif
 
     INIT_G();
@@ -579 +583 @@
         cfmakeraw(&G.termios_raw);
     }
-
-    if (argc < 2)
-        bb_show_usage();
 
 #if ENABLE_FEATURE_TELNET_AUTOLOGIN
@@ -597 +598 @@
         bb_show_usage();
 
-    G.netfd = create_and_connect_stream_or_die(host, port);
-
-    setsockopt(G.netfd, SOL_SOCKET, SO_KEEPALIVE, &const_int_1, sizeof(const_int_1));
-
-    signal(SIGINT, fgotsig);
-
-#ifdef USE_POLL
-    ufds[0].fd = 0; ufds[1].fd = G.netfd;
-    ufds[0].events = ufds[1].events = POLLIN;
-#else
-    FD_ZERO(&readfds);
-    FD_SET(0, &readfds);
-    FD_SET(G.netfd, &readfds);
-    maxfd = G.netfd + 1;
-#endif
+    xmove_fd(create_and_connect_stream_or_die(host, port), netfd);
+
+    setsockopt(netfd, SOL_SOCKET, SO_KEEPALIVE, &const_int_1, sizeof(const_int_1));
+
+    signal(SIGINT, record_signo);
+
+    ufds[0].fd = STDIN_FILENO;
+    ufds[0].events = POLLIN;
+    ufds[1].fd = netfd;
+    ufds[1].events = POLLIN;
 
     while (1) {
-#ifndef USE_POLL
-        fd_set rfds = readfds;
-
-        switch (select(maxfd, &rfds, NULL, NULL, NULL))
-#else
-        switch (poll(ufds, 2, -1))
-#endif
-        {
-        case 0:
-            /* timeout */
-        case -1:
+        if (poll(ufds, 2, -1) < 0) {
             /* error, ignore and/or log something, bay go to loop */
-            if (G.gotsig)
-                conescape();
+            if (bb_got_signal)
+                con_escape();
             else
                 sleep(1);
-            break;
-        default:
-
-#ifdef USE_POLL
-            if (ufds[0].revents) /* well, should check POLLIN, but ... */
-#else
-            if (FD_ISSET(0, &rfds))
-#endif
-            {
-                len = read(0, G.buf, DATABUFSIZE);
-                if (len <= 0)
-                    doexit(0);
-                TRACE(0, ("Read con: %d\n", len));
-                handlenetoutput(len);
+            continue;
+        }
+
+// FIXME: reads can block. Need full bidirectional buffering.
+
+        if (ufds[0].revents) {
+            len = safe_read(STDIN_FILENO, G.buf, DATABUFSIZE);
+            if (len <= 0)
+                doexit(EXIT_SUCCESS);
+            TRACE(0, ("Read con: %d\n", len));
+            handle_net_output(len);
+        }
+
+        if (ufds[1].revents) {
+            len = safe_read(netfd, G.buf, DATABUFSIZE);
+            if (len <= 0) {
+                full_write1_str("Connection closed by foreign host\r\n");
+                doexit(EXIT_FAILURE);
             }
-
-#ifdef USE_POLL
-            if (ufds[1].revents) /* well, should check POLLIN, but ... */
-#else
-            if (FD_ISSET(G.netfd, &rfds))
-#endif
-            {
-                len = read(G.netfd, G.buf, DATABUFSIZE);
-                if (len <= 0) {
-                    write_str(1, "Connection closed by foreign host\r\n");
-                    doexit(1);
-                }
-                TRACE(0, ("Read netfd (%d): %d\n", G.netfd, len));
-                handlenetinput(len);
-            }
-        }
-    }
-}
+            TRACE(0, ("Read netfd (%d): %d\n", netfd, len));
+            handle_net_input(len);
+        }
+    } /* while (1) */
+}

branches/2.2.9/mindi-busybox/networking/telnetd.c

@@ -4 +4 @@
  * Bjorn Wesen, Axis Communications AB (bjornw@axis.com)
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  * ---------------------------------------------------------------------------
@@ -12 +12 @@
  * The telnetd manpage says it all:
  *
- *   Telnetd operates by allocating a pseudo-terminal device (see pty(4))  for
- *   a client, then creating a login process which has the slave side of the
- *   pseudo-terminal as stdin, stdout, and stderr. Telnetd manipulates the
- *   master side of the pseudo-terminal, implementing the telnet protocol and
- *   passing characters between the remote client and the login process.
+ * Telnetd operates by allocating a pseudo-terminal device (see pty(4)) for
+ * a client, then creating a login process which has the slave side of the
+ * pseudo-terminal as stdin, stdout, and stderr. Telnetd manipulates the
+ * master side of the pseudo-terminal, implementing the telnet protocol and
+ * passing characters between the remote client and the login process.
  *
  * Vladimir Oleynik <dzo@simtreas.ru> 2001
- *     Set process group corrections, initial busybox port
+ * Set process group corrections, initial busybox port
  */
-
 #define DEBUG 0
 
 #include "libbb.h"
+#include <syslog.h>
 
 #if DEBUG
-#define TELCMDS
-#define TELOPTS
+# define TELCMDS
+# define TELOPTS
 #endif
 #include <arpa/telnet.h>
-#include <sys/syslog.h>
-
-
-#if ENABLE_LOGIN
-static const char *loginpath = "/bin/login";
-#else
-static const char *loginpath = DEFAULT_SHELL;
-#endif
-
-static const char *issuefile = "/etc/issue.net";
-
-/* structure that describes a session */
+
+#if ENABLE_FEATURE_UTMP
+# include <utmp.h> /* LOGIN_PROCESS */
+#endif
+
 
 struct tsession {
     struct tsession *next;
-    int sockfd_read, sockfd_write, ptyfd;
-    int shell_pid;
+    pid_t shell_pid;
+    int sockfd_read;
+    int sockfd_write;
+    int ptyfd;
+
     /* two circular buffers */
-    char *buf1, *buf2;
+    /*char *buf1, *buf2;*/
+/*#define TS_BUF1(ts) ts->buf1*/
+/*#define TS_BUF2(ts) TS_BUF2(ts)*/
+#define TS_BUF1(ts) ((unsigned char*)(ts + 1))
+#define TS_BUF2(ts) (((unsigned char*)(ts + 1)) + BUFSIZE)
     int rdidx1, wridx1, size1;
     int rdidx2, wridx2, size2;
@@ -56 +56 @@
 /* Two buffers are directly after tsession in malloced memory.
  * Make whole thing fit in 4k */
-enum { BUFSIZE = (4*1024 - sizeof(struct tsession)) / 2 };
+enum { BUFSIZE = (4 * 1024 - sizeof(struct tsession)) / 2 };
+
+
+/* Globals */
+struct globals {
+    struct tsession *sessions;
+    const char *loginpath;
+    const char *issuefile;
+    int maxfd;
+} FIX_ALIASING;
+#define G (*(struct globals*)&bb_common_bufsiz1)
+#define INIT_G() do { \
+    G.loginpath = "/bin/login"; \
+    G.issuefile = "/etc/issue.net"; \
+} while (0)
+
 
 /*
-   This is how the buffers are used. The arrows indicate the movement
-   of data.
+   Remove all IAC's from buf1 (received IACs are ignored and must be removed
+   so as to not be interpreted by the terminal).  Make an uninterrupted
+   string of characters fit for the terminal.  Do this by packing
+   all characters meant for the terminal sequentially towards the end of buf.
+
+   Return a pointer to the beginning of the characters meant for the terminal
+   and make *num_totty the number of characters that should be sent to
+   the terminal.
+
+   Note - if an IAC (3 byte quantity) starts before (bf + len) but extends
+   past (bf + len) then that IAC will be left unprocessed and *processed
+   will be less than len.
+
+   CR-LF ->'s CR mapping is also done here, for convenience.
+
+   NB: may fail to remove iacs which wrap around buffer!
+ */
+static unsigned char *
+remove_iacs(struct tsession *ts, int *pnum_totty)
+{
+    unsigned char *ptr0 = TS_BUF1(ts) + ts->wridx1;
+    unsigned char *ptr = ptr0;
+    unsigned char *totty = ptr;
+    unsigned char *end = ptr + MIN(BUFSIZE - ts->wridx1, ts->size1);
+    int num_totty;
+
+    while (ptr < end) {
+        if (*ptr != IAC) {
+            char c = *ptr;
+
+            *totty++ = c;
+            ptr++;
+            /* We map \r\n ==> \r for pragmatic reasons.
+             * Many client implementations send \r\n when
+             * the user hits the CarriageReturn key.
+             */
+            if (c == '\r' && ptr < end && (*ptr == '\n' || *ptr == '\0'))
+                ptr++;
+            continue;
+        }
+
+        if ((ptr+1) >= end)
+            break;
+        if (ptr[1] == NOP) { /* Ignore? (putty keepalive, etc.) */
+            ptr += 2;
+            continue;
+        }
+        if (ptr[1] == IAC) { /* Literal IAC? (emacs M-DEL) */
+            *totty++ = ptr[1];
+            ptr += 2;
+            continue;
+        }
+
+        /*
+         * TELOPT_NAWS support!
+         */
+        if ((ptr+2) >= end) {
+            /* Only the beginning of the IAC is in the
+            buffer we were asked to process, we can't
+            process this char */
+            break;
+        }
+        /*
+         * IAC -> SB -> TELOPT_NAWS -> 4-byte -> IAC -> SE
+         */
+        if (ptr[1] == SB && ptr[2] == TELOPT_NAWS) {
+            struct winsize ws;
+            if ((ptr+8) >= end)
+                break;  /* incomplete, can't process */
+            ws.ws_col = (ptr[3] << 8) | ptr[4];
+            ws.ws_row = (ptr[5] << 8) | ptr[6];
+            ioctl(ts->ptyfd, TIOCSWINSZ, (char *)&ws);
+            ptr += 9;
+            continue;
+        }
+        /* skip 3-byte IAC non-SB cmd */
+#if DEBUG
+        fprintf(stderr, "Ignoring IAC %s,%s\n",
+                TELCMD(ptr[1]), TELOPT(ptr[2]));
+#endif
+        ptr += 3;
+    }
+
+    num_totty = totty - ptr0;
+    *pnum_totty = num_totty;
+    /* The difference between ptr and totty is number of iacs
+       we removed from the stream. Adjust buf1 accordingly */
+    if ((ptr - totty) == 0) /* 99.999% of cases */
+        return ptr0;
+    ts->wridx1 += ptr - totty;
+    ts->size1 -= ptr - totty;
+    /* Move chars meant for the terminal towards the end of the buffer */
+    return memmove(ptr - num_totty, ptr0, num_totty);
+}
+
+/*
+ * Converting single IAC into double on output
+ */
+static size_t iac_safe_write(int fd, const char *buf, size_t count)
+{
+    const char *IACptr;
+    size_t wr, rc, total;
+
+    total = 0;
+    while (1) {
+        if (count == 0)
+            return total;
+        if (*buf == (char)IAC) {
+            static const char IACIAC[] ALIGN1 = { IAC, IAC };
+            rc = safe_write(fd, IACIAC, 2);
+            if (rc != 2)
+                break;
+            buf++;
+            total++;
+            count--;
+            continue;
+        }
+        /* count != 0, *buf != IAC */
+        IACptr = memchr(buf, IAC, count);
+        wr = count;
+        if (IACptr)
+            wr = IACptr - buf;
+        rc = safe_write(fd, buf, wr);
+        if (rc != wr)
+            break;
+        buf += rc;
+        total += rc;
+        count -= rc;
+    }
+    /* here: rc - result of last short write */
+    if ((ssize_t)rc < 0) { /* error? */
+        if (total == 0)
+            return rc;
+        rc = 0;
+    }
+    return total + rc;
+}
+
+/* Must match getopt32 string */
+enum {
+    OPT_WATCHCHILD = (1 << 2), /* -K */
+    OPT_INETD      = (1 << 3) * ENABLE_FEATURE_TELNETD_STANDALONE, /* -i */
+    OPT_PORT       = (1 << 4) * ENABLE_FEATURE_TELNETD_STANDALONE, /* -p PORT */
+    OPT_FOREGROUND = (1 << 6) * ENABLE_FEATURE_TELNETD_STANDALONE, /* -F */
+    OPT_SYSLOG     = (1 << 7) * ENABLE_FEATURE_TELNETD_INETD_WAIT, /* -S */
+    OPT_WAIT       = (1 << 8) * ENABLE_FEATURE_TELNETD_INETD_WAIT, /* -w SEC */
+};
+
+static struct tsession *
+make_new_session(
+        IF_FEATURE_TELNETD_STANDALONE(int sock)
+        IF_NOT_FEATURE_TELNETD_STANDALONE(void)
+) {
+#if !ENABLE_FEATURE_TELNETD_STANDALONE
+    enum { sock = 0 };
+#endif
+    const char *login_argv[2];
+    struct termios termbuf;
+    int fd, pid;
+    char tty_name[GETPTY_BUFSIZE];
+    struct tsession *ts = xzalloc(sizeof(struct tsession) + BUFSIZE * 2);
+
+    /*ts->buf1 = (char *)(ts + 1);*/
+    /*ts->buf2 = ts->buf1 + BUFSIZE;*/
+
+    /* Got a new connection, set up a tty */
+    fd = xgetpty(tty_name);
+    if (fd > G.maxfd)
+        G.maxfd = fd;
+    ts->ptyfd = fd;
+    ndelay_on(fd);
+    close_on_exec_on(fd);
+
+    /* SO_KEEPALIVE by popular demand */
+    setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, &const_int_1, sizeof(const_int_1));
+#if ENABLE_FEATURE_TELNETD_STANDALONE
+    ts->sockfd_read = sock;
+    ndelay_on(sock);
+    if (sock == 0) { /* We are called with fd 0 - we are in inetd mode */
+        sock++; /* so use fd 1 for output */
+        ndelay_on(sock);
+    }
+    ts->sockfd_write = sock;
+    if (sock > G.maxfd)
+        G.maxfd = sock;
+#else
+    /* ts->sockfd_read = 0; - done by xzalloc */
+    ts->sockfd_write = 1;
+    ndelay_on(0);
+    ndelay_on(1);
+#endif
+
+    /* Make the telnet client understand we will echo characters so it
+     * should not do it locally. We don't tell the client to run linemode,
+     * because we want to handle line editing and tab completion and other
+     * stuff that requires char-by-char support. */
+    {
+        static const char iacs_to_send[] ALIGN1 = {
+            IAC, DO, TELOPT_ECHO,
+            IAC, DO, TELOPT_NAWS,
+            /* This requires telnetd.ctrlSQ.patch (incomplete) */
+            /*IAC, DO, TELOPT_LFLOW,*/
+            IAC, WILL, TELOPT_ECHO,
+            IAC, WILL, TELOPT_SGA
+        };
+        /* This confuses iac_safe_write(), it will try to duplicate
+         * each IAC... */
+        //memcpy(TS_BUF2(ts), iacs_to_send, sizeof(iacs_to_send));
+        //ts->rdidx2 = sizeof(iacs_to_send);
+        //ts->size2 = sizeof(iacs_to_send);
+        /* So just stuff it into TCP stream! (no error check...) */
+#if ENABLE_FEATURE_TELNETD_STANDALONE
+        safe_write(sock, iacs_to_send, sizeof(iacs_to_send));
+#else
+        safe_write(1, iacs_to_send, sizeof(iacs_to_send));
+#endif
+        /*ts->rdidx2 = 0; - xzalloc did it */
+        /*ts->size2 = 0;*/
+    }
+
+    fflush_all();
+    pid = vfork(); /* NOMMU-friendly */
+    if (pid < 0) {
+        free(ts);
+        close(fd);
+        /* sock will be closed by caller */
+        bb_perror_msg("vfork");
+        return NULL;
+    }
+    if (pid > 0) {
+        /* Parent */
+        ts->shell_pid = pid;
+        return ts;
+    }
+
+    /* Child */
+    /* Careful - we are after vfork! */
+
+    /* Restore default signal handling ASAP */
+    bb_signals((1 << SIGCHLD) + (1 << SIGPIPE), SIG_DFL);
+
+    if (ENABLE_FEATURE_UTMP) {
+        len_and_sockaddr *lsa = get_peer_lsa(sock);
+        char *hostname = NULL;
+        if (lsa) {
+            hostname = xmalloc_sockaddr2dotted(&lsa->u.sa);
+            free(lsa);
+        }
+        write_new_utmp(pid, LOGIN_PROCESS, tty_name, /*username:*/ "LOGIN", hostname);
+        free(hostname);
+    }
+
+    /* Make new session and process group */
+    setsid();
+
+    /* Open the child's side of the tty */
+    /* NB: setsid() disconnects from any previous ctty's. Therefore
+     * we must open child's side of the tty AFTER setsid! */
+    close(0);
+    xopen(tty_name, O_RDWR); /* becomes our ctty */
+    xdup2(0, 1);
+    xdup2(0, 2);
+    pid = getpid();
+    tcsetpgrp(0, pid); /* switch this tty's process group to us */
+
+    /* The pseudo-terminal allocated to the client is configured to operate
+     * in cooked mode, and with XTABS CRMOD enabled (see tty(4)) */
+    tcgetattr(0, &termbuf);
+    termbuf.c_lflag |= ECHO; /* if we use readline we dont want this */
+    termbuf.c_oflag |= ONLCR | XTABS;
+    termbuf.c_iflag |= ICRNL;
+    termbuf.c_iflag &= ~IXOFF;
+    /*termbuf.c_lflag &= ~ICANON;*/
+    tcsetattr_stdin_TCSANOW(&termbuf);
+
+    /* Uses FILE-based I/O to stdout, but does fflush_all(),
+     * so should be safe with vfork.
+     * I fear, though, that some users will have ridiculously big
+     * issue files, and they may block writing to fd 1,
+     * (parent is supposed to read it, but parent waits
+     * for vforked child to exec!) */
+    print_login_issue(G.issuefile, tty_name);
+
+    /* Exec shell / login / whatever */
+    login_argv[0] = G.loginpath;
+    login_argv[1] = NULL;
+    /* exec busybox applet (if PREFER_APPLETS=y), if that fails,
+     * exec external program.
+     * NB: sock is either 0 or has CLOEXEC set on it.
+     * fd has CLOEXEC set on it too. These two fds will be closed here.
+     */
+    BB_EXECVP(G.loginpath, (char **)login_argv);
+    /* _exit is safer with vfork, and we shouldn't send message
+     * to remote clients anyway */
+    _exit(EXIT_FAILURE); /*bb_perror_msg_and_die("execv %s", G.loginpath);*/
+}
+
+#if ENABLE_FEATURE_TELNETD_STANDALONE
+
+static void
+free_session(struct tsession *ts)
+{
+    struct tsession *t;
+
+    if (option_mask32 & OPT_INETD)
+        exit(EXIT_SUCCESS);
+
+    /* Unlink this telnet session from the session list */
+    t = G.sessions;
+    if (t == ts)
+        G.sessions = ts->next;
+    else {
+        while (t->next != ts)
+            t = t->next;
+        t->next = ts->next;
+    }
+
+#if 0
+    /* It was said that "normal" telnetd just closes ptyfd,
+     * doesn't send SIGKILL. When we close ptyfd,
+     * kernel sends SIGHUP to processes having slave side opened. */
+    kill(ts->shell_pid, SIGKILL);
+    waitpid(ts->shell_pid, NULL, 0);
+#endif
+    close(ts->ptyfd);
+    close(ts->sockfd_read);
+    /* We do not need to close(ts->sockfd_write), it's the same
+     * as sockfd_read unless we are in inetd mode. But in inetd mode
+     * we do not reach this */
+    free(ts);
+
+    /* Scan all sessions and find new maxfd */
+    G.maxfd = 0;
+    ts = G.sessions;
+    while (ts) {
+        if (G.maxfd < ts->ptyfd)
+            G.maxfd = ts->ptyfd;
+        if (G.maxfd < ts->sockfd_read)
+            G.maxfd = ts->sockfd_read;
+#if 0
+        /* Again, sockfd_write == sockfd_read here */
+        if (G.maxfd < ts->sockfd_write)
+            G.maxfd = ts->sockfd_write;
+#endif
+        ts = ts->next;
+    }
+}
+
+#else /* !FEATURE_TELNETD_STANDALONE */
+
+/* Used in main() only, thus "return 0" actually is exit(EXIT_SUCCESS). */
+#define free_session(ts) return 0
+
+#endif
+
+static void handle_sigchld(int sig UNUSED_PARAM)
+{
+    pid_t pid;
+    struct tsession *ts;
+    int save_errno = errno;
+
+    /* Looping: more than one child may have exited */
+    while (1) {
+        pid = wait_any_nohang(NULL);
+        if (pid <= 0)
+            break;
+        ts = G.sessions;
+        while (ts) {
+            if (ts->shell_pid == pid) {
+                ts->shell_pid = -1;
+// man utmp:
+// When init(8) finds that a process has exited, it locates its utmp entry
+// by ut_pid, sets ut_type to DEAD_PROCESS, and clears ut_user, ut_host
+// and ut_time with null bytes.
+// [same applies to other processes which maintain utmp entries, like telnetd]
+//
+// We do not bother actually clearing fields:
+// it might be interesting to know who was logged in and from where
+                update_utmp(pid, DEAD_PROCESS, /*tty_name:*/ NULL, /*username:*/ NULL, /*hostname:*/ NULL);
+                break;
+            }
+            ts = ts->next;
+        }
+    }
+
+    errno = save_errno;
+}
+
+int telnetd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int telnetd_main(int argc UNUSED_PARAM, char **argv)
+{
+    fd_set rdfdset, wrfdset;
+    unsigned opt;
+    int count;
+    struct tsession *ts;
+#if ENABLE_FEATURE_TELNETD_STANDALONE
+#define IS_INETD (opt & OPT_INETD)
+    int master_fd = master_fd; /* for compiler */
+    int sec_linger = sec_linger;
+    char *opt_bindaddr = NULL;
+    char *opt_portnbr;
+#else
+    enum {
+        IS_INETD = 1,
+        master_fd = -1,
+    };
+#endif
+    INIT_G();
+
+    /* -w NUM, and implies -F. -w and -i don't mix */
+    IF_FEATURE_TELNETD_INETD_WAIT(opt_complementary = "wF:w+:i--w:w--i";)
+    /* Even if !STANDALONE, we accept (and ignore) -i, thus people
+     * don't need to guess whether it's ok to pass -i to us */
+    opt = getopt32(argv, "f:l:Ki"
+            IF_FEATURE_TELNETD_STANDALONE("p:b:F")
+            IF_FEATURE_TELNETD_INETD_WAIT("Sw:"),
+            &G.issuefile, &G.loginpath
+            IF_FEATURE_TELNETD_STANDALONE(, &opt_portnbr, &opt_bindaddr)
+            IF_FEATURE_TELNETD_INETD_WAIT(, &sec_linger)
+    );
+    if (!IS_INETD /*&& !re_execed*/) {
+        /* inform that we start in standalone mode?
+         * May be useful when people forget to give -i */
+        /*bb_error_msg("listening for connections");*/
+        if (!(opt & OPT_FOREGROUND)) {
+            /* DAEMON_CHDIR_ROOT was giving inconsistent
+             * behavior with/without -F, -i */
+            bb_daemonize_or_rexec(0 /*was DAEMON_CHDIR_ROOT*/, argv);
+        }
+    }
+    /* Redirect log to syslog early, if needed */
+    if (IS_INETD || (opt & OPT_SYSLOG) || !(opt & OPT_FOREGROUND)) {
+        openlog(applet_name, LOG_PID, LOG_DAEMON);
+        logmode = LOGMODE_SYSLOG;
+    }
+#if ENABLE_FEATURE_TELNETD_STANDALONE
+    if (IS_INETD) {
+        G.sessions = make_new_session(0);
+        if (!G.sessions) /* pty opening or vfork problem, exit */
+            return 1; /* make_new_session printed error message */
+    } else {
+        master_fd = 0;
+        if (!(opt & OPT_WAIT)) {
+            unsigned portnbr = 23;
+            if (opt & OPT_PORT)
+                portnbr = xatou16(opt_portnbr);
+            master_fd = create_and_bind_stream_or_die(opt_bindaddr, portnbr);
+            xlisten(master_fd, 1);
+        }
+        close_on_exec_on(master_fd);
+    }
+#else
+    G.sessions = make_new_session();
+    if (!G.sessions) /* pty opening or vfork problem, exit */
+        return 1; /* make_new_session printed error message */
+#endif
+
+    /* We don't want to die if just one session is broken */
+    signal(SIGPIPE, SIG_IGN);
+
+    if (opt & OPT_WATCHCHILD)
+        signal(SIGCHLD, handle_sigchld);
+    else /* prevent dead children from becoming zombies */
+        signal(SIGCHLD, SIG_IGN);
+
+/*
+   This is how the buffers are used. The arrows indicate data flow.
 
    +-------+     wridx1++     +------+     rdidx1++     +----------+
@@ -70 +550 @@
    +-------+     size2++      +------+     size2--      +----------+
 
-   Each session has got two buffers.
+   size1: "how many bytes are buffered for pty between rdidx1 and wridx1?"
+   size2: "how many bytes are buffered for socket between rdidx2 and wridx2?"
+
+   Each session has got two buffers. Buffers are circular. If sizeN == 0,
+   buffer is empty. If sizeN == BUFSIZE, buffer is full. In both these cases
+   rdidxN == wridxN.
 */
-
-static int maxfd;
-
-static struct tsession *sessions;
-
-
-/*
-   Remove all IAC's from the buffer pointed to by bf (received IACs are ignored
-   and must be removed so as to not be interpreted by the terminal).  Make an
-   uninterrupted string of characters fit for the terminal.  Do this by packing
-   all characters meant for the terminal sequentially towards the end of bf.
-
-   Return a pointer to the beginning of the characters meant for the terminal.
-   and make *num_totty the number of characters that should be sent to
-   the terminal.
-
-   Note - If an IAC (3 byte quantity) starts before (bf + len) but extends
-   past (bf + len) then that IAC will be left unprocessed and *processed will be
-   less than len.
-
-   FIXME - if we mean to send 0xFF to the terminal then it will be escaped,
-   what is the escape character?  We aren't handling that situation here.
-
-   CR-LF ->'s CR mapping is also done here, for convenience
- */
-static char *
-remove_iacs(struct tsession *ts, int *pnum_totty)
-{
-    unsigned char *ptr0 = (unsigned char *)ts->buf1 + ts->wridx1;
-    unsigned char *ptr = ptr0;
-    unsigned char *totty = ptr;
-    unsigned char *end = ptr + MIN(BUFSIZE - ts->wridx1, ts->size1);
-    int processed;
-    int num_totty;
-
-    while (ptr < end) {
-        if (*ptr != IAC) {
-            int c = *ptr;
-            *totty++ = *ptr++;
-            /* We now map \r\n ==> \r for pragmatic reasons.
-             * Many client implementations send \r\n when
-             * the user hits the CarriageReturn key.
-             */
-            if (c == '\r' && (*ptr == '\n' || *ptr == 0) && ptr < end)
-                ptr++;
-        } else {
-            /*
-             * TELOPT_NAWS support!
-             */
-            if ((ptr+2) >= end) {
-                /* only the beginning of the IAC is in the
-                buffer we were asked to process, we can't
-                process this char. */
-                break;
-            }
-
-            /*
-             * IAC -> SB -> TELOPT_NAWS -> 4-byte -> IAC -> SE
-             */
-            else if (ptr[1] == SB && ptr[2] == TELOPT_NAWS) {
-                struct winsize ws;
-                if ((ptr+8) >= end)
-                    break;  /* incomplete, can't process */
-                ws.ws_col = (ptr[3] << 8) | ptr[4];
-                ws.ws_row = (ptr[5] << 8) | ptr[6];
-                ioctl(ts->ptyfd, TIOCSWINSZ, (char *)&ws);
-                ptr += 9;
-            } else {
-                /* skip 3-byte IAC non-SB cmd */
-#if DEBUG
-                fprintf(stderr, "Ignoring IAC %s,%s\n",
-                    TELCMD(ptr[1]), TELOPT(ptr[2]));
-#endif
-                ptr += 3;
-            }
-        }
-    }
-
-    processed = ptr - ptr0;
-    num_totty = totty - ptr0;
-    /* the difference between processed and num_to tty
-       is all the iacs we removed from the stream.
-       Adjust buf1 accordingly. */
-    ts->wridx1 += processed - num_totty;
-    ts->size1 -= processed - num_totty;
-    *pnum_totty = num_totty;
-    /* move the chars meant for the terminal towards the end of the
-    buffer. */
-    return memmove(ptr - num_totty, ptr0, num_totty);
-}
-
-
-static int
-getpty(char *line, int size)
-{
-    int p;
-#if ENABLE_FEATURE_DEVPTS
-    p = open("/dev/ptmx", O_RDWR);
-    if (p > 0) {
-        const char *name;
-        grantpt(p);
-        unlockpt(p);
-        name = ptsname(p);
-        if (!name) {
-            bb_perror_msg("ptsname error (is /dev/pts mounted?)");
-            return -1;
-        }
-        safe_strncpy(line, name, size);
-        return p;
-    }
-#else
-    struct stat stb;
-    int i;
-    int j;
-
-    strcpy(line, "/dev/ptyXX");
-
-    for (i = 0; i < 16; i++) {
-        line[8] = "pqrstuvwxyzabcde"[i];
-        line[9] = '0';
-        if (stat(line, &stb) < 0) {
-            continue;
-        }
-        for (j = 0; j < 16; j++) {
-            line[9] = j < 10 ? j + '0' : j - 10 + 'a';
-            if (DEBUG)
-                fprintf(stderr, "Trying to open device: %s\n", line);
-            p = open(line, O_RDWR | O_NOCTTY);
-            if (p >= 0) {
-                line[5] = 't';
-                return p;
-            }
-        }
-    }
-#endif /* FEATURE_DEVPTS */
-    return -1;
-}
-
-
-static void
-send_iac(struct tsession *ts, unsigned char command, int option)
-{
-    /* We rely on that there is space in the buffer for now. */
-    char *b = ts->buf2 + ts->rdidx2;
-    *b++ = IAC;
-    *b++ = command;
-    *b++ = option;
-    ts->rdidx2 += 3;
-    ts->size2 += 3;
-}
-
-
-static struct tsession *
-make_new_session(
-        USE_FEATURE_TELNETD_STANDALONE(int sock_r, int sock_w)
-        SKIP_FEATURE_TELNETD_STANDALONE(void)
-) {
-    const char *login_argv[2];
-    struct termios termbuf;
-    int fd, pid;
-    char tty_name[32];
-    struct tsession *ts = xzalloc(sizeof(struct tsession) + BUFSIZE * 2);
-
-    ts->buf1 = (char *)(&ts[1]);
-    ts->buf2 = ts->buf1 + BUFSIZE;
-
-    /* Got a new connection, set up a tty. */
-    fd = getpty(tty_name, 32);
-    if (fd < 0) {
-        bb_error_msg("all terminals in use");
-        return NULL;
-    }
-    if (fd > maxfd) maxfd = fd;
-    ndelay_on(ts->ptyfd = fd);
-#if ENABLE_FEATURE_TELNETD_STANDALONE
-    if (sock_w > maxfd) maxfd = sock_w;
-    if (sock_r > maxfd) maxfd = sock_r;
-    ndelay_on(ts->sockfd_write = sock_w);
-    ndelay_on(ts->sockfd_read = sock_r);
-#else
-    ts->sockfd_write = 1;
-    /* xzalloc: ts->sockfd_read = 0; */
-    ndelay_on(0);
-    ndelay_on(1);
-#endif
-    /* Make the telnet client understand we will echo characters so it
-     * should not do it locally. We don't tell the client to run linemode,
-     * because we want to handle line editing and tab completion and other
-     * stuff that requires char-by-char support. */
-    send_iac(ts, DO, TELOPT_ECHO);
-    send_iac(ts, DO, TELOPT_NAWS);
-    send_iac(ts, DO, TELOPT_LFLOW);
-    send_iac(ts, WILL, TELOPT_ECHO);
-    send_iac(ts, WILL, TELOPT_SGA);
-
-    pid = fork();
-    if (pid < 0) {
-        free(ts);
-        close(fd);
-        bb_perror_msg("fork");
-        return NULL;
-    }
-    if (pid > 0) {
-        /* parent */
-        ts->shell_pid = pid;
-        return ts;
-    }
-
-    /* child */
-
-    /* make new session and process group */
-    setsid();
-
-    /* open the child's side of the tty. */
-    /* NB: setsid() disconnects from any previous ctty's. Therefore
-     * we must open child's side of the tty AFTER setsid! */
-    fd = xopen(tty_name, O_RDWR); /* becomes our ctty */
-    dup2(fd, 0);
-    dup2(fd, 1);
-    dup2(fd, 2);
-    while (fd > 2) close(fd--);
-    tcsetpgrp(0, getpid()); /* switch this tty's process group to us */
-
-    /* The pseudo-terminal allocated to the client is configured to operate in
-     * cooked mode, and with XTABS CRMOD enabled (see tty(4)). */
-    tcgetattr(0, &termbuf);
-    termbuf.c_lflag |= ECHO; /* if we use readline we dont want this */
-    termbuf.c_oflag |= ONLCR|XTABS;
-    termbuf.c_iflag |= ICRNL;
-    termbuf.c_iflag &= ~IXOFF;
-    /*termbuf.c_lflag &= ~ICANON;*/
-    tcsetattr(0, TCSANOW, &termbuf);
-
-    print_login_issue(issuefile, NULL);
-
-    /* exec shell / login /whatever */
-    login_argv[0] = loginpath;
-    login_argv[1] = NULL;
-    execv(loginpath, (char **)login_argv);
-    /* Hmmm... this gets sent to the client thru fd#2! Is it ok?? */
-    bb_perror_msg_and_die("execv %s", loginpath);
-}
-
-#if ENABLE_FEATURE_TELNETD_STANDALONE
-
-static void
-free_session(struct tsession *ts)
-{
-    struct tsession *t = sessions;
-
-    /* unlink this telnet session from the session list */
-    if (t == ts)
-        sessions = ts->next;
-    else {
-        while (t->next != ts)
-            t = t->next;
-        t->next = ts->next;
-    }
-
-    kill(ts->shell_pid, SIGKILL);
-    wait4(ts->shell_pid, NULL, 0, NULL);
-    close(ts->ptyfd);
-    close(ts->sockfd_read);
-    /* error if ts->sockfd_read == ts->sockfd_write. So what? ;) */
-    close(ts->sockfd_write);
-    free(ts);
-
-    /* scan all sessions and find new maxfd */
-    ts = sessions;
-    maxfd = 0;
-    while (ts) {
-        if (maxfd < ts->ptyfd)
-            maxfd = ts->ptyfd;
-        if (maxfd < ts->sockfd_read)
-            maxfd = ts->sockfd_read;
-        if (maxfd < ts->sockfd_write)
-            maxfd = ts->sockfd_write;
-        ts = ts->next;
-    }
-}
-
-#else /* !FEATURE_TELNETD_STANDALONE */
-
-/* Never actually called */
-void free_session(struct tsession *ts);
-
-#endif
-
-
-int telnetd_main(int argc, char **argv);
-int telnetd_main(int argc, char **argv)
-{
-    fd_set rdfdset, wrfdset;
-    unsigned opt;
-    int selret, maxlen, w, r;
-    struct tsession *ts;
-#if ENABLE_FEATURE_TELNETD_STANDALONE
-#define IS_INETD (opt & OPT_INETD)
-    int master_fd = -1; /* be happy, gcc */
-    unsigned portnbr = 23;
-    char *opt_bindaddr = NULL;
-    char *opt_portnbr;
-#else
-    enum {
-        IS_INETD = 1,
-        master_fd = -1,
-        portnbr = 23,
-    };
-#endif
-    enum {
-        OPT_PORT = 4 * ENABLE_FEATURE_TELNETD_STANDALONE,
-        OPT_FOREGROUND = 0x10 * ENABLE_FEATURE_TELNETD_STANDALONE,
-        OPT_INETD = 0x20 * ENABLE_FEATURE_TELNETD_STANDALONE,
-    };
-
-    opt = getopt32(argv, "f:l:" USE_FEATURE_TELNETD_STANDALONE("p:b:Fi"),
-            &issuefile, &loginpath
-            USE_FEATURE_TELNETD_STANDALONE(, &opt_portnbr, &opt_bindaddr));
-    /* Redirect log to syslog early, if needed */
-    if (IS_INETD || !(opt & OPT_FOREGROUND)) {
-        openlog(applet_name, 0, LOG_USER);
-        logmode = LOGMODE_SYSLOG;
-    }
-    //if (opt & 1) // -f
-    //if (opt & 2) // -l
-    USE_FEATURE_TELNETD_STANDALONE(
-        if (opt & OPT_PORT) // -p
-            portnbr = xatou16(opt_portnbr);
-        //if (opt & 8) // -b
-        //if (opt & 0x10) // -F
-        //if (opt & 0x20) // -i
-    );
-
-    /* Used to check access(loginpath, X_OK) here. Pointless.
-     * exec will do this for us for free later. */
-
-#if ENABLE_FEATURE_TELNETD_STANDALONE
-    if (IS_INETD) {
-        sessions = make_new_session(0, 1);
-    } else {
-        master_fd = create_and_bind_stream_or_die(opt_bindaddr, portnbr);
-        xlisten(master_fd, 1);
-        if (!(opt & OPT_FOREGROUND))
-            bb_daemonize(DAEMON_CHDIR_ROOT);
-    }
-#else
-    sessions = make_new_session();
-#endif
-
-    /* We don't want to die if just one session is broken */
-    signal(SIGPIPE, SIG_IGN);
-
  again:
     FD_ZERO(&rdfdset);
     FD_ZERO(&wrfdset);
+
+    /* Select on the master socket, all telnet sockets and their
+     * ptys if there is room in their session buffers.
+     * NB: scalability problem: we recalculate entire bitmap
+     * before each select. Can be a problem with 500+ connections. */
+    ts = G.sessions;
+    while (ts) {
+        struct tsession *next = ts->next; /* in case we free ts */
+        if (ts->shell_pid == -1) {
+            /* Child died and we detected that */
+            free_session(ts);
+        } else {
+            if (ts->size1 > 0)       /* can write to pty */
+                FD_SET(ts->ptyfd, &wrfdset);
+            if (ts->size1 < BUFSIZE) /* can read from socket */
+                FD_SET(ts->sockfd_read, &rdfdset);
+            if (ts->size2 > 0)       /* can write to socket */
+                FD_SET(ts->sockfd_write, &wrfdset);
+            if (ts->size2 < BUFSIZE) /* can read from pty */
+                FD_SET(ts->ptyfd, &rdfdset);
+        }
+        ts = next;
+    }
     if (!IS_INETD) {
         FD_SET(master_fd, &rdfdset);
         /* This is needed because free_session() does not
-         * take into account master_fd when it finds new
-         * maxfd among remaining fd's: */
-        if (master_fd > maxfd)
-            maxfd = master_fd;
-    }
-
-    /* select on the master socket, all telnet sockets and their
-     * ptys if there is room in their session buffers. */
-    ts = sessions;
-    while (ts) {
-        /* buf1 is used from socket to pty
-         * buf2 is used from pty to socket */
-        if (ts->size1 > 0)       /* can write to pty */
-            FD_SET(ts->ptyfd, &wrfdset);
-        if (ts->size1 < BUFSIZE) /* can read from socket */
-            FD_SET(ts->sockfd_read, &rdfdset);
-        if (ts->size2 > 0)       /* can write to socket */
-            FD_SET(ts->sockfd_write, &wrfdset);
-        if (ts->size2 < BUFSIZE) /* can read from pty */
-            FD_SET(ts->ptyfd, &rdfdset);
-        ts = ts->next;
-    }
-
-    selret = select(maxfd + 1, &rdfdset, &wrfdset, 0, 0);
-    if (!selret)
+         * take master_fd into account when it finds new
+         * maxfd among remaining fd's */
+        if (master_fd > G.maxfd)
+            G.maxfd = master_fd;
+    }
+
+    {
+        struct timeval *tv_ptr = NULL;
+#if ENABLE_FEATURE_TELNETD_INETD_WAIT
+        struct timeval tv;
+        if ((opt & OPT_WAIT) && !G.sessions) {
+            tv.tv_sec = sec_linger;
+            tv.tv_usec = 0;
+            tv_ptr = &tv;
+        }
+#endif
+        count = select(G.maxfd + 1, &rdfdset, &wrfdset, NULL, tv_ptr);
+    }
+    if (count == 0) /* "telnetd -w SEC" timed out */
         return 0;
+    if (count < 0)
+        goto again; /* EINTR or ENOMEM */
 
 #if ENABLE_FEATURE_TELNETD_STANDALONE
-    /* First check for and accept new sessions. */
+    /* Check for and accept new sessions */
     if (!IS_INETD && FD_ISSET(master_fd, &rdfdset)) {
         int fd;
         struct tsession *new_ts;
 
-        fd = accept(master_fd, NULL, 0);
+        fd = accept(master_fd, NULL, NULL);
         if (fd < 0)
             goto again;
-        /* Create a new session and link it into our active list */
-        new_ts = make_new_session(fd, fd);
+        close_on_exec_on(fd);
+
+        /* Create a new session and link it into active list */
+        new_ts = make_new_session(fd);
         if (new_ts) {
-            new_ts->next = sessions;
-            sessions = new_ts;
+            new_ts->next = G.sessions;
+            G.sessions = new_ts;
         } else {
             close(fd);
@@ -477 +631 @@
 #endif
 
-    /* Then check for data tunneling. */
-    ts = sessions;
+    /* Then check for data tunneling */
+    ts = G.sessions;
     while (ts) { /* For all sessions... */
-        struct tsession *next = ts->next; /* in case we free ts. */
-
-        if (ts->size1 && FD_ISSET(ts->ptyfd, &wrfdset)) {
+        struct tsession *next = ts->next; /* in case we free ts */
+
+        if (/*ts->size1 &&*/ FD_ISSET(ts->ptyfd, &wrfdset)) {
             int num_totty;
-            char *ptr;
-            /* Write to pty from buffer 1. */
+            unsigned char *ptr;
+            /* Write to pty from buffer 1 */
             ptr = remove_iacs(ts, &num_totty);
-            w = safe_write(ts->ptyfd, ptr, num_totty);
-            /* needed? if (w < 0 && errno == EAGAIN) continue; */
-            if (w < 0) {
-                if (IS_INETD)
-                    return 0;
-                free_session(ts);
-                ts = next;
-                continue;
+            count = safe_write(ts->ptyfd, ptr, num_totty);
+            if (count < 0) {
+                if (errno == EAGAIN)
+                    goto skip1;
+                goto kill_session;
             }
-            ts->wridx1 += w;
-            ts->size1 -= w;
-            if (ts->wridx1 == BUFSIZE)
+            ts->size1 -= count;
+            ts->wridx1 += count;
+            if (ts->wridx1 >= BUFSIZE) /* actually == BUFSIZE */
                 ts->wridx1 = 0;
         }
-
-        if (ts->size2 && FD_ISSET(ts->sockfd_write, &wrfdset)) {
-            /* Write to socket from buffer 2. */
-            maxlen = MIN(BUFSIZE - ts->wridx2, ts->size2);
-            w = safe_write(ts->sockfd_write, ts->buf2 + ts->wridx2, maxlen);
-            /* needed? if (w < 0 && errno == EAGAIN) continue; */
-            if (w < 0) {
-                if (IS_INETD)
-                    return 0;
-                free_session(ts);
-                ts = next;
-                continue;
+ skip1:
+        if (/*ts->size2 &&*/ FD_ISSET(ts->sockfd_write, &wrfdset)) {
+            /* Write to socket from buffer 2 */
+            count = MIN(BUFSIZE - ts->wridx2, ts->size2);
+            count = iac_safe_write(ts->sockfd_write, (void*)(TS_BUF2(ts) + ts->wridx2), count);
+            if (count < 0) {
+                if (errno == EAGAIN)
+                    goto skip2;
+                goto kill_session;
             }
-            ts->wridx2 += w;
-            ts->size2 -= w;
-            if (ts->wridx2 == BUFSIZE)
+            ts->size2 -= count;
+            ts->wridx2 += count;
+            if (ts->wridx2 >= BUFSIZE) /* actually == BUFSIZE */
                 ts->wridx2 = 0;
         }
-
-        if (ts->size1 < BUFSIZE && FD_ISSET(ts->sockfd_read, &rdfdset)) {
-            /* Read from socket to buffer 1. */
-            maxlen = MIN(BUFSIZE - ts->rdidx1, BUFSIZE - ts->size1);
-            r = safe_read(ts->sockfd_read, ts->buf1 + ts->rdidx1, maxlen);
-            if (r < 0 && errno == EAGAIN) continue;
-            if (r <= 0) {
-                if (IS_INETD)
-                    return 0;
-                free_session(ts);
-                ts = next;
-                continue;
-            }
-            if (!ts->buf1[ts->rdidx1 + r - 1])
-                if (!--r)
-                    continue;
-            ts->rdidx1 += r;
-            ts->size1 += r;
-            if (ts->rdidx1 == BUFSIZE)
-                ts->rdidx1 = 0;
-        }
-
-        if (ts->size2 < BUFSIZE && FD_ISSET(ts->ptyfd, &rdfdset)) {
-            /* Read from pty to buffer 2. */
-            maxlen = MIN(BUFSIZE - ts->rdidx2, BUFSIZE - ts->size2);
-            r = safe_read(ts->ptyfd, ts->buf2 + ts->rdidx2, maxlen);
-            if (r < 0 && errno == EAGAIN) continue;
-            if (r <= 0) {
-                if (IS_INETD)
-                    return 0;
-                free_session(ts);
-                ts = next;
-                continue;
-            }
-            ts->rdidx2 += r;
-            ts->size2 += r;
-            if (ts->rdidx2 == BUFSIZE)
-                ts->rdidx2 = 0;
-        }
-
+ skip2:
+        /* Should not be needed, but... remove_iacs is actually buggy
+         * (it cannot process iacs which wrap around buffer's end)!
+         * Since properly fixing it requires writing bigger code,
+         * we rely instead on this code making it virtually impossible
+         * to have wrapped iac (people don't type at 2k/second).
+         * It also allows for bigger reads in common case. */
         if (ts->size1 == 0) {
             ts->rdidx1 = 0;
@@ -567 +682 @@
             ts->wridx2 = 0;
         }
+
+        if (/*ts->size1 < BUFSIZE &&*/ FD_ISSET(ts->sockfd_read, &rdfdset)) {
+            /* Read from socket to buffer 1 */
+            count = MIN(BUFSIZE - ts->rdidx1, BUFSIZE - ts->size1);
+            count = safe_read(ts->sockfd_read, TS_BUF1(ts) + ts->rdidx1, count);
+            if (count <= 0) {
+                if (count < 0 && errno == EAGAIN)
+                    goto skip3;
+                goto kill_session;
+            }
+            /* Ignore trailing NUL if it is there */
+            if (!TS_BUF1(ts)[ts->rdidx1 + count - 1]) {
+                --count;
+            }
+            ts->size1 += count;
+            ts->rdidx1 += count;
+            if (ts->rdidx1 >= BUFSIZE) /* actually == BUFSIZE */
+                ts->rdidx1 = 0;
+        }
+ skip3:
+        if (/*ts->size2 < BUFSIZE &&*/ FD_ISSET(ts->ptyfd, &rdfdset)) {
+            /* Read from pty to buffer 2 */
+            count = MIN(BUFSIZE - ts->rdidx2, BUFSIZE - ts->size2);
+            count = safe_read(ts->ptyfd, TS_BUF2(ts) + ts->rdidx2, count);
+            if (count <= 0) {
+                if (count < 0 && errno == EAGAIN)
+                    goto skip4;
+                goto kill_session;
+            }
+            ts->size2 += count;
+            ts->rdidx2 += count;
+            if (ts->rdidx2 >= BUFSIZE) /* actually == BUFSIZE */
+                ts->rdidx2 = 0;
+        }
+ skip4:
         ts = next;
-    }
+        continue;
+ kill_session:
+        if (ts->shell_pid > 0)
+            update_utmp(ts->shell_pid, DEAD_PROCESS, /*tty_name:*/ NULL, /*username:*/ NULL, /*hostname:*/ NULL);
+        free_session(ts);
+        ts = next;
+    }
+
     goto again;
 }

branches/2.2.9/mindi-busybox/networking/tftp.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
-/* -------------------------------------------------------------------------
- * tftp.c
- *
- * A simple tftp client for busybox.
+/*
+ * A simple tftp client/server for busybox.
  * Tries to follow RFC1350.
  * Only "octet" mode supported.
@@ -17 +15 @@
  * utftp:  Copyright (C) 1999 Uwe Ohse <uwe@ohse.de>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
- * ------------------------------------------------------------------------- */
-
+ * tftpd added by Denys Vlasenko & Vladimir Dronnikov
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
 #include "libbb.h"
 
-
 #if ENABLE_FEATURE_TFTP_GET || ENABLE_FEATURE_TFTP_PUT
 
-#define TFTP_BLOCKSIZE_DEFAULT 512  /* according to RFC 1350, don't change */
-#define TFTP_TIMEOUT 5  /* seconds */
-#define TFTP_NUM_RETRIES 5 /* number of retries */
+#define TFTP_BLKSIZE_DEFAULT       512  /* according to RFC 1350, don't change */
+#define TFTP_BLKSIZE_DEFAULT_STR "512"
+/* Was 50 ms but users asked to bump it up a bit */
+#define TFTP_TIMEOUT_MS            100
+#define TFTP_MAXTIMEOUT_MS        2000
+#define TFTP_NUM_RETRIES            12  /* number of backed-off retries */
 
 /* opcodes we support */
@@ -37 +38 @@
 #define TFTP_OACK  6
 
+/* error codes sent over network (we use only 0, 1, 3 and 8) */
+/* generic (error message is included in the packet) */
+#define ERR_UNSPEC   0
+#define ERR_NOFILE   1
+#define ERR_ACCESS   2
+/* disk full or allocation exceeded */
+#define ERR_WRITE    3
+#define ERR_OP       4
+#define ERR_BAD_ID   5
+#define ERR_EXIST    6
+#define ERR_BAD_USER 7
+#define ERR_BAD_OPT  8
+
+/* masks coming from getopt32 */
+enum {
+    TFTP_OPT_GET = (1 << 0),
+    TFTP_OPT_PUT = (1 << 1),
+    /* pseudo option: if set, it's tftpd */
+    TFTPD_OPT = (1 << 7) * ENABLE_TFTPD,
+    TFTPD_OPT_r = (1 << 8) * ENABLE_TFTPD,
+    TFTPD_OPT_c = (1 << 9) * ENABLE_TFTPD,
+    TFTPD_OPT_u = (1 << 10) * ENABLE_TFTPD,
+};
+
 #if ENABLE_FEATURE_TFTP_GET && !ENABLE_FEATURE_TFTP_PUT
-#define USE_GETPUT(...)
+#define IF_GETPUT(...)
 #define CMD_GET(cmd) 1
 #define CMD_PUT(cmd) 0
 #elif !ENABLE_FEATURE_TFTP_GET && ENABLE_FEATURE_TFTP_PUT
-#define USE_GETPUT(...)
+#define IF_GETPUT(...)
 #define CMD_GET(cmd) 0
 #define CMD_PUT(cmd) 1
 #else
-#define USE_GETPUT(...) __VA_ARGS__
-/* masks coming from getpot32 */
-#define CMD_GET(cmd) ((cmd) & 1)
-#define CMD_PUT(cmd) ((cmd) & 2)
+#define IF_GETPUT(...) __VA_ARGS__
+#define CMD_GET(cmd) ((cmd) & TFTP_OPT_GET)
+#define CMD_PUT(cmd) ((cmd) & TFTP_OPT_PUT)
 #endif
 /* NB: in the code below
@@ -56 +80 @@
 
 
+struct globals {
+    /* u16 TFTP_ERROR; u16 reason; both network-endian, then error text: */
+    uint8_t error_pkt[4 + 32];
+    char *user_opt;
+    /* used in tftpd_main(), a bit big for stack: */
+    char block_buf[TFTP_BLKSIZE_DEFAULT];
+#if ENABLE_FEATURE_TFTP_PROGRESS_BAR
+    off_t pos;
+    off_t size;
+    const char *file;
+    bb_progress_t pmt;
+#endif
+} FIX_ALIASING;
+#define G (*(struct globals*)&bb_common_bufsiz1)
+struct BUG_G_too_big {
+    char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1];
+};
+#define block_buf        (G.block_buf   )
+#define user_opt         (G.user_opt    )
+#define error_pkt        (G.error_pkt   )
+#define INIT_G() do { } while (0)
+
+#define error_pkt_reason (error_pkt[3])
+#define error_pkt_str    (error_pkt + 4)
+
+#if ENABLE_FEATURE_TFTP_PROGRESS_BAR
+static void tftp_progress_update(void)
+{
+    bb_progress_update(&G.pmt, G.file, 0, G.pos, G.size);
+}
+static void tftp_progress_init(void)
+{
+    bb_progress_init(&G.pmt);
+    tftp_progress_update();
+}
+static void tftp_progress_done(void)
+{
+    if (G.pmt.inited) {
+        tftp_progress_update();
+        bb_putchar_stderr('\n');
+        G.pmt.inited = 0;
+    }
+}
+#else
+# define tftp_progress_init() ((void)0)
+# define tftp_progress_done() ((void)0)
+#endif
+
 #if ENABLE_FEATURE_TFTP_BLOCKSIZE
 
-static int tftp_blocksize_check(int blocksize, int bufsize)
+static int tftp_blksize_check(const char *blksize_str, int maxsize)
 {
-    /* Check if the blocksize is valid:
+    /* Check if the blksize is valid:
      * RFC2348 says between 8 and 65464,
      * but our implementation makes it impossible
-     * to use blocksizes smaller than 22 octets.
-     */
-
-    if ((bufsize && (blocksize > bufsize))
-     || (blocksize < 8) || (blocksize > 65564)
+     * to use blksizes smaller than 22 octets. */
+    unsigned blksize = bb_strtou(blksize_str, NULL, 10);
+    if (errno
+     || (blksize < 24) || (blksize > maxsize)
     ) {
-        bb_error_msg("bad blocksize");
-        return 0;
-    }
-
-    return blocksize;
+        bb_error_msg("bad blocksize '%s'", blksize_str);
+        return -1;
+    }
+# if ENABLE_TFTP_DEBUG
+    bb_error_msg("using blksize %u", blksize);
+# endif
+    return blksize;
 }
 
-static char *tftp_option_get(char *buf, int len, const char *option)
+static char *tftp_get_option(const char *option, char *buf, int len)
 {
     int opt_val = 0;
@@ -82 +155 @@
     int k;
 
+    /* buf points to:
+     * "opt_name<NUL>opt_val<NUL>opt_name2<NUL>opt_val2<NUL>..." */
+
     while (len > 0) {
-        /* Make sure the options are terminated correctly */
+        /* Make sure options are terminated correctly */
         for (k = 0; k < len; k++) {
             if (buf[k] == '\0') {
@@ -91 +167 @@
         return NULL;
  nul_found:
-        if (opt_val == 0) {
+        if (opt_val == 0) { /* it's "name" part */
             if (strcasecmp(buf, option) == 0) {
                 opt_found = 1;
@@ -110 +186 @@
 #endif
 
-static int tftp( USE_GETPUT(const int cmd,)
+static int tftp_protocol(
+        /* NULL if tftp, !NULL if tftpd: */
+        len_and_sockaddr *our_lsa,
         len_and_sockaddr *peer_lsa,
-        const char *remotefile, const int localfd,
-        unsigned port, int tftp_bufsize)
+        const char *local_file
+        IF_TFTP(, const char *remote_file)
+#if !ENABLE_TFTP
+# define remote_file NULL
+#endif
+        /* 1 for tftp; 1/0 for tftpd depending whether client asked about it: */
+        IF_FEATURE_TFTP_BLOCKSIZE(, int want_transfer_size)
+        IF_FEATURE_TFTP_BLOCKSIZE(, int blksize))
 {
-    struct timeval tv;
-    fd_set rfds;
-    int socketfd;
+#if !ENABLE_FEATURE_TFTP_BLOCKSIZE
+    enum { blksize = TFTP_BLKSIZE_DEFAULT };
+#endif
+
+    struct pollfd pfd[1];
+#define socket_fd (pfd[0].fd)
     int len;
     int send_len;
-    USE_FEATURE_TFTP_BLOCKSIZE(smallint want_option_ack = 0;)
+    IF_FEATURE_TFTP_BLOCKSIZE(smallint expect_OACK = 0;)
     smallint finished = 0;
     uint16_t opcode;
-    uint16_t block_nr = 1;
+    uint16_t block_nr;
     uint16_t recv_blk;
-    int timeout = TFTP_NUM_RETRIES;
+    int open_mode, local_fd;
+    int retries, waittime_ms;
+    int io_bufsize = blksize + 4;
     char *cp;
-
-    unsigned org_port;
-    len_and_sockaddr *const from = alloca(offsetof(len_and_sockaddr, sa) + peer_lsa->len);
-
     /* Can't use RESERVE_CONFIG_BUFFER here since the allocation
-     * size varies meaning BUFFERS_GO_ON_STACK would fail */
-    /* We must keep the transmit and receive buffers seperate */
-    /* In case we rcv a garbage pkt and we need to rexmit the last pkt */
-    char *xbuf = xmalloc(tftp_bufsize += 4);
-    char *rbuf = xmalloc(tftp_bufsize);
-
-    port = org_port = htons(port);
-
-    socketfd = xsocket(peer_lsa->sa.sa_family, SOCK_DGRAM, 0);
-
-    /* build opcode */
-    opcode = TFTP_WRQ;
-    if (CMD_GET(cmd)) {
-        opcode = TFTP_RRQ;
-    }
+     * size varies meaning BUFFERS_GO_ON_STACK would fail.
+     *
+     * We must keep the transmit and receive buffers separate
+     * in case we rcv a garbage pkt - we need to rexmit the last pkt.
+     */
+    char *xbuf = xmalloc(io_bufsize);
+    char *rbuf = xmalloc(io_bufsize);
+
+    socket_fd = xsocket(peer_lsa->u.sa.sa_family, SOCK_DGRAM, 0);
+    setsockopt_reuseaddr(socket_fd);
+
+    if (!ENABLE_TFTP || our_lsa) { /* tftpd */
+        /* Create a socket which is:
+         * 1. bound to IP:port peer sent 1st datagram to,
+         * 2. connected to peer's IP:port
+         * This way we will answer from the IP:port peer
+         * expects, will not get any other packets on
+         * the socket, and also plain read/write will work. */
+        xbind(socket_fd, &our_lsa->u.sa, our_lsa->len);
+        xconnect(socket_fd, &peer_lsa->u.sa, peer_lsa->len);
+
+        /* Is there an error already? Send pkt and bail out */
+        if (error_pkt_reason || error_pkt_str[0])
+            goto send_err_pkt;
+
+        if (user_opt) {
+            struct passwd *pw = xgetpwnam(user_opt);
+            change_identity(pw); /* initgroups, setgid, setuid */
+        }
+    }
+
+    /* Prepare open mode */
+    if (CMD_PUT(option_mask32)) {
+        open_mode = O_RDONLY;
+    } else {
+        open_mode = O_WRONLY | O_TRUNC | O_CREAT;
+#if ENABLE_TFTPD
+        if ((option_mask32 & (TFTPD_OPT+TFTPD_OPT_c)) == TFTPD_OPT) {
+            /* tftpd without -c */
+            open_mode = O_WRONLY | O_TRUNC;
+        }
+#endif
+    }
+
+    /* Examples of network traffic.
+     * Note two cases when ACKs with block# of 0 are sent.
+     *
+     * Download without options:
+     * tftp -> "\0\1FILENAME\0octet\0"
+     *         "\0\3\0\1FILEDATA..." <- tftpd
+     * tftp -> "\0\4\0\1"
+     * ...
+     * Download with option of blksize 16384:
+     * tftp -> "\0\1FILENAME\0octet\0blksize\00016384\0"
+     *         "\0\6blksize\00016384\0" <- tftpd
+     * tftp -> "\0\4\0\0"
+     *         "\0\3\0\1FILEDATA..." <- tftpd
+     * tftp -> "\0\4\0\1"
+     * ...
+     * Upload without options:
+     * tftp -> "\0\2FILENAME\0octet\0"
+     *         "\0\4\0\0" <- tftpd
+     * tftp -> "\0\3\0\1FILEDATA..."
+     *         "\0\4\0\1" <- tftpd
+     * ...
+     * Upload with option of blksize 16384:
+     * tftp -> "\0\2FILENAME\0octet\0blksize\00016384\0"
+     *         "\0\6blksize\00016384\0" <- tftpd
+     * tftp -> "\0\3\0\1FILEDATA..."
+     *         "\0\4\0\1" <- tftpd
+     * ...
+     */
+    block_nr = 1;
     cp = xbuf + 2;
-    /* add filename and mode */
-    /* fill in packet if the filename fits into xbuf */
-    len = strlen(remotefile) + 1;
-    if (2 + len + sizeof("octet") >= tftp_bufsize) {
-        bb_error_msg("remote filename is too long");
-        goto ret;
-    }
-    strcpy(cp, remotefile);
-    cp += len;
-    /* add "mode" part of the package */
-    strcpy(cp, "octet");
-    cp += sizeof("octet");
-
+
+    if (!ENABLE_TFTP || our_lsa) { /* tftpd */
+        /* Open file (must be after changing user) */
+        local_fd = open(local_file, open_mode, 0666);
+        if (local_fd < 0) {
+            error_pkt_reason = ERR_NOFILE;
+            strcpy((char*)error_pkt_str, "can't open file");
+            goto send_err_pkt;
+        }
+/* gcc 4.3.1 would NOT optimize it out as it should! */
 #if ENABLE_FEATURE_TFTP_BLOCKSIZE
-    len = tftp_bufsize - 4; /* data block size */
-    if (len != TFTP_BLOCKSIZE_DEFAULT) {
-        /* rfc2348 says that 65464 is a max allowed value */
-        if ((&xbuf[tftp_bufsize - 1] - cp) < sizeof("blksize NNNNN")) {
+        if (blksize != TFTP_BLKSIZE_DEFAULT || want_transfer_size) {
+            /* Create and send OACK packet. */
+            /* For the download case, block_nr is still 1 -
+             * we expect 1st ACK from peer to be for (block_nr-1),
+             * that is, for "block 0" which is our OACK pkt */
+            opcode = TFTP_OACK;
+            goto add_blksize_opt;
+        }
+#endif
+        if (CMD_GET(option_mask32)) {
+            /* It's upload and we don't send OACK.
+             * We must ACK 1st packet (with filename)
+             * as if it is "block 0" */
+            block_nr = 0;
+        }
+
+    } else { /* tftp */
+        /* Open file (must be after changing user) */
+        local_fd = CMD_GET(option_mask32) ? STDOUT_FILENO : STDIN_FILENO;
+        if (NOT_LONE_DASH(local_file))
+            local_fd = xopen(local_file, open_mode);
+/* Removing #if, or using if() statement instead of #if may lead to
+ * "warning: null argument where non-null required": */
+#if ENABLE_TFTP
+        /* tftp */
+
+        /* We can't (and don't really need to) bind the socket:
+         * we don't know from which local IP datagrams will be sent,
+         * but kernel will pick the same IP every time (unless routing
+         * table is changed), thus peer will see dgrams consistently
+         * coming from the same IP.
+         * We would like to connect the socket, but since peer's
+         * UDP code can be less perfect than ours, _peer's_ IP:port
+         * in replies may differ from IP:port we used to send
+         * our first packet. We can connect() only when we get
+         * first reply. */
+
+        /* build opcode */
+        opcode = TFTP_WRQ;
+        if (CMD_GET(option_mask32)) {
+            opcode = TFTP_RRQ;
+        }
+        /* add filename and mode */
+        /* fill in packet if the filename fits into xbuf */
+        len = strlen(remote_file) + 1;
+        if (2 + len + sizeof("octet") >= io_bufsize) {
             bb_error_msg("remote filename is too long");
             goto ret;
         }
-        /* add "blksize", <nul>, blocksize */
-        strcpy(cp, "blksize");
-        cp += sizeof("blksize");
-        cp += snprintf(cp, 6, "%d", len) + 1;
-        want_option_ack = 1;
-    }
-#endif
-    /* First packet is built, so skip packet generation */
-    goto send_pkt;
+        strcpy(cp, remote_file);
+        cp += len;
+        /* add "mode" part of the packet */
+        strcpy(cp, "octet");
+        cp += sizeof("octet");
+
+# if ENABLE_FEATURE_TFTP_BLOCKSIZE
+        if (blksize == TFTP_BLKSIZE_DEFAULT && !want_transfer_size)
+            goto send_pkt;
+
+        /* Need to add option to pkt */
+        if ((&xbuf[io_bufsize - 1] - cp) < sizeof("blksize NNNNN tsize ") + sizeof(off_t)*3) {
+            bb_error_msg("remote filename is too long");
+            goto ret;
+        }
+        expect_OACK = 1;
+# endif
+#endif /* ENABLE_TFTP */
+
+#if ENABLE_FEATURE_TFTP_BLOCKSIZE
+ add_blksize_opt:
+        if (blksize != TFTP_BLKSIZE_DEFAULT) {
+            /* add "blksize", <nul>, blksize, <nul> */
+            strcpy(cp, "blksize");
+            cp += sizeof("blksize");
+            cp += snprintf(cp, 6, "%d", blksize) + 1;
+        }
+        if (want_transfer_size) {
+            /* add "tsize", <nul>, size, <nul> (see RFC2349) */
+            /* if tftp and downloading, we send "0" (since we opened local_fd with O_TRUNC)
+             * and this makes server to send "tsize" option with the size */
+            /* if tftp and uploading, we send file size (maybe dont, to not confuse old servers???) */
+            /* if tftpd and downloading, we are answering to client's request */
+            /* if tftpd and uploading: !want_transfer_size, this code is not executed */
+            struct stat st;
+            strcpy(cp, "tsize");
+            cp += sizeof("tsize");
+            st.st_size = 0;
+            fstat(local_fd, &st);
+            cp += sprintf(cp, "%"OFF_FMT"u", (off_t)st.st_size) + 1;
+# if ENABLE_FEATURE_TFTP_PROGRESS_BAR
+            /* Save for progress bar. If 0 (tftp downloading),
+             * we look at server's reply later */
+            G.size = st.st_size;
+            if (remote_file && st.st_size)
+                tftp_progress_init();
+# endif
+        }
+#endif
+        /* First packet is built, so skip packet generation */
+        goto send_pkt;
+    }
 
     /* Using mostly goto's - continue/break will be less clear
      * in where we actually jump to */
-
     while (1) {
         /* Build ACK or DATA */
@@ -189 +413 @@
         block_nr++;
         opcode = TFTP_ACK;
-        if (CMD_PUT(cmd)) {
+        if (CMD_PUT(option_mask32)) {
             opcode = TFTP_DATA;
-            len = full_read(localfd, cp, tftp_bufsize - 4);
+            len = full_read(local_fd, cp, blksize);
             if (len < 0) {
-                bb_perror_msg(bb_msg_read_error);
-                goto ret;
-            }
-            if (len != (tftp_bufsize - 4)) {
+                goto send_read_err_pkt;
+            }
+            if (len != blksize) {
                 finished = 1;
             }
@@ -207 +430 @@
         /* NB: send_len value is preserved in code below
          * for potential resend */
+
+        retries = TFTP_NUM_RETRIES;  /* re-initialize */
+        waittime_ms = TFTP_TIMEOUT_MS;
+
  send_again:
-#if ENABLE_DEBUG_TFTP
+#if ENABLE_TFTP_DEBUG
         fprintf(stderr, "sending %u bytes\n", send_len);
         for (cp = xbuf; cp < &xbuf[send_len]; cp++)
@@ -214 +441 @@
         fprintf(stderr, "\n");
 #endif
-        xsendto(socketfd, xbuf, send_len, &peer_lsa->sa, peer_lsa->len);
+        xsendto(socket_fd, xbuf, send_len, &peer_lsa->u.sa, peer_lsa->len);
+
+#if ENABLE_FEATURE_TFTP_PROGRESS_BAR
+        if (ENABLE_TFTP && remote_file) /* tftp */
+            G.pos = (block_nr - 1) * (uoff_t)blksize;
+        if (G.pmt.inited)
+            tftp_progress_update();
+#endif
         /* Was it final ACK? then exit */
         if (finished && (opcode == TFTP_ACK))
             goto ret;
 
-        timeout = TFTP_NUM_RETRIES; /* re-initialize */
  recv_again:
         /* Receive packet */
-        tv.tv_sec = TFTP_TIMEOUT;
-        tv.tv_usec = 0;
-        FD_ZERO(&rfds);
-        FD_SET(socketfd, &rfds);
-        switch (select(socketfd + 1, &rfds, NULL, NULL, &tv)) {
-            unsigned from_port;
+        /*pfd[0].fd = socket_fd;*/
+        pfd[0].events = POLLIN;
+        switch (safe_poll(pfd, 1, waittime_ms)) {
+        default:
+            /*bb_perror_msg("poll"); - done in safe_poll */
+            goto ret;
+        case 0:
+            retries--;
+            if (retries == 0) {
+                tftp_progress_done();
+                bb_error_msg("timeout");
+                goto ret; /* no err packet sent */
+            }
+
+            /* exponential backoff with limit */
+            waittime_ms += waittime_ms/2;
+            if (waittime_ms > TFTP_MAXTIMEOUT_MS) {
+                waittime_ms = TFTP_MAXTIMEOUT_MS;
+            }
+
+            goto send_again; /* resend last sent pkt */
         case 1:
-            from->len = peer_lsa->len;
-            memset(&from->sa, 0, peer_lsa->len);
-            len = recvfrom(socketfd, rbuf, tftp_bufsize, 0,
-                        &from->sa, &from->len);
+            if (!our_lsa) {
+                /* tftp (not tftpd!) receiving 1st packet */
+                our_lsa = ((void*)(ptrdiff_t)-1); /* not NULL */
+                len = recvfrom(socket_fd, rbuf, io_bufsize, 0,
+                        &peer_lsa->u.sa, &peer_lsa->len);
+                /* Our first dgram went to port 69
+                 * but reply may come from different one.
+                 * Remember and use this new port (and IP) */
+                if (len >= 0)
+                    xconnect(socket_fd, &peer_lsa->u.sa, peer_lsa->len);
+            } else {
+                /* tftpd, or not the very first packet:
+                 * socket is connect()ed, can just read from it. */
+                /* Don't full_read()!
+                 * This is not TCP, one read == one pkt! */
+                len = safe_read(socket_fd, rbuf, io_bufsize);
+            }
             if (len < 0) {
-                bb_perror_msg("recvfrom");
-                goto ret;
-            }
-            from_port = get_nport(&from->sa);
-            if (port == org_port) {
-                /* Our first query went to port 69
-                 * but reply will come from different one.
-                 * Remember and use this new port */
-                port = from_port;
-                set_nport(peer_lsa, from_port);
-            }
-            if (port != from_port)
+                goto send_read_err_pkt;
+            }
+            if (len < 4) { /* too small? */
                 goto recv_again;
-            goto process_pkt;
-        case 0:
-            timeout--;
-            if (timeout == 0) {
-                bb_error_msg("last timeout");
-                goto ret;
-            }
-            bb_error_msg("last timeout" + 5);
-            goto send_again; /* resend last sent pkt */
-        default:
-            bb_perror_msg("select");
-            goto ret;
-        }
- process_pkt:
+            }
+        }
+
         /* Process recv'ed packet */
         opcode = ntohs( ((uint16_t*)rbuf)[0] );
         recv_blk = ntohs( ((uint16_t*)rbuf)[1] );
-
-#if ENABLE_DEBUG_TFTP
+#if ENABLE_TFTP_DEBUG
         fprintf(stderr, "received %d bytes: %04x %04x\n", len, opcode, recv_blk);
 #endif
-
         if (opcode == TFTP_ERROR) {
-            static const char *const errcode_str[] = {
-                "",
-                "file not found",
-                "access violation",
-                "disk full",
-                "illegal TFTP operation",
-                "unknown transfer id",
-                "file already exists",
-                "no such user",
-                "bad option"
-            };
+            static const char errcode_str[] ALIGN1 =
+                "\0"
+                "file not found\0"
+                "access violation\0"
+                "disk full\0"
+                "bad operation\0"
+                "unknown transfer id\0"
+                "file already exists\0"
+                "no such user\0"
+                "bad option";
 
             const char *msg = "";
 
-            if (rbuf[4] != '\0') {
+            if (len > 4 && rbuf[4] != '\0') {
                 msg = &rbuf[4];
-                rbuf[tftp_bufsize - 1] = '\0';
-            } else if (recv_blk < ARRAY_SIZE(errcode_str)) {
-                msg = errcode_str[recv_blk];
+                rbuf[io_bufsize - 1] = '\0'; /* paranoia */
+            } else if (recv_blk <= 8) {
+                msg = nth_string(errcode_str, recv_blk);
             }
             bb_error_msg("server error: (%u) %s", recv_blk, msg);
@@ -295 +533 @@
 
 #if ENABLE_FEATURE_TFTP_BLOCKSIZE
-        if (want_option_ack) {
-            want_option_ack = 0;
-
+        if (expect_OACK) {
+            expect_OACK = 0;
             if (opcode == TFTP_OACK) {
                 /* server seems to support options */
                 char *res;
 
-                res = tftp_option_get(&rbuf[2], len - 2, "blksize");
+                res = tftp_get_option("blksize", &rbuf[2], len - 2);
                 if (res) {
-                    int blksize = xatoi_u(res);
-                    if (!tftp_blocksize_check(blksize, tftp_bufsize - 4)) {
-                        /* send ERROR 8 to server... */
-                        /* htons can be impossible to use in const initializer: */
-                        /*static const uint16_t error_8[2] = { htons(TFTP_ERROR), htons(8) };*/
-                        /* thus we open-code big-endian layout */
-                        static const uint8_t error_8[4] = { 0,TFTP_ERROR, 0,8 };
-                        xsendto(socketfd, error_8, 4, &peer_lsa->sa, peer_lsa->len);
-                        bb_error_msg("server proposes bad blksize %d, exiting", blksize);
-                        goto ret;
+                    blksize = tftp_blksize_check(res, blksize);
+                    if (blksize < 0) {
+                        error_pkt_reason = ERR_BAD_OPT;
+                        goto send_err_pkt;
                     }
-#if ENABLE_DEBUG_TFTP
-                    fprintf(stderr, "using blksize %u\n",
-                            blksize);
-#endif
-                    tftp_bufsize = blksize + 4;
-                    /* Send ACK for OACK ("block" no: 0) */
+                    io_bufsize = blksize + 4;
+                }
+# if ENABLE_FEATURE_TFTP_PROGRESS_BAR
+                if (remote_file && G.size == 0) { /* if we don't know it yet */
+                    res = tftp_get_option("tsize", &rbuf[2], len - 2);
+                    if (res) {
+                        G.size = bb_strtoull(res, NULL, 10);
+                        if (G.size)
+                            tftp_progress_init();
+                    }
+                }
+# endif
+                if (CMD_GET(option_mask32)) {
+                    /* We'll send ACK for OACK,
+                     * such ACK has "block no" of 0 */
                     block_nr = 0;
-                    continue;
                 }
-                /* rfc2347:
-                 * "An option not acknowledged by the server
-                 *  must be ignored by the client and server
-                 *  as if it were never requested." */
-            }
-
-            bb_error_msg("blksize is not supported by server"
-                        " - reverting to 512");
-            tftp_bufsize = TFTP_BLOCKSIZE_DEFAULT + 4;
+                continue;
+            }
+            /* rfc2347:
+             * "An option not acknowledged by the server
+             * must be ignored by the client and server
+             * as if it were never requested." */
+            if (blksize != TFTP_BLKSIZE_DEFAULT)
+                bb_error_msg("falling back to blocksize "TFTP_BLKSIZE_DEFAULT_STR);
+            blksize = TFTP_BLKSIZE_DEFAULT;
+            io_bufsize = TFTP_BLKSIZE_DEFAULT + 4;
         }
 #endif
@@ -338 +578 @@
          * to get / block# we are about to send next time */
 
-        if (CMD_GET(cmd) && (opcode == TFTP_DATA)) {
+        if (CMD_GET(option_mask32) && (opcode == TFTP_DATA)) {
             if (recv_blk == block_nr) {
-                len = full_write(localfd, &rbuf[4], len - 4);
-                if (len < 0) {
-                    bb_perror_msg(bb_msg_write_error);
-                    goto ret;
+                int sz = full_write(local_fd, &rbuf[4], len - 4);
+                if (sz != len - 4) {
+                    strcpy((char*)error_pkt_str, bb_msg_write_error);
+                    error_pkt_reason = ERR_WRITE;
+                    goto send_err_pkt;
                 }
-                if (len != (tftp_bufsize - 4)) {
+                if (sz != blksize) {
                     finished = 1;
                 }
                 continue; /* send ACK */
             }
+/* Disabled to cope with servers with Sorcerer's Apprentice Syndrome */
+#if 0
             if (recv_blk == (block_nr - 1)) {
                 /* Server lost our TFTP_ACK.  Resend it */
@@ -355 +598 @@
                 continue;
             }
-        }
-
-        if (CMD_PUT(cmd) && (opcode == TFTP_ACK)) {
-            /* did server ACK our last DATA pkt? */
+#endif
+        }
+
+        if (CMD_PUT(option_mask32) && (opcode == TFTP_ACK)) {
+            /* did peer ACK our last DATA pkt? */
             if (recv_blk == (uint16_t) (block_nr - 1)) {
                 if (finished)
@@ -376 +620 @@
          * http://en.wikipedia.org/wiki/Sorcerer's_Apprentice_Syndrome
          */
-    }
+    } /* end of "while (1)" */
  ret:
     if (ENABLE_FEATURE_CLEAN_UP) {
-        close(socketfd);
+        close(local_fd);
+        close(socket_fd);
         free(xbuf);
         free(rbuf);
     }
     return finished == 0; /* returns 1 on failure */
+
+ send_read_err_pkt:
+    strcpy((char*)error_pkt_str, bb_msg_read_error);
+ send_err_pkt:
+    if (error_pkt_str[0])
+        bb_error_msg("%s", (char*)error_pkt_str);
+    error_pkt[1] = TFTP_ERROR;
+    xsendto(socket_fd, error_pkt, 4 + 1 + strlen((char*)error_pkt_str),
+            &peer_lsa->u.sa, peer_lsa->len);
+    return EXIT_FAILURE;
+#undef remote_file
 }
 
-int tftp_main(int argc, char **argv);
-int tftp_main(int argc, char **argv)
+#if ENABLE_TFTP
+
+int tftp_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int tftp_main(int argc UNUSED_PARAM, char **argv)
 {
     len_and_sockaddr *peer_lsa;
-    const char *localfile = NULL;
-    const char *remotefile = NULL;
-#if ENABLE_FEATURE_TFTP_BLOCKSIZE
-    const char *sblocksize = NULL;
-#endif
+    const char *local_file = NULL;
+    const char *remote_file = NULL;
+# if ENABLE_FEATURE_TFTP_BLOCKSIZE
+    const char *blksize_str = TFTP_BLKSIZE_DEFAULT_STR;
+    int blksize;
+# endif
+    int result;
     int port;
-    USE_GETPUT(int cmd;)
-    int fd = -1;
-    int flags = 0;
-    int result;
-    int blocksize = TFTP_BLOCKSIZE_DEFAULT;
+    IF_GETPUT(int opt;)
+
+    INIT_G();
 
     /* -p or -g is mandatory, and they are mutually exclusive */
-    opt_complementary = "" USE_FEATURE_TFTP_GET("g:") USE_FEATURE_TFTP_PUT("p:")
-            USE_GETPUT("?g--p:p--g");
-
-    USE_GETPUT(cmd =) getopt32(argv,
-            USE_FEATURE_TFTP_GET("g") USE_FEATURE_TFTP_PUT("p")
-                "l:r:" USE_FEATURE_TFTP_BLOCKSIZE("b:"),
-            &localfile, &remotefile
-            USE_FEATURE_TFTP_BLOCKSIZE(, &sblocksize));
+    opt_complementary = "" IF_FEATURE_TFTP_GET("g:") IF_FEATURE_TFTP_PUT("p:")
+            IF_GETPUT("g--p:p--g:");
+
+    IF_GETPUT(opt =) getopt32(argv,
+            IF_FEATURE_TFTP_GET("g") IF_FEATURE_TFTP_PUT("p")
+                "l:r:" IF_FEATURE_TFTP_BLOCKSIZE("b:"),
+            &local_file, &remote_file
+            IF_FEATURE_TFTP_BLOCKSIZE(, &blksize_str));
     argv += optind;
 
-    flags = O_RDONLY;
-    if (CMD_GET(cmd))
-        flags = O_WRONLY | O_CREAT | O_TRUNC;
-
-#if ENABLE_FEATURE_TFTP_BLOCKSIZE
-    if (sblocksize) {
-        blocksize = xatoi_u(sblocksize);
-        if (!tftp_blocksize_check(blocksize, 0)) {
-            return EXIT_FAILURE;
-        }
-    }
-#endif
-
-    if (!localfile)
-        localfile = remotefile;
-    if (!remotefile)
-        remotefile = localfile;
+# if ENABLE_FEATURE_TFTP_BLOCKSIZE
+    /* Check if the blksize is valid:
+     * RFC2348 says between 8 and 65464 */
+    blksize = tftp_blksize_check(blksize_str, 65564);
+    if (blksize < 0) {
+        //bb_error_msg("bad block size");
+        return EXIT_FAILURE;
+    }
+# endif
+
+    if (remote_file) {
+        if (!local_file) {
+            const char *slash = strrchr(remote_file, '/');
+            local_file = slash ? slash + 1 : remote_file;
+        }
+    } else {
+        remote_file = local_file;
+    }
+
     /* Error if filename or host is not known */
-    if (!remotefile || !argv[0])
+    if (!remote_file || !argv[0])
         bb_show_usage();
-
-    fd = CMD_GET(cmd) ? STDOUT_FILENO : STDIN_FILENO;
-    if (!LONE_DASH(localfile)) {
-        fd = xopen(localfile, flags);
-    }
 
     port = bb_lookup_port(argv[1], "udp", 69);
     peer_lsa = xhost2sockaddr(argv[0], port);
 
-#if ENABLE_DEBUG_TFTP
-    fprintf(stderr, "using server '%s', remotefile '%s', localfile '%s'\n",
-            xmalloc_sockaddr2dotted(&peer_lsa->sa),
-            remotefile, localfile);
-#endif
-
-    result = tftp( USE_GETPUT(cmd,) peer_lsa, remotefile, fd, port, blocksize);
-
-    if (ENABLE_FEATURE_CLEAN_UP)
-        close(fd);
-    if (result != EXIT_SUCCESS && !LONE_DASH(localfile) && CMD_GET(cmd)) {
-        unlink(localfile);
+# if ENABLE_TFTP_DEBUG
+    fprintf(stderr, "using server '%s', remote_file '%s', local_file '%s'\n",
+            xmalloc_sockaddr2dotted(&peer_lsa->u.sa),
+            remote_file, local_file);
+# endif
+
+# if ENABLE_FEATURE_TFTP_PROGRESS_BAR
+    G.file = remote_file;
+# endif
+    result = tftp_protocol(
+        NULL /*our_lsa*/, peer_lsa,
+        local_file, remote_file
+        IF_FEATURE_TFTP_BLOCKSIZE(, 1 /* want_transfer_size */)
+        IF_FEATURE_TFTP_BLOCKSIZE(, blksize)
+    );
+    tftp_progress_done();
+
+    if (result != EXIT_SUCCESS && NOT_LONE_DASH(local_file) && CMD_GET(opt)) {
+        unlink(local_file);
     }
     return result;
 }
 
+#endif /* ENABLE_TFTP */
+
+#if ENABLE_TFTPD
+int tftpd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int tftpd_main(int argc UNUSED_PARAM, char **argv)
+{
+    len_and_sockaddr *our_lsa;
+    len_and_sockaddr *peer_lsa;
+    char *local_file, *mode;
+    const char *error_msg;
+    int opt, result, opcode;
+    IF_FEATURE_TFTP_BLOCKSIZE(int blksize = TFTP_BLKSIZE_DEFAULT;)
+    IF_FEATURE_TFTP_BLOCKSIZE(int want_transfer_size = 0;)
+
+    INIT_G();
+
+    our_lsa = get_sock_lsa(STDIN_FILENO);
+    if (!our_lsa) {
+        /* This is confusing:
+         *bb_error_msg_and_die("stdin is not a socket");
+         * Better: */
+        bb_show_usage();
+        /* Help text says that tftpd must be used as inetd service,
+         * which is by far the most usual cause of get_sock_lsa
+         * failure */
+    }
+    peer_lsa = xzalloc(LSA_LEN_SIZE + our_lsa->len);
+    peer_lsa->len = our_lsa->len;
+
+    /* Shifting to not collide with TFTP_OPTs */
+    opt = option_mask32 = TFTPD_OPT | (getopt32(argv, "rcu:", &user_opt) << 8);
+    argv += optind;
+    if (argv[0])
+        xchdir(argv[0]);
+
+    result = recv_from_to(STDIN_FILENO, block_buf, sizeof(block_buf),
+            0 /* flags */,
+            &peer_lsa->u.sa, &our_lsa->u.sa, our_lsa->len);
+
+    error_msg = "malformed packet";
+    opcode = ntohs(*(uint16_t*)block_buf);
+    if (result < 4 || result >= sizeof(block_buf)
+     || block_buf[result-1] != '\0'
+     || (IF_FEATURE_TFTP_PUT(opcode != TFTP_RRQ) /* not download */
+         IF_GETPUT(&&)
+         IF_FEATURE_TFTP_GET(opcode != TFTP_WRQ) /* not upload */
+        )
+    ) {
+        goto err;
+    }
+    local_file = block_buf + 2;
+    if (local_file[0] == '.' || strstr(local_file, "/.")) {
+        error_msg = "dot in file name";
+        goto err;
+    }
+    mode = local_file + strlen(local_file) + 1;
+    if (mode >= block_buf + result || strcmp(mode, "octet") != 0) {
+        goto err;
+    }
+# if ENABLE_FEATURE_TFTP_BLOCKSIZE
+    {
+        char *res;
+        char *opt_str = mode + sizeof("octet");
+        int opt_len = block_buf + result - opt_str;
+        if (opt_len > 0) {
+            res = tftp_get_option("blksize", opt_str, opt_len);
+            if (res) {
+                blksize = tftp_blksize_check(res, 65564);
+                if (blksize < 0) {
+                    error_pkt_reason = ERR_BAD_OPT;
+                    /* will just send error pkt */
+                    goto do_proto;
+                }
+            }
+            if (opcode != TFTP_WRQ /* download? */
+            /* did client ask us about file size? */
+             && tftp_get_option("tsize", opt_str, opt_len)
+            ) {
+                want_transfer_size = 1;
+            }
+        }
+    }
+# endif
+
+    if (!ENABLE_FEATURE_TFTP_PUT || opcode == TFTP_WRQ) {
+        if (opt & TFTPD_OPT_r) {
+            /* This would mean "disk full" - not true */
+            /*error_pkt_reason = ERR_WRITE;*/
+            error_msg = bb_msg_write_error;
+            goto err;
+        }
+        IF_GETPUT(option_mask32 |= TFTP_OPT_GET;) /* will receive file's data */
+    } else {
+        IF_GETPUT(option_mask32 |= TFTP_OPT_PUT;) /* will send file's data */
+    }
+
+    /* NB: if error_pkt_str or error_pkt_reason is set up,
+     * tftp_protocol() just sends one error pkt and returns */
+
+ do_proto:
+    close(STDIN_FILENO); /* close old, possibly wildcard socket */
+    /* tftp_protocol() will create new one, bound to particular local IP */
+    result = tftp_protocol(
+        our_lsa, peer_lsa,
+        local_file IF_TFTP(, NULL /*remote_file*/)
+        IF_FEATURE_TFTP_BLOCKSIZE(, want_transfer_size)
+        IF_FEATURE_TFTP_BLOCKSIZE(, blksize)
+    );
+
+    return result;
+ err:
+    strcpy((char*)error_pkt_str, error_msg);
+    goto do_proto;
+}
+
+#endif /* ENABLE_TFTPD */
+
 #endif /* ENABLE_FEATURE_TFTP_GET || ENABLE_FEATURE_TFTP_PUT */

branches/2.2.9/mindi-busybox/networking/traceroute.c

@@ -23 +23 @@
  */
 
-//#define version "1.4a12"
-
+/*
+ *  traceroute6
+ *
+ *      Modified for NRL 4.4BSD IPv6 release.
+ *      07/31/96 bgp
+ *
+ *  Modified for Linux IPv6 by Pedro Roque <roque@di.fc.ul.pt>
+ *  31/07/1996
+ *
+ *  As ICMP error messages for IPv6 now include more than 8 bytes
+ *  UDP datagrams are now sent via an UDP socket instead of magic
+ *  RAW socket tricks.
+ *
+ *  Converted to busybox applet by Leonid Lisovskiy <lly@sf.net>
+ *  2009-11-16
+ */
 
 /*
@@ -215 +229 @@
 #include <netinet/ip.h>
 #include <netinet/ip_icmp.h>
+#if ENABLE_FEATURE_IPV6
+# include <netinet/ip6.h>
+# include <netinet/icmp6.h>
+# ifndef SOL_IPV6
+#  define SOL_IPV6 IPPROTO_IPV6
+# endif
+#endif
 
 #include "libbb.h"
 #include "inet_common.h"
 
-
-/*
- * Definitions for internet protocol version 4.
- * Per RFC 791, September 1981.
- */
-#define IPVERSION 4
-
 #ifndef IPPROTO_ICMP
-/* Grrrr.... */
-#define IPPROTO_ICMP 1
+# define IPPROTO_ICMP 1
 #endif
 #ifndef IPPROTO_IP
-#define IPPROTO_IP 0
-#endif
-
-/*
- * Overlay for ip header used by other protocols (tcp, udp).
- */
-struct ipovly {
-    unsigned char  ih_x1[9];               /* (unused) */
-    unsigned char  ih_pr;                  /* protocol */
-    short   ih_len;                 /* protocol length */
-    struct  in_addr ih_src;         /* source internet address */
-    struct  in_addr ih_dst;         /* destination internet address */
+# define IPPROTO_IP 0
+#endif
+
+
+#define OPT_STRING "FIlnrdvxt:i:m:p:q:s:w:z:f:" \
+            IF_FEATURE_TRACEROUTE_SOURCE_ROUTE("g:") \
+            "4" IF_TRACEROUTE6("6")
+enum {
+    OPT_DONT_FRAGMNT = (1 << 0),    /* F */
+    OPT_USE_ICMP     = (1 << 1) * ENABLE_FEATURE_TRACEROUTE_USE_ICMP, /* I */
+    OPT_TTL_FLAG     = (1 << 2),    /* l */
+    OPT_ADDR_NUM     = (1 << 3),    /* n */
+    OPT_BYPASS_ROUTE = (1 << 4),    /* r */
+    OPT_DEBUG        = (1 << 5),    /* d */
+    OPT_VERBOSE      = (1 << 6) * ENABLE_FEATURE_TRACEROUTE_VERBOSE, /* v */
+    OPT_IP_CHKSUM    = (1 << 7),    /* x */
+    OPT_TOS          = (1 << 8),    /* t */
+    OPT_DEVICE       = (1 << 9),    /* i */
+    OPT_MAX_TTL      = (1 << 10),   /* m */
+    OPT_PORT         = (1 << 11),   /* p */
+    OPT_NPROBES      = (1 << 12),   /* q */
+    OPT_SOURCE       = (1 << 13),   /* s */
+    OPT_WAITTIME     = (1 << 14),   /* w */
+    OPT_PAUSE_MS     = (1 << 15),   /* z */
+    OPT_FIRST_TTL    = (1 << 16),   /* f */
+    OPT_SOURCE_ROUTE = (1 << 17) * ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE, /* g */
+    OPT_IPV4         = (1 << (17+ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE)),   /* 4 */
+    OPT_IPV6         = (1 << (18+ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE)) * ENABLE_TRACEROUTE6, /* 6 */
 };
-
-/*
- * UDP kernel structures and variables.
- */
-struct udpiphdr {
-    struct  ipovly ui_i;            /* overlaid ip structure */
-    struct  udphdr ui_u;            /* udp header */
+#define verbose (option_mask32 & OPT_VERBOSE)
+
+enum {
+    SIZEOF_ICMP_HDR = 8,
+    rcvsock = 3, /* receive (icmp) socket file descriptor */
+    sndsock = 4, /* send (udp/icmp) socket file descriptor */
 };
-#define ui_next         ui_i.ih_next
-#define ui_prev         ui_i.ih_prev
-#define ui_x1           ui_i.ih_x1
-#define ui_pr           ui_i.ih_pr
-#define ui_len          ui_i.ih_len
-#define ui_src          ui_i.ih_src
-#define ui_dst          ui_i.ih_dst
-#define ui_sport        ui_u.uh_sport
-#define ui_dport        ui_u.uh_dport
-#define ui_ulen         ui_u.uh_ulen
-#define ui_sum          ui_u.uh_sum
-
-
-/* Host name and address list */
-struct hostinfo {
-    char *name;
-    int n;
-    uint32_t *addrs;
-};
 
 /* Data section of the probe packet */
-struct outdata {
+struct outdata_t {
     unsigned char seq;             /* sequence number of this packet */
     unsigned char ttl;             /* ttl packet left with */
 // UNUSED. Retaining to have the same packet size.
-    struct timeval tv_UNUSED ATTRIBUTE_PACKED; /* time packet left */
+    struct timeval tv_UNUSED PACKED; /* time packet left */
 };
 
-struct IFADDRLIST {
-    uint32_t addr;
-    char device[sizeof(struct ifreq)];
+#if ENABLE_TRACEROUTE6
+struct outdata6_t {
+    uint32_t ident6;
+    uint32_t seq6;
+    struct timeval tv_UNUSED PACKED; /* time packet left */
 };
-
-
-static struct ip *outip;               /* last output (udp) packet */
-static struct udphdr *outudp;          /* last output (udp) packet */
-static struct outdata *outdata;        /* last output (udp) packet */
-
-#if ENABLE_FEATURE_TRACEROUTE_USE_ICMP
-static struct icmp *outicmp;           /* last output (icmp) packet */
-#endif
-
-static int s;                          /* receive (icmp) socket file descriptor */
-static int sndsock;                    /* send (udp/icmp) socket file descriptor */
-
-static int packlen;                    /* total length of packet */
-static int minpacket;                  /* min ip packet size */
-static int maxpacket = 32 * 1024;      /* max ip packet size */
-static int pmtu;                       /* Path MTU Discovery (RFC1191) */
-
-static char *hostname;
-
-static uint16_t ident;
-static uint16_t port = 32768 + 666;     /* start udp dest port # for probe packets */
-
-static int waittime = 5;               /* time to wait for response (in seconds) */
-static int doipcksum = 1;              /* calculate ip checksums by default */
-
+#endif
+
+struct globals {
+    struct ip *outip;
+    struct outdata_t *outdata;
+    len_and_sockaddr *dest_lsa;
+    int packlen;                    /* total length of packet */
+    int pmtu;                       /* Path MTU Discovery (RFC1191) */
+    uint32_t ident;
+    uint16_t port; // 32768 + 666;  /* start udp dest port # for probe packets */
+    int waittime; // 5;             /* time to wait for response (in seconds) */
 #if ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE
-static int optlen;                     /* length of ip options */
+    int optlen;                     /* length of ip options */
 #else
 #define optlen 0
 #endif
-
-
-/* Keep in sync with getopt32 call! */
-#define OPT_DONT_FRAGMNT (1<<0)    /* F */
-#define OPT_USE_ICMP     (1<<1)    /* I */
-#define OPT_TTL_FLAG     (1<<2)    /* l */
-#define OPT_ADDR_NUM     (1<<3)    /* n */
-#define OPT_BYPASS_ROUTE (1<<4)    /* r */
-#define OPT_DEBUG        (1<<5)    /* d */
-#define OPT_VERBOSE      (1<<6)    /* v */
-#define OPT_IP_CHKSUM    (1<<7)    /* x */
-#define OPT_TOS          (1<<8)    /* t */
-#define OPT_DEVICE       (1<<9)    /* i */
-#define OPT_MAX_TTL      (1<<10)   /* m */
-#define OPT_PORT         (1<<11)   /* p */
-#define OPT_NPROBES      (1<<12)   /* q */
-#define OPT_SOURCE       (1<<13)   /* s */
-#define OPT_WAITTIME     (1<<14)   /* w */
-#define OPT_PAUSE_MS     (1<<15)   /* z */
-#define OPT_FIRST_TTL    (1<<16)   /* f */
-
-#if ENABLE_FEATURE_TRACEROUTE_USE_ICMP
-/* use icmp echo instead of udp packets */
-#define useicmp (option_mask32 & OPT_USE_ICMP)
-#endif
-#if ENABLE_FEATURE_TRACEROUTE_VERBOSE
-#define verbose (option_mask32 & OPT_VERBOSE)
-#endif
-#define nflag   (option_mask32 & OPT_ADDR_NUM)
-
-
-struct globals {
-    /* last inbound (icmp) packet */
-    unsigned char packet[512];
-    struct sockaddr_storage whereto;        /* Who to try to reach */
-    struct sockaddr_storage wherefrom;      /* Who we are */
+    unsigned char recv_pkt[512];    /* last inbound (icmp) packet */
 #if ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE
     /* Maximum number of gateways (include room for one noop) */
@@ -360 +321 @@
 
 #define G (*ptr_to_globals)
-
-#define packet    (G.packet   )
-#define whereto   (G.whereto  )
-#define wherefrom (G.wherefrom)
+#define outip     (G.outip    )
+#define outdata   (G.outdata  )
+#define dest_lsa  (G.dest_lsa )
+#define packlen   (G.packlen  )
+#define pmtu      (G.pmtu     )
+#define ident     (G.ident    )
+#define port      (G.port     )
+#define waittime  (G.waittime )
+#if ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE
+# define optlen   (G.optlen   )
+#endif
+#define recv_pkt  (G.recv_pkt )
 #define gwlist    (G.gwlist   )
-
-
-/*
- * Return the interface list
- */
+#define INIT_G() do { \
+    SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
+    port = 32768 + 666; \
+    waittime = 5; \
+} while (0)
+
+#define outicmp ((struct icmp *)(outip + 1))
+#define outudp  ((struct udphdr *)(outip + 1))
+
+
+/* libbb candidate? tftp uses this idiom too */
+static len_and_sockaddr* dup_sockaddr(const len_and_sockaddr *lsa)
+{
+    len_and_sockaddr *new_lsa = xzalloc(LSA_LEN_SIZE + lsa->len);
+    memcpy(new_lsa, lsa, LSA_LEN_SIZE + lsa->len);
+    return new_lsa;
+}
+
+
 static int
-ifaddrlist(struct IFADDRLIST **ipaddrp)
-{
-    enum { IFREQ_BUFSIZE = (32 * 1024) / sizeof(struct ifreq) };
-
-    int fd, nipaddr;
-#ifdef HAVE_SOCKADDR_SA_LEN
-    int n;
-#endif
-    struct ifreq *ifrp, *ifend, *ifnext;
-    struct sockaddr_in *addr_sin;
-    struct IFADDRLIST *al;
-    struct ifconf ifc;
-    struct ifreq ifr;
-    /* Was on stack, but 32k is a bit too much: */
-    struct ifreq *ibuf = xmalloc(IFREQ_BUFSIZE * sizeof(ibuf[0]));
-    struct IFADDRLIST *st_ifaddrlist;
-
-    fd = xsocket(AF_INET, SOCK_DGRAM, 0);
-
-    ifc.ifc_len = IFREQ_BUFSIZE * sizeof(ibuf[0]);
-    ifc.ifc_buf = (caddr_t)ibuf;
-
-    if (ioctl(fd, SIOCGIFCONF, (char *)&ifc) < 0
-     || ifc.ifc_len < sizeof(struct ifreq)
-    ) {
-        if (errno == EINVAL)
-            bb_error_msg_and_die(
-                "SIOCGIFCONF: ifreq struct too small (%u bytes)",
-                (unsigned)(IFREQ_BUFSIZE * sizeof(ibuf[0])));
-        bb_perror_msg_and_die("SIOCGIFCONF");
-    }
-    ifrp = ibuf;
-    ifend = (struct ifreq *)((char *)ibuf + ifc.ifc_len);
-
-    nipaddr = 1 + (ifc.ifc_len / sizeof(struct ifreq));
-    st_ifaddrlist = xzalloc(nipaddr * sizeof(struct IFADDRLIST));
-    al = st_ifaddrlist;
-    nipaddr = 0;
-
-    for (; ifrp < ifend; ifrp = ifnext) {
-#ifdef HAVE_SOCKADDR_SA_LEN
-        n = ifrp->ifr_addr.sa_len + sizeof(ifrp->ifr_name);
-        if (n < sizeof(*ifrp))
-            ifnext = ifrp + 1;
-        else
-            ifnext = (struct ifreq *)((char *)ifrp + n);
-        if (ifrp->ifr_addr.sa_family != AF_INET)
-            continue;
-#else
-        ifnext = ifrp + 1;
-#endif
-        /*
-         * Need a template to preserve address info that is
-         * used below to locate the next entry.  (Otherwise,
-         * SIOCGIFFLAGS stomps over it because the requests
-         * are returned in a union.)
-         */
-        strncpy(ifr.ifr_name, ifrp->ifr_name, sizeof(ifr.ifr_name));
-        if (ioctl(fd, SIOCGIFFLAGS, (char *)&ifr) < 0) {
-            if (errno == ENXIO)
-                continue;
-            bb_perror_msg_and_die("SIOCGIFFLAGS: %.*s",
-                (int)sizeof(ifr.ifr_name), ifr.ifr_name);
-        }
-
-        /* Must be up */
-        if ((ifr.ifr_flags & IFF_UP) == 0)
-            continue;
-
-        safe_strncpy(al->device, ifr.ifr_name, sizeof(ifr.ifr_name) + 1);
-#ifdef sun
-        /* Ignore sun virtual interfaces */
-        if (strchr(al->device, ':') != NULL)
-            continue;
-#endif
-        ioctl_or_perror_and_die(fd, SIOCGIFADDR, (char *)&ifr,
-                "SIOCGIFADDR: %s", al->device);
-
-        addr_sin = (struct sockaddr_in *)&ifr.ifr_addr;
-        al->addr = addr_sin->sin_addr.s_addr;
-        ++al;
-        ++nipaddr;
-    }
-    if (nipaddr == 0)
-        bb_error_msg_and_die("can't find any network interfaces");
-
-    free(ibuf);
-    close(fd);
-    *ipaddrp = st_ifaddrlist;
-    return nipaddr;
-}
-
-
-static void
-setsin(struct sockaddr_in *addr_sin, uint32_t addr)
-{
-    memset(addr_sin, 0, sizeof(*addr_sin));
-#ifdef HAVE_SOCKADDR_SA_LEN
-    addr_sin->sin_len = sizeof(*addr_sin);
-#endif
-    addr_sin->sin_family = AF_INET;
-    addr_sin->sin_addr.s_addr = addr;
-}
-
-
-/*
- * Return the source address for the given destination address
- */
-static void
-findsaddr(const struct sockaddr_in *to, struct sockaddr_in *from)
-{
-    int i, n;
-    FILE *f;
-    uint32_t mask;
-    uint32_t dest, tmask;
-    struct IFADDRLIST *al;
-    char buf[256], tdevice[256], device[256];
-
-    f = xfopen("/proc/net/route", "r");
-
-    /* Find the appropriate interface */
-    n = 0;
-    mask = 0;
-    device[0] = '\0';
-    while (fgets(buf, sizeof(buf), f) != NULL) {
-        ++n;
-        if (n == 1 && strncmp(buf, "Iface", 5) == 0)
-            continue;
-        i = sscanf(buf, "%255s %x %*s %*s %*s %*s %*s %x",
-                    tdevice, &dest, &tmask);
-        if (i != 3)
-            bb_error_msg_and_die("junk in buffer");
-        if ((to->sin_addr.s_addr & tmask) == dest
-         && (tmask > mask || mask == 0)
-        ) {
-            mask = tmask;
-            strcpy(device, tdevice);
-        }
-    }
-    fclose(f);
-
-    if (device[0] == '\0')
-        bb_error_msg_and_die("can't find interface");
-
-    /* Get the interface address list */
-    n = ifaddrlist(&al);
-
-    /* Find our appropriate source address */
-    for (i = n; i > 0; --i, ++al)
-        if (strcmp(device, al->device) == 0)
-            break;
-    if (i <= 0)
-        bb_error_msg_and_die("can't find interface %s", device);
-
-    setsin(from, al->addr);
-}
-
-/*
-"Usage: %s [-dFIlnrvx] [-g gateway] [-i iface] [-f first_ttl]\n"
-"\t[-m max_ttl] [ -p port] [-q nqueries] [-s src_addr] [-t tos]\n"
-"\t[-w waittime] [-z pausemsecs] host [packetlen]"
-
-*/
-
-static int
-wait_for_reply(int sock, struct sockaddr_in *fromp)
-{
-    fd_set fds;
-    struct timeval tvwait;
-    int cc = 0;
-    socklen_t fromlen = sizeof(*fromp);
-
-    FD_ZERO(&fds);
-    FD_SET(sock, &fds);
-
-    tvwait.tv_sec = waittime;
-    tvwait.tv_usec = 0;
-
-    if (select(sock + 1, &fds, NULL, NULL, &tvwait) > 0)
-        cc = recvfrom(sock, (char *)packet, sizeof(packet), 0,
-                (struct sockaddr *)fromp, &fromlen);
-
-    return cc;
+wait_for_reply(len_and_sockaddr *from_lsa, struct sockaddr *to)
+{
+    struct pollfd pfd[1];
+    int read_len = 0;
+
+    pfd[0].fd = rcvsock;
+    pfd[0].events = POLLIN;
+    if (safe_poll(pfd, 1, waittime * 1000) > 0) {
+        read_len = recv_from_to(rcvsock,
+                recv_pkt, sizeof(recv_pkt),
+                /*flags:*/ 0,
+                &from_lsa->u.sa, to, from_lsa->len);
+    }
+
+    return read_len;
 }
 
@@ -568 +383 @@
 
     /*
-     *  Our algorithm is simple, using a 32 bit accumulator (sum),
-     *  we add sequential 16 bit words to it, and at the end, fold
-     *  back all the carry bits from the top 16 bits into the lower
-     *  16 bits.
+     * Our algorithm is simple, using a 32 bit accumulator (sum),
+     * we add sequential 16 bit words to it, and at the end, fold
+     * back all the carry bits from the top 16 bits into the lower
+     * 16 bits.
      */
-    while (nleft > 1)  {
+    while (nleft > 1) {
         sum += *w++;
         nleft -= 2;
@@ -582 +397 @@
         sum += *(unsigned char *)w;
 
-    /*
-     * add back carry outs from top 16 bits to low 16 bits
-     */
+    /* add back carry outs from top 16 bits to low 16 bits */
     sum = (sum >> 16) + (sum & 0xffff);     /* add hi 16 to low 16 */
     sum += (sum >> 16);                     /* add carry */
@@ -591 +404 @@
 }
 
-
 static void
 send_probe(int seq, int ttl)
 {
-    int cc;
-    struct udpiphdr *ui, *oui;
-    struct ip tip;
-
-    outip->ip_ttl = ttl;
-    outip->ip_id = htons(ident + seq);
-
-    /*
-     * In most cases, the kernel will recalculate the ip checksum.
-     * But we must do it anyway so that the udp checksum comes out
-     * right.
-     */
-    if (doipcksum) {
-        outip->ip_sum =
-            in_cksum((uint16_t *)outip, sizeof(*outip) + optlen);
-        if (outip->ip_sum == 0)
-            outip->ip_sum = 0xffff;
-    }
+    int len, res;
+    void *out;
 
     /* Payload */
-    outdata->seq = seq;
-    outdata->ttl = ttl;
+#if ENABLE_TRACEROUTE6
+    if (dest_lsa->u.sa.sa_family == AF_INET6) {
+        struct outdata6_t *pkt = (struct outdata6_t *) outip;
+        pkt->ident6 = htonl(ident);
+        pkt->seq6   = htonl(seq);
+        /*gettimeofday(&pkt->tv, &tz);*/
+    } else
+#endif
+    {
+        outdata->seq = seq;
+        outdata->ttl = ttl;
 // UNUSED: was storing gettimeofday's result there, but never ever checked it
-    /*memcpy(&outdata->tv, tp, sizeof(outdata->tv));*/
-
-#if ENABLE_FEATURE_TRACEROUTE_USE_ICMP
-    if (useicmp)
-        outicmp->icmp_seq = htons(seq);
-    else
-#endif
-        outudp->dest = htons(port + seq);
-
-#if ENABLE_FEATURE_TRACEROUTE_USE_ICMP
-    if (useicmp) {
-        /* Always calculate checksum for icmp packets */
-        outicmp->icmp_cksum = 0;
-        outicmp->icmp_cksum = in_cksum((uint16_t *)outicmp,
-            packlen - (sizeof(*outip) + optlen));
-        if (outicmp->icmp_cksum == 0)
-            outicmp->icmp_cksum = 0xffff;
-    } else
-#endif
-    if (doipcksum) {
-        /* Checksum (we must save and restore ip header) */
-        tip = *outip;
-        ui = (struct udpiphdr *)outip;
-        oui = (struct udpiphdr *)&tip;
-        /* Easier to zero and put back things that are ok */
-        memset((char *)ui, 0, sizeof(ui->ui_i));
-        ui->ui_src = oui->ui_src;
-        ui->ui_dst = oui->ui_dst;
-        ui->ui_pr = oui->ui_pr;
-        ui->ui_len = outudp->len;
-        outudp->check = 0;
-        outudp->check = in_cksum((uint16_t *)ui, packlen);
-        if (outudp->check == 0)
-            outudp->check = 0xffff;
-        *outip = tip;
-    }
-
-#if ENABLE_FEATURE_TRACEROUTE_VERBOSE
+        /*memcpy(&outdata->tv, tp, sizeof(outdata->tv));*/
+
+        if (option_mask32 & OPT_USE_ICMP) {
+            outicmp->icmp_seq = htons(seq);
+
+            /* Always calculate checksum for icmp packets */
+            outicmp->icmp_cksum = 0;
+            outicmp->icmp_cksum = in_cksum((uint16_t *)outicmp,
+                        packlen - (sizeof(*outip) + optlen));
+            if (outicmp->icmp_cksum == 0)
+                outicmp->icmp_cksum = 0xffff;
+        }
+    }
+
+//BUG! verbose is (x & OPT_VERBOSE), not a counter!
+#if 0 //ENABLE_FEATURE_TRACEROUTE_VERBOSE
     /* XXX undocumented debugging hack */
     if (verbose > 1) {
@@ -680 +463 @@
 #endif
 
-#if !defined(IP_HDRINCL) && defined(IP_TTL)
-    if (setsockopt(sndsock, IPPROTO_IP, IP_TTL,
-        (char *)&ttl, sizeof(ttl)) < 0) {
-        bb_perror_msg_and_die("setsockopt ttl %d", ttl);
-    }
-#endif
-
-    cc = xsendto(sndsock, (char *)outip,
-        packlen, (struct sockaddr *)&whereto, sizeof(whereto));
-    if (cc != packlen)  {
-        bb_info_msg("wrote %s %d chars, ret=%d", hostname, packlen, cc);
-    }
+#if ENABLE_TRACEROUTE6
+    if (dest_lsa->u.sa.sa_family == AF_INET6) {
+        res = setsockopt(sndsock, SOL_IPV6, IPV6_UNICAST_HOPS, &ttl, sizeof(ttl));
+        if (res < 0)
+            bb_perror_msg_and_die("setsockopt UNICAST_HOPS %d", ttl);
+        out = outip;
+        len = packlen;
+    } else
+#endif
+    {
+#if defined IP_TTL
+        res = setsockopt(sndsock, IPPROTO_IP, IP_TTL, &ttl, sizeof(ttl));
+        if (res < 0)
+            bb_perror_msg_and_die("setsockopt ttl %d", ttl);
+#endif
+        out = outicmp;
+        len = packlen - sizeof(*outip);
+        if (!(option_mask32 & OPT_USE_ICMP)) {
+            out = outdata;
+            len -= sizeof(*outudp);
+            set_nport(dest_lsa, htons(port + seq));
+        }
+    }
+
+    res = xsendto(sndsock, out, len, &dest_lsa->u.sa, dest_lsa->len);
+    if (res != len)
+        bb_info_msg("sent %d octets, ret=%d", len, res);
 }
 
@@ -698 +496 @@
  * Convert an ICMP "type" field to a printable string.
  */
-static inline const char *
+static const char *
 pr_type(unsigned char t)
 {
@@ -708 +506 @@
     "Info Reply",   "Mask Request", "Mask Reply"
     };
-
-    if (t > 18)
+# if ENABLE_TRACEROUTE6
+    static const char *const ttab6[] = {
+[0] "Error", "Dest Unreachable", "Packet Too Big", "Time Exceeded",
+[4] "Param Problem",
+[8] "Echo Request", "Echo Reply", "Membership Query", "Membership Report",
+[12]    "Membership Reduction", "Router Solicit", "Router Advert", "Neighbor Solicit",
+[16]    "Neighbor Advert", "Redirect",
+    };
+
+    if (dest_lsa->u.sa.sa_family == AF_INET6) {
+        if (t < 5)
+            return ttab6[t];
+        if (t < 128 || t > ND_REDIRECT)
+            return "OUT-OF-RANGE";
+        return ttab6[(t & 63) + 8];
+    }
+# endif
+    if (t >= ARRAY_SIZE(ttab))
         return "OUT-OF-RANGE";
 
@@ -716 +530 @@
 #endif
 
+#if !ENABLE_FEATURE_TRACEROUTE_VERBOSE
+#define packet4_ok(read_len, from, seq) \
+    packet4_ok(read_len, seq)
+#endif
 static int
-packet_ok(unsigned char *buf, int cc, struct sockaddr_in *from, int seq)
-{
-    struct icmp *icp;
+packet4_ok(int read_len, const struct sockaddr_in *from, int seq)
+{
+    const struct icmp *icp;
     unsigned char type, code;
     int hlen;
-    struct ip *ip;
-
-    ip = (struct ip *) buf;
+    const struct ip *ip;
+
+    ip = (struct ip *) recv_pkt;
     hlen = ip->ip_hl << 2;
-    if (cc < hlen + ICMP_MINLEN) {
+    if (read_len < hlen + ICMP_MINLEN) {
 #if ENABLE_FEATURE_TRACEROUTE_VERBOSE
         if (verbose)
-            printf("packet too short (%d bytes) from %s\n", cc,
+            printf("packet too short (%d bytes) from %s\n", read_len,
                 inet_ntoa(from->sin_addr));
 #endif
         return 0;
     }
-    cc -= hlen;
-    icp = (struct icmp *)(buf + hlen);
+    read_len -= hlen;
+    icp = (struct icmp *)(recv_pkt + hlen);
     type = icp->icmp_type;
     code = icp->icmp_code;
     /* Path MTU Discovery (RFC1191) */
-    if (code != ICMP_UNREACH_NEEDFRAG)
-        pmtu = 0;
-    else {
+    pmtu = 0;
+    if (code == ICMP_UNREACH_NEEDFRAG)
         pmtu = ntohs(icp->icmp_nextmtu);
-    }
-    if ((type == ICMP_TIMXCEED && code == ICMP_TIMXCEED_INTRANS) ||
-        type == ICMP_UNREACH || type == ICMP_ECHOREPLY) {
-        struct ip *hip;
-        struct udphdr *up;
+
+    if ((type == ICMP_TIMXCEED && code == ICMP_TIMXCEED_INTRANS)
+     || type == ICMP_UNREACH
+     || type == ICMP_ECHOREPLY
+    ) {
+        const struct ip *hip;
+        const struct udphdr *up;
 
         hip = &icp->icmp_ip;
         hlen = hip->ip_hl << 2;
-#if ENABLE_FEATURE_TRACEROUTE_USE_ICMP
-        if (useicmp) {
+        if (option_mask32 & OPT_USE_ICMP) {
             struct icmp *hicmp;
 
             /* XXX */
-            if (type == ICMP_ECHOREPLY &&
-                icp->icmp_id == htons(ident) &&
-                icp->icmp_seq == htons(seq))
-                return -2;
+            if (type == ICMP_ECHOREPLY
+             && icp->icmp_id == htons(ident)
+             && icp->icmp_seq == htons(seq)
+            ) {
+                return ICMP_UNREACH_PORT+1;
+            }
 
             hicmp = (struct icmp *)((unsigned char *)hip + hlen);
-            /* XXX 8 is a magic number */
-            if (hlen + 8 <= cc &&
-                hip->ip_p == IPPROTO_ICMP &&
-                hicmp->icmp_id == htons(ident) &&
-                hicmp->icmp_seq == htons(seq))
+            if (hlen + SIZEOF_ICMP_HDR <= read_len
+             && hip->ip_p == IPPROTO_ICMP
+             && hicmp->icmp_id == htons(ident)
+             && hicmp->icmp_seq == htons(seq)
+            ) {
                 return (type == ICMP_TIMXCEED ? -1 : code + 1);
-        } else
-#endif
-        {
-            up = (struct udphdr *)((unsigned char *)hip + hlen);
-            /* XXX 8 is a magic number */
-            if (hlen + 12 <= cc &&
-                hip->ip_p == IPPROTO_UDP &&
-                up->source == htons(ident) &&
-                up->dest == htons(port + seq))
+            }
+        } else {
+            up = (struct udphdr *)((char *)hip + hlen);
+            if (hlen + 12 <= read_len
+             && hip->ip_p == IPPROTO_UDP
+// Off: since we do not form the entire IP packet,
+// but defer it to kernel, we can't set source port,
+// and thus can't check it here in the reply
+            /* && up->source == htons(ident) */
+             && up->dest == htons(port + seq)
+            ) {
                 return (type == ICMP_TIMXCEED ? -1 : code + 1);
+            }
         }
     }
@@ -787 +610 @@
         printf("\n%d bytes from %s to "
                "%s: icmp type %d (%s) code %d\n",
-            cc, inet_ntoa(from->sin_addr),
-            inet_ntoa(ip->ip_dst), type, pr_type(type), icp->icmp_code);
-        for (i = 4; i < cc; i += sizeof(*lp))
+            read_len, inet_ntoa(from->sin_addr),
+            inet_ntoa(ip->ip_dst),
+            type, pr_type(type), icp->icmp_code);
+        for (i = 4; i < read_len; i += sizeof(*lp))
             printf("%2d: x%8.8x\n", i, *lp++);
     }
@@ -796 +620 @@
 }
 
+#if ENABLE_TRACEROUTE6
+# if !ENABLE_FEATURE_TRACEROUTE_VERBOSE
+#define packet_ok(read_len, from_lsa, to, seq) \
+    packet_ok(read_len, from_lsa, seq)
+# endif
+static int
+packet_ok(int read_len, len_and_sockaddr *from_lsa,
+            struct sockaddr *to,
+            int seq)
+{
+    const struct icmp6_hdr *icp;
+    unsigned char type, code;
+
+    if (from_lsa->u.sa.sa_family == AF_INET)
+        return packet4_ok(read_len, &from_lsa->u.sin, seq);
+
+    icp = (struct icmp6_hdr *) recv_pkt;
+
+    type = icp->icmp6_type;
+    code = icp->icmp6_code;
+
+    if ((type == ICMP6_TIME_EXCEEDED && code == ICMP6_TIME_EXCEED_TRANSIT)
+     || type == ICMP6_DST_UNREACH
+    ) {
+        struct ip6_hdr *hip;
+        struct udphdr *up;
+        int nexthdr;
+
+        hip = (struct ip6_hdr *)(icp + 1);
+        up  = (struct udphdr *) (hip + 1);
+        nexthdr = hip->ip6_nxt;
+
+        if (nexthdr == IPPROTO_FRAGMENT) {
+            nexthdr = *(unsigned char*)up;
+            up++;
+        }
+        if (nexthdr == IPPROTO_UDP) {
+            struct outdata6_t *pkt;
+
+            pkt = (struct outdata6_t *) (up + 1);
+
+            if (ntohl(pkt->ident6) == ident
+             && ntohl(pkt->seq6) == seq
+            ) {
+                return (type == ICMP6_TIME_EXCEEDED ? -1 : (code<<8)+1);
+            }
+        }
+    }
+
+# if ENABLE_FEATURE_TRACEROUTE_VERBOSE
+    if (verbose) {
+        unsigned char *p;
+        char pa1[MAXHOSTNAMELEN];
+        char pa2[MAXHOSTNAMELEN];
+        int i;
+
+        p = (unsigned char *) (icp + 1);
+
+        printf("\n%d bytes from %s to "
+               "%s: icmp type %d (%s) code %d\n",
+            read_len,
+            inet_ntop(AF_INET6, &from_lsa->u.sin6.sin6_addr, pa1, sizeof(pa1)),
+            inet_ntop(AF_INET6, &((struct sockaddr_in6*)to)->sin6_addr, pa2, sizeof(pa2)),
+            type, pr_type(type), icp->icmp6_code);
+
+        read_len -= sizeof(struct icmp6_hdr);
+        for (i = 0; i < read_len ; i++) {
+            if (i % 16 == 0)
+                printf("%04x:", i);
+            if (i % 4 == 0)
+                bb_putchar(' ');
+            printf("%02x", p[i]);
+            if ((i % 16 == 15) && (i + 1 < read_len))
+                bb_putchar('\n');
+        }
+        bb_putchar('\n');
+    }
+# endif
+
+    return 0;
+}
+#else /* !ENABLE_TRACEROUTE6 */
+static ALWAYS_INLINE int
+packet_ok(int read_len,
+        len_and_sockaddr *from_lsa IF_NOT_FEATURE_TRACEROUTE_VERBOSE(UNUSED_PARAM),
+        struct sockaddr *to UNUSED_PARAM,
+        int seq)
+{
+    return packet4_ok(read_len, &from_lsa->u.sin, seq);
+}
+#endif
 
 /*
  * Construct an Internet address representation.
- * If the nflag has been supplied, give
+ * If the -n flag has been supplied, give
  * numeric value, otherwise try for symbolic name.
  */
-static inline void
-print_inetname(struct sockaddr_in *from)
-{
-    const char *ina;
-
-    ina = inet_ntoa(from->sin_addr);
-    if (nflag)
-        printf(" %s", ina);
-    else {
+static void
+print_inetname(const struct sockaddr *from)
+{
+    char *ina = xmalloc_sockaddr2dotted_noport(from);
+
+    if (option_mask32 & OPT_ADDR_NUM) {
+        printf("  %s", ina);
+    } else {
         char *n = NULL;
-        if (from->sin_addr.s_addr != INADDR_ANY)
+
+        if (from->sa_family != AF_INET
+         || ((struct sockaddr_in*)from)->sin_addr.s_addr != INADDR_ANY
+        ) {
+            /* Try to reverse resolve if it is not 0.0.0.0 */
             n = xmalloc_sockaddr2host_noport((struct sockaddr*)from);
-        printf(" %s (%s)", (n ? n : ina), ina);
+        }
+        printf("  %s (%s)", (n ? n : ina), ina);
         free(n);
     }
-}
-
-static inline void
-print(unsigned char *buf, int cc, struct sockaddr_in *from)
-{
-    struct ip *ip;
-    int hlen;
-
-    ip = (struct ip *) buf;
-    hlen = ip->ip_hl << 2;
-    cc -= hlen;
-
+    free(ina);
+}
+
+static void
+print(int read_len, const struct sockaddr *from, const struct sockaddr *to)
+{
     print_inetname(from);
-#if ENABLE_FEATURE_TRACEROUTE_VERBOSE
-    if (verbose)
-        printf(" %d bytes to %s", cc, inet_ntoa(ip->ip_dst));
-#endif
-}
-
-
-static struct hostinfo *
-gethostinfo(const char *host)
-{
-    int n;
-    struct hostent *hp;
-    struct hostinfo *hi;
-    char **p;
-    uint32_t addr, *ap;
-
-    hi = xzalloc(sizeof(*hi));
-    addr = inet_addr(host);
-    if (addr != 0xffffffff) {
-        hi->name = xstrdup(host);
-        hi->n = 1;
-        hi->addrs = xzalloc(sizeof(hi->addrs[0]));
-        hi->addrs[0] = addr;
-        return hi;
-    }
-
-    hp = xgethostbyname(host);
-    if (hp->h_addrtype != AF_INET || hp->h_length != 4)
-        bb_perror_msg_and_die("bad host %s", host);
-    hi->name = xstrdup(hp->h_name);
-    for (n = 0, p = hp->h_addr_list; *p != NULL; ++n, ++p)
-        continue;
-    hi->n = n;
-    hi->addrs = xzalloc(n * sizeof(hi->addrs[0]));
-    for (ap = hi->addrs, p = hp->h_addr_list; *p != NULL; ++ap, ++p)
-        memcpy(ap, *p, sizeof(*ap));
-    return hi;
-}
-
-static void
-freehostinfo(struct hostinfo *hi)
-{
-    free(hi->name);
-    free(hi->addrs);
-    free(hi);
-}
-
-#if ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE
-static void
-getaddr(uint32_t *ap, const char *host)
-{
-    struct hostinfo *hi;
-
-    hi = gethostinfo(host);
-    *ap = hi->addrs[0];
-    freehostinfo(hi);
-}
-#endif
+
+    if (verbose) {
+        char *ina = xmalloc_sockaddr2dotted_noport(to);
+#if ENABLE_TRACEROUTE6
+        if (to->sa_family == AF_INET6) {
+            read_len -= sizeof(struct ip6_hdr);
+        } else
+#endif
+        {
+            read_len -= ((struct ip*)recv_pkt)->ip_hl << 2;
+        }
+        printf(" %d bytes to %s", read_len, ina);
+        free(ina);
+    }
+}
 
 static void
@@ -893 +763 @@
 {
     unsigned tt = t2p - t1p;
-    printf("  %u.%03u ms", tt/1000, tt%1000);
-}
-
-int traceroute_main(int argc, char **argv);
-int traceroute_main(int argc, char **argv)
-{
-    int code, n;
-    unsigned char *outp;
-    uint32_t *ap;
-    struct sockaddr_in *from;
-    struct sockaddr_in *to;
-    struct hostinfo *hi;
-    int ttl, probe, i;
-    int seq = 0;
+    printf("  %u.%03u ms", tt / 1000, tt % 1000);
+}
+
+/*
+ * Usage: [-dFIlnrvx] [-g gateway] [-i iface] [-f first_ttl]
+ * [-m max_ttl] [ -p port] [-q nqueries] [-s src_addr] [-t tos]
+ * [-w waittime] [-z pausemsecs] host [packetlen]"
+ */
+static int
+common_traceroute_main(int op, char **argv)
+{
+    int i;
+    int minpacket;
     int tos = 0;
+    int max_ttl = 30;
+    int nprobes = 3;
+    int first_ttl = 1;
+    unsigned pausemsecs = 0;
+    char *source;
+    char *device;
     char *tos_str;
-    char *source;
-    unsigned op;
-#if ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE
-    int lsrr = 0;
-#endif
-    uint16_t off = 0;
-    struct IFADDRLIST *al;
-    char *device;
-    int max_ttl = 30;
     char *max_ttl_str;
     char *port_str;
-    int nprobes = 3;
     char *nprobes_str;
     char *waittime_str;
-    unsigned pausemsecs = 0;
     char *pausemsecs_str;
-    int first_ttl = 1;
     char *first_ttl_str;
 #if ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE
     llist_t *source_route_list = NULL;
-#endif
-
-    PTR_TO_GLOBALS = xzalloc(sizeof(G));
-    from = (struct sockaddr_in *)&wherefrom;
-    to = (struct sockaddr_in *)&whereto;
-
-    //opterr = 0;
-#if ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE
-    opt_complementary = "x-x:g::";
+    int lsrr = 0;
+#endif
+#if ENABLE_TRACEROUTE6
+    sa_family_t af;
 #else
-    opt_complementary = "x-x";
-#endif
-
-    op = getopt32(argv, "FIlnrdvxt:i:m:p:q:s:w:z:f:"
-#if ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE
-                    "g:"
-#endif
+    enum { af = AF_INET };
+#endif
+    int ttl;
+    int seq;
+    len_and_sockaddr *from_lsa;
+    struct sockaddr *lastaddr;
+    struct sockaddr *to;
+
+    INIT_G();
+
+    /* minimum 1 arg */
+    opt_complementary = "-1:x-x" IF_FEATURE_TRACEROUTE_SOURCE_ROUTE(":g::");
+    op |= getopt32(argv, OPT_STRING
         , &tos_str, &device, &max_ttl_str, &port_str, &nprobes_str
         , &source, &waittime_str, &pausemsecs_str, &first_ttl_str
@@ -952 +816 @@
 #endif
     );
-
-    if (op & OPT_DONT_FRAGMNT)
-        off = IP_DF;
-    if (op & OPT_IP_CHKSUM) {
-        doipcksum = 0;
+    argv += optind;
+
+#if 0 /* IGNORED */
+    if (op & OPT_IP_CHKSUM)
         bb_error_msg("warning: ip checksums disabled");
-    }
+#endif
     if (op & OPT_TOS)
         tos = xatou_range(tos_str, 0, 255);
@@ -972 +835 @@
          * probe (e.g., on a multi-homed host).
          */
-        if (getuid())
-            bb_error_msg_and_die("-s %s: permission denied", source);
+        if (getuid() != 0)
+            bb_error_msg_and_die(bb_msg_you_must_be_root);
     }
     if (op & OPT_WAITTIME)
-        waittime = xatou_range(waittime_str, 2, 24 * 60 * 60);
+        waittime = xatou_range(waittime_str, 1, 24 * 60 * 60);
     if (op & OPT_PAUSE_MS)
         pausemsecs = xatou_range(pausemsecs_str, 0, 60 * 60 * 1000);
     if (op & OPT_FIRST_TTL)
-        first_ttl = xatou_range(first_ttl_str, 1, 255);
+        first_ttl = xatou_range(first_ttl_str, 1, max_ttl);
 
 #if ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE
     if (source_route_list) {
-        llist_t *l_sr;
-
-        l_sr = source_route_list;
-        while (l_sr) {
+        while (source_route_list) {
+            len_and_sockaddr *lsa;
+
             if (lsrr >= NGATEWAYS)
                 bb_error_msg_and_die("no more than %d gateways", NGATEWAYS);
-            getaddr(gwlist + lsrr, l_sr->data);
+            lsa = xhost_and_af2sockaddr(llist_pop(&source_route_list), 0, AF_INET);
+            gwlist[lsrr] = lsa->u.sin.sin_addr.s_addr;
+            free(lsa);
             ++lsrr;
-            l_sr = l_sr->link;
-            free(source_route_list);
-            source_route_list = l_sr;
         }
         optlen = (lsrr + 1) * sizeof(gwlist[0]);
@@ -1000 +861 @@
 #endif
 
-    if (first_ttl > max_ttl) {
-        bb_error_msg_and_die(
-            "first ttl (%d) may not be greater than max ttl (%d)",
-            first_ttl, max_ttl);
-    }
-
-    minpacket = sizeof(*outip) + sizeof(*outdata) + optlen;
-
-#if ENABLE_FEATURE_TRACEROUTE_USE_ICMP
-    if (useicmp)
-        minpacket += 8;                 /* XXX magic number */
-    else
-#endif
-        minpacket += sizeof(*outudp);
-    packlen = minpacket;                    /* minimum sized packet */
-
     /* Process destination and optional packet size */
-    switch (argc - optind) {
-
-    case 2:
-        packlen = xatoul_range(argv[optind + 1], minpacket, maxpacket);
-        /* Fall through */
-
-    case 1:
-        hostname = argv[optind];
-        hi = gethostinfo(hostname);
-        setsin(to, hi->addrs[0]);
-        if (hi->n > 1)
-            bb_error_msg("warning: %s has multiple addresses; using %s",
-                hostname, inet_ntoa(to->sin_addr));
-        hostname = hi->name;
-        hi->name = NULL;
-        freehostinfo(hi);
-        break;
-
-    default:
-        bb_show_usage();
-    }
+    minpacket = sizeof(*outip) + SIZEOF_ICMP_HDR + sizeof(*outdata) + optlen;
+    if (!(op & OPT_USE_ICMP))
+        minpacket += sizeof(*outudp) - SIZEOF_ICMP_HDR;
+#if ENABLE_TRACEROUTE6
+    af = AF_UNSPEC;
+    if (op & OPT_IPV4)
+        af = AF_INET;
+    if (op & OPT_IPV6)
+        af = AF_INET6;
+    dest_lsa = xhost_and_af2sockaddr(argv[0], port, af);
+    af = dest_lsa->u.sa.sa_family;
+    if (af == AF_INET6)
+        minpacket = sizeof(struct outdata6_t);
+#else
+    dest_lsa = xhost2sockaddr(argv[0], port);
+#endif
+    packlen = minpacket;
+    if (argv[1])
+        packlen = xatoul_range(argv[1], minpacket, 32 * 1024);
 
     /* Ensure the socket fds won't be 0, 1 or 2 */
     bb_sanitize_stdio();
 
-    s = xsocket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
+#if ENABLE_TRACEROUTE6
+    if (af == AF_INET6) {
+        xmove_fd(xsocket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6), rcvsock);
+# ifdef IPV6_RECVPKTINFO
+        setsockopt(rcvsock, SOL_IPV6, IPV6_RECVPKTINFO,
+                &const_int_1, sizeof(const_int_1));
+        setsockopt(rcvsock, SOL_IPV6, IPV6_2292PKTINFO,
+                &const_int_1, sizeof(const_int_1));
+# else
+        setsockopt(rcvsock, SOL_IPV6, IPV6_PKTINFO,
+                &const_int_1, sizeof(const_int_1));
+# endif
+    } else
+#endif
+    {
+        xmove_fd(xsocket(AF_INET, SOCK_RAW, IPPROTO_ICMP), rcvsock);
+    }
 
 #if TRACEROUTE_SO_DEBUG
     if (op & OPT_DEBUG)
-        setsockopt(s, SOL_SOCKET, SO_DEBUG,
+        setsockopt(rcvsock, SOL_SOCKET, SO_DEBUG,
                 &const_int_1, sizeof(const_int_1));
 #endif
     if (op & OPT_BYPASS_ROUTE)
-        setsockopt(s, SOL_SOCKET, SO_DONTROUTE,
+        setsockopt(rcvsock, SOL_SOCKET, SO_DONTROUTE,
                 &const_int_1, sizeof(const_int_1));
 
-    sndsock = xsocket(AF_INET, SOCK_RAW, IPPROTO_RAW);
-
-#if ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE
-#if defined(IP_OPTIONS)
-    if (lsrr > 0) {
-        unsigned char optlist[MAX_IPOPTLEN];
-
-        /* final hop */
-        gwlist[lsrr] = to->sin_addr.s_addr;
-        ++lsrr;
-
-        /* force 4 byte alignment */
-        optlist[0] = IPOPT_NOP;
-        /* loose source route option */
-        optlist[1] = IPOPT_LSRR;
-        i = lsrr * sizeof(gwlist[0]);
-        optlist[2] = i + 3;
-        /* Pointer to LSRR addresses */
-        optlist[3] = IPOPT_MINOFF;
-        memcpy(optlist + 4, gwlist, i);
-
-        if ((setsockopt(sndsock, IPPROTO_IP, IP_OPTIONS,
-            (char *)optlist, i + sizeof(gwlist[0]))) < 0) {
-            bb_perror_msg_and_die("IP_OPTIONS");
-        }
-    }
-#endif /* IP_OPTIONS */
-#endif /* CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE */
+#if ENABLE_TRACEROUTE6
+    if (af == AF_INET6) {
+        static const int two = 2;
+        if (setsockopt(rcvsock, SOL_RAW, IPV6_CHECKSUM, &two, sizeof(two)) < 0)
+            bb_perror_msg_and_die("setsockopt RAW_CHECKSUM");
+        xmove_fd(xsocket(af, SOCK_DGRAM, 0), sndsock);
+    } else
+#endif
+    {
+        if (op & OPT_USE_ICMP)
+            xmove_fd(xsocket(AF_INET, SOCK_RAW, IPPROTO_ICMP), sndsock);
+        else
+            xmove_fd(xsocket(AF_INET, SOCK_DGRAM, 0), sndsock);
+#if ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE && defined IP_OPTIONS
+        if (lsrr > 0) {
+            unsigned char optlist[MAX_IPOPTLEN];
+
+            /* final hop */
+            gwlist[lsrr] = dest_lsa->u.sin.sin_addr.s_addr;
+            ++lsrr;
+
+            /* force 4 byte alignment */
+            optlist[0] = IPOPT_NOP;
+            /* loose source route option */
+            optlist[1] = IPOPT_LSRR;
+            i = lsrr * sizeof(gwlist[0]);
+            optlist[2] = i + 3;
+            /* pointer to LSRR addresses */
+            optlist[3] = IPOPT_MINOFF;
+            memcpy(optlist + 4, gwlist, i);
+
+            if (setsockopt(sndsock, IPPROTO_IP, IP_OPTIONS,
+                    (char *)optlist, i + sizeof(gwlist[0])) < 0) {
+                bb_perror_msg_and_die("IP_OPTIONS");
+            }
+        }
+#endif
+    }
 
 #ifdef SO_SNDBUF
@@ -1087 +956 @@
     }
 #endif
-#ifdef IP_HDRINCL
-    if (setsockopt(sndsock, IPPROTO_IP, IP_HDRINCL, &const_int_1, sizeof(const_int_1)) < 0
-     && errno != ENOPROTOOPT
-    ) {
-        bb_perror_msg_and_die("IP_HDRINCL");
-    }
-#else
 #ifdef IP_TOS
-    if (tos_str && setsockopt(sndsock, IPPROTO_IP, IP_TOS, &tos, sizeof(tos)) < 0) {
+    if ((op & OPT_TOS) && setsockopt(sndsock, IPPROTO_IP, IP_TOS, &tos, sizeof(tos)) < 0) {
         bb_perror_msg_and_die("setsockopt tos %d", tos);
     }
 #endif
+#ifdef IP_DONTFRAG
+    if (op & OPT_DONT_FRAGMNT)
+        setsockopt(sndsock, IPPROTO_IP, IP_DONTFRAG,
+                &const_int_1, sizeof(const_int_1));
 #endif
 #if TRACEROUTE_SO_DEBUG
@@ -1109 +975 @@
                 &const_int_1, sizeof(const_int_1));
 
+    outip = xzalloc(packlen);
+
+    ident = getpid();
+
+    if (af == AF_INET) {
+        if (op & OPT_USE_ICMP) {
+            ident |= 0x8000;
+            outicmp->icmp_type = ICMP_ECHO;
+            outicmp->icmp_id = htons(ident);
+            outdata = (struct outdata_t *)((char *)outicmp + SIZEOF_ICMP_HDR);
+        } else {
+            outdata = (struct outdata_t *)(outudp + 1);
+        }
+    }
+
+    if (op & OPT_DEVICE) /* hmm, do we need error check? */
+        setsockopt_bindtodevice(sndsock, device);
+
+    if (op & OPT_SOURCE) {
+#if ENABLE_TRACEROUTE6
+// TODO: need xdotted_and_af2sockaddr?
+        len_and_sockaddr *source_lsa = xhost_and_af2sockaddr(source, 0, af);
+#else
+        len_and_sockaddr *source_lsa = xdotted2sockaddr(source, 0);
+#endif
+        /* Ping4 does this (why?) */
+        if (af == AF_INET)
+            if (setsockopt(sndsock, IPPROTO_IP, IP_MULTICAST_IF,
+                    &source_lsa->u.sa, source_lsa->len))
+                bb_error_msg_and_die("can't set multicast source interface");
+//TODO: we can query source port we bound to,
+// and check it in replies... if we care enough
+        xbind(sndsock, &source_lsa->u.sa, source_lsa->len);
+        free(source_lsa);
+    }
+#if ENABLE_TRACEROUTE6
+    else if (af == AF_INET6) {
+//TODO: why we don't do it for IPv4?
+        len_and_sockaddr *source_lsa;
+
+        int probe_fd = xsocket(af, SOCK_DGRAM, 0);
+        if (op & OPT_DEVICE)
+            setsockopt_bindtodevice(probe_fd, device);
+        set_nport(dest_lsa, htons(1025));
+        /* dummy connect. makes kernel pick source IP (and port) */
+        xconnect(probe_fd, &dest_lsa->u.sa, dest_lsa->len);
+        set_nport(dest_lsa, htons(port));
+
+        /* read IP and port */
+        source_lsa = get_sock_lsa(probe_fd);
+        if (source_lsa == NULL)
+            bb_error_msg_and_die("can't get probe addr");
+
+        close(probe_fd);
+
+        /* bind our sockets to this IP (but not port) */
+        set_nport(source_lsa, 0);
+        xbind(sndsock, &source_lsa->u.sa, source_lsa->len);
+        xbind(rcvsock, &source_lsa->u.sa, source_lsa->len);
+
+        free(source_lsa);
+    }
+#endif
+
     /* Revert to non-privileged user after opening sockets */
     xsetgid(getgid());
     xsetuid(getuid());
 
-    outip = xzalloc(packlen);
-
-    outip->ip_v = IPVERSION;
-    if (tos_str)
-        outip->ip_tos = tos;
-    outip->ip_len = htons(packlen);
-    outip->ip_off = htons(off);
-    outp = (unsigned char *)(outip + 1);
-    outip->ip_dst = to->sin_addr;
-
-    outip->ip_hl = (outp - (unsigned char *)outip) >> 2;
-    ident = (getpid() & 0xffff) | 0x8000;
-#if ENABLE_FEATURE_TRACEROUTE_USE_ICMP
-    if (useicmp) {
-        outip->ip_p = IPPROTO_ICMP;
-        outicmp = (struct icmp *)outp;
-        outicmp->icmp_type = ICMP_ECHO;
-        outicmp->icmp_id = htons(ident);
-        outdata = (struct outdata *)(outp + 8); /* XXX magic number */
-    } else
-#endif
-    {
-        outip->ip_p = IPPROTO_UDP;
-        outudp = (struct udphdr *)outp;
-        outudp->source = htons(ident);
-        outudp->len = htons((uint16_t)(packlen - (sizeof(*outip) + optlen)));
-        outdata = (struct outdata *)(outudp + 1);
-    }
-
-    /* Get the interface address list */
-    n = ifaddrlist(&al);
-
-    /* Look for a specific device */
-    if (op & OPT_DEVICE) {
-        for (i = n; i > 0; --i, ++al)
-            if (strcmp(device, al->device) == 0)
-                goto found_dev;
-        bb_error_msg_and_die("can't find interface %s", device);
-    }
- found_dev:
-
-    /* Determine our source address */
-    if (!(op & OPT_SOURCE)) {
-        /*
-         * If a device was specified, use the interface address.
-         * Otherwise, try to determine our source address.
-         */
-        if (op & OPT_DEVICE)
-            setsin(from, al->addr);
-        findsaddr(to, from);
-    } else {
-        hi = gethostinfo(source);
-        source = hi->name;
-        hi->name = NULL;
-        /*
-         * If the device was specified make sure it
-         * corresponds to the source address specified.
-         * Otherwise, use the first address (and warn if
-         * there are more than one).
-         */
-        if (op & OPT_DEVICE) {
-            for (i = hi->n, ap = hi->addrs; i > 0; --i, ++ap)
-                if (*ap == al->addr)
-                    goto found_dev2;
-            bb_error_msg_and_die("%s is not on interface %s",
-                    source, device);
- found_dev2:
-            setsin(from, *ap);
-        } else {
-            setsin(from, hi->addrs[0]);
-            if (hi->n > 1)
-                bb_error_msg(
-            "warning: %s has multiple addresses; using %s",
-                    source, inet_ntoa(from->sin_addr));
-        }
-        freehostinfo(hi);
-    }
-
-    outip->ip_src = from->sin_addr;
-#ifndef IP_HDRINCL
-    xbind(sndsock, (struct sockaddr *)from, sizeof(*from));
-#endif
-
-    printf("traceroute to %s (%s)", hostname, inet_ntoa(to->sin_addr));
+    printf("traceroute to %s (%s)", argv[0],
+            xmalloc_sockaddr2dotted_noport(&dest_lsa->u.sa));
     if (op & OPT_SOURCE)
         printf(" from %s", source);
     printf(", %d hops max, %d byte packets\n", max_ttl, packlen);
-    fflush(stdout);
-
+
+    from_lsa = dup_sockaddr(dest_lsa);
+    lastaddr = xzalloc(dest_lsa->len);
+    to = xzalloc(dest_lsa->len);
+    seq = 0;
     for (ttl = first_ttl; ttl <= max_ttl; ++ttl) {
-        uint32_t lastaddr = 0;
-        int gotlastaddr = 0;
+        int probe;
+        int unreachable = 0; /* counter */
+        int gotlastaddr = 0; /* flags */
         int got_there = 0;
-        int unreachable = 0;
-        int sentfirst = 0;
-
-        printf("%2d ", ttl);
+        int first = 1;
+
+        printf("%2d", ttl);
         for (probe = 0; probe < nprobes; ++probe) {
-            int cc;
+            int read_len;
             unsigned t1;
             unsigned t2;
             struct ip *ip;
 
-            if (sentfirst && pausemsecs > 0)
+            if (!first && pausemsecs > 0)
                 usleep(pausemsecs * 1000);
+            fflush_all();
+
             t1 = monotonic_us();
             send_probe(++seq, ttl);
-            ++sentfirst;
-            while ((cc = wait_for_reply(s, from)) != 0) {
+
+            first = 0;
+            while ((read_len = wait_for_reply(from_lsa, to)) != 0) {
                 t2 = monotonic_us();
-                i = packet_ok(packet, cc, from, seq);
+                i = packet_ok(read_len, from_lsa, to, seq);
                 /* Skip short packet */
                 if (i == 0)
                     continue;
-                if (!gotlastaddr ||
-                    from->sin_addr.s_addr != lastaddr) {
-                    print(packet, cc, from);
-                    lastaddr = from->sin_addr.s_addr;
-                    ++gotlastaddr;
+
+                if (!gotlastaddr
+                 || (memcmp(lastaddr, &from_lsa->u.sa, from_lsa->len) != 0)
+                ) {
+                    print(read_len, &from_lsa->u.sa, to);
+                    memcpy(lastaddr, &from_lsa->u.sa, from_lsa->len);
+                    gotlastaddr = 1;
                 }
+
                 print_delta_ms(t1, t2);
-                ip = (struct ip *)packet;
-                if (op & OPT_TTL_FLAG)
-                    printf(" (%d)", ip->ip_ttl);
-                if (i == -2) {
-                    if (ip->ip_ttl <= 1)
-                        printf(" !");
-                    ++got_there;
-                    break;
-                }
+                ip = (struct ip *)recv_pkt;
+
+                if (from_lsa->u.sa.sa_family == AF_INET)
+                    if (op & OPT_TTL_FLAG)
+                        printf(" (%d)", ip->ip_ttl);
+
                 /* time exceeded in transit */
                 if (i == -1)
                     break;
-                code = i - 1;
-                switch (code) {
-
+                i--;
+                switch (i) {
+#if ENABLE_TRACEROUTE6
+                case ICMP6_DST_UNREACH_NOPORT << 8:
+                    got_there = 1;
+                    break;
+#endif
                 case ICMP_UNREACH_PORT:
                     if (ip->ip_ttl <= 1)
                         printf(" !");
-                    ++got_there;
+                    got_there = 1;
                     break;
 
                 case ICMP_UNREACH_NET:
+#if ENABLE_TRACEROUTE6 && (ICMP6_DST_UNREACH_NOROUTE != ICMP_UNREACH_NET)
+                case ICMP6_DST_UNREACH_NOROUTE << 8:
+#endif
+                    printf(" !N");
                     ++unreachable;
-                    printf(" !N");
-                    break;
-
+                    break;
                 case ICMP_UNREACH_HOST:
+#if ENABLE_TRACEROUTE6
+                case ICMP6_DST_UNREACH_ADDR << 8:
+#endif
+                    printf(" !H");
                     ++unreachable;
-                    printf(" !H");
-                    break;
-
+                    break;
                 case ICMP_UNREACH_PROTOCOL:
-                    ++got_there;
                     printf(" !P");
-                    break;
-
+                    got_there = 1;
+                    break;
                 case ICMP_UNREACH_NEEDFRAG:
+                    printf(" !F-%d", pmtu);
                     ++unreachable;
-                    printf(" !F-%d", pmtu);
-                    break;
-
+                    break;
                 case ICMP_UNREACH_SRCFAIL:
+#if ENABLE_TRACEROUTE6
+                case ICMP6_DST_UNREACH_ADMIN << 8:
+#endif
+                    printf(" !S");
                     ++unreachable;
-                    printf(" !S");
-                    break;
-
+                    break;
                 case ICMP_UNREACH_FILTER_PROHIB:
                 case ICMP_UNREACH_NET_PROHIB:   /* misuse */
+                    printf(" !A");
                     ++unreachable;
-                    printf(" !A");
-                    break;
-
+                    break;
                 case ICMP_UNREACH_HOST_PROHIB:
+                    printf(" !C");
                     ++unreachable;
+                    break;
+                case ICMP_UNREACH_HOST_PRECEDENCE:
+                    printf(" !V");
+                    ++unreachable;
+                    break;
+                case ICMP_UNREACH_PRECEDENCE_CUTOFF:
                     printf(" !C");
-                    break;
-
-                case ICMP_UNREACH_HOST_PRECEDENCE:
                     ++unreachable;
-                    printf(" !V");
-                    break;
-
-                case ICMP_UNREACH_PRECEDENCE_CUTOFF:
-                    ++unreachable;
-                    printf(" !C");
-                    break;
-
+                    break;
                 case ICMP_UNREACH_NET_UNKNOWN:
                 case ICMP_UNREACH_HOST_UNKNOWN:
+                    printf(" !U");
                     ++unreachable;
-                    printf(" !U");
-                    break;
-
+                    break;
                 case ICMP_UNREACH_ISOLATED:
+                    printf(" !I");
                     ++unreachable;
-                    printf(" !I");
-                    break;
-
+                    break;
                 case ICMP_UNREACH_TOSNET:
                 case ICMP_UNREACH_TOSHOST:
+                    printf(" !T");
                     ++unreachable;
-                    printf(" !T");
-                    break;
-
+                    break;
                 default:
+                    printf(" !<%d>", i);
                     ++unreachable;
-                    printf(" !<%d>", code);
                     break;
                 }
                 break;
             }
-            if (cc == 0)
-                printf(" *");
-            (void)fflush(stdout);
-        }
-        putchar('\n');
-        if (got_there ||
-            (unreachable > 0 && unreachable >= nprobes - 1))
+            /* there was no packet at all? */
+            if (read_len == 0)
+                printf("  *");
+        }
+        bb_putchar('\n');
+        if (got_there
+         || (unreachable > 0 && unreachable >= nprobes - 1)
+        ) {
             break;
-    }
+        }
+    }
+
     return 0;
 }
+
+int traceroute_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int traceroute_main(int argc UNUSED_PARAM, char **argv)
+{
+    return common_traceroute_main(0, argv);
+}
+
+#if ENABLE_TRACEROUTE6
+int traceroute6_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int traceroute6_main(int argc UNUSED_PARAM, char **argv)
+{
+    return common_traceroute_main(OPT_IPV6, argv);
+}
+#endif

branches/2.2.9/mindi-busybox/networking/udhcp/Config.in

@@ +1 @@
+# DO NOT EDIT. This file is generated from Config.src
 #
 # For a description of the syntax of this configuration file,
@@ -4 +5 @@
 #
 
-config APP_UDHCPD
-    bool "udhcp Server (udhcpd)"
-    default n
+
+
+config UDHCPD
+    bool "udhcp server (udhcpd)"
+    default y
+    depends on PLATFORM_LINUX
     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 APP_DHCPRELAY
+config DHCPRELAY
     bool "dhcprelay"
-    default n
-    depends on APP_UDHCPD
+    default y
+    depends on UDHCPD
     help
       dhcprelay listens for dhcp requests on one or more interfaces
@@ -22 +24 @@
       server.
 
-config APP_DUMPLEASES
+config DUMPLEASES
     bool "Lease display utility (dumpleases)"
-    default n
-    depends on APP_UDHCPD
+    default y
+    depends on UDHCPD
     help
       dumpleases displays the leases written out by the udhcpd server.
@@ -31 +33 @@
       by the absolute time that it expires in seconds from epoch.
 
-      See http://udhcp.busybox.net for further details.
-
 config FEATURE_UDHCPD_WRITE_LEASES_EARLY
     bool "Rewrite the lease file at every new acknowledge"
-    default n
-    depends on APP_UDHCPD
+    default y
+    depends on 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 APP_UDHCPC
-    bool "udhcp Client (udhcpc)"
-    default n
+config DHCPD_LEASES_FILE
+    string "Absolute path to lease file"
+    default "/var/lib/misc/udhcpd.leases"
+    depends on UDHCPD
     help
-      uDHCPc is a DHCP client geared primarily toward embedded systems,
+      udhcpd stores addresses in a lease file. This is the absolute path
+      of the file. Normally it is safe to leave it untouched.
+
+config UDHCPC
+    bool "udhcp client (udhcpc)"
+    default y
+    depends on PLATFORM_LINUX
+    help
+      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 FEATURE_UDHCPC_ARPING
+    bool "Verify that the offered address is free, using ARP ping"
+    default y
+    depends on 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 FEATURE_UDHCP_DEBUG
-    bool "Compile udhcp with noisy debugging messages"
-    default n
-    depends on APP_UDHCPD || APP_UDHCPC
+config FEATURE_UDHCP_PORT
+    bool "Enable '-P port' option for udhcpd and udhcpc"
+    default y
+    depends on UDHCPD || 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.
 
-      See http://udhcp.busybox.net for further details.
+config UDHCP_DEBUG
+    int "Maximum verbosity level for udhcp applets (0..9)"
+    default 9
+    range 0 9
+    depends on UDHCPD || UDHCPC || DHCPRELAY
+    help
+      Verbosity can be increased with multiple -v options.
+      This option controls how high it can be cranked up.
 
-config FEATURE_RFC3397
+      Bigger values result in bigger code. Levels above 1
+      are very verbose and useful for debugging only.
+
+config FEATURE_UDHCP_RFC3397
     bool "Support for RFC3397 domain search (experimental)"
-    default n
-    depends on APP_UDHCPD || APP_UDHCPC
+    default y
+    depends on UDHCPD || UDHCPC
     help
       If selected, both client and server will support passing of domain
-      search lists via option 119, specified in RFC3397.
+      search lists via option 119, specified in RFC 3397,
+      and SIP servers option 120, specified in RFC 3361.
+
+config UDHCPC_DEFAULT_SCRIPT
+    string "Absolute path to config script"
+    default "/usr/share/udhcpc/default.script"
+    depends on 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 UDHCPC_SLACK_FOR_BUGGY_SERVERS
+    int "DHCP options slack buffer size"
+    default 80
+    range 0 924
+    depends on UDHCPD || 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.

branches/2.2.9/mindi-busybox/networking/udhcp/Kbuild

@@ +1 @@
+# DO NOT EDIT. This file is generated from Kbuild.src
 # Makefile for busybox
 #
 # Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 #
-# Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+# Licensed under GPLv2 or later, see file LICENSE in this source tree.
 #
 
 lib-y:=
-lib-$(CONFIG_APP_UDHCPC)        += common.o options.o packet.o \
-                                   signalpipe.o socket.o
-lib-$(CONFIG_APP_UDHCPD)        += common.o options.o packet.o \
-                                   signalpipe.o socket.o
-lib-$(CONFIG_APP_UDHCPC)        += dhcpc.o clientpacket.o clientsocket.o \
-                                   script.o
-lib-$(CONFIG_APP_UDHCPD)        += dhcpd.o arpping.o files.o leases.o \
-                                   serverpacket.o static_leases.o
-lib-$(CONFIG_APP_DUMPLEASES)    += dumpleases.o
-lib-$(CONFIG_APP_DHCPRELAY)     += dhcprelay.o
-lib-$(CONFIG_FEATURE_RFC3397)   += domain_codec.o
+
+
+
+lib-$(CONFIG_UDHCPC)     += common.o packet.o signalpipe.o socket.o
+lib-$(CONFIG_UDHCPD)     += common.o packet.o signalpipe.o socket.o
+
+lib-$(CONFIG_UDHCPC)     += dhcpc.o
+lib-$(CONFIG_UDHCPD)     += dhcpd.o arpping.o files.o leases.o static_leases.o
+lib-$(CONFIG_DUMPLEASES) += dumpleases.o
+lib-$(CONFIG_DHCPRELAY)  += dhcprelay.o
+
+lib-$(CONFIG_FEATURE_UDHCPC_ARPING) += arpping.o
+lib-$(CONFIG_FEATURE_UDHCP_RFC3397) += domain_codec.o

branches/2.2.9/mindi-busybox/networking/udhcp/arpping.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * arpping.c
- *
  * Mostly stolen from: dhcpcd - DHCP client daemon
  * by Yoichi Hariguchi <yoichi@fore.com>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-
 #include <netinet/if_ether.h>
 #include <net/if_arp.h>
@@ -12 +11 @@
 #include "common.h"
 #include "dhcpd.h"
-
 
 struct arpMsg {
@@ -31 +29 @@
     uint8_t  tInaddr[4];    /* 26 target's IP address */
     uint8_t  pad[18];       /* 2a pad for min. ethernet payload (60 bytes) */
-} ATTRIBUTE_PACKED;
+} PACKED;
 
+enum {
+    ARP_MSG_SIZE = 0x2a
+};
 
 /* Returns 1 if no reply received */
-
-int arpping(uint32_t test_ip, uint32_t from_ip, uint8_t *from_mac, const char *interface)
+int FAST_FUNC arpping(uint32_t test_nip,
+        const uint8_t *safe_mac,
+        uint32_t from_ip,
+        uint8_t *from_mac,
+        const char *interface)
 {
-    int timeout = 2;
-    int s;                  /* socket */
+    int timeout_ms;
+    struct pollfd pfd[1];
+#define s (pfd[0].fd)           /* socket */
     int rv = 1;             /* "no reply received" yet */
     struct sockaddr addr;   /* for interface name */
     struct arpMsg arp;
-    fd_set fdset;
-    struct timeval tm;
-    unsigned prevTime;
 
     s = socket(PF_PACKET, SOCK_PACKET, htons(ETH_P_ARP));
@@ -54 +56 @@
 
     if (setsockopt_broadcast(s) == -1) {
-        bb_perror_msg("cannot setsocketopt on raw socket");
+        bb_perror_msg("can't enable bcast on raw socket");
         goto ret;
     }
@@ -70 +72 @@
     memcpy(arp.sHaddr, from_mac, 6);                /* source hardware address */
     memcpy(arp.sInaddr, &from_ip, sizeof(from_ip)); /* source IP address */
-    /* tHaddr */                                    /* target hardware address */
-    memcpy(arp.tInaddr, &test_ip, sizeof(test_ip)); /* target IP address */
+    /* tHaddr is zero-filled */                     /* target hardware address */
+    memcpy(arp.tInaddr, &test_nip, sizeof(test_nip));/* target IP address */
 
     memset(&addr, 0, sizeof(addr));
     safe_strncpy(addr.sa_data, interface, sizeof(addr.sa_data));
-    if (sendto(s, &arp, sizeof(arp), 0, &addr, sizeof(addr)) < 0)
+    if (sendto(s, &arp, sizeof(arp), 0, &addr, sizeof(addr)) < 0) {
+        // TODO: error message? caller didn't expect us to fail,
+        // just returning 1 "no reply received" misleads it.
         goto ret;
+    }
 
     /* wait for arp reply, and check it */
+    timeout_ms = 2000;
     do {
+        typedef uint32_t aliased_uint32_t FIX_ALIASING;
         int r;
-        prevTime = monotonic_sec();
-        FD_ZERO(&fdset);
-        FD_SET(s, &fdset);
-        tm.tv_sec = timeout;
-        tm.tv_usec = 0;
-        r = select(s + 1, &fdset, NULL, NULL, &tm);
-        if (r < 0) {
-            bb_perror_msg("error on ARPING request");
-            if (errno != EINTR)
+        unsigned prevTime = monotonic_ms();
+
+        pfd[0].events = POLLIN;
+        r = safe_poll(pfd, 1, timeout_ms);
+        if (r < 0)
+            break;
+        if (r) {
+            r = safe_read(s, &arp, sizeof(arp));
+            if (r < 0)
                 break;
-        } else if (r) {
-            if (recv(s, &arp, sizeof(arp), 0) < 0)
-                break;
-            if (arp.operation == htons(ARPOP_REPLY)
-             && memcmp(arp.tHaddr, from_mac, 6) == 0
-             && *((uint32_t *) arp.sInaddr) == test_ip
+
+            //log3("sHaddr %02x:%02x:%02x:%02x:%02x:%02x",
+            //  arp.sHaddr[0], arp.sHaddr[1], arp.sHaddr[2],
+            //  arp.sHaddr[3], arp.sHaddr[4], arp.sHaddr[5]);
+
+            if (r >= ARP_MSG_SIZE
+             && arp.operation == htons(ARPOP_REPLY)
+             /* don't check it: Linux doesn't return proper tHaddr (fixed in 2.6.24?) */
+             /* && memcmp(arp.tHaddr, from_mac, 6) == 0 */
+             && *(aliased_uint32_t*)arp.sInaddr == test_nip
             ) {
-                rv = 0;
+                /* if ARP source MAC matches safe_mac
+                 * (which is client's MAC), then it's not a conflict
+                 * (client simply already has this IP and replies to ARPs!)
+                 */
+                if (!safe_mac || memcmp(safe_mac, arp.sHaddr, 6) != 0)
+                    rv = 0;
+                //else log2("sHaddr == safe_mac");
                 break;
             }
         }
-        timeout -= monotonic_sec() - prevTime;
-    } while (timeout > 0);
+        timeout_ms -= (unsigned)monotonic_ms() - prevTime;
+    } while (timeout_ms > 0);
 
  ret:
     close(s);
-    DEBUG("%srp reply received for this address", rv ? "No a" : "A");
+    log1("%srp reply received for this address", rv ? "No a" : "A");
     return rv;
 }

branches/2.2.9/mindi-busybox/networking/udhcp/common.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
-/* common.c
+/*
+ * Rewrite by Russ Dill <Russ.Dill@asu.edu> July 2001
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-
 #include "common.h"
+
+#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1
+unsigned dhcp_verbose;
+#endif
 
 const uint8_t MAC_BCAST_ADDR[6] ALIGN2 = {
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff
 };
+
+/* Supported options are easily added here.
+ * See RFC2132 for more options.
+ * OPTION_REQ: these options are requested by udhcpc (unless -o).
+ */
+const struct dhcp_optflag dhcp_optflags[] = {
+    /* flags                                    code */
+    { OPTION_IP                   | OPTION_REQ, 0x01 }, /* DHCP_SUBNET        */
+    { OPTION_S32                              , 0x02 }, /* DHCP_TIME_OFFSET   */
+    { OPTION_IP | OPTION_LIST     | OPTION_REQ, 0x03 }, /* DHCP_ROUTER        */
+//  { OPTION_IP | OPTION_LIST                 , 0x04 }, /* DHCP_TIME_SERVER   */
+//  { OPTION_IP | OPTION_LIST                 , 0x05 }, /* DHCP_NAME_SERVER   */
+    { OPTION_IP | OPTION_LIST     | OPTION_REQ, 0x06 }, /* DHCP_DNS_SERVER    */
+//  { OPTION_IP | OPTION_LIST                 , 0x07 }, /* DHCP_LOG_SERVER    */
+//  { OPTION_IP | OPTION_LIST                 , 0x08 }, /* DHCP_COOKIE_SERVER */
+    { OPTION_IP | OPTION_LIST                 , 0x09 }, /* DHCP_LPR_SERVER    */
+    { OPTION_STRING               | OPTION_REQ, 0x0c }, /* DHCP_HOST_NAME     */
+    { OPTION_U16                              , 0x0d }, /* DHCP_BOOT_SIZE     */
+    { OPTION_STRING               | OPTION_REQ, 0x0f }, /* DHCP_DOMAIN_NAME   */
+    { OPTION_IP                               , 0x10 }, /* DHCP_SWAP_SERVER   */
+    { OPTION_STRING                           , 0x11 }, /* DHCP_ROOT_PATH     */
+    { OPTION_U8                               , 0x17 }, /* DHCP_IP_TTL        */
+    { OPTION_U16                              , 0x1a }, /* DHCP_MTU           */
+    { OPTION_IP                   | OPTION_REQ, 0x1c }, /* DHCP_BROADCAST     */
+    { OPTION_IP_PAIR | OPTION_LIST            , 0x21 }, /* DHCP_ROUTES        */
+    { OPTION_STRING                           , 0x28 }, /* DHCP_NIS_DOMAIN    */
+    { OPTION_IP | OPTION_LIST                 , 0x29 }, /* DHCP_NIS_SERVER    */
+    { OPTION_IP | OPTION_LIST     | OPTION_REQ, 0x2a }, /* DHCP_NTP_SERVER    */
+    { OPTION_IP | OPTION_LIST                 , 0x2c }, /* DHCP_WINS_SERVER   */
+    { OPTION_U32                              , 0x33 }, /* DHCP_LEASE_TIME    */
+    { OPTION_IP                               , 0x36 }, /* DHCP_SERVER_ID     */
+    { OPTION_STRING                           , 0x38 }, /* DHCP_ERR_MESSAGE   */
+//TODO: must be combined with 'sname' and 'file' handling:
+    { OPTION_STRING                           , 0x42 }, /* DHCP_TFTP_SERVER_NAME */
+    { OPTION_STRING                           , 0x43 }, /* DHCP_BOOT_FILE     */
+//TODO: not a string, but a set of LASCII strings:
+//  { OPTION_STRING                           , 0x4D }, /* DHCP_USER_CLASS    */
+#if ENABLE_FEATURE_UDHCP_RFC3397
+    { OPTION_DNS_STRING | OPTION_LIST         , 0x77 }, /* DHCP_DOMAIN_SEARCH */
+    { OPTION_SIP_SERVERS                      , 0x78 }, /* DHCP_SIP_SERVERS   */
+#endif
+    { OPTION_STATIC_ROUTES                    , 0x79 }, /* DHCP_STATIC_ROUTES */
+    { OPTION_STATIC_ROUTES                    , 0xf9 }, /* DHCP_MS_STATIC_ROUTES */
+    { OPTION_STRING                           , 0xfc }, /* DHCP_WPAD          */
+
+    /* Options below have no match in dhcp_option_strings[],
+     * are not passed to dhcpc scripts, and cannot be specified
+     * with "option XXX YYY" syntax in dhcpd config file.
+     * These entries are only used internally by udhcp[cd]
+     * to correctly encode options into packets.
+     */
+
+    { OPTION_IP                               , 0x32 }, /* DHCP_REQUESTED_IP  */
+    { OPTION_U8                               , 0x35 }, /* DHCP_MESSAGE_TYPE  */
+    { OPTION_U16                              , 0x39 }, /* DHCP_MAX_SIZE      */
+//looks like these opts will work just fine even without these defs:
+//  { OPTION_STRING                           , 0x3c }, /* DHCP_VENDOR        */
+//  /* not really a string: */
+//  { OPTION_STRING                           , 0x3d }, /* DHCP_CLIENT_ID     */
+    { 0, 0 } /* zeroed terminating entry */
+};
+
+/* Used for converting options from incoming packets to env variables
+ * for udhcpc stript, and for setting options for udhcpd via
+ * "opt OPTION_NAME OPTION_VALUE" directives in udhcpd.conf file.
+ */
+/* Must match dhcp_optflags[] order */
+const char dhcp_option_strings[] ALIGN1 =
+    "subnet" "\0"      /* DHCP_SUBNET         */
+    "timezone" "\0"    /* DHCP_TIME_OFFSET    */
+    "router" "\0"      /* DHCP_ROUTER         */
+//  "timesrv" "\0"     /* DHCP_TIME_SERVER    */
+//  "namesrv" "\0"     /* DHCP_NAME_SERVER    */
+    "dns" "\0"         /* DHCP_DNS_SERVER     */
+//  "logsrv" "\0"      /* DHCP_LOG_SERVER     */
+//  "cookiesrv" "\0"   /* DHCP_COOKIE_SERVER  */
+    "lprsrv" "\0"      /* DHCP_LPR_SERVER     */
+    "hostname" "\0"    /* DHCP_HOST_NAME      */
+    "bootsize" "\0"    /* DHCP_BOOT_SIZE      */
+    "domain" "\0"      /* DHCP_DOMAIN_NAME    */
+    "swapsrv" "\0"     /* DHCP_SWAP_SERVER    */
+    "rootpath" "\0"    /* DHCP_ROOT_PATH      */
+    "ipttl" "\0"       /* DHCP_IP_TTL         */
+    "mtu" "\0"         /* DHCP_MTU            */
+    "broadcast" "\0"   /* DHCP_BROADCAST      */
+    "routes" "\0"      /* DHCP_ROUTES         */
+    "nisdomain" "\0"   /* DHCP_NIS_DOMAIN     */
+    "nissrv" "\0"      /* DHCP_NIS_SERVER     */
+    "ntpsrv" "\0"      /* DHCP_NTP_SERVER     */
+    "wins" "\0"        /* DHCP_WINS_SERVER    */
+    "lease" "\0"       /* DHCP_LEASE_TIME     */
+    "serverid" "\0"    /* DHCP_SERVER_ID      */
+    "message" "\0"     /* DHCP_ERR_MESSAGE    */
+    "tftp" "\0"        /* DHCP_TFTP_SERVER_NAME */
+    "bootfile" "\0"    /* DHCP_BOOT_FILE      */
+//  "userclass" "\0"   /* DHCP_USER_CLASS     */
+#if ENABLE_FEATURE_UDHCP_RFC3397
+    "search" "\0"      /* DHCP_DOMAIN_SEARCH  */
+// doesn't work in udhcpd.conf since OPTION_SIP_SERVERS
+// is not handled yet by "string->option" conversion code:
+    "sipsrv" "\0"      /* DHCP_SIP_SERVERS    */
+#endif
+// doesn't work in udhcpd.conf since OPTION_STATIC_ROUTES
+// is not handled yet by "string->option" conversion code:
+    "staticroutes" "\0"/* DHCP_STATIC_ROUTES  */
+    "msstaticroutes""\0"/* DHCP_MS_STATIC_ROUTES */
+    "wpad" "\0"        /* DHCP_WPAD           */
+    ;
+
+/* Lengths of the option types in binary form.
+ * Used by:
+ * udhcp_str2optset: to determine how many bytes to allocate.
+ * xmalloc_optname_optval: to estimate string length
+ * from binary option length: (option[LEN] / dhcp_option_lengths[opt_type])
+ * is the number of elements, multiply in by one element's string width
+ * (len_of_option_as_string[opt_type]) and you know how wide string you need.
+ */
+const uint8_t dhcp_option_lengths[] ALIGN1 = {
+    [OPTION_IP] =      4,
+    [OPTION_IP_PAIR] = 8,
+//  [OPTION_BOOLEAN] = 1,
+    [OPTION_STRING] =  1,  /* ignored by udhcp_str2optset */
+#if ENABLE_FEATURE_UDHCP_RFC3397
+    [OPTION_DNS_STRING] = 1,  /* ignored by both udhcp_str2optset and xmalloc_optname_optval */
+    [OPTION_SIP_SERVERS] = 1,
+#endif
+    [OPTION_U8] =      1,
+    [OPTION_U16] =     2,
+//  [OPTION_S16] =     2,
+    [OPTION_U32] =     4,
+    [OPTION_S32] =     4,
+    /* Just like OPTION_STRING, we use minimum length here */
+    [OPTION_STATIC_ROUTES] = 5,
+};
+
+
+#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 2
+static void log_option(const char *pfx, const uint8_t *opt)
+{
+    if (dhcp_verbose >= 2) {
+        char buf[256 * 2 + 2];
+        *bin2hex(buf, (void*) (opt + OPT_DATA), opt[OPT_LEN]) = '\0';
+        bb_info_msg("%s: 0x%02x %s", pfx, opt[OPT_CODE], buf);
+    }
+}
+#else
+# define log_option(pfx, opt) ((void)0)
+#endif
+
+unsigned FAST_FUNC udhcp_option_idx(const char *name)
+{
+    int n = index_in_strings(dhcp_option_strings, name);
+    if (n >= 0)
+        return n;
+
+    {
+        char buf[sizeof(dhcp_option_strings)];
+        char *d = buf;
+        const char *s = dhcp_option_strings;
+        while (s < dhcp_option_strings + sizeof(dhcp_option_strings) - 2) {
+            *d++ = (*s == '\0' ? ' ' : *s);
+            s++;
+        }
+        *d = '\0';
+        bb_error_msg_and_die("unknown option '%s', known options: %s", name, buf);
+    }
+}
+
+/* Get an option with bounds checking (warning, result is not aligned) */
+uint8_t* FAST_FUNC udhcp_get_option(struct dhcp_packet *packet, int code)
+{
+    uint8_t *optionptr;
+    int len;
+    int rem;
+    int overload = 0;
+    enum {
+        FILE_FIELD101  = FILE_FIELD  * 0x101,
+        SNAME_FIELD101 = SNAME_FIELD * 0x101,
+    };
+
+    /* option bytes: [code][len][data1][data2]..[dataLEN] */
+    optionptr = packet->options;
+    rem = sizeof(packet->options);
+    while (1) {
+        if (rem <= 0) {
+            bb_error_msg("bad packet, malformed option field");
+            return NULL;
+        }
+        if (optionptr[OPT_CODE] == DHCP_PADDING) {
+            rem--;
+            optionptr++;
+            continue;
+        }
+        if (optionptr[OPT_CODE] == DHCP_END) {
+            if ((overload & FILE_FIELD101) == FILE_FIELD) {
+                /* can use packet->file, and didn't look at it yet */
+                overload |= FILE_FIELD101; /* "we looked at it" */
+                optionptr = packet->file;
+                rem = sizeof(packet->file);
+                continue;
+            }
+            if ((overload & SNAME_FIELD101) == SNAME_FIELD) {
+                /* can use packet->sname, and didn't look at it yet */
+                overload |= SNAME_FIELD101; /* "we looked at it" */
+                optionptr = packet->sname;
+                rem = sizeof(packet->sname);
+                continue;
+            }
+            break;
+        }
+        len = 2 + optionptr[OPT_LEN];
+        rem -= len;
+        if (rem < 0)
+            continue; /* complain and return NULL */
+
+        if (optionptr[OPT_CODE] == code) {
+            log_option("Option found", optionptr);
+            return optionptr + OPT_DATA;
+        }
+
+        if (optionptr[OPT_CODE] == DHCP_OPTION_OVERLOAD) {
+            overload |= optionptr[OPT_DATA];
+            /* fall through */
+        }
+        optionptr += len;
+    }
+
+    /* log3 because udhcpc uses it a lot - very noisy */
+    log3("Option 0x%02x not found", code);
+    return NULL;
+}
+
+/* Return the position of the 'end' option (no bounds checking) */
+int FAST_FUNC udhcp_end_option(uint8_t *optionptr)
+{
+    int i = 0;
+
+    while (optionptr[i] != DHCP_END) {
+        if (optionptr[i] != DHCP_PADDING)
+            i += optionptr[i + OPT_LEN] + OPT_DATA-1;
+        i++;
+    }
+    return i;
+}
+
+/* Add an option (supplied in binary form) to the options.
+ * Option format: [code][len][data1][data2]..[dataLEN]
+ */
+void FAST_FUNC udhcp_add_binary_option(struct dhcp_packet *packet, uint8_t *addopt)
+{
+    unsigned len;
+    uint8_t *optionptr = packet->options;
+    unsigned end = udhcp_end_option(optionptr);
+
+    len = OPT_DATA + addopt[OPT_LEN];
+    /* end position + (option code/length + addopt length) + end option */
+    if (end + len + 1 >= DHCP_OPTIONS_BUFSIZE) {
+//TODO: learn how to use overflow option if we exhaust packet->options[]
+        bb_error_msg("option 0x%02x did not fit into the packet",
+                addopt[OPT_CODE]);
+        return;
+    }
+    log_option("Adding option", addopt);
+    memcpy(optionptr + end, addopt, len);
+    optionptr[end + len] = DHCP_END;
+}
+
+/* Add an one to four byte option to a packet */
+void FAST_FUNC udhcp_add_simple_option(struct dhcp_packet *packet, uint8_t code, uint32_t data)
+{
+    const struct dhcp_optflag *dh;
+
+    for (dh = dhcp_optflags; dh->code; dh++) {
+        if (dh->code == code) {
+            uint8_t option[6], len;
+
+            option[OPT_CODE] = code;
+            len = dhcp_option_lengths[dh->flags & OPTION_TYPE_MASK];
+            option[OPT_LEN] = len;
+            if (BB_BIG_ENDIAN)
+                data <<= 8 * (4 - len);
+            /* Assignment is unaligned! */
+            move_to_unaligned32(&option[OPT_DATA], data);
+            udhcp_add_binary_option(packet, option);
+            return;
+        }
+    }
+
+    bb_error_msg("can't add option 0x%02x", code);
+}
+
+/* Find option 'code' in opt_list */
+struct option_set* FAST_FUNC udhcp_find_option(struct option_set *opt_list, uint8_t code)
+{
+    while (opt_list && opt_list->data[OPT_CODE] < code)
+        opt_list = opt_list->next;
+
+    if (opt_list && opt_list->data[OPT_CODE] == code)
+        return opt_list;
+    return NULL;
+}
+
+/* Parse string to IP in network order */
+int FAST_FUNC udhcp_str2nip(const char *str, void *arg)
+{
+    len_and_sockaddr *lsa;
+
+    lsa = host_and_af2sockaddr(str, 0, AF_INET);
+    if (!lsa)
+        return 0;
+    *(uint32_t*)arg = lsa->u.sin.sin_addr.s_addr;
+    free(lsa);
+    return 1;
+}
+
+/* udhcp_str2optset:
+ * Parse string option representation to binary form and add it to opt_list.
+ * Called to parse "udhcpc -x OPTNAME:OPTVAL"
+ * and to parse udhcpd.conf's "opt OPTNAME OPTVAL" directives.
+ */
+/* helper for the helper */
+static char *allocate_tempopt_if_needed(
+        const struct dhcp_optflag *optflag,
+        char *buffer,
+        int *length_p)
+{
+    char *allocated = NULL;
+    if ((optflag->flags & OPTION_TYPE_MASK) == OPTION_BIN) {
+        const char *end;
+        allocated = xstrdup(buffer); /* more than enough */
+        end = hex2bin(allocated, buffer, 255);
+        if (errno)
+            bb_error_msg_and_die("malformed hex string '%s'", buffer);
+        *length_p = end - allocated;
+    }
+    return allocated;
+}
+/* helper: add an option to the opt_list */
+static NOINLINE void attach_option(
+        struct option_set **opt_list,
+        const struct dhcp_optflag *optflag,
+        char *buffer,
+        int length)
+{
+    struct option_set *existing, *new, **curr;
+    char *allocated = NULL;
+
+    existing = udhcp_find_option(*opt_list, optflag->code);
+    if (!existing) {
+        log2("Attaching option %02x to list", optflag->code);
+        allocated = allocate_tempopt_if_needed(optflag, buffer, &length);
+#if ENABLE_FEATURE_UDHCP_RFC3397
+        if ((optflag->flags & OPTION_TYPE_MASK) == OPTION_DNS_STRING) {
+            /* reuse buffer and length for RFC1035-formatted string */
+            allocated = buffer = (char *)dname_enc(NULL, 0, buffer, &length);
+        }
+#endif
+        /* make a new option */
+        new = xmalloc(sizeof(*new));
+        new->data = xmalloc(length + OPT_DATA);
+        new->data[OPT_CODE] = optflag->code;
+        new->data[OPT_LEN] = length;
+        memcpy(new->data + OPT_DATA, (allocated ? allocated : buffer), length);
+
+        curr = opt_list;
+        while (*curr && (*curr)->data[OPT_CODE] < optflag->code)
+            curr = &(*curr)->next;
+
+        new->next = *curr;
+        *curr = new;
+        goto ret;
+    }
+
+    if (optflag->flags & OPTION_LIST) {
+        unsigned old_len;
+
+        /* add it to an existing option */
+        log2("Attaching option %02x to existing member of list", optflag->code);
+        allocated = allocate_tempopt_if_needed(optflag, buffer, &length);
+        old_len = existing->data[OPT_LEN];
+#if ENABLE_FEATURE_UDHCP_RFC3397
+        if ((optflag->flags & OPTION_TYPE_MASK) == OPTION_DNS_STRING) {
+            /* reuse buffer and length for RFC1035-formatted string */
+            allocated = buffer = (char *)dname_enc(existing->data + OPT_DATA, old_len, buffer, &length);
+        }
+#endif
+        if (old_len + length < 255) {
+            /* actually 255 is ok too, but adding a space can overlow it */
+
+            existing->data = xrealloc(existing->data, OPT_DATA + 1 + old_len + length);
+            if ((optflag->flags & OPTION_TYPE_MASK) == OPTION_STRING) {
+                /* add space separator between STRING options in a list */
+                existing->data[OPT_DATA + old_len] = ' ';
+                old_len++;
+            }
+            memcpy(existing->data + OPT_DATA + old_len, buffer, length);
+            existing->data[OPT_LEN] = old_len + length;
+        } /* else, ignore the data, we could put this in a second option in the future */
+    } /* else, ignore the new data */
+
+ ret:
+    free(allocated);
+}
+
+int FAST_FUNC udhcp_str2optset(const char *const_str, void *arg)
+{
+    struct option_set **opt_list = arg;
+    char *opt, *val, *endptr;
+    char *str;
+    const struct dhcp_optflag *optflag;
+    struct dhcp_optflag bin_optflag;
+    unsigned optcode;
+    int retval, length;
+    char buffer[8] ALIGNED(4);
+    uint16_t *result_u16 = (uint16_t *) buffer;
+    uint32_t *result_u32 = (uint32_t *) buffer;
+
+    /* Cheat, the only *const* str possible is "" */
+    str = (char *) const_str;
+    opt = strtok(str, " \t=");
+    if (!opt)
+        return 0;
+
+    optcode = bb_strtou(opt, NULL, 0);
+    if (!errno && optcode < 255) {
+        /* Raw (numeric) option code */
+        bin_optflag.flags = OPTION_BIN;
+        bin_optflag.code = optcode;
+        optflag = &bin_optflag;
+    } else {
+        optflag = &dhcp_optflags[udhcp_option_idx(opt)];
+    }
+
+    retval = 0;
+    do {
+        val = strtok(NULL, ", \t");
+        if (!val)
+            break;
+        length = dhcp_option_lengths[optflag->flags & OPTION_TYPE_MASK];
+        retval = 0;
+        opt = buffer; /* new meaning for variable opt */
+        switch (optflag->flags & OPTION_TYPE_MASK) {
+        case OPTION_IP:
+            retval = udhcp_str2nip(val, buffer);
+            break;
+        case OPTION_IP_PAIR:
+            retval = udhcp_str2nip(val, buffer);
+            val = strtok(NULL, ", \t/-");
+            if (!val)
+                retval = 0;
+            if (retval)
+                retval = udhcp_str2nip(val, buffer + 4);
+            break;
+        case OPTION_STRING:
+#if ENABLE_FEATURE_UDHCP_RFC3397
+        case OPTION_DNS_STRING:
+#endif
+            length = strnlen(val, 254);
+            if (length > 0) {
+                opt = val;
+                retval = 1;
+            }
+            break;
+//      case OPTION_BOOLEAN: {
+//          static const char no_yes[] ALIGN1 = "no\0yes\0";
+//          buffer[0] = retval = index_in_strings(no_yes, val);
+//          retval++; /* 0 - bad; 1: "no" 2: "yes" */
+//          break;
+//      }
+        case OPTION_U8:
+            buffer[0] = strtoul(val, &endptr, 0);
+            retval = (endptr[0] == '\0');
+            break;
+        /* htonX are macros in older libc's, using temp var
+         * in code below for safety */
+        /* TODO: use bb_strtoX? */
+        case OPTION_U16: {
+            unsigned long tmp = strtoul(val, &endptr, 0);
+            *result_u16 = htons(tmp);
+            retval = (endptr[0] == '\0' /*&& tmp < 0x10000*/);
+            break;
+        }
+//      case OPTION_S16: {
+//          long tmp = strtol(val, &endptr, 0);
+//          *result_u16 = htons(tmp);
+//          retval = (endptr[0] == '\0');
+//          break;
+//      }
+        case OPTION_U32: {
+            unsigned long tmp = strtoul(val, &endptr, 0);
+            *result_u32 = htonl(tmp);
+            retval = (endptr[0] == '\0');
+            break;
+        }
+        case OPTION_S32: {
+            long tmp = strtol(val, &endptr, 0);
+            *result_u32 = htonl(tmp);
+            retval = (endptr[0] == '\0');
+            break;
+        }
+        case OPTION_BIN: /* handled in attach_option() */
+            opt = val;
+            retval = 1;
+        default:
+            break;
+        }
+        if (retval)
+            attach_option(opt_list, optflag, opt, length);
+    } while (retval && optflag->flags & OPTION_LIST);
+
+    return retval;
+}

branches/2.2.9/mindi-busybox/networking/udhcp/common.h

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
-/* common.h
- *
+/*
  * Russ Dill <Russ.Dill@asu.edu> September 2001
  * Rewritten by Vladimir Oleynik <dzo@simtreas.ru> (C) 2003
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
-#ifndef _COMMON_H
-#define _COMMON_H
+#ifndef UDHCP_COMMON_H
+#define UDHCP_COMMON_H 1
 
 #include "libbb.h"
-
-#define DEFAULT_SCRIPT  "/usr/share/udhcpc/default.script"
-
-extern const uint8_t MAC_BCAST_ADDR[6]; /* six all-ones */
-
-/*** packet.h ***/
-
 #include <netinet/udp.h>
 #include <netinet/ip.h>
 
-struct dhcpMessage {
-    uint8_t op;
-    uint8_t htype;
-    uint8_t hlen;
-    uint8_t hops;
-    uint32_t xid;
-    uint16_t secs;
-    uint16_t flags;
-    uint32_t ciaddr;
-    uint32_t yiaddr;
-    uint32_t siaddr;
-    uint32_t giaddr;
-    uint8_t chaddr[16];
-    uint8_t sname[64];
-    uint8_t file[128];
-    uint32_t cookie;
-    uint8_t options[308]; /* 312 - cookie */
-};
-
-struct udp_dhcp_packet {
+PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
+
+extern const uint8_t MAC_BCAST_ADDR[6]; /* six all-ones */
+
+
+/*** DHCP packet ***/
+
+/* DHCP protocol. See RFC 2131 */
+#define DHCP_MAGIC              0x63825363
+#define DHCP_OPTIONS_BUFSIZE    308
+#define BOOTREQUEST             1
+#define BOOTREPLY               2
+
+//TODO: rename ciaddr/yiaddr/chaddr
+struct dhcp_packet {
+    uint8_t op;      /* BOOTREQUEST or BOOTREPLY */
+    uint8_t htype;   /* hardware address type. 1 = 10mb ethernet */
+    uint8_t hlen;    /* hardware address length */
+    uint8_t hops;    /* used by relay agents only */
+    uint32_t xid;    /* unique id */
+    uint16_t secs;   /* elapsed since client began acquisition/renewal */
+    uint16_t flags;  /* only one flag so far: */
+#define BROADCAST_FLAG 0x8000 /* "I need broadcast replies" */
+    uint32_t ciaddr; /* client IP (if client is in BOUND, RENEW or REBINDING state) */
+    uint32_t yiaddr; /* 'your' (client) IP address */
+    /* IP address of next server to use in bootstrap, returned in DHCPOFFER, DHCPACK by server */
+    uint32_t siaddr_nip;
+    uint32_t gateway_nip; /* relay agent IP address */
+    uint8_t chaddr[16];   /* link-layer client hardware address (MAC) */
+    uint8_t sname[64];    /* server host name (ASCIZ) */
+    uint8_t file[128];    /* boot file name (ASCIZ) */
+    uint32_t cookie;      /* fixed first four option bytes (99,130,83,99 dec) */
+    uint8_t options[DHCP_OPTIONS_BUFSIZE + CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS];
+} PACKED;
+#define DHCP_PKT_SNAME_LEN      64
+#define DHCP_PKT_FILE_LEN      128
+#define DHCP_PKT_SNAME_LEN_STR "64"
+#define DHCP_PKT_FILE_LEN_STR "128"
+
+struct ip_udp_dhcp_packet {
     struct iphdr ip;
     struct udphdr udp;
-    struct dhcpMessage data;
-};
-
-void udhcp_init_header(struct dhcpMessage *packet, char type);
-int udhcp_get_packet(struct dhcpMessage *packet, int fd);
-uint16_t udhcp_checksum(void *addr, int count);
-int udhcp_raw_packet(struct dhcpMessage *payload,
-        uint32_t source_ip, int source_port,
-        uint32_t dest_ip, int dest_port,
-        const uint8_t *dest_arp, int ifindex);
-int udhcp_kernel_packet(struct dhcpMessage *payload,
-        uint32_t source_ip, int source_port,
-        uint32_t dest_ip, int dest_port);
-
-
-/**/
-
-void udhcp_run_script(struct dhcpMessage *packet, const char *name);
-
-// Still need to clean these up...
-
-/* from options.h */
-#define get_option      udhcp_get_option
-#define end_option      udhcp_end_option
-#define add_option_string   udhcp_add_option_string
-#define add_simple_option   udhcp_add_simple_option
-#define option_lengths      udhcp_option_lengths
-/* from socket.h */
-#define listen_socket       udhcp_listen_socket
-#define read_interface      udhcp_read_interface
-/* from dhcpc.h */
-#define client_config       udhcp_client_config
-/* from dhcpd.h */
-#define server_config       udhcp_server_config
-
-void udhcp_sp_setup(void);
-int udhcp_sp_fd_set(fd_set *rfds, int extra_fd);
-int udhcp_sp_read(fd_set *rfds);
-int raw_socket(int ifindex);
-int read_interface(const char *interface, int *ifindex, uint32_t *addr, uint8_t *arp);
-int listen_socket(/*uint32_t ip,*/ int port, const char *inf);
+    struct dhcp_packet data;
+} PACKED;
+
+struct udp_dhcp_packet {
+    struct udphdr udp;
+    struct dhcp_packet data;
+} PACKED;
+
+enum {
+    IP_UDP_DHCP_SIZE = sizeof(struct ip_udp_dhcp_packet) - CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS,
+    UDP_DHCP_SIZE    = sizeof(struct udp_dhcp_packet) - CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS,
+    DHCP_SIZE        = sizeof(struct dhcp_packet) - CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS,
+};
+
+/* Let's see whether compiler understood us right */
+struct BUG_bad_sizeof_struct_ip_udp_dhcp_packet {
+    char c[IP_UDP_DHCP_SIZE == 576 ? 1 : -1];
+};
+
+
+/*** Options ***/
+
+enum {
+    OPTION_IP = 1,
+    OPTION_IP_PAIR,
+    OPTION_STRING,
+//  OPTION_BOOLEAN,
+    OPTION_U8,
+    OPTION_U16,
+//  OPTION_S16,
+    OPTION_U32,
+    OPTION_S32,
+    OPTION_BIN,
+    OPTION_STATIC_ROUTES,
+#if ENABLE_FEATURE_UDHCP_RFC3397
+    OPTION_DNS_STRING,  /* RFC1035 compressed domain name list */
+    OPTION_SIP_SERVERS,
+#endif
+
+    OPTION_TYPE_MASK = 0x0f,
+    /* Client requests this option by default */
+    OPTION_REQ  = 0x10,
+    /* There can be a list of 1 or more of these */
+    OPTION_LIST = 0x20,
+};
+
+/* DHCP option codes (partial list). See RFC 2132 and
+ * http://www.iana.org/assignments/bootp-dhcp-parameters/
+ * Commented out options are handled by common option machinery,
+ * uncommented ones have spacial cases (grep for them to see).
+ */
+#define DHCP_PADDING            0x00
+#define DHCP_SUBNET             0x01
+//#define DHCP_TIME_OFFSET      0x02 /* (localtime - UTC_time) in seconds. signed */
+//#define DHCP_ROUTER           0x03
+//#define DHCP_TIME_SERVER      0x04 /* RFC 868 time server (32-bit, 0 = 1.1.1900) */
+//#define DHCP_NAME_SERVER      0x05 /* IEN 116 _really_ ancient kind of NS */
+//#define DHCP_DNS_SERVER       0x06
+//#define DHCP_LOG_SERVER       0x07 /* port 704 UDP log (not syslog)
+//#define DHCP_COOKIE_SERVER    0x08 /* "quote of the day" server */
+//#define DHCP_LPR_SERVER       0x09
+#define DHCP_HOST_NAME          0x0c /* either client informs server or server gives name to client */
+//#define DHCP_BOOT_SIZE        0x0d
+//#define DHCP_DOMAIN_NAME      0x0f /* server gives domain suffix */
+//#define DHCP_SWAP_SERVER      0x10
+//#define DHCP_ROOT_PATH        0x11
+//#define DHCP_IP_TTL           0x17
+//#define DHCP_MTU              0x1a
+//#define DHCP_BROADCAST        0x1c
+//#define DHCP_ROUTES           0x21
+//#define DHCP_NIS_DOMAIN       0x28
+//#define DHCP_NIS_SERVER       0x29
+//#define DHCP_NTP_SERVER       0x2a
+//#define DHCP_WINS_SERVER      0x2c
+#define DHCP_REQUESTED_IP       0x32 /* sent by client if specific IP is wanted */
+#define DHCP_LEASE_TIME         0x33
+#define DHCP_OPTION_OVERLOAD    0x34
+#define DHCP_MESSAGE_TYPE       0x35
+#define DHCP_SERVER_ID          0x36 /* by default server's IP */
+#define DHCP_PARAM_REQ          0x37 /* list of options client wants */
+//#define DHCP_ERR_MESSAGE      0x38 /* error message when sending NAK etc */
+#define DHCP_MAX_SIZE           0x39
+#define DHCP_VENDOR             0x3c /* client's vendor (a string) */
+#define DHCP_CLIENT_ID          0x3d /* by default client's MAC addr, but may be arbitrarily long */
+//#define DHCP_TFTP_SERVER_NAME 0x42 /* same as 'sname' field */
+//#define DHCP_BOOT_FILE        0x43 /* same as 'file' field */
+//#define DHCP_USER_CLASS       0x4d /* RFC 3004. set of LASCII strings. "I am a printer" etc */
+#define DHCP_FQDN               0x51 /* client asks to update DNS to map its FQDN to its new IP */
+//#define DHCP_DOMAIN_SEARCH    0x77 /* RFC 3397. set of ASCIZ string, DNS-style compressed */
+//#define DHCP_SIP_SERVERS      0x78 /* RFC 3361. flag byte, then: 0: domain names, 1: IP addrs */
+//#define DHCP_STATIC_ROUTES    0x79 /* RFC 3442. (mask,ip,router) tuples */
+//#define DHCP_MS_STATIC_ROUTES 0xf9 /* Microsoft's pre-RFC 3442 code for 0x79? */
+//#define DHCP_WPAD             0xfc /* MSIE's Web Proxy Autodiscovery Protocol */
+#define DHCP_END                0xff
+
+/* Offsets in option byte sequence */
+#define OPT_CODE                0
+#define OPT_LEN                 1
+#define OPT_DATA                2
+/* Bits in "overload" option */
+#define OPTION_FIELD            0
+#define FILE_FIELD              1
+#define SNAME_FIELD             2
+
+/* DHCP_MESSAGE_TYPE values */
+#define DHCPDISCOVER            1 /* client -> server */
+#define DHCPOFFER               2 /* client <- server */
+#define DHCPREQUEST             3 /* client -> server */
+#define DHCPDECLINE             4 /* client -> server */
+#define DHCPACK                 5 /* client <- server */
+#define DHCPNAK                 6 /* client <- server */
+#define DHCPRELEASE             7 /* client -> server */
+#define DHCPINFORM              8 /* client -> server */
+#define DHCP_MINTYPE DHCPDISCOVER
+#define DHCP_MAXTYPE DHCPINFORM
+
+struct dhcp_optflag {
+    uint8_t flags;
+    uint8_t code;
+};
+
+struct option_set {
+    uint8_t *data;
+    struct option_set *next;
+};
+
+extern const struct dhcp_optflag dhcp_optflags[];
+extern const char dhcp_option_strings[];
+extern const uint8_t dhcp_option_lengths[];
+
+unsigned FAST_FUNC udhcp_option_idx(const char *name);
+
+uint8_t *udhcp_get_option(struct dhcp_packet *packet, int code) FAST_FUNC;
+int udhcp_end_option(uint8_t *optionptr) FAST_FUNC;
+void udhcp_add_binary_option(struct dhcp_packet *packet, uint8_t *addopt) FAST_FUNC;
+void udhcp_add_simple_option(struct dhcp_packet *packet, uint8_t code, uint32_t data) FAST_FUNC;
+#if ENABLE_FEATURE_UDHCP_RFC3397
+char *dname_dec(const uint8_t *cstr, int clen, const char *pre) FAST_FUNC;
+uint8_t *dname_enc(const uint8_t *cstr, int clen, const char *src, int *retlen) FAST_FUNC;
+#endif
+struct option_set *udhcp_find_option(struct option_set *opt_list, uint8_t code) FAST_FUNC;
+
+
+// RFC 2131  Table 5: Fields and options used by DHCP clients
+//
+// Fields 'hops', 'yiaddr', 'siaddr', 'giaddr' are always zero
+//
+// Field      DHCPDISCOVER          DHCPINFORM            DHCPREQUEST           DHCPDECLINE         DHCPRELEASE
+// -----      ------------          ------------          -----------           -----------         -----------
+// 'xid'      selected by client    selected by client    'xid' from server     selected by client  selected by client
+//                                                        DHCPOFFER message
+// 'secs'     0 or seconds since    0 or seconds since    0 or seconds since    0                   0
+//            DHCP process started  DHCP process started  DHCP process started
+// 'flags'    Set 'BROADCAST'       Set 'BROADCAST'       Set 'BROADCAST'       0                   0
+//            flag if client        flag if client        flag if client
+//            requires broadcast    requires broadcast    requires broadcast
+//            reply                 reply                 reply
+// 'ciaddr'   0                     client's IP           0 or client's IP      0                   client's IP
+//                                                        (BOUND/RENEW/REBIND)
+// 'chaddr'   client's MAC          client's MAC          client's MAC          client's MAC        client's MAC
+// 'sname'    options or sname      options or sname      options or sname      (unused)            (unused)
+// 'file'     options or file       options or file       options or file       (unused)            (unused)
+// 'options'  options               options               options               message type opt    message type opt
+//
+// Option                     DHCPDISCOVER  DHCPINFORM  DHCPREQUEST      DHCPDECLINE  DHCPRELEASE
+// ------                     ------------  ----------  -----------      -----------  -----------
+// Requested IP address       MAY           MUST NOT    MUST (in         MUST         MUST NOT
+//                                                      SELECTING or
+//                                                      INIT-REBOOT)
+//                                                      MUST NOT (in
+//                                                      BOUND or
+//                                                      RENEWING)
+// IP address lease time      MAY           MUST NOT    MAY              MUST NOT     MUST NOT
+// Use 'file'/'sname' fields  MAY           MAY         MAY              MAY          MAY
+// Client identifier          MAY           MAY         MAY              MAY          MAY
+// Vendor class identifier    MAY           MAY         MAY              MUST NOT     MUST NOT
+// Server identifier          MUST NOT      MUST NOT    MUST (after      MUST         MUST
+//                                                      SELECTING)
+//                                                      MUST NOT (after
+//                                                      INIT-REBOOT,
+//                                                      BOUND, RENEWING
+//                                                      or REBINDING)
+// Parameter request list     MAY           MAY         MAY              MUST NOT     MUST NOT
+// Maximum message size       MAY           MAY         MAY              MUST NOT     MUST NOT
+// Message                    SHOULD NOT    SHOULD NOT  SHOULD NOT       SHOULD       SHOULD
+// Site-specific              MAY           MAY         MAY              MUST NOT     MUST NOT
+// All others                 MAY           MAY         MAY              MUST NOT     MUST NOT
+
+
+/*** Logging ***/
+
+#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1
+extern unsigned dhcp_verbose;
+# define log1(...) do { if (dhcp_verbose >= 1) bb_info_msg(__VA_ARGS__); } while (0)
+# if CONFIG_UDHCP_DEBUG >= 2
+void udhcp_dump_packet(struct dhcp_packet *packet) FAST_FUNC;
+#  define log2(...) do { if (dhcp_verbose >= 2) bb_info_msg(__VA_ARGS__); } while (0)
+# else
+#  define udhcp_dump_packet(...) ((void)0)
+#  define log2(...) ((void)0)
+# endif
+# if CONFIG_UDHCP_DEBUG >= 3
+#  define log3(...) do { if (dhcp_verbose >= 3) bb_info_msg(__VA_ARGS__); } while (0)
+# else
+#  define log3(...) ((void)0)
+# endif
+#else
+# define udhcp_dump_packet(...) ((void)0)
+# define log1(...) ((void)0)
+# define log2(...) ((void)0)
+# define log3(...) ((void)0)
+#endif
+
+
+/*** Other shared functions ***/
+
+/* 2nd param is "uint32_t*" */
+int FAST_FUNC udhcp_str2nip(const char *str, void *arg);
+/* 2nd param is "struct option_set**" */
+int FAST_FUNC udhcp_str2optset(const char *str, void *arg);
+
+uint16_t udhcp_checksum(void *addr, int count) FAST_FUNC;
+
+void udhcp_init_header(struct dhcp_packet *packet, char type) FAST_FUNC;
+
+int udhcp_recv_kernel_packet(struct dhcp_packet *packet, int fd) FAST_FUNC;
+
+int udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt,
+        uint32_t source_nip, int source_port,
+        uint32_t dest_nip, int dest_port, const uint8_t *dest_arp,
+        int ifindex) FAST_FUNC;
+
+int udhcp_send_kernel_packet(struct dhcp_packet *dhcp_pkt,
+        uint32_t source_nip, int source_port,
+        uint32_t dest_nip, int dest_port) FAST_FUNC;
+
+void udhcp_sp_setup(void) FAST_FUNC;
+int udhcp_sp_fd_set(fd_set *rfds, int extra_fd) FAST_FUNC;
+int udhcp_sp_read(const fd_set *rfds) FAST_FUNC;
+
+int udhcp_read_interface(const char *interface, int *ifindex, uint32_t *nip, uint8_t *mac) FAST_FUNC;
+
+int udhcp_listen_socket(/*uint32_t ip,*/ int port, const char *inf) FAST_FUNC;
+
 /* Returns 1 if no reply received */
-int arpping(uint32_t test_ip, uint32_t from_ip, uint8_t *from_mac, const char *interface);
-
-#if ENABLE_FEATURE_UDHCP_DEBUG
-# define DEBUG(str, args...) bb_info_msg(str, ## args)
-#else
-# define DEBUG(str, args...) do {;} while (0)
+int arpping(uint32_t test_nip,
+        const uint8_t *safe_mac,
+        uint32_t from_ip,
+        uint8_t *from_mac,
+        const char *interface) FAST_FUNC;
+
+POP_SAVED_FUNCTION_VISIBILITY
+
 #endif
-
-#endif

branches/2.2.9/mindi-busybox/networking/udhcp/dhcpc.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
-/* dhcpc.c
- *
- * udhcp DHCP client
+/*
+ * udhcp client
  *
  * Russ Dill <Russ.Dill@asu.edu> July 2001
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-
-#include <getopt.h>
 #include <syslog.h>
-
 /* Override ENABLE_FEATURE_PIDFILE - ifupdown needs our pidfile to always exist */
 #define WANT_PIDFILE 1
@@ -17 +25 @@
 #include "dhcpd.h"
 #include "dhcpc.h"
-#include "options.h"
-
-
-/* Something is definitely wrong here. IPv4 addresses
- * in variables of type long?? BTW, we use inet_ntoa()
- * in the code. Manpage says that struct in_addr has a member of type long (!)
- * which holds IPv4 address, and the struct is passed by value (!!)
+
+#include <asm/types.h>
+#if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined(_NEWLIB_VERSION)
+# include <netpacket/packet.h>
+# include <net/ethernet.h>
+#else
+# include <linux/if_packet.h>
+# include <linux/if_ether.h>
+#endif
+#include <linux/filter.h>
+
+/* struct client_config_t client_config is in bb_common_bufsiz1 */
+
+
+/*** Script execution code ***/
+
+/* get a rough idea of how long an option will be (rounding up...) */
+static const uint8_t len_of_option_as_string[] = {
+    [OPTION_IP              ] = sizeof("255.255.255.255 "),
+    [OPTION_IP_PAIR         ] = sizeof("255.255.255.255 ") * 2,
+    [OPTION_STATIC_ROUTES   ] = sizeof("255.255.255.255/32 255.255.255.255 "),
+    [OPTION_STRING          ] = 1,
+#if ENABLE_FEATURE_UDHCP_RFC3397
+    [OPTION_DNS_STRING      ] = 1, /* unused */
+    /* Hmmm, this severely overestimates size if SIP_SERVERS option
+     * is in domain name form: N-byte option in binary form
+     * mallocs ~16*N bytes. But it is freed almost at once.
+     */
+    [OPTION_SIP_SERVERS     ] = sizeof("255.255.255.255 "),
+#endif
+//  [OPTION_BOOLEAN         ] = sizeof("yes "),
+    [OPTION_U8              ] = sizeof("255 "),
+    [OPTION_U16             ] = sizeof("65535 "),
+//  [OPTION_S16             ] = sizeof("-32768 "),
+    [OPTION_U32             ] = sizeof("4294967295 "),
+    [OPTION_S32             ] = sizeof("-2147483684 "),
+};
+
+/* note: ip is a pointer to an IP in network order, possibly misaliged */
+static int sprint_nip(char *dest, const char *pre, const uint8_t *ip)
+{
+    return sprintf(dest, "%s%u.%u.%u.%u", pre, ip[0], ip[1], ip[2], ip[3]);
+}
+
+/* really simple implementation, just count the bits */
+static int mton(uint32_t mask)
+{
+    int i = 0;
+    mask = ntohl(mask); /* 111110000-like bit pattern */
+    while (mask) {
+        i++;
+        mask <<= 1;
+    }
+    return i;
+}
+
+/* Create "opt_name=opt_value" string */
+static NOINLINE char *xmalloc_optname_optval(uint8_t *option, const struct dhcp_optflag *optflag, const char *opt_name)
+{
+    unsigned upper_length;
+    int len, type, optlen;
+    char *dest, *ret;
+
+    /* option points to OPT_DATA, need to go back and get OPT_LEN */
+    len = option[OPT_LEN - OPT_DATA];
+
+    type = optflag->flags & OPTION_TYPE_MASK;
+    optlen = dhcp_option_lengths[type];
+    upper_length = len_of_option_as_string[type] * ((unsigned)len / (unsigned)optlen);
+
+    dest = ret = xmalloc(upper_length + strlen(opt_name) + 2);
+    dest += sprintf(ret, "%s=", opt_name);
+
+    while (len >= optlen) {
+        unsigned ip_ofs = 0;
+
+        switch (type) {
+        case OPTION_IP_PAIR:
+            dest += sprint_nip(dest, "", option);
+            *dest++ = '/';
+            ip_ofs = 4;
+            /* fall through */
+        case OPTION_IP:
+            dest += sprint_nip(dest, "", option + ip_ofs);
+            break;
+//      case OPTION_BOOLEAN:
+//          dest += sprintf(dest, *option ? "yes" : "no");
+//          break;
+        case OPTION_U8:
+            dest += sprintf(dest, "%u", *option);
+            break;
+//      case OPTION_S16:
+        case OPTION_U16: {
+            uint16_t val_u16;
+            move_from_unaligned16(val_u16, option);
+            dest += sprintf(dest, "%u", ntohs(val_u16));
+            break;
+        }
+        case OPTION_S32:
+        case OPTION_U32: {
+            uint32_t val_u32;
+            move_from_unaligned32(val_u32, option);
+            dest += sprintf(dest, type == OPTION_U32 ? "%lu" : "%ld", (unsigned long) ntohl(val_u32));
+            break;
+        }
+        case OPTION_STRING:
+            memcpy(dest, option, len);
+            dest[len] = '\0';
+            return ret;  /* Short circuit this case */
+        case OPTION_STATIC_ROUTES: {
+            /* Option binary format:
+             * mask [one byte, 0..32]
+             * ip [big endian, 0..4 bytes depending on mask]
+             * router [big endian, 4 bytes]
+             * may be repeated
+             *
+             * We convert it to a string "IP/MASK ROUTER IP2/MASK2 ROUTER2"
+             */
+            const char *pfx = "";
+
+            while (len >= 1 + 4) { /* mask + 0-byte ip + router */
+                uint32_t nip;
+                uint8_t *p;
+                unsigned mask;
+                int bytes;
+
+                mask = *option++;
+                if (mask > 32)
+                    break;
+                len--;
+
+                nip = 0;
+                p = (void*) &nip;
+                bytes = (mask + 7) / 8; /* 0 -> 0, 1..8 -> 1, 9..16 -> 2 etc */
+                while (--bytes >= 0) {
+                    *p++ = *option++;
+                    len--;
+                }
+                if (len < 4)
+                    break;
+
+                /* print ip/mask */
+                dest += sprint_nip(dest, pfx, (void*) &nip);
+                pfx = " ";
+                dest += sprintf(dest, "/%u ", mask);
+                /* print router */
+                dest += sprint_nip(dest, "", option);
+                option += 4;
+                len -= 4;
+            }
+
+            return ret;
+        }
+#if ENABLE_FEATURE_UDHCP_RFC3397
+        case OPTION_DNS_STRING:
+            /* unpack option into dest; use ret for prefix (i.e., "optname=") */
+            dest = dname_dec(option, len, ret);
+            if (dest) {
+                free(ret);
+                return dest;
+            }
+            /* error. return "optname=" string */
+            return ret;
+        case OPTION_SIP_SERVERS:
+            /* Option binary format:
+             * type: byte
+             * type=0: domain names, dns-compressed
+             * type=1: IP addrs
+             */
+            option++;
+            len--;
+            if (option[-1] == 0) {
+                dest = dname_dec(option, len, ret);
+                if (dest) {
+                    free(ret);
+                    return dest;
+                }
+            } else
+            if (option[-1] == 1) {
+                const char *pfx = "";
+                while (1) {
+                    len -= 4;
+                    if (len < 0)
+                        break;
+                    dest += sprint_nip(dest, pfx, option);
+                    pfx = " ";
+                    option += 4;
+                }
+            }
+            return ret;
+#endif
+        } /* switch */
+        option += optlen;
+        len -= optlen;
+// TODO: it can be a list only if (optflag->flags & OPTION_LIST).
+// Should we bail out/warn if we see multi-ip option which is
+// not allowed to be such (for example, DHCP_BROADCAST)? -
+        if (len <= 0 /* || !(optflag->flags & OPTION_LIST) */)
+            break;
+        *dest++ = ' ';
+        *dest = '\0';
+    }
+    return ret;
+}
+
+/* put all the parameters into the environment */
+static char **fill_envp(struct dhcp_packet *packet)
+{
+    int envc;
+    int i;
+    char **envp, **curr;
+    const char *opt_name;
+    uint8_t *temp;
+    uint8_t overload = 0;
+
+    /* We need 6 elements for:
+     * "interface=IFACE"
+     * "ip=N.N.N.N" from packet->yiaddr
+     * "siaddr=IP" from packet->siaddr_nip (unless 0)
+     * "boot_file=FILE" from packet->file (unless overloaded)
+     * "sname=SERVER_HOSTNAME" from packet->sname (unless overloaded)
+     * terminating NULL
+     */
+    envc = 6;
+    /* +1 element for each option, +2 for subnet option: */
+    if (packet) {
+        for (i = 0; dhcp_optflags[i].code; i++) {
+            if (udhcp_get_option(packet, dhcp_optflags[i].code)) {
+                if (dhcp_optflags[i].code == DHCP_SUBNET)
+                    envc++; /* for mton */
+                envc++;
+            }
+        }
+        temp = udhcp_get_option(packet, DHCP_OPTION_OVERLOAD);
+        if (temp)
+            overload = *temp;
+    }
+    curr = envp = xzalloc(sizeof(char *) * envc);
+
+    *curr = xasprintf("interface=%s", client_config.interface);
+    putenv(*curr++);
+
+    if (!packet)
+        return envp;
+
+    *curr = xmalloc(sizeof("ip=255.255.255.255"));
+    sprint_nip(*curr, "ip=", (uint8_t *) &packet->yiaddr);
+    putenv(*curr++);
+
+    opt_name = dhcp_option_strings;
+    i = 0;
+    while (*opt_name) {
+        temp = udhcp_get_option(packet, dhcp_optflags[i].code);
+        if (!temp)
+            goto next;
+        *curr = xmalloc_optname_optval(temp, &dhcp_optflags[i], opt_name);
+        putenv(*curr++);
+        if (dhcp_optflags[i].code == DHCP_SUBNET) {
+            /* Subnet option: make things like "$ip/$mask" possible */
+            uint32_t subnet;
+            move_from_unaligned32(subnet, temp);
+            *curr = xasprintf("mask=%d", mton(subnet));
+            putenv(*curr++);
+        }
+ next:
+        opt_name += strlen(opt_name) + 1;
+        i++;
+    }
+    if (packet->siaddr_nip) {
+        *curr = xmalloc(sizeof("siaddr=255.255.255.255"));
+        sprint_nip(*curr, "siaddr=", (uint8_t *) &packet->siaddr_nip);
+        putenv(*curr++);
+    }
+    if (!(overload & FILE_FIELD) && packet->file[0]) {
+        /* watch out for invalid packets */
+        *curr = xasprintf("boot_file=%."DHCP_PKT_FILE_LEN_STR"s", packet->file);
+        putenv(*curr++);
+    }
+    if (!(overload & SNAME_FIELD) && packet->sname[0]) {
+        /* watch out for invalid packets */
+        *curr = xasprintf("sname=%."DHCP_PKT_SNAME_LEN_STR"s", packet->sname);
+        putenv(*curr++);
+    }
+    return envp;
+}
+
+/* Call a script with a par file and env vars */
+static void udhcp_run_script(struct dhcp_packet *packet, const char *name)
+{
+    char **envp, **curr;
+    char *argv[3];
+
+    if (client_config.script == NULL)
+        return;
+
+    envp = fill_envp(packet);
+
+    /* call script */
+    log1("Executing %s %s", client_config.script, name);
+    argv[0] = (char*) client_config.script;
+    argv[1] = (char*) name;
+    argv[2] = NULL;
+    spawn_and_wait(argv);
+
+    for (curr = envp; *curr; curr++) {
+        log2(" %s", *curr);
+        bb_unsetenv_and_free(*curr);
+    }
+    free(envp);
+}
+
+
+/*** Sending/receiving packets ***/
+
+static ALWAYS_INLINE uint32_t random_xid(void)
+{
+    return rand();
+}
+
+/* Initialize the packet with the proper defaults */
+static void init_packet(struct dhcp_packet *packet, char type)
+{
+    /* Fill in: op, htype, hlen, cookie fields; message type option: */
+    udhcp_init_header(packet, type);
+
+    packet->xid = random_xid();
+
+    memcpy(packet->chaddr, client_config.client_mac, 6);
+    if (client_config.clientid)
+        udhcp_add_binary_option(packet, client_config.clientid);
+}
+
+static void add_client_options(struct dhcp_packet *packet)
+{
+    uint8_t c;
+    int i, end, len;
+
+    udhcp_add_simple_option(packet, DHCP_MAX_SIZE, htons(IP_UDP_DHCP_SIZE));
+
+    /* Add a "param req" option with the list of options we'd like to have
+     * from stubborn DHCP servers. Pull the data from the struct in common.c.
+     * No bounds checking because it goes towards the head of the packet. */
+    end = udhcp_end_option(packet->options);
+    len = 0;
+    for (i = 0; (c = dhcp_optflags[i].code) != 0; i++) {
+        if ((   (dhcp_optflags[i].flags & OPTION_REQ)
+             && !client_config.no_default_options
+            )
+         || (client_config.opt_mask[c >> 3] & (1 << (c & 7)))
+        ) {
+            packet->options[end + OPT_DATA + len] = c;
+            len++;
+        }
+    }
+    if (len) {
+        packet->options[end + OPT_CODE] = DHCP_PARAM_REQ;
+        packet->options[end + OPT_LEN] = len;
+        packet->options[end + OPT_DATA + len] = DHCP_END;
+    }
+
+    if (client_config.vendorclass)
+        udhcp_add_binary_option(packet, client_config.vendorclass);
+    if (client_config.hostname)
+        udhcp_add_binary_option(packet, client_config.hostname);
+    if (client_config.fqdn)
+        udhcp_add_binary_option(packet, client_config.fqdn);
+
+    /* Add -x options if any */
+    {
+        struct option_set *curr = client_config.options;
+        while (curr) {
+            udhcp_add_binary_option(packet, curr->data);
+            curr = curr->next;
+        }
+//      if (client_config.sname)
+//          strncpy((char*)packet->sname, client_config.sname, sizeof(packet->sname) - 1);
+//      if (client_config.boot_file)
+//          strncpy((char*)packet->file, client_config.boot_file, sizeof(packet->file) - 1);
+    }
+}
+
+/* RFC 2131
+ * 4.4.4 Use of broadcast and unicast
+ *
+ * The DHCP client broadcasts DHCPDISCOVER, DHCPREQUEST and DHCPINFORM
+ * messages, unless the client knows the address of a DHCP server.
+ * The client unicasts DHCPRELEASE messages to the server. Because
+ * the client is declining the use of the IP address supplied by the server,
+ * the client broadcasts DHCPDECLINE messages.
+ *
+ * When the DHCP client knows the address of a DHCP server, in either
+ * INIT or REBOOTING state, the client may use that address
+ * in the DHCPDISCOVER or DHCPREQUEST rather than the IP broadcast address.
+ * The client may also use unicast to send DHCPINFORM messages
+ * to a known DHCP server. If the client receives no response to DHCP
+ * messages sent to the IP address of a known DHCP server, the DHCP
+ * client reverts to using the IP broadcast address.
  */
-static unsigned timeout;
-static uint32_t requested_ip; /* = 0 */
-static uint32_t server_addr;
-static int packet_num; /* = 0 */
+
+static int raw_bcast_from_client_config_ifindex(struct dhcp_packet *packet)
+{
+    return udhcp_send_raw_packet(packet,
+        /*src*/ INADDR_ANY, CLIENT_PORT,
+        /*dst*/ INADDR_BROADCAST, SERVER_PORT, MAC_BCAST_ADDR,
+        client_config.ifindex);
+}
+
+/* Broadcast a DHCP discover packet to the network, with an optionally requested IP */
+/* NOINLINE: limit stack usage in caller */
+static NOINLINE int send_discover(uint32_t xid, uint32_t requested)
+{
+    struct dhcp_packet packet;
+
+    /* Fill in: op, htype, hlen, cookie, chaddr fields,
+     * random xid field (we override it below),
+     * client-id option (unless -C), message type option:
+     */
+    init_packet(&packet, DHCPDISCOVER);
+
+    packet.xid = xid;
+    if (requested)
+        udhcp_add_simple_option(&packet, DHCP_REQUESTED_IP, requested);
+
+    /* Add options: maxsize,
+     * optionally: hostname, fqdn, vendorclass,
+     * "param req" option according to -O, options specified with -x
+     */
+    add_client_options(&packet);
+
+    bb_info_msg("Sending discover...");
+    return raw_bcast_from_client_config_ifindex(&packet);
+}
+
+/* Broadcast a DHCP request message */
+/* RFC 2131 3.1 paragraph 3:
+ * "The client _broadcasts_ a DHCPREQUEST message..."
+ */
+/* NOINLINE: limit stack usage in caller */
+static NOINLINE int send_select(uint32_t xid, uint32_t server, uint32_t requested)
+{
+    struct dhcp_packet packet;
+    struct in_addr addr;
+
+/*
+ * RFC 2131 4.3.2 DHCPREQUEST message
+ * ...
+ * If the DHCPREQUEST message contains a 'server identifier'
+ * option, the message is in response to a DHCPOFFER message.
+ * Otherwise, the message is a request to verify or extend an
+ * existing lease. If the client uses a 'client identifier'
+ * in a DHCPREQUEST message, it MUST use that same 'client identifier'
+ * in all subsequent messages. If the client included a list
+ * of requested parameters in a DHCPDISCOVER message, it MUST
+ * include that list in all subsequent messages.
+ */
+    /* Fill in: op, htype, hlen, cookie, chaddr fields,
+     * random xid field (we override it below),
+     * client-id option (unless -C), message type option:
+     */
+    init_packet(&packet, DHCPREQUEST);
+
+    packet.xid = xid;
+    udhcp_add_simple_option(&packet, DHCP_REQUESTED_IP, requested);
+
+    udhcp_add_simple_option(&packet, DHCP_SERVER_ID, server);
+
+    /* Add options: maxsize,
+     * optionally: hostname, fqdn, vendorclass,
+     * "param req" option according to -O, and options specified with -x
+     */
+    add_client_options(&packet);
+
+    addr.s_addr = requested;
+    bb_info_msg("Sending select for %s...", inet_ntoa(addr));
+    return raw_bcast_from_client_config_ifindex(&packet);
+}
+
+/* Unicast or broadcast a DHCP renew message */
+/* NOINLINE: limit stack usage in caller */
+static NOINLINE int send_renew(uint32_t xid, uint32_t server, uint32_t ciaddr)
+{
+    struct dhcp_packet packet;
+
+/*
+ * RFC 2131 4.3.2 DHCPREQUEST message
+ * ...
+ * DHCPREQUEST generated during RENEWING state:
+ *
+ * 'server identifier' MUST NOT be filled in, 'requested IP address'
+ * option MUST NOT be filled in, 'ciaddr' MUST be filled in with
+ * client's IP address. In this situation, the client is completely
+ * configured, and is trying to extend its lease. This message will
+ * be unicast, so no relay agents will be involved in its
+ * transmission.  Because 'giaddr' is therefore not filled in, the
+ * DHCP server will trust the value in 'ciaddr', and use it when
+ * replying to the client.
+ */
+    /* Fill in: op, htype, hlen, cookie, chaddr fields,
+     * random xid field (we override it below),
+     * client-id option (unless -C), message type option:
+     */
+    init_packet(&packet, DHCPREQUEST);
+
+    packet.xid = xid;
+    packet.ciaddr = ciaddr;
+
+    /* Add options: maxsize,
+     * optionally: hostname, fqdn, vendorclass,
+     * "param req" option according to -O, and options specified with -x
+     */
+    add_client_options(&packet);
+
+    bb_info_msg("Sending renew...");
+    if (server)
+        return udhcp_send_kernel_packet(&packet,
+            ciaddr, CLIENT_PORT,
+            server, SERVER_PORT);
+    return raw_bcast_from_client_config_ifindex(&packet);
+}
+
+#if ENABLE_FEATURE_UDHCPC_ARPING
+/* Broadcast a DHCP decline message */
+/* NOINLINE: limit stack usage in caller */
+static NOINLINE int send_decline(uint32_t xid, uint32_t server, uint32_t requested)
+{
+    struct dhcp_packet packet;
+
+    /* Fill in: op, htype, hlen, cookie, chaddr, random xid fields,
+     * client-id option (unless -C), message type option:
+     */
+    init_packet(&packet, DHCPDECLINE);
+
+    /* RFC 2131 says DHCPDECLINE's xid is randomly selected by client,
+     * but in case the server is buggy and wants DHCPDECLINE's xid
+     * to match the xid which started entire handshake,
+     * we use the same xid we used in initial DHCPDISCOVER:
+     */
+    packet.xid = xid;
+    /* DHCPDECLINE uses "requested ip", not ciaddr, to store offered IP */
+    udhcp_add_simple_option(&packet, DHCP_REQUESTED_IP, requested);
+
+    udhcp_add_simple_option(&packet, DHCP_SERVER_ID, server);
+
+    bb_info_msg("Sending decline...");
+    return raw_bcast_from_client_config_ifindex(&packet);
+}
+#endif
+
+/* Unicast a DHCP release message */
+static int send_release(uint32_t server, uint32_t ciaddr)
+{
+    struct dhcp_packet packet;
+
+    /* Fill in: op, htype, hlen, cookie, chaddr, random xid fields,
+     * client-id option (unless -C), message type option:
+     */
+    init_packet(&packet, DHCPRELEASE);
+
+    /* DHCPRELEASE uses ciaddr, not "requested ip", to store IP being released */
+    packet.ciaddr = ciaddr;
+
+    udhcp_add_simple_option(&packet, DHCP_SERVER_ID, server);
+
+    bb_info_msg("Sending release...");
+    return udhcp_send_kernel_packet(&packet, ciaddr, CLIENT_PORT, server, SERVER_PORT);
+}
+
+/* Returns -1 on errors that are fatal for the socket, -2 for those that aren't */
+/* NOINLINE: limit stack usage in caller */
+static NOINLINE int udhcp_recv_raw_packet(struct dhcp_packet *dhcp_pkt, int fd)
+{
+    int bytes;
+    struct ip_udp_dhcp_packet packet;
+    uint16_t check;
+
+    memset(&packet, 0, sizeof(packet));
+    bytes = safe_read(fd, &packet, sizeof(packet));
+    if (bytes < 0) {
+        log1("Packet read error, ignoring");
+        /* NB: possible down interface, etc. Caller should pause. */
+        return bytes; /* returns -1 */
+    }
+
+    if (bytes < (int) (sizeof(packet.ip) + sizeof(packet.udp))) {
+        log1("Packet is too short, ignoring");
+        return -2;
+    }
+
+    if (bytes < ntohs(packet.ip.tot_len)) {
+        /* packet is bigger than sizeof(packet), we did partial read */
+        log1("Oversized packet, ignoring");
+        return -2;
+    }
+
+    /* ignore any extra garbage bytes */
+    bytes = ntohs(packet.ip.tot_len);
+
+    /* make sure its the right packet for us, and that it passes sanity checks */
+    if (packet.ip.protocol != IPPROTO_UDP || packet.ip.version != IPVERSION
+     || packet.ip.ihl != (sizeof(packet.ip) >> 2)
+     || packet.udp.dest != htons(CLIENT_PORT)
+    /* || bytes > (int) sizeof(packet) - can't happen */
+     || ntohs(packet.udp.len) != (uint16_t)(bytes - sizeof(packet.ip))
+    ) {
+        log1("Unrelated/bogus packet, ignoring");
+        return -2;
+    }
+
+    /* verify IP checksum */
+    check = packet.ip.check;
+    packet.ip.check = 0;
+    if (check != udhcp_checksum(&packet.ip, sizeof(packet.ip))) {
+        log1("Bad IP header checksum, ignoring");
+        return -2;
+    }
+
+    /* verify UDP checksum. IP header has to be modified for this */
+    memset(&packet.ip, 0, offsetof(struct iphdr, protocol));
+    /* ip.xx fields which are not memset: protocol, check, saddr, daddr */
+    packet.ip.tot_len = packet.udp.len; /* yes, this is needed */
+    check = packet.udp.check;
+    packet.udp.check = 0;
+    if (check && check != udhcp_checksum(&packet, bytes)) {
+        log1("Packet with bad UDP checksum received, ignoring");
+        return -2;
+    }
+
+    memcpy(dhcp_pkt, &packet.data, bytes - (sizeof(packet.ip) + sizeof(packet.udp)));
+
+    if (dhcp_pkt->cookie != htonl(DHCP_MAGIC)) {
+        bb_info_msg("Packet with bad magic, ignoring");
+        return -2;
+    }
+    log1("Got valid DHCP packet");
+    udhcp_dump_packet(dhcp_pkt);
+    return bytes - (sizeof(packet.ip) + sizeof(packet.udp));
+}
+
+
+/*** Main ***/
+
 static int sockfd = -1;
 
-#define LISTEN_NONE 0
+#define LISTEN_NONE   0
 #define LISTEN_KERNEL 1
-#define LISTEN_RAW 2
+#define LISTEN_RAW    2
 static smallint listen_mode;
 
+/* initial state: (re)start DHCP negotiation */
+#define INIT_SELECTING  0
+/* discover was sent, DHCPOFFER reply received */
+#define REQUESTING      1
+/* select/renew was sent, DHCPACK reply received */
+#define BOUND           2
+/* half of lease passed, want to renew it by sending unicast renew requests */
+#define RENEWING        3
+/* renew requests were not answered, lease is almost over, send broadcast renew */
+#define REBINDING       4
+/* manually requested renew (SIGUSR1) */
+#define RENEW_REQUESTED 5
+/* release, possibly manually requested (SIGUSR2) */
+#define RELEASED        6
 static smallint state;
 
-struct client_config_t client_config;
-
-
-/* just a little helper */
-static void change_mode(int new_mode)
-{
-    DEBUG("entering %s listen mode",
-        new_mode ? (new_mode == 1 ? "kernel" : "raw") : "none");
+static int udhcp_raw_socket(int ifindex)
+{
+    int fd;
+    struct sockaddr_ll sock;
+
+    /*
+     * Comment:
+     *
+     *  I've selected not to see LL header, so BPF doesn't see it, too.
+     *  The filter may also pass non-IP and non-ARP packets, but we do
+     *  a more complete check when receiving the message in userspace.
+     *
+     * and filter shamelessly stolen from:
+     *
+     *  http://www.flamewarmaster.de/software/dhcpclient/
+     *
+     * There are a few other interesting ideas on that page (look under
+     * "Motivation").  Use of netlink events is most interesting.  Think
+     * of various network servers listening for events and reconfiguring.
+     * That would obsolete sending HUP signals and/or make use of restarts.
+     *
+     * Copyright: 2006, 2007 Stefan Rompf <sux@loplof.de>.
+     * License: GPL v2.
+     *
+     * TODO: make conditional?
+     */
+#define SERVER_AND_CLIENT_PORTS  ((67 << 16) + 68)
+    static const struct sock_filter filter_instr[] = {
+        /* check for udp */
+        BPF_STMT(BPF_LD|BPF_B|BPF_ABS, 9),
+        BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, IPPROTO_UDP, 2, 0),     /* L5, L1, is UDP? */
+        /* ugly check for arp on ethernet-like and IPv4 */
+        BPF_STMT(BPF_LD|BPF_W|BPF_ABS, 2),                      /* L1: */
+        BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, 0x08000604, 3, 4),      /* L3, L4 */
+        /* skip IP header */
+        BPF_STMT(BPF_LDX|BPF_B|BPF_MSH, 0),                     /* L5: */
+        /* check udp source and destination ports */
+        BPF_STMT(BPF_LD|BPF_W|BPF_IND, 0),
+        BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, SERVER_AND_CLIENT_PORTS, 0, 1), /* L3, L4 */
+        /* returns */
+        BPF_STMT(BPF_RET|BPF_K, 0x0fffffff ),                   /* L3: pass */
+        BPF_STMT(BPF_RET|BPF_K, 0),                             /* L4: reject */
+    };
+    static const struct sock_fprog filter_prog = {
+        .len = sizeof(filter_instr) / sizeof(filter_instr[0]),
+        /* casting const away: */
+        .filter = (struct sock_filter *) filter_instr,
+    };
+
+    log1("Opening raw socket on ifindex %d", ifindex); //log2?
+
+    fd = xsocket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP));
+    log1("Got raw socket fd %d", fd); //log2?
+
+    if (SERVER_PORT == 67 && CLIENT_PORT == 68) {
+        /* Use only if standard ports are in use */
+        /* Ignoring error (kernel may lack support for this) */
+        if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &filter_prog,
+                sizeof(filter_prog)) >= 0)
+            log1("Attached filter to raw socket fd %d", fd); // log?
+    }
+
+    sock.sll_family = AF_PACKET;
+    sock.sll_protocol = htons(ETH_P_IP);
+    sock.sll_ifindex = ifindex;
+    xbind(fd, (struct sockaddr *) &sock, sizeof(sock));
+    log1("Created raw socket");
+
+    return fd;
+}
+
+static void change_listen_mode(int new_mode)
+{
+    log1("Entering listen mode: %s",
+        new_mode != LISTEN_NONE
+            ? (new_mode == LISTEN_KERNEL ? "kernel" : "raw")
+            : "none"
+    );
+
+    listen_mode = new_mode;
     if (sockfd >= 0) {
         close(sockfd);
         sockfd = -1;
     }
-    listen_mode = new_mode;
-}
-
-
-/* perform a renew */
+    if (new_mode == LISTEN_KERNEL)
+        sockfd = udhcp_listen_socket(/*INADDR_ANY,*/ CLIENT_PORT, client_config.interface);
+    else if (new_mode != LISTEN_NONE)
+        sockfd = udhcp_raw_socket(client_config.ifindex);
+    /* else LISTEN_NONE: sockfd stays closed */
+}
+
 static void perform_renew(void)
 {
@@ -60 +785 @@
     switch (state) {
     case BOUND:
-        change_mode(LISTEN_KERNEL);
+        change_listen_mode(LISTEN_KERNEL);
     case RENEWING:
     case REBINDING:
@@ -69 +794 @@
     case REQUESTING:
     case RELEASED:
-        change_mode(LISTEN_RAW);
+        change_listen_mode(LISTEN_RAW);
         state = INIT_SELECTING;
         break;
@@ -75 +800 @@
         break;
     }
-
-    /* start things over */
-    packet_num = 0;
-
-    /* Kill any timeouts because the user wants this to hurry along */
-    timeout = 0;
-}
-
-
-/* perform a release */
-static void perform_release(void)
+}
+
+static void perform_release(uint32_t requested_ip, uint32_t server_addr)
 {
     char buffer[sizeof("255.255.255.255")];
@@ -102 +819 @@
     bb_info_msg("Entering released state");
 
-    change_mode(LISTEN_NONE);
+    change_listen_mode(LISTEN_NONE);
     state = RELEASED;
-    timeout = INT_MAX;
-}
-
-
-static void client_background(void)
-{
-#if !BB_MMU
-    bb_error_msg("cannot background in uclinux (yet)");
-/* ... mainly because udhcpc calls client_background()
- * in _the _middle _of _udhcpc _run_, not at the start!
- * If that will be properly disabled for NOMMU, client_background()
- * will work on NOMMU too */
-#else
-    bb_daemonize(0);
-    logmode &= ~LOGMODE_STDIO;
-    /* rewrite pidfile, as our pid is different now */
-    write_pidfile(client_config.pidfile);
-#endif
-    /* Do not fork again. */
-    client_config.foreground = 1;
-    client_config.background_if_no_lease = 0;
-}
-
+}
 
 static uint8_t* alloc_dhcp_option(int code, const char *str, int extra)
 {
     uint8_t *storage;
-    int len = strlen(str);
-    if (len > 255) len = 255;
+    int len = strnlen(str, 255);
     storage = xzalloc(len + extra + OPT_DATA);
     storage[OPT_CODE] = code;
@@ -140 +834 @@
 }
 
-
-int udhcpc_main(int argc, char **argv);
-int udhcpc_main(int argc, char **argv)
+#if BB_MMU
+static void client_background(void)
+{
+    bb_daemonize(0);
+    logmode &= ~LOGMODE_STDIO;
+    /* rewrite pidfile, as our pid is different now */
+    write_pidfile(client_config.pidfile);
+}
+#endif
+
+//usage:#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1
+//usage:# define IF_UDHCP_VERBOSE(...) __VA_ARGS__
+//usage:#else
+//usage:# define IF_UDHCP_VERBOSE(...)
+//usage:#endif
+//usage:#define udhcpc_trivial_usage
+//usage:       "[-fbnq"IF_UDHCP_VERBOSE("v")"oCR] [-i IFACE] [-r IP] [-s PROG] [-p PIDFILE]\n"
+//usage:       "    [-H HOSTNAME] [-V VENDOR] [-x OPT:VAL]... [-O OPT]..." IF_FEATURE_UDHCP_PORT(" [-P N]")
+//usage:#define udhcpc_full_usage "\n"
+//usage:    IF_LONG_OPTS(
+//usage:     "\n    -i,--interface IFACE    Interface to use (default eth0)"
+//usage:     "\n    -p,--pidfile FILE   Create pidfile"
+//usage:     "\n    -s,--script PROG    Run PROG at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")"
+//usage:     "\n    -t,--retries N      Send up to N discover packets"
+//usage:     "\n    -T,--timeout N      Pause between packets (default 3 seconds)"
+//usage:     "\n    -A,--tryagain N     Wait N seconds after failure (default 20)"
+//usage:     "\n    -f,--foreground     Run in foreground"
+//usage:    USE_FOR_MMU(
+//usage:     "\n    -b,--background     Background if lease is not obtained"
+//usage:    )
+//usage:     "\n    -n,--now        Exit if lease is not obtained"
+//usage:     "\n    -q,--quit       Exit after obtaining lease"
+//usage:     "\n    -R,--release        Release IP on exit"
+//usage:     "\n    -S,--syslog     Log to syslog too"
+//usage:    IF_FEATURE_UDHCP_PORT(
+//usage:     "\n    -P,--client-port N  Use port N (default 68)"
+//usage:    )
+//usage:    IF_FEATURE_UDHCPC_ARPING(
+//usage:     "\n    -a,--arping     Use arping to validate offered address"
+//usage:    )
+//usage:     "\n    -O,--request-option OPT Request option OPT from server (cumulative)"
+//usage:     "\n    -o,--no-default-options Don't request any options (unless -O is given)"
+//usage:     "\n    -r,--request IP     Request this IP address"
+//usage:     "\n    -x OPT:VAL      Include option OPT in sent packets (cumulative)"
+//usage:     "\n                Examples of string, numeric, and hex byte opts:"
+//usage:     "\n                -x hostname:bbox - option 12"
+//usage:     "\n                -x lease:3600 - option 51 (lease time)"
+//usage:     "\n                -x 0x3d:0100BEEFC0FFEE - option 61 (client id)"
+//usage:     "\n    -F,--fqdn NAME      Ask server to update DNS mapping for NAME"
+//usage:     "\n    -H,-h,--hostname NAME   Send NAME as client hostname (default none)"
+//usage:     "\n    -V,--vendorclass VENDOR Vendor identifier (default 'udhcp VERSION')"
+//usage:     "\n    -C,--clientid-none  Don't send MAC as client identifier"
+//usage:    IF_UDHCP_VERBOSE(
+//usage:     "\n    -v          Verbose"
+//usage:    )
+//usage:    )
+//usage:    IF_NOT_LONG_OPTS(
+//usage:     "\n    -i IFACE    Interface to use (default eth0)"
+//usage:     "\n    -p FILE     Create pidfile"
+//usage:     "\n    -s PROG     Run PROG at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")"
+//usage:     "\n    -t N        Send up to N discover packets"
+//usage:     "\n    -T N        Pause between packets (default 3 seconds)"
+//usage:     "\n    -A N        Wait N seconds (default 20) after failure"
+//usage:     "\n    -f      Run in foreground"
+//usage:    USE_FOR_MMU(
+//usage:     "\n    -b      Background if lease is not obtained"
+//usage:    )
+//usage:     "\n    -n      Exit if lease is not obtained"
+//usage:     "\n    -q      Exit after obtaining lease"
+//usage:     "\n    -R      Release IP on exit"
+//usage:     "\n    -S      Log to syslog too"
+//usage:    IF_FEATURE_UDHCP_PORT(
+//usage:     "\n    -P N        Use port N (default 68)"
+//usage:    )
+//usage:    IF_FEATURE_UDHCPC_ARPING(
+//usage:     "\n    -a      Use arping to validate offered address"
+//usage:    )
+//usage:     "\n    -O OPT      Request option OPT from server (cumulative)"
+//usage:     "\n    -o      Don't request any options (unless -O is given)"
+//usage:     "\n    -r IP       Request this IP address"
+//usage:     "\n    -x OPT:VAL  Include option OPT in sent packets (cumulative)"
+//usage:     "\n            Examples of string, numeric, and hex byte opts:"
+//usage:     "\n            -x hostname:bbox - option 12"
+//usage:     "\n            -x lease:3600 - option 51 (lease time)"
+//usage:     "\n            -x 0x3d:0100BEEFC0FFEE - option 61 (client id)"
+//usage:     "\n    -F NAME     Ask server to update DNS mapping for NAME"
+//usage:     "\n    -H,-h NAME  Send NAME as client hostname (default none)"
+//usage:     "\n    -V VENDOR   Vendor identifier (default 'udhcp VERSION')"
+//usage:     "\n    -C      Don't send MAC as client identifier"
+//usage:    IF_UDHCP_VERBOSE(
+//usage:     "\n    -v      Verbose"
+//usage:    )
+//usage:    )
+
+int udhcpc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int udhcpc_main(int argc UNUSED_PARAM, char **argv)
 {
     uint8_t *temp, *message;
-    char *str_c, *str_V, *str_h, *str_F, *str_r, *str_T, *str_t;
+    const char *str_V, *str_h, *str_F, *str_r;
+    IF_FEATURE_UDHCP_PORT(char *str_P;)
+    void *clientid_mac_ptr;
+    llist_t *list_O = NULL;
+    llist_t *list_x = NULL;
+    int tryagain_timeout = 20;
+    int discover_timeout = 3;
+    int discover_retries = 3;
+    uint32_t server_addr = server_addr; /* for compiler */
+    uint32_t requested_ip = 0;
     uint32_t xid = 0;
-    uint32_t lease = 0; /* can be given as 32-bit quantity */
-    unsigned t1 = 0, t2 = 0; /* what a wonderful names */
-    unsigned start = 0;
-    unsigned now;
+    uint32_t lease_seconds = 0; /* can be given as 32-bit quantity */
+    int packet_num;
+    int timeout; /* must be signed */
+    unsigned already_waited_sec;
     unsigned opt;
     int max_fd;
     int retval;
-    int len;
     struct timeval tv;
-    struct in_addr temp_addr;
-    struct dhcpMessage packet;
+    struct dhcp_packet packet;
     fd_set rfds;
 
-    enum {
-        OPT_c = 1 << 0,
-        OPT_C = 1 << 1,
-        OPT_V = 1 << 2,
-        OPT_f = 1 << 3,
-        OPT_b = 1 << 4,
-        OPT_H = 1 << 5,
-        OPT_h = 1 << 6,
-        OPT_F = 1 << 7,
-        OPT_i = 1 << 8,
-        OPT_n = 1 << 9,
-        OPT_p = 1 << 10,
-        OPT_q = 1 << 11,
-        OPT_R = 1 << 12,
-        OPT_r = 1 << 13,
-        OPT_s = 1 << 14,
-        OPT_T = 1 << 15,
-        OPT_t = 1 << 16,
-        OPT_v = 1 << 17,
-        OPT_S = 1 << 18,
-    };
-#if ENABLE_GETOPT_LONG
+#if ENABLE_LONG_OPTS
     static const char udhcpc_longopts[] ALIGN1 =
-        "clientid\0"      Required_argument "c"
-        "clientid-none\0" No_argument       "C"
-        "vendorclass\0"   Required_argument "V"
-        "foreground\0"    No_argument       "f"
-        "background\0"    No_argument       "b"
-        "hostname\0"      Required_argument "H"
-        "hostname\0"      Required_argument "h"
-        "fqdn\0"          Required_argument "F"
-        "interface\0"     Required_argument "i"
-        "now\0"           No_argument       "n"
-        "pidfile\0"       Required_argument "p"
-        "quit\0"          No_argument       "q"
-        "release\0"       No_argument       "R"
-        "request\0"       Required_argument "r"
-        "script\0"        Required_argument "s"
-        "timeout\0"       Required_argument "T"
-        "version\0"       No_argument       "v"
-        "retries\0"       Required_argument "t"
-        "syslog\0"        No_argument       "S"
+        "clientid-none\0"  No_argument       "C"
+        "vendorclass\0"    Required_argument "V"
+        "hostname\0"       Required_argument "H"
+        "fqdn\0"           Required_argument "F"
+        "interface\0"      Required_argument "i"
+        "now\0"            No_argument       "n"
+        "pidfile\0"        Required_argument "p"
+        "quit\0"           No_argument       "q"
+        "release\0"        No_argument       "R"
+        "request\0"        Required_argument "r"
+        "script\0"         Required_argument "s"
+        "timeout\0"        Required_argument "T"
+        "version\0"        No_argument       "v"
+        "retries\0"        Required_argument "t"
+        "tryagain\0"       Required_argument "A"
+        "syslog\0"         No_argument       "S"
+        "request-option\0" Required_argument "O"
+        "no-default-options\0" No_argument   "o"
+        "foreground\0"     No_argument       "f"
+        "background\0"     No_argument       "b"
+        IF_FEATURE_UDHCPC_ARPING("arping\0" No_argument       "a")
+        IF_FEATURE_UDHCP_PORT("client-port\0"   Required_argument "P")
         ;
 #endif
-    /* Default options. */
+    enum {
+        OPT_C = 1 << 0,
+        OPT_V = 1 << 1,
+        OPT_H = 1 << 2,
+        OPT_h = 1 << 3,
+        OPT_F = 1 << 4,
+        OPT_i = 1 << 5,
+        OPT_n = 1 << 6,
+        OPT_p = 1 << 7,
+        OPT_q = 1 << 8,
+        OPT_R = 1 << 9,
+        OPT_r = 1 << 10,
+        OPT_s = 1 << 11,
+        OPT_T = 1 << 12,
+        OPT_t = 1 << 13,
+        OPT_S = 1 << 14,
+        OPT_A = 1 << 15,
+        OPT_O = 1 << 16,
+        OPT_o = 1 << 17,
+        OPT_x = 1 << 18,
+        OPT_f = 1 << 19,
+/* The rest has variable bit positions, need to be clever */
+        OPTBIT_f = 19,
+        USE_FOR_MMU(             OPTBIT_b,)
+        IF_FEATURE_UDHCPC_ARPING(OPTBIT_a,)
+        IF_FEATURE_UDHCP_PORT(   OPTBIT_P,)
+        USE_FOR_MMU(             OPT_b = 1 << OPTBIT_b,)
+        IF_FEATURE_UDHCPC_ARPING(OPT_a = 1 << OPTBIT_a,)
+        IF_FEATURE_UDHCP_PORT(   OPT_P = 1 << OPTBIT_P,)
+    };
+
+    /* Default options */
+    IF_FEATURE_UDHCP_PORT(SERVER_PORT = 67;)
+    IF_FEATURE_UDHCP_PORT(CLIENT_PORT = 68;)
     client_config.interface = "eth0";
-    client_config.script = DEFAULT_SCRIPT;
-    client_config.retries = 3;
-    client_config.timeout = 3;
+    client_config.script = CONFIG_UDHCPC_DEFAULT_SCRIPT;
+    str_V = "udhcp "BB_VER;
 
     /* Parse command line */
-    opt_complementary = "c--C:C--c" // mutually exclusive
-                        ":hH:Hh"; // -h and -H are the same
-#if ENABLE_GETOPT_LONG
-    applet_long_options = udhcpc_longopts;
+    /* O,x: list; -T,-t,-A take numeric param */
+    opt_complementary = "O::x::T+:t+:A+"
+#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1
+        ":vv"
 #endif
-    opt = getopt32(argv, "c:CV:fbH:h:F:i:np:qRr:s:T:t:vS",
-        &str_c, &str_V, &str_h, &str_h, &str_F,
-        &client_config.interface, &client_config.pidfile, &str_r,
-        &client_config.script, &str_T, &str_t
+        ;
+    IF_LONG_OPTS(applet_long_options = udhcpc_longopts;)
+    opt = getopt32(argv, "CV:H:h:F:i:np:qRr:s:T:t:SA:O:ox:f"
+        USE_FOR_MMU("b")
+        IF_FEATURE_UDHCPC_ARPING("a")
+        IF_FEATURE_UDHCP_PORT("P:")
+        "v"
+        , &str_V, &str_h, &str_h, &str_F
+        , &client_config.interface, &client_config.pidfile, &str_r /* i,p */
+        , &client_config.script /* s */
+        , &discover_timeout, &discover_retries, &tryagain_timeout /* T,t,A */
+        , &list_O
+        , &list_x
+        IF_FEATURE_UDHCP_PORT(, &str_P)
+#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1
+        , &dhcp_verbose
+#endif
         );
-
-    if (opt & OPT_c)
-        client_config.clientid = alloc_dhcp_option(DHCP_CLIENT_ID, str_c, 0);
-    //if (opt & OPT_C)
-    if (opt & OPT_V)
-        client_config.vendorclass = alloc_dhcp_option(DHCP_VENDOR, str_V, 0);
-    if (opt & OPT_f)
-        client_config.foreground = 1;
-    if (opt & OPT_b)
-        client_config.background_if_no_lease = 1;
-    if (opt & OPT_h)
+    if (opt & (OPT_h|OPT_H))
         client_config.hostname = alloc_dhcp_option(DHCP_HOST_NAME, str_h, 0);
     if (opt & OPT_F) {
+        /* FQDN option format: [0x51][len][flags][0][0]<fqdn> */
         client_config.fqdn = alloc_dhcp_option(DHCP_FQDN, str_F, 3);
-        /* Flags: 0000NEOS
-        S: 1 => Client requests Server to update A RR in DNS as well as PTR
-        O: 1 => Server indicates to client that DNS has been updated regardless
-        E: 1 => Name data is DNS format, i.e. <4>host<6>domain<4>com<0> not "host.domain.com"
-        N: 1 => Client requests Server to not update DNS
-        */
+        /* Flag bits: 0000NEOS
+         * S: 1 = Client requests server to update A RR in DNS as well as PTR
+         * O: 1 = Server indicates to client that DNS has been updated regardless
+         * E: 1 = Name is in DNS format, i.e. <4>host<6>domain<3>com<0>,
+         *    not "host.domain.com". Format 0 is obsolete.
+         * N: 1 = Client requests server to not update DNS (S must be 0 then)
+         * Two [0] bytes which follow are deprecated and must be 0.
+         */
         client_config.fqdn[OPT_DATA + 0] = 0x1;
-        /* client_config.fqdn[OPT_DATA + 1] = 0; - redundant */
-        /* client_config.fqdn[OPT_DATA + 2] = 0; - redundant */
-    }
-    // if (opt & OPT_i) client_config.interface = ...
-    if (opt & OPT_n)
-        client_config.abort_if_no_lease = 1;
-    // if (opt & OPT_p) client_config.pidfile = ...
-    if (opt & OPT_q)
-        client_config.quit_after_lease = 1;
-    if (opt & OPT_R)
-        client_config.release_on_quit = 1;
+        /*client_config.fqdn[OPT_DATA + 1] = 0; - xzalloc did it */
+        /*client_config.fqdn[OPT_DATA + 2] = 0; */
+    }
     if (opt & OPT_r)
         requested_ip = inet_addr(str_r);
-    // if (opt & OPT_s) client_config.script = ...
-    if (opt & OPT_T)
-        client_config.timeout = xatoi_u(str_T);
-    if (opt & OPT_t)
-        client_config.retries = xatoi_u(str_t);
-    if (opt & OPT_v) {
-        printf("version %s\n", BB_VER);
-        return 0;
-    }
-
+#if ENABLE_FEATURE_UDHCP_PORT
+    if (opt & OPT_P) {
+        CLIENT_PORT = xatou16(str_P);
+        SERVER_PORT = CLIENT_PORT - 1;
+    }
+#endif
+    if (opt & OPT_o)
+        client_config.no_default_options = 1;
+    while (list_O) {
+        char *optstr = llist_pop(&list_O);
+        unsigned n = udhcp_option_idx(optstr);
+        n = dhcp_optflags[n].code;
+        client_config.opt_mask[n >> 3] |= 1 << (n & 7);
+    }
+    while (list_x) {
+        char *optstr = llist_pop(&list_x);
+        char *colon = strchr(optstr, ':');
+        if (colon)
+            *colon = ' ';
+        /* now it looks similar to udhcpd's config file line:
+         * "optname optval", using the common routine: */
+        udhcp_str2optset(optstr, &client_config.options);
+    }
+
+    if (udhcp_read_interface(client_config.interface,
+            &client_config.ifindex,
+            NULL,
+            client_config.client_mac)
+    ) {
+        return 1;
+    }
+
+    clientid_mac_ptr = NULL;
+    if (!(opt & OPT_C) && !udhcp_find_option(client_config.options, DHCP_CLIENT_ID)) {
+        /* not suppressed and not set, set the default client ID */
+        client_config.clientid = alloc_dhcp_option(DHCP_CLIENT_ID, "", 7);
+        client_config.clientid[OPT_DATA] = 1; /* type: ethernet */
+        clientid_mac_ptr = client_config.clientid + OPT_DATA+1;
+        memcpy(clientid_mac_ptr, client_config.client_mac, 6);
+    }
+    if (str_V[0] != '\0')
+        client_config.vendorclass = alloc_dhcp_option(DHCP_VENDOR, str_V, 0);
+#if !BB_MMU
+    /* on NOMMU reexec (i.e., background) early */
+    if (!(opt & OPT_f)) {
+        bb_daemonize_or_rexec(0 /* flags */, argv);
+        logmode = LOGMODE_NONE;
+    }
+#endif
     if (opt & OPT_S) {
-        openlog(applet_name, LOG_PID, LOG_LOCAL0);
+        openlog(applet_name, LOG_PID, LOG_DAEMON);
         logmode |= LOGMODE_SYSLOG;
     }
-
-    if (read_interface(client_config.interface, &client_config.ifindex,
-               NULL, client_config.arp))
-        return 1;
 
     /* Make sure fd 0,1,2 are open */
@@ -278 +1119 @@
     /* Equivalent of doing a fflush after every \n */
     setlinebuf(stdout);
-
     /* Create pidfile */
     write_pidfile(client_config.pidfile);
-    /* if (!..) bb_perror_msg("cannot create pidfile %s", pidfile); */
-
-    /* Goes to stdout and possibly syslog */
-    bb_info_msg("%s (v%s) started", applet_name, BB_VER);
-
-    /* if not set, and not suppressed, setup the default client ID */
-    if (!client_config.clientid && !(opt & OPT_C)) {
-        client_config.clientid = alloc_dhcp_option(DHCP_CLIENT_ID, "", 7);
-        client_config.clientid[OPT_DATA] = 1;
-        memcpy(client_config.clientid + OPT_DATA+1, client_config.arp, 6);
-    }
-
-    if (!client_config.vendorclass)
-        client_config.vendorclass = alloc_dhcp_option(DHCP_VENDOR, "udhcp "BB_VER, 0);
-
-    /* setup the signal pipe */
+    /* Goes to stdout (unless NOMMU) and possibly syslog */
+    bb_info_msg("%s (v"BB_VER") started", applet_name);
+    /* Set up the signal pipe */
     udhcp_sp_setup();
+    /* We want random_xid to be random... */
+    srand(monotonic_us());
 
     state = INIT_SELECTING;
     udhcp_run_script(NULL, "deconfig");
-    change_mode(LISTEN_RAW);
-    tv.tv_sec = 0;
-    goto jump_in;
-
+    change_listen_mode(LISTEN_RAW);
+    packet_num = 0;
+    timeout = 0;
+    already_waited_sec = 0;
+
+    /* Main event loop. select() waits on signal pipe and possibly
+     * on sockfd.
+     * "continue" statements in code below jump to the top of the loop.
+     */
     for (;;) {
-        tv.tv_sec = timeout - monotonic_sec();
- jump_in:
+        /* silence "uninitialized!" warning */
+        unsigned timestamp_before_wait = timestamp_before_wait;
+
+        //bb_error_msg("sockfd:%d, listen_mode:%d", sockfd, listen_mode);
+
+        /* Was opening raw or udp socket here
+         * if (listen_mode != LISTEN_NONE && sockfd < 0),
+         * but on fast network renew responses return faster
+         * than we open sockets. Thus this code is moved
+         * to change_listen_mode(). Thus we open listen socket
+         * BEFORE we send renew request (see "case BOUND:"). */
+
+        max_fd = udhcp_sp_fd_set(&rfds, sockfd);
+
+        tv.tv_sec = timeout - already_waited_sec;
         tv.tv_usec = 0;
-
-        if (listen_mode != LISTEN_NONE && sockfd < 0) {
-            if (listen_mode == LISTEN_KERNEL)
-                sockfd = listen_socket(/*INADDR_ANY,*/ CLIENT_PORT, client_config.interface);
-            else
-                sockfd = raw_socket(client_config.ifindex);
-        }
-        max_fd = udhcp_sp_fd_set(&rfds, sockfd);
-
-        retval = 0; /* If we already timed out, fall through, else... */
-        if (tv.tv_sec > 0) {
-            DEBUG("Waiting on select...");
+        retval = 0;
+        /* If we already timed out, fall through with retval = 0, else... */
+        if ((int)tv.tv_sec > 0) {
+            timestamp_before_wait = (unsigned)monotonic_sec();
+            log1("Waiting on select...");
             retval = select(max_fd + 1, &rfds, NULL, NULL, &tv);
-        }
-
-        now = monotonic_sec();
-        if (retval < 0) {
-            /* EINTR? signal was caught, don't panic */
-            if (errno != EINTR) {
+            if (retval < 0) {
+                /* EINTR? A signal was caught, don't panic */
+                if (errno == EINTR) {
+                    already_waited_sec += (unsigned)monotonic_sec() - timestamp_before_wait;
+                    continue;
+                }
                 /* Else: an error occured, panic! */
                 bb_perror_msg_and_die("select");
             }
-        } else if (retval == 0) {
-            /* timeout dropped to zero */
+        }
+
+        /* If timeout dropped to zero, time to become active:
+         * resend discover/renew/whatever
+         */
+        if (retval == 0) {
+            /* When running on a bridge, the ifindex may have changed
+             * (e.g. if member interfaces were added/removed
+             * or if the status of the bridge changed).
+             * Refresh ifindex and client_mac:
+             */
+            if (udhcp_read_interface(client_config.interface,
+                    &client_config.ifindex,
+                    NULL,
+                    client_config.client_mac)
+            ) {
+                return 1; /* iface is gone? */
+            }
+            if (clientid_mac_ptr)
+                memcpy(clientid_mac_ptr, client_config.client_mac, 6);
+
+            /* We will restart the wait in any case */
+            already_waited_sec = 0;
+
             switch (state) {
             case INIT_SELECTING:
-                if (packet_num < client_config.retries) {
+                if (packet_num < discover_retries) {
                     if (packet_num == 0)
                         xid = random_xid();
-
-                    /* send discover packet */
-                    send_discover(xid, requested_ip); /* broadcast */
-
-                    timeout = now + client_config.timeout;
+                    /* broadcast */
+                    send_discover(xid, requested_ip);
+                    timeout = discover_timeout;
                     packet_num++;
+                    continue;
+                }
+ leasefail:
+                udhcp_run_script(NULL, "leasefail");
+#if BB_MMU /* -b is not supported on NOMMU */
+                if (opt & OPT_b) { /* background if no lease */
+                    bb_info_msg("No lease, forking to background");
+                    client_background();
+                    /* do not background again! */
+                    opt = ((opt & ~OPT_b) | OPT_f);
+                } else
+#endif
+                if (opt & OPT_n) { /* abort if no lease */
+                    bb_info_msg("No lease, failing");
+                    retval = 1;
+                    goto ret;
+                }
+                /* wait before trying again */
+                timeout = tryagain_timeout;
+                packet_num = 0;
+                continue;
+            case REQUESTING:
+                if (packet_num < discover_retries) {
+                    /* send broadcast select packet */
+                    send_select(xid, server_addr, requested_ip);
+                    timeout = discover_timeout;
+                    packet_num++;
+                    continue;
+                }
+                /* Timed out, go back to init state.
+                 * "discover...select...discover..." loops
+                 * were seen in the wild. Treat them similarly
+                 * to "no response to discover" case */
+                change_listen_mode(LISTEN_RAW);
+                state = INIT_SELECTING;
+                goto leasefail;
+            case BOUND:
+                /* 1/2 lease passed, enter renewing state */
+                state = RENEWING;
+                change_listen_mode(LISTEN_KERNEL);
+                log1("Entering renew state");
+                /* fall right through */
+            case RENEW_REQUESTED: /* manual (SIGUSR1) renew */
+            case_RENEW_REQUESTED:
+            case RENEWING:
+                if (timeout > 60) {
+                    /* send an unicast renew request */
+            /* Sometimes observed to fail (EADDRNOTAVAIL) to bind
+             * a new UDP socket for sending inside send_renew.
+             * I hazard to guess existing listening socket
+             * is somehow conflicting with it, but why is it
+             * not deterministic then?! Strange.
+             * Anyway, it does recover by eventually failing through
+             * into INIT_SELECTING state.
+             */
+                    send_renew(xid, server_addr, requested_ip);
+                    timeout >>= 1;
+                    continue;
+                }
+                /* Timed out, enter rebinding state */
+                log1("Entering rebinding state");
+                state = REBINDING;
+                /* fall right through */
+            case REBINDING:
+                /* Switch to bcast receive */
+                change_listen_mode(LISTEN_RAW);
+                /* Lease is *really* about to run out,
+                 * try to find DHCP server using broadcast */
+                if (timeout > 0) {
+                    /* send a broadcast renew request */
+                    send_renew(xid, 0 /*INADDR_ANY*/, requested_ip);
+                    timeout >>= 1;
+                    continue;
+                }
+                /* Timed out, enter init state */
+                bb_info_msg("Lease lost, entering init state");
+                udhcp_run_script(NULL, "deconfig");
+                state = INIT_SELECTING;
+                /*timeout = 0; - already is */
+                packet_num = 0;
+                continue;
+            /* case RELEASED: */
+            }
+            /* yah, I know, *you* say it would never happen */
+            timeout = INT_MAX;
+            continue; /* back to main loop */
+        } /* if select timed out */
+
+        /* select() didn't timeout, something happened */
+
+        /* Is it a signal? */
+        /* note: udhcp_sp_read checks FD_ISSET before reading */
+        switch (udhcp_sp_read(&rfds)) {
+        case SIGUSR1:
+            perform_renew();
+            if (state == RENEW_REQUESTED)
+                goto case_RENEW_REQUESTED;
+            /* Start things over */
+            packet_num = 0;
+            /* Kill any timeouts, user wants this to hurry along */
+            timeout = 0;
+            continue;
+        case SIGUSR2:
+            perform_release(requested_ip, server_addr);
+            timeout = INT_MAX;
+            continue;
+        case SIGTERM:
+            bb_info_msg("Received SIGTERM");
+            if (opt & OPT_R) /* release on quit */
+                perform_release(requested_ip, server_addr);
+            goto ret0;
+        }
+
+        /* Is it a packet? */
+        if (listen_mode == LISTEN_NONE || !FD_ISSET(sockfd, &rfds))
+            continue; /* no */
+
+        {
+            int len;
+
+            /* A packet is ready, read it */
+            if (listen_mode == LISTEN_KERNEL)
+                len = udhcp_recv_kernel_packet(&packet, sockfd);
+            else
+                len = udhcp_recv_raw_packet(&packet, sockfd);
+            if (len == -1) {
+                /* Error is severe, reopen socket */
+                bb_info_msg("Read error: %s, reopening socket", strerror(errno));
+                sleep(discover_timeout); /* 3 seconds by default */
+                change_listen_mode(listen_mode); /* just close and reopen */
+            }
+            /* If this packet will turn out to be unrelated/bogus,
+             * we will go back and wait for next one.
+             * Be sure timeout is properly decreased. */
+            already_waited_sec += (unsigned)monotonic_sec() - timestamp_before_wait;
+            if (len < 0)
+                continue;
+        }
+
+        if (packet.xid != xid) {
+            log1("xid %x (our is %x), ignoring packet",
+                (unsigned)packet.xid, (unsigned)xid);
+            continue;
+        }
+
+        /* Ignore packets that aren't for us */
+        if (packet.hlen != 6
+         || memcmp(packet.chaddr, client_config.client_mac, 6) != 0
+        ) {
+//FIXME: need to also check that last 10 bytes are zero
+            log1("chaddr does not match, ignoring packet"); // log2?
+            continue;
+        }
+
+        message = udhcp_get_option(&packet, DHCP_MESSAGE_TYPE);
+        if (message == NULL) {
+            bb_error_msg("no message type option, ignoring packet");
+            continue;
+        }
+
+        switch (state) {
+        case INIT_SELECTING:
+            /* Must be a DHCPOFFER to one of our xid's */
+            if (*message == DHCPOFFER) {
+        /* TODO: why we don't just fetch server's IP from IP header? */
+                temp = udhcp_get_option(&packet, DHCP_SERVER_ID);
+                if (!temp) {
+                    bb_error_msg("no server ID, ignoring packet");
+                    continue;
+                    /* still selecting - this server looks bad */
+                }
+                /* it IS unaligned sometimes, don't "optimize" */
+                move_from_unaligned32(server_addr, temp);
+                /*xid = packet.xid; - already is */
+                requested_ip = packet.yiaddr;
+
+                /* enter requesting state */
+                state = REQUESTING;
+                timeout = 0;
+                packet_num = 0;
+                already_waited_sec = 0;
+            }
+            continue;
+        case REQUESTING:
+        case RENEWING:
+        case RENEW_REQUESTED:
+        case REBINDING:
+            if (*message == DHCPACK) {
+                temp = udhcp_get_option(&packet, DHCP_LEASE_TIME);
+                if (!temp) {
+                    bb_error_msg("no lease time with ACK, using 1 hour lease");
+                    lease_seconds = 60 * 60;
                 } else {
-                    udhcp_run_script(NULL, "leasefail");
-                    if (client_config.background_if_no_lease) {
-                        bb_info_msg("No lease, forking to background");
-                        client_background();
-                    } else if (client_config.abort_if_no_lease) {
-                        bb_info_msg("No lease, failing");
-                        retval = 1;
-                        goto ret;
-                    }
-                    /* wait to try again */
-                    packet_num = 0;
-                    timeout = now + 60;
+                    /* it IS unaligned sometimes, don't "optimize" */
+                    move_from_unaligned32(lease_seconds, temp);
+                    lease_seconds = ntohl(lease_seconds);
+                    lease_seconds &= 0x0fffffff; /* paranoia: must not be prone to overflows */
+                    if (lease_seconds < 10) /* and not too small */
+                        lease_seconds = 10;
                 }
-                break;
-            case RENEW_REQUESTED:
-            case REQUESTING:
-                if (packet_num < client_config.retries) {
-                    /* send request packet */
-                    if (state == RENEW_REQUESTED)
-                        send_renew(xid, server_addr, requested_ip); /* unicast */
-                    else send_selecting(xid, server_addr, requested_ip); /* broadcast */
-
-                    timeout = now + ((packet_num == 2) ? 10 : 2);
-                    packet_num++;
-                } else {
-                    /* timed out, go back to init state */
-                    if (state == RENEW_REQUESTED)
-                        udhcp_run_script(NULL, "deconfig");
-                    state = INIT_SELECTING;
-                    timeout = now;
-                    packet_num = 0;
-                    change_mode(LISTEN_RAW);
-                }
-                break;
-            case BOUND:
-                /* Lease is starting to run out, time to enter renewing state */
-                state = RENEWING;
-                change_mode(LISTEN_KERNEL);
-                DEBUG("Entering renew state");
-                /* fall right through */
-            case RENEWING:
-                /* Either set a new T1, or enter REBINDING state */
-                if ((t2 - t1) <= (lease / 14400 + 1)) {
-                    /* timed out, enter rebinding state */
-                    state = REBINDING;
-                    timeout = now + (t2 - t1);
-                    DEBUG("Entering rebinding state");
-                } else {
-                    /* send a request packet */
-                    send_renew(xid, server_addr, requested_ip); /* unicast */
-                    t1 = (t2 - t1) / 2 + t1;
-                    timeout = start + t1;
-                }
-                break;
-            case REBINDING:
-                /* Either set a new T2, or enter INIT state */
-                if ((lease - t2) <= (lease / 14400 + 1)) {
-                    /* timed out, enter init state */
-                    state = INIT_SELECTING;
-                    bb_info_msg("Lease lost, entering init state");
-                    udhcp_run_script(NULL, "deconfig");
-                    timeout = now;
-                    packet_num = 0;
-                    change_mode(LISTEN_RAW);
-                } else {
-                    /* send a request packet */
-                    send_renew(xid, 0, requested_ip); /* broadcast */
-                    t2 = (lease - t2) / 2 + t2;
-                    timeout = start + t2;
-                }
-                break;
-            case RELEASED:
-                /* yah, I know, *you* say it would never happen */
-                timeout = INT_MAX;
-                break;
-            }
-        } else if (listen_mode != LISTEN_NONE && FD_ISSET(sockfd, &rfds)) {
-            /* a packet is ready, read it */
-
-            if (listen_mode == LISTEN_KERNEL)
-                len = udhcp_get_packet(&packet, sockfd);
-            else len = get_raw_packet(&packet, sockfd);
-
-            if (len == -1 && errno != EINTR) {
-                DEBUG("error on read, %s, reopening socket", strerror(errno));
-                change_mode(listen_mode); /* just close and reopen */
-            }
-            if (len < 0) continue;
-
-            if (packet.xid != xid) {
-                DEBUG("Ignoring XID %x (our xid is %x)",
-                    (unsigned)packet.xid, (unsigned)xid);
-                continue;
-            }
-
-            /* Ignore packets that aren't for us */
-            if (memcmp(packet.chaddr, client_config.arp, 6)) {
-                DEBUG("Packet does not have our chaddr - ignoring");
-                continue;
-            }
-
-            message = get_option(&packet, DHCP_MESSAGE_TYPE);
-            if (message == NULL) {
-                bb_error_msg("cannot get option from packet - ignoring");
-                continue;
-            }
-
-            switch (state) {
-            case INIT_SELECTING:
-                /* Must be a DHCPOFFER to one of our xid's */
-                if (*message == DHCPOFFER) {
-                    temp = get_option(&packet, DHCP_SERVER_ID);
-                    if (temp) {
-                        /* can be misaligned, thus memcpy */
-                        memcpy(&server_addr, temp, 4);
-                        xid = packet.xid;
-                        requested_ip = packet.yiaddr;
-
-                        /* enter requesting state */
-                        state = REQUESTING;
-                        timeout = now;
+#if ENABLE_FEATURE_UDHCPC_ARPING
+                if (opt & OPT_a) {
+/* RFC 2131 3.1 paragraph 5:
+ * "The client receives the DHCPACK message with configuration
+ * parameters. The client SHOULD perform a final check on the
+ * parameters (e.g., ARP for allocated network address), and notes
+ * the duration of the lease specified in the DHCPACK message. At this
+ * point, the client is configured. If the client detects that the
+ * address is already in use (e.g., through the use of ARP),
+ * the client MUST send a DHCPDECLINE message to the server and restarts
+ * the configuration process..." */
+                    if (!arpping(packet.yiaddr,
+                            NULL,
+                            (uint32_t) 0,
+                            client_config.client_mac,
+                            client_config.interface)
+                    ) {
+                        bb_info_msg("Offered address is in use "
+                            "(got ARP reply), declining");
+                        send_decline(xid, server_addr, packet.yiaddr);
+
+                        if (state != REQUESTING)
+                            udhcp_run_script(NULL, "deconfig");
+                        change_listen_mode(LISTEN_RAW);
+                        state = INIT_SELECTING;
+                        requested_ip = 0;
+                        timeout = tryagain_timeout;
                         packet_num = 0;
-                    } else {
-                        bb_error_msg("no server ID in message");
+                        already_waited_sec = 0;
+                        continue; /* back to main loop */
                     }
                 }
-                break;
-            case RENEW_REQUESTED:
-            case REQUESTING:
-            case RENEWING:
-            case REBINDING:
-                if (*message == DHCPACK) {
-                    temp = get_option(&packet, DHCP_LEASE_TIME);
-                    if (!temp) {
-                        bb_error_msg("no lease time with ACK, using 1 hour lease");
-                        lease = 60 * 60;
-                    } else {
-                        /* can be misaligned, thus memcpy */
-                        memcpy(&lease, temp, 4);
-                        lease = ntohl(lease);
-                    }
-
-                    /* enter bound state */
-                    t1 = lease / 2;
-
-                    /* little fixed point for n * .875 */
-                    t2 = (lease * 7) >> 3;
+#endif
+                /* enter bound state */
+                timeout = lease_seconds / 2;
+                {
+                    struct in_addr temp_addr;
                     temp_addr.s_addr = packet.yiaddr;
                     bb_info_msg("Lease of %s obtained, lease time %u",
-                        inet_ntoa(temp_addr), (unsigned)lease);
-                    start = now;
-                    timeout = start + t1;
-                    requested_ip = packet.yiaddr;
-                    udhcp_run_script(&packet,
-                           ((state == RENEWING || state == REBINDING) ? "renew" : "bound"));
-
-                    state = BOUND;
-                    change_mode(LISTEN_NONE);
-                    if (client_config.quit_after_lease) {
-                        if (client_config.release_on_quit)
-                            perform_release();
-                        goto ret0;
-                    }
-                    if (!client_config.foreground)
-                        client_background();
-
-                } else if (*message == DHCPNAK) {
-                    /* return to init state */
-                    bb_info_msg("Received DHCP NAK");
-                    udhcp_run_script(&packet, "nak");
-                    if (state != REQUESTING)
-                        udhcp_run_script(NULL, "deconfig");
-                    state = INIT_SELECTING;
-                    timeout = now;
-                    requested_ip = 0;
-                    packet_num = 0;
-                    change_mode(LISTEN_RAW);
-                    sleep(3); /* avoid excessive network traffic */
+                        inet_ntoa(temp_addr), (unsigned)lease_seconds);
                 }
-                break;
-            /* case BOUND, RELEASED: - ignore all packets */
+                requested_ip = packet.yiaddr;
+                udhcp_run_script(&packet, state == REQUESTING ? "bound" : "renew");
+
+                state = BOUND;
+                change_listen_mode(LISTEN_NONE);
+                if (opt & OPT_q) { /* quit after lease */
+                    if (opt & OPT_R) /* release on quit */
+                        perform_release(requested_ip, server_addr);
+                    goto ret0;
+                }
+                /* future renew failures should not exit (JM) */
+                opt &= ~OPT_n;
+#if BB_MMU /* NOMMU case backgrounded earlier */
+                if (!(opt & OPT_f)) {
+                    client_background();
+                    /* do not background again! */
+                    opt = ((opt & ~OPT_b) | OPT_f);
+                }
+#endif
+                already_waited_sec = 0;
+                continue; /* back to main loop */
             }
-        } else {
-            int signo = udhcp_sp_read(&rfds);
-            switch (signo) {
-            case SIGUSR1:
-                perform_renew();
-                break;
-            case SIGUSR2:
-                perform_release();
-                break;
-            case SIGTERM:
-                bb_info_msg("Received SIGTERM");
-                if (client_config.release_on_quit)
-                    perform_release();
-                goto ret0;
+            if (*message == DHCPNAK) {
+                /* return to init state */
+                bb_info_msg("Received DHCP NAK");
+                udhcp_run_script(&packet, "nak");
+                if (state != REQUESTING)
+                    udhcp_run_script(NULL, "deconfig");
+                change_listen_mode(LISTEN_RAW);
+                sleep(3); /* avoid excessive network traffic */
+                state = INIT_SELECTING;
+                requested_ip = 0;
+                timeout = 0;
+                packet_num = 0;
+                already_waited_sec = 0;
             }
+            continue;
+        /* case BOUND: - ignore all packets */
+        /* case RELEASED: - ignore all packets */
         }
-    } /* for (;;) */
+        /* back to main loop */
+    } /* for (;;) - main loop ends */
+
  ret0:
     retval = 0;
  ret:
-    /*if (client_config.pidfile) - remove_pidfile has it's own check */
+    /*if (client_config.pidfile) - remove_pidfile has its own check */
         remove_pidfile(client_config.pidfile);
     return retval;

branches/2.2.9/mindi-busybox/networking/udhcp/dhcpc.h

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
-/* dhcpc.h */
-#ifndef _DHCPC_H
-#define _DHCPC_H
+/*
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+#ifndef UDHCP_DHCPC_H
+#define UDHCP_DHCPC_H 1
 
-#define INIT_SELECTING  0
-#define REQUESTING  1
-#define BOUND       2
-#define RENEWING    3
-#define REBINDING   4
-#define INIT_REBOOT 5
-#define RENEW_REQUESTED 6
-#define RELEASED    7
+PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 
 struct client_config_t {
-    /* TODO: combine flag fields into single "unsigned opt" */
-    /* (can be set directly to the result of getopt32) */
-    char foreground;                /* Do not fork */
-    char quit_after_lease;          /* Quit after obtaining lease */
-    char release_on_quit;           /* Perform release on quit */
-    char abort_if_no_lease;         /* Abort if no lease */
-    char background_if_no_lease;    /* Fork to background if no lease */
+    uint8_t client_mac[6];          /* Our mac address */
+    char no_default_options;        /* Do not include default options in request */
+    IF_FEATURE_UDHCP_PORT(uint16_t port;)
+    int ifindex;                    /* Index number of the interface to use */
+    uint8_t opt_mask[256 / 8];      /* Bitmask of options to send (-O option) */
     const char *interface;          /* The name of the interface to use */
     char *pidfile;                  /* Optionally store the process ID */
     const char *script;             /* User script to run at dhcp events */
+    struct option_set *options;     /* list of DHCP options to send to server */
     uint8_t *clientid;              /* Optional client id to use */
     uint8_t *vendorclass;           /* Optional vendor class-id to use */
     uint8_t *hostname;              /* Optional hostname to use */
     uint8_t *fqdn;                  /* Optional fully qualified domain name to use */
-    int ifindex;                    /* Index number of the interface to use */
-    int retries;                    /* Max number of request packets */
-    int timeout;                    /* Number of seconds to try to get a lease */
-    uint8_t arp[6];                 /* Our arp address */
-};
+} FIX_ALIASING;
 
-extern struct client_config_t client_config;
+/* server_config sits in 1st half of bb_common_bufsiz1 */
+#define client_config (*(struct client_config_t*)(&bb_common_bufsiz1[COMMON_BUFSIZE / 2]))
 
+#if ENABLE_FEATURE_UDHCP_PORT
+#define CLIENT_PORT (client_config.port)
+#else
+#define CLIENT_PORT 68
+#endif
 
-/*** clientpacket.h ***/
-
-uint32_t random_xid(void);
-int send_discover(uint32_t xid, uint32_t requested);
-int send_selecting(uint32_t xid, uint32_t server, uint32_t requested);
-int send_renew(uint32_t xid, uint32_t server, uint32_t ciaddr);
-int send_renew(uint32_t xid, uint32_t server, uint32_t ciaddr);
-int send_release(uint32_t server, uint32_t ciaddr);
-int get_raw_packet(struct dhcpMessage *payload, int fd);
-
+POP_SAVED_FUNCTION_VISIBILITY
 
 #endif

branches/2.2.9/mindi-busybox/networking/udhcp/dhcpd.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
-/* dhcpd.c
- *
- * udhcp Server
+/*
+ * udhcp server
  * Copyright (C) 1999 Matthew Ramsay <matthewr@moreton.com.au>
  *          Chris Trew <ctrew@moreton.com.au>
@@ -8 +7 @@
  * Rewrite by Russ Dill <Russ.Dill@asu.edu> July 2001
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-
 #include <syslog.h>
 #include "common.h"
+#include "dhcpc.h"
 #include "dhcpd.h"
-#include "options.h"
+
+
+/* Send a packet to a specific mac address and ip address by creating our own ip packet */
+static void send_packet_to_client(struct dhcp_packet *dhcp_pkt, int force_broadcast)
+{
+    const uint8_t *chaddr;
+    uint32_t ciaddr;
+
+    // Was:
+    //if (force_broadcast) { /* broadcast */ }
+    //else if (dhcp_pkt->ciaddr) { /* unicast to dhcp_pkt->ciaddr */ }
+    //else if (dhcp_pkt->flags & htons(BROADCAST_FLAG)) { /* broadcast */ }
+    //else { /* unicast to dhcp_pkt->yiaddr */ }
+    // But this is wrong: yiaddr is _our_ idea what client's IP is
+    // (for example, from lease file). Client may not know that,
+    // and may not have UDP socket listening on that IP!
+    // We should never unicast to dhcp_pkt->yiaddr!
+    // dhcp_pkt->ciaddr, OTOH, comes from client's request packet,
+    // and can be used.
+
+    if (force_broadcast
+     || (dhcp_pkt->flags & htons(BROADCAST_FLAG))
+     || dhcp_pkt->ciaddr == 0
+    ) {
+        log1("Broadcasting packet to client");
+        ciaddr = INADDR_BROADCAST;
+        chaddr = MAC_BCAST_ADDR;
+    } else {
+        log1("Unicasting packet to client ciaddr");
+        ciaddr = dhcp_pkt->ciaddr;
+        chaddr = dhcp_pkt->chaddr;
+    }
+
+    udhcp_send_raw_packet(dhcp_pkt,
+        /*src*/ server_config.server_nip, SERVER_PORT,
+        /*dst*/ ciaddr, CLIENT_PORT, chaddr,
+        server_config.ifindex);
+}
+
+/* Send a packet to gateway_nip using the kernel ip stack */
+static void send_packet_to_relay(struct dhcp_packet *dhcp_pkt)
+{
+    log1("Forwarding packet to relay");
+
+    udhcp_send_kernel_packet(dhcp_pkt,
+            server_config.server_nip, SERVER_PORT,
+            dhcp_pkt->gateway_nip, SERVER_PORT);
+}
+
+static void send_packet(struct dhcp_packet *dhcp_pkt, int force_broadcast)
+{
+    if (dhcp_pkt->gateway_nip)
+        send_packet_to_relay(dhcp_pkt);
+    else
+        send_packet_to_client(dhcp_pkt, force_broadcast);
+}
+
+static void init_packet(struct dhcp_packet *packet, struct dhcp_packet *oldpacket, char type)
+{
+    /* Sets op, htype, hlen, cookie fields
+     * and adds DHCP_MESSAGE_TYPE option */
+    udhcp_init_header(packet, type);
+
+    packet->xid = oldpacket->xid;
+    memcpy(packet->chaddr, oldpacket->chaddr, sizeof(oldpacket->chaddr));
+    packet->flags = oldpacket->flags;
+    packet->gateway_nip = oldpacket->gateway_nip;
+    packet->ciaddr = oldpacket->ciaddr;
+    udhcp_add_simple_option(packet, DHCP_SERVER_ID, server_config.server_nip);
+}
+
+/* Fill options field, siaddr_nip, and sname and boot_file fields.
+ * TODO: teach this code to use overload option.
+ */
+static void add_server_options(struct dhcp_packet *packet)
+{
+    struct option_set *curr = server_config.options;
+
+    while (curr) {
+        if (curr->data[OPT_CODE] != DHCP_LEASE_TIME)
+            udhcp_add_binary_option(packet, curr->data);
+        curr = curr->next;
+    }
+
+    packet->siaddr_nip = server_config.siaddr_nip;
+
+    if (server_config.sname)
+        strncpy((char*)packet->sname, server_config.sname, sizeof(packet->sname) - 1);
+    if (server_config.boot_file)
+        strncpy((char*)packet->file, server_config.boot_file, sizeof(packet->file) - 1);
+}
+
+static uint32_t select_lease_time(struct dhcp_packet *packet)
+{
+    uint32_t lease_time_sec = server_config.max_lease_sec;
+    uint8_t *lease_time_opt = udhcp_get_option(packet, DHCP_LEASE_TIME);
+    if (lease_time_opt) {
+        move_from_unaligned32(lease_time_sec, lease_time_opt);
+        lease_time_sec = ntohl(lease_time_sec);
+        if (lease_time_sec > server_config.max_lease_sec)
+            lease_time_sec = server_config.max_lease_sec;
+        if (lease_time_sec < server_config.min_lease_sec)
+            lease_time_sec = server_config.min_lease_sec;
+    }
+    return lease_time_sec;
+}
+
+/* We got a DHCP DISCOVER. Send an OFFER. */
+/* NOINLINE: limit stack usage in caller */
+static NOINLINE void send_offer(struct dhcp_packet *oldpacket, uint32_t static_lease_nip, struct dyn_lease *lease)
+{
+    struct dhcp_packet packet;
+    uint32_t lease_time_sec;
+    struct in_addr addr;
+
+    init_packet(&packet, oldpacket, DHCPOFFER);
+
+    /* If it is a static lease, use its IP */
+    packet.yiaddr = static_lease_nip;
+    /* Else: */
+    if (!static_lease_nip) {
+        /* We have no static lease for client's chaddr */
+        uint32_t req_nip;
+        uint8_t *req_ip_opt;
+        const char *p_host_name;
+
+        if (lease) {
+            /* We have a dynamic lease for client's chaddr.
+             * Reuse its IP (even if lease is expired).
+             * Note that we ignore requested IP in this case.
+             */
+            packet.yiaddr = lease->lease_nip;
+        }
+        /* Or: if client has requested an IP */
+        else if ((req_ip_opt = udhcp_get_option(oldpacket, DHCP_REQUESTED_IP)) != NULL
+         /* (read IP) */
+         && (move_from_unaligned32(req_nip, req_ip_opt), 1)
+         /* and the IP is in the lease range */
+         && ntohl(req_nip) >= server_config.start_ip
+         && ntohl(req_nip) <= server_config.end_ip
+         /* and */
+         && (  !(lease = find_lease_by_nip(req_nip)) /* is not already taken */
+            || is_expired_lease(lease) /* or is taken, but expired */
+            )
+        ) {
+            packet.yiaddr = req_nip;
+        }
+        else {
+            /* Otherwise, find a free IP */
+            packet.yiaddr = find_free_or_expired_nip(oldpacket->chaddr);
+        }
+
+        if (!packet.yiaddr) {
+            bb_error_msg("no free IP addresses. OFFER abandoned");
+            return;
+        }
+        /* Reserve the IP for a short time hoping to get DHCPREQUEST soon */
+        p_host_name = (const char*) udhcp_get_option(oldpacket, DHCP_HOST_NAME);
+        lease = add_lease(packet.chaddr, packet.yiaddr,
+                server_config.offer_time,
+                p_host_name,
+                p_host_name ? (unsigned char)p_host_name[OPT_LEN - OPT_DATA] : 0
+        );
+        if (!lease) {
+            bb_error_msg("no free IP addresses. OFFER abandoned");
+            return;
+        }
+    }
+
+    lease_time_sec = select_lease_time(oldpacket);
+    udhcp_add_simple_option(&packet, DHCP_LEASE_TIME, htonl(lease_time_sec));
+    add_server_options(&packet);
+
+    addr.s_addr = packet.yiaddr;
+    bb_info_msg("Sending OFFER of %s", inet_ntoa(addr));
+    /* send_packet emits error message itself if it detects failure */
+    send_packet(&packet, /*force_bcast:*/ 0);
+}
+
+/* NOINLINE: limit stack usage in caller */
+static NOINLINE void send_NAK(struct dhcp_packet *oldpacket)
+{
+    struct dhcp_packet packet;
+
+    init_packet(&packet, oldpacket, DHCPNAK);
+
+    log1("Sending NAK");
+    send_packet(&packet, /*force_bcast:*/ 1);
+}
+
+/* NOINLINE: limit stack usage in caller */
+static NOINLINE void send_ACK(struct dhcp_packet *oldpacket, uint32_t yiaddr)
+{
+    struct dhcp_packet packet;
+    uint32_t lease_time_sec;
+    struct in_addr addr;
+    const char *p_host_name;
+
+    init_packet(&packet, oldpacket, DHCPACK);
+    packet.yiaddr = yiaddr;
+
+    lease_time_sec = select_lease_time(oldpacket);
+    udhcp_add_simple_option(&packet, DHCP_LEASE_TIME, htonl(lease_time_sec));
+
+    add_server_options(&packet);
+
+    addr.s_addr = yiaddr;
+    bb_info_msg("Sending ACK to %s", inet_ntoa(addr));
+    send_packet(&packet, /*force_bcast:*/ 0);
+
+    p_host_name = (const char*) udhcp_get_option(oldpacket, DHCP_HOST_NAME);
+    add_lease(packet.chaddr, packet.yiaddr,
+        lease_time_sec,
+        p_host_name,
+        p_host_name ? (unsigned char)p_host_name[OPT_LEN - OPT_DATA] : 0
+    );
+    if (ENABLE_FEATURE_UDHCPD_WRITE_LEASES_EARLY) {
+        /* rewrite the file with leases at every new acceptance */
+        write_leases();
+    }
+}
+
+/* NOINLINE: limit stack usage in caller */
+static NOINLINE void send_inform(struct dhcp_packet *oldpacket)
+{
+    struct dhcp_packet packet;
+
+    /* "If a client has obtained a network address through some other means
+     * (e.g., manual configuration), it may use a DHCPINFORM request message
+     * to obtain other local configuration parameters.  Servers receiving a
+     * DHCPINFORM message construct a DHCPACK message with any local
+     * configuration parameters appropriate for the client without:
+     * allocating a new address, checking for an existing binding, filling
+     * in 'yiaddr' or including lease time parameters.  The servers SHOULD
+     * unicast the DHCPACK reply to the address given in the 'ciaddr' field
+     * of the DHCPINFORM message.
+     * ...
+     * The server responds to a DHCPINFORM message by sending a DHCPACK
+     * message directly to the address given in the 'ciaddr' field
+     * of the DHCPINFORM message.  The server MUST NOT send a lease
+     * expiration time to the client and SHOULD NOT fill in 'yiaddr'."
+     */
+//TODO: do a few sanity checks: is ciaddr set?
+//Better yet: is ciaddr == IP source addr?
+    init_packet(&packet, oldpacket, DHCPACK);
+    add_server_options(&packet);
+
+    send_packet(&packet, /*force_bcast:*/ 0);
+}
 
 
 /* globals */
-struct dhcpOfferedAddr *leases;
-struct server_config_t server_config;
-
-
-int udhcpd_main(int argc, char **argv);
-int udhcpd_main(int argc, char **argv)
+struct dyn_lease *g_leases;
+/* struct server_config_t server_config is in bb_common_bufsiz1 */
+
+
+int udhcpd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int udhcpd_main(int argc UNUSED_PARAM, char **argv)
 {
     fd_set rfds;
-    struct timeval tv;
-    int server_socket = -1, bytes, retval, max_sock;
-    struct dhcpMessage packet;
-    uint8_t *state, *server_id, *requested;
-    uint32_t server_id_align, requested_align, static_lease_ip;
+    int server_socket = -1, retval, max_sock;
+    struct dhcp_packet packet;
+    uint8_t *state;
+    uint32_t static_lease_nip;
     unsigned timeout_end;
     unsigned num_ips;
     unsigned opt;
     struct option_set *option;
-    struct dhcpOfferedAddr *lease, static_lease;
-
-    opt = getopt32(argv, "fS");
-    argv += optind;
-
+    struct dyn_lease *lease, fake_lease;
+    IF_FEATURE_UDHCP_PORT(char *str_P;)
+
+#if ENABLE_FEATURE_UDHCP_PORT
+    SERVER_PORT = 67;
+    CLIENT_PORT = 68;
+#endif
+
+#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1
+    opt_complementary = "vv";
+#endif
+    opt = getopt32(argv, "fSv"
+        IF_FEATURE_UDHCP_PORT("P:", &str_P)
+#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1
+        , &dhcp_verbose
+#endif
+        );
     if (!(opt & 1)) { /* no -f */
         bb_daemonize_or_rexec(0, argv);
-        logmode &= ~LOGMODE_STDIO;
-    }
-
+        logmode = LOGMODE_NONE;
+    }
+    /* update argv after the possible vfork+exec in daemonize */
+    argv += optind;
     if (opt & 2) { /* -S */
-        openlog(applet_name, LOG_PID, LOG_LOCAL0);
+        openlog(applet_name, LOG_PID, LOG_DAEMON);
         logmode |= LOGMODE_SYSLOG;
     }
-
+#if ENABLE_FEATURE_UDHCP_PORT
+    if (opt & 8) { /* -P */
+        SERVER_PORT = xatou16(str_P);
+        CLIENT_PORT = SERVER_PORT + 1;
+    }
+#endif
     /* Would rather not do read_config before daemonization -
      * otherwise NOMMU machines will parse config twice */
@@ -61 +337 @@
     /* Create pidfile */
     write_pidfile(server_config.pidfile);
-    /* if (!..) bb_perror_msg("cannot create pidfile %s", pidfile); */
-
-    bb_info_msg("%s (v%s) started", applet_name, BB_VER);
-
-    option = find_option(server_config.options, DHCP_LEASE_TIME);
-    server_config.lease = LEASE_TIME;
+    /* if (!..) bb_perror_msg("can't create pidfile %s", pidfile); */
+
+    bb_info_msg("%s (v"BB_VER") started", applet_name);
+
+    option = udhcp_find_option(server_config.options, DHCP_LEASE_TIME);
+    server_config.max_lease_sec = DEFAULT_LEASE_TIME;
     if (option) {
-        memcpy(&server_config.lease, option->data + 2, 4);
-        server_config.lease = ntohl(server_config.lease);
+        move_from_unaligned32(server_config.max_lease_sec, option->data + OPT_DATA);
+        server_config.max_lease_sec = ntohl(server_config.max_lease_sec);
     }
 
@@ -80 +356 @@
     }
 
-    leases = xzalloc(server_config.max_leases * sizeof(*leases));
+    g_leases = xzalloc(server_config.max_leases * sizeof(g_leases[0]));
     read_leases(server_config.lease_file);
 
-    if (read_interface(server_config.interface, &server_config.ifindex,
-               &server_config.server, server_config.arp)) {
+    if (udhcp_read_interface(server_config.interface,
+            &server_config.ifindex,
+            &server_config.server_nip,
+            server_config.server_mac)
+    ) {
         retval = 1;
         goto ret;
@@ -94 +373 @@
     timeout_end = monotonic_sec() + server_config.auto_time;
     while (1) { /* loop until universe collapses */
+        int bytes;
+        struct timeval tv;
+        uint8_t *server_id_opt;
+        uint8_t *requested_opt;
+        uint32_t requested_nip = requested_nip; /* for compiler */
 
         if (server_socket < 0) {
-            server_socket = listen_socket(/*INADDR_ANY,*/ SERVER_PORT,
+            server_socket = udhcp_listen_socket(/*INADDR_ANY,*/ SERVER_PORT,
                     server_config.interface);
         }
@@ -116 +400 @@
         }
         if (retval < 0 && errno != EINTR) {
-            DEBUG("error on select");
+            log1("Error on select");
             continue;
         }
@@ -122 +406 @@
         switch (udhcp_sp_read(&rfds)) {
         case SIGUSR1:
-            bb_info_msg("Received a SIGUSR1");
+            bb_info_msg("Received SIGUSR1");
             write_leases();
             /* why not just reset the timeout, eh */
@@ -128 +412 @@
             continue;
         case SIGTERM:
-            bb_info_msg("Received a SIGTERM");
+            bb_info_msg("Received SIGTERM");
             goto ret0;
-        case 0: break;      /* no signal */
-        default: continue;  /* signal or error (probably EINTR) */
-        }
-
-        bytes = udhcp_get_packet(&packet, server_socket); /* this waits for a packet - idle */
+        case 0: /* no signal: read a packet */
+            break;
+        default: /* signal or error (probably EINTR): back to select */
+            continue;
+        }
+
+        bytes = udhcp_recv_kernel_packet(&packet, server_socket);
         if (bytes < 0) {
+            /* bytes can also be -2 ("bad packet data") */
             if (bytes == -1 && errno != EINTR) {
-                DEBUG("error on read, %s, reopening socket", strerror(errno));
+                log1("Read error: %s, reopening socket", strerror(errno));
                 close(server_socket);
                 server_socket = -1;
@@ -143 +430 @@
             continue;
         }
-
-        state = get_option(&packet, DHCP_MESSAGE_TYPE);
-        if (state == NULL) {
-            bb_error_msg("cannot get option from packet, ignoring");
-            continue;
-        }
-
-        /* Look for a static lease */
-        static_lease_ip = getIpByMac(server_config.static_leases, &packet.chaddr);
-
-        if (static_lease_ip) {
-            bb_info_msg("Found static lease: %x", static_lease_ip);
-
-            memcpy(&static_lease.chaddr, &packet.chaddr, 16);
-            static_lease.yiaddr = static_lease_ip;
-            static_lease.expires = 0;
-
-            lease = &static_lease;
+        if (packet.hlen != 6) {
+            bb_error_msg("MAC length != 6, ignoring packet");
+            continue;
+        }
+        if (packet.op != BOOTREQUEST) {
+            bb_error_msg("not a REQUEST, ignoring packet");
+            continue;
+        }
+        state = udhcp_get_option(&packet, DHCP_MESSAGE_TYPE);
+        if (state == NULL || state[0] < DHCP_MINTYPE || state[0] > DHCP_MAXTYPE) {
+            bb_error_msg("no or bad message type option, ignoring packet");
+            continue;
+        }
+
+        /* Look for a static/dynamic lease */
+        static_lease_nip = get_static_nip_by_mac(server_config.static_leases, &packet.chaddr);
+        if (static_lease_nip) {
+            bb_info_msg("Found static lease: %x", static_lease_nip);
+            memcpy(&fake_lease.lease_mac, &packet.chaddr, 6);
+            fake_lease.lease_nip = static_lease_nip;
+            fake_lease.expires = 0;
+            lease = &fake_lease;
         } else {
-            lease = find_lease_by_chaddr(packet.chaddr);
+            lease = find_lease_by_mac(packet.chaddr);
+        }
+
+        /* Get REQUESTED_IP and SERVER_ID if present */
+        server_id_opt = udhcp_get_option(&packet, DHCP_SERVER_ID);
+        if (server_id_opt) {
+            uint32_t server_id_net;
+            move_from_unaligned32(server_id_net, server_id_opt);
+            if (server_id_net != server_config.server_nip) {
+                /* client talks to somebody else */
+                log1("server ID doesn't match, ignoring");
+                continue;
+            }
+        }
+        requested_opt = udhcp_get_option(&packet, DHCP_REQUESTED_IP);
+        if (requested_opt) {
+            move_from_unaligned32(requested_nip, requested_opt);
         }
 
         switch (state[0]) {
+
         case DHCPDISCOVER:
-            DEBUG("Received DISCOVER");
-
-            if (sendOffer(&packet) < 0) {
-                bb_error_msg("send OFFER failed");
+            log1("Received DISCOVER");
+
+            send_offer(&packet, static_lease_nip, lease);
+            break;
+
+        case DHCPREQUEST:
+            log1("Received REQUEST");
+/* RFC 2131:
+
+o DHCPREQUEST generated during SELECTING state:
+
+   Client inserts the address of the selected server in 'server
+   identifier', 'ciaddr' MUST be zero, 'requested IP address' MUST be
+   filled in with the yiaddr value from the chosen DHCPOFFER.
+
+   Note that the client may choose to collect several DHCPOFFER
+   messages and select the "best" offer.  The client indicates its
+   selection by identifying the offering server in the DHCPREQUEST
+   message.  If the client receives no acceptable offers, the client
+   may choose to try another DHCPDISCOVER message.  Therefore, the
+   servers may not receive a specific DHCPREQUEST from which they can
+   decide whether or not the client has accepted the offer.
+
+o DHCPREQUEST generated during INIT-REBOOT state:
+
+   'server identifier' MUST NOT be filled in, 'requested IP address'
+   option MUST be filled in with client's notion of its previously
+   assigned address. 'ciaddr' MUST be zero. The client is seeking to
+   verify a previously allocated, cached configuration. Server SHOULD
+   send a DHCPNAK message to the client if the 'requested IP address'
+   is incorrect, or is on the wrong network.
+
+   Determining whether a client in the INIT-REBOOT state is on the
+   correct network is done by examining the contents of 'giaddr', the
+   'requested IP address' option, and a database lookup. If the DHCP
+   server detects that the client is on the wrong net (i.e., the
+   result of applying the local subnet mask or remote subnet mask (if
+   'giaddr' is not zero) to 'requested IP address' option value
+   doesn't match reality), then the server SHOULD send a DHCPNAK
+   message to the client.
+
+   If the network is correct, then the DHCP server should check if
+   the client's notion of its IP address is correct. If not, then the
+   server SHOULD send a DHCPNAK message to the client. If the DHCP
+   server has no record of this client, then it MUST remain silent,
+   and MAY output a warning to the network administrator. This
+   behavior is necessary for peaceful coexistence of non-
+   communicating DHCP servers on the same wire.
+
+   If 'giaddr' is 0x0 in the DHCPREQUEST message, the client is on
+   the same subnet as the server.  The server MUST broadcast the
+   DHCPNAK message to the 0xffffffff broadcast address because the
+   client may not have a correct network address or subnet mask, and
+   the client may not be answering ARP requests.
+
+   If 'giaddr' is set in the DHCPREQUEST message, the client is on a
+   different subnet.  The server MUST set the broadcast bit in the
+   DHCPNAK, so that the relay agent will broadcast the DHCPNAK to the
+   client, because the client may not have a correct network address
+   or subnet mask, and the client may not be answering ARP requests.
+
+o DHCPREQUEST generated during RENEWING state:
+
+   'server identifier' MUST NOT be filled in, 'requested IP address'
+   option MUST NOT be filled in, 'ciaddr' MUST be filled in with
+   client's IP address. In this situation, the client is completely
+   configured, and is trying to extend its lease. This message will
+   be unicast, so no relay agents will be involved in its
+   transmission.  Because 'giaddr' is therefore not filled in, the
+   DHCP server will trust the value in 'ciaddr', and use it when
+   replying to the client.
+
+   A client MAY choose to renew or extend its lease prior to T1.  The
+   server may choose not to extend the lease (as a policy decision by
+   the network administrator), but should return a DHCPACK message
+   regardless.
+
+o DHCPREQUEST generated during REBINDING state:
+
+   'server identifier' MUST NOT be filled in, 'requested IP address'
+   option MUST NOT be filled in, 'ciaddr' MUST be filled in with
+   client's IP address. In this situation, the client is completely
+   configured, and is trying to extend its lease. This message MUST
+   be broadcast to the 0xffffffff IP broadcast address.  The DHCP
+   server SHOULD check 'ciaddr' for correctness before replying to
+   the DHCPREQUEST.
+
+   The DHCPREQUEST from a REBINDING client is intended to accommodate
+   sites that have multiple DHCP servers and a mechanism for
+   maintaining consistency among leases managed by multiple servers.
+   A DHCP server MAY extend a client's lease only if it has local
+   administrative authority to do so.
+*/
+            if (!requested_opt) {
+                requested_nip = packet.ciaddr;
+                if (requested_nip == 0) {
+                    log1("no requested IP and no ciaddr, ignoring");
+                    break;
+                }
+            }
+            if (lease && requested_nip == lease->lease_nip) {
+                /* client requested or configured IP matches the lease.
+                 * ACK it, and bump lease expiration time. */
+                send_ACK(&packet, lease->lease_nip);
+                break;
+            }
+            if (server_id_opt) {
+                /* client was talking specifically to us.
+                 * "No, we don't have this IP for you". */
+                send_NAK(&packet);
             }
             break;
-        case DHCPREQUEST:
-            DEBUG("received REQUEST");
-
-            requested = get_option(&packet, DHCP_REQUESTED_IP);
-            server_id = get_option(&packet, DHCP_SERVER_ID);
-
-            if (requested) memcpy(&requested_align, requested, 4);
-            if (server_id) memcpy(&server_id_align, server_id, 4);
-
-            if (lease) {
-                if (server_id) {
-                    /* SELECTING State */
-                    DEBUG("server_id = %08x", ntohl(server_id_align));
-                    if (server_id_align == server_config.server && requested
-                     && requested_align == lease->yiaddr
-                    ) {
-                        sendACK(&packet, lease->yiaddr);
-                    }
-                } else if (requested) {
-                    /* INIT-REBOOT State */
-                    if (lease->yiaddr == requested_align)
-                        sendACK(&packet, lease->yiaddr);
-                    else
-                        sendNAK(&packet);
-                } else if (lease->yiaddr == packet.ciaddr) {
-                    /* RENEWING or REBINDING State */
-                    sendACK(&packet, lease->yiaddr);
-                } else {
-                    /* don't know what to do!!!! */
-                    sendNAK(&packet);
-                }
-
-            /* what to do if we have no record of the client */
-            } else if (server_id) {
-                /* SELECTING State */
-
-            } else if (requested) {
-                /* INIT-REBOOT State */
-                lease = find_lease_by_yiaddr(requested_align);
-                if (lease) {
-                    if (lease_expired(lease)) {
-                        /* probably best if we drop this lease */
-                        memset(lease->chaddr, 0, 16);
-                    /* make some contention for this address */
-                    } else
-                        sendNAK(&packet);
-                } else {
-                    uint32_t r = ntohl(requested_align);
-                    if (r < server_config.start_ip
-                         || r > server_config.end_ip
-                    ) {
-                        sendNAK(&packet);
-                    }
-                    /* else remain silent */
-                }
-
-            } else {
-                /* RENEWING or REBINDING State */
+
+        case DHCPDECLINE:
+            /* RFC 2131:
+             * "If the server receives a DHCPDECLINE message,
+             * the client has discovered through some other means
+             * that the suggested network address is already
+             * in use. The server MUST mark the network address
+             * as not available and SHOULD notify the local
+             * sysadmin of a possible configuration problem."
+             *
+             * SERVER_ID must be present,
+             * REQUESTED_IP must be present,
+             * chaddr must be filled in,
+             * ciaddr must be 0 (we do not check this)
+             */
+            log1("Received DECLINE");
+            if (server_id_opt
+             && requested_opt
+             && lease  /* chaddr matches this lease */
+             && requested_nip == lease->lease_nip
+            ) {
+                memset(lease->lease_mac, 0, sizeof(lease->lease_mac));
+                lease->expires = time(NULL) + server_config.decline_time;
             }
             break;
-        case DHCPDECLINE:
-            DEBUG("Received DECLINE");
-            if (lease) {
-                memset(lease->chaddr, 0, 16);
-                lease->expires = time(0) + server_config.decline_time;
+
+        case DHCPRELEASE:
+            /* "Upon receipt of a DHCPRELEASE message, the server
+             * marks the network address as not allocated."
+             *
+             * SERVER_ID must be present,
+             * REQUESTED_IP must not be present (we do not check this),
+             * chaddr must be filled in,
+             * ciaddr must be filled in
+             */
+            log1("Received RELEASE");
+            if (server_id_opt
+             && lease  /* chaddr matches this lease */
+             && packet.ciaddr == lease->lease_nip
+            ) {
+                lease->expires = time(NULL);
             }
             break;
-        case DHCPRELEASE:
-            DEBUG("Received RELEASE");
-            if (lease)
-                lease->expires = time(0);
-            break;
+
         case DHCPINFORM:
-            DEBUG("Received INFORM");
+            log1("Received INFORM");
             send_inform(&packet);
             break;
-        default:
-            bb_info_msg("Unsupported DHCP message (%02x) - ignoring", state[0]);
         }
     }

branches/2.2.9/mindi-busybox/networking/udhcp/dhcpd.h

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
-/* dhcpd.h */
-#ifndef _DHCPD_H
-#define _DHCPD_H
+/*
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+#ifndef UDHCP_DHCPD_H
+#define UDHCP_DHCPD_H 1
 
-/************************************/
-/* Defaults _you_ may want to tweak */
-/************************************/
+PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 
-/* the period of time the client is allowed to use that address */
-#define LEASE_TIME              (60*60*24*10) /* 10 days of seconds */
-#define LEASES_FILE     "/var/lib/misc/udhcpd.leases"
-
-/* where to find the DHCP server configuration file */
+/* Defaults you may want to tweak */
+/* Default max_lease_sec */
+#define DEFAULT_LEASE_TIME      (60*60*24 * 10)
+#define LEASES_FILE             CONFIG_DHCPD_LEASES_FILE
+/* Where to find the DHCP server configuration file */
 #define DHCPD_CONF_FILE         "/etc/udhcpd.conf"
 
-struct option_set {
-    uint8_t *data;
-    struct option_set *next;
-};
 
 struct static_lease {
     struct static_lease *next;
-    uint8_t *mac;
-    uint32_t *ip;
+    uint32_t nip;
+    uint8_t mac[6];
 };
 
 struct server_config_t {
-    uint32_t server;                /* Our IP, in network order */
+    char *interface;                /* interface to use */
+//TODO: ifindex, server_nip, server_mac
+// are obtained from interface name.
+// Instead of querying them *once*, create update_server_network_data_cache()
+// and call it before any usage of these fields.
+// update_server_network_data_cache() must re-query data
+// if more than N seconds have passed after last use.
+    int ifindex;
+    uint32_t server_nip;
+#if ENABLE_FEATURE_UDHCP_PORT
+    uint16_t port;
+#endif
+    uint8_t server_mac[6];          /* our MAC address (used only for ARP probing) */
+    struct option_set *options;     /* list of DHCP options loaded from the config file */
     /* start,end are in host order: we need to compare start <= ip <= end */
-    uint32_t start_ip;              /* Start address of leases, in host order */
-    uint32_t end_ip;                /* End of leases, in host order */
-    struct option_set *options;     /* List of DHCP options loaded from the config file */
-    char *interface;                /* The name of the interface to use */
-    int ifindex;                    /* Index number of the interface to use */
-    uint8_t arp[6];                 /* Our arp address */
-    char remaining;                 /* should the lease file be interpreted as lease time remaining, or
-                                     * as the time the lease expires */
-    uint32_t lease;                 /* lease time in seconds (host order) */
-    uint32_t max_leases;            /* maximum number of leases (including reserved address) */
+    uint32_t start_ip;              /* start address of leases, in host order */
+    uint32_t end_ip;                /* end of leases, in host order */
+    uint32_t max_lease_sec;         /* maximum lease time (host order) */
+    uint32_t min_lease_sec;         /* minimum lease time a client can request */
+    uint32_t max_leases;            /* maximum number of leases (including reserved addresses) */
     uint32_t auto_time;             /* how long should udhcpd wait before writing a config file.
                                      * if this is zero, it will only write one on SIGUSR1 */
@@ -45 +49 @@
     uint32_t conflict_time;         /* how long an arp conflict offender is leased for */
     uint32_t offer_time;            /* how long an offered address is reserved */
-    uint32_t min_lease;             /* minimum lease a client can request */
+    uint32_t siaddr_nip;            /* "next server" bootp option */
     char *lease_file;
     char *pidfile;
-    char *notify_file;              /* What to run whenever leases are written */
-    uint32_t siaddr;                /* next server bootp option */
+    char *notify_file;              /* what to run whenever leases are written */
     char *sname;                    /* bootp server name */
     char *boot_file;                /* bootp boot file option */
     struct static_lease *static_leases; /* List of ip/mac pairs to assign static leases */
-};
+} FIX_ALIASING;
 
-extern struct server_config_t server_config;
-extern struct dhcpOfferedAddr *leases;
+#define server_config (*(struct server_config_t*)&bb_common_bufsiz1)
+/* client_config sits in 2nd half of bb_common_bufsiz1 */
+
+#if ENABLE_FEATURE_UDHCP_PORT
+#define SERVER_PORT (server_config.port)
+#else
+#define SERVER_PORT 67
+#endif
 
 
-/*** leases.h ***/
+typedef uint32_t leasetime_t;
+typedef int32_t signed_leasetime_t;
 
-struct dhcpOfferedAddr {
-    uint8_t chaddr[16];
-    uint32_t yiaddr;    /* network order */
-    uint32_t expires;   /* host order */
-};
+struct dyn_lease {
+    /* Unix time when lease expires. Kept in memory in host order.
+     * When written to file, converted to network order
+     * and adjusted (current time subtracted) */
+    leasetime_t expires;
+    /* "nip": IP in network order */
+    uint32_t lease_nip;
+    /* We use lease_mac[6], since e.g. ARP probing uses
+     * only 6 first bytes anyway. We check received dhcp packets
+     * that their hlen == 6 and thus chaddr has only 6 significant bytes
+     * (dhcp packet has chaddr[16], not [6])
+     */
+    uint8_t lease_mac[6];
+    char hostname[20];
+    uint8_t pad[2];
+    /* total size is a multiply of 4 */
+} PACKED;
 
-struct dhcpOfferedAddr *add_lease(const uint8_t *chaddr, uint32_t yiaddr, unsigned long lease);
-int lease_expired(struct dhcpOfferedAddr *lease);
-struct dhcpOfferedAddr *find_lease_by_chaddr(const uint8_t *chaddr);
-struct dhcpOfferedAddr *find_lease_by_yiaddr(uint32_t yiaddr);
-uint32_t find_address(int check_expired);
+extern struct dyn_lease *g_leases;
+
+struct dyn_lease *add_lease(
+        const uint8_t *chaddr, uint32_t yiaddr,
+        leasetime_t leasetime,
+        const char *hostname, int hostname_len
+        ) FAST_FUNC;
+int is_expired_lease(struct dyn_lease *lease) FAST_FUNC;
+struct dyn_lease *find_lease_by_mac(const uint8_t *mac) FAST_FUNC;
+struct dyn_lease *find_lease_by_nip(uint32_t nip) FAST_FUNC;
+uint32_t find_free_or_expired_nip(const uint8_t *safe_mac) FAST_FUNC;
 
 
-/*** static_leases.h ***/
-
-/* Config file will pass static lease info to this function which will add it
- * to a data structure that can be searched later */
-int addStaticLease(struct static_lease **lease_struct, uint8_t *mac, uint32_t *ip);
-/* Check to see if a mac has an associated static lease */
-uint32_t getIpByMac(struct static_lease *lease_struct, void *arg);
-/* Check to see if an ip is reserved as a static ip */
-uint32_t reservedIp(struct static_lease *lease_struct, uint32_t ip);
+/* Config file parser will pass static lease info to this function
+ * which will add it to a data structure that can be searched later */
+void add_static_lease(struct static_lease **st_lease_pp, uint8_t *mac, uint32_t nip) FAST_FUNC;
+/* Find static lease IP by mac */
+uint32_t get_static_nip_by_mac(struct static_lease *st_lease, void *arg) FAST_FUNC;
+/* Check to see if an IP is reserved as a static IP */
+int is_nip_reserved(struct static_lease *st_lease, uint32_t nip) FAST_FUNC;
 /* Print out static leases just to check what's going on (debug code) */
-void printStaticLeases(struct static_lease **lease_struct);
+#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 2
+void log_static_leases(struct static_lease **st_lease_pp) FAST_FUNC;
+#else
+# define log_static_leases(st_lease_pp) ((void)0)
+#endif
 
 
-/*** serverpacket.h ***/
-
-int sendOffer(struct dhcpMessage *oldpacket);
-int sendNAK(struct dhcpMessage *oldpacket);
-int sendACK(struct dhcpMessage *oldpacket, uint32_t yiaddr);
-int send_inform(struct dhcpMessage *oldpacket);
+void read_config(const char *file) FAST_FUNC;
+void write_leases(void) FAST_FUNC;
+void read_leases(const char *file) FAST_FUNC;
 
 
-/*** files.h ***/
-
-int read_config(const char *file);
-void write_leases(void);
-void read_leases(const char *file);
-struct option_set *find_option(struct option_set *opt_list, char code);
-
+POP_SAVED_FUNCTION_VISIBILITY
 
 #endif

branches/2.2.9/mindi-busybox/networking/udhcp/dhcprelay.c

@@ -2 +2 @@
 /* Port to Busybox Copyright (C) 2006 Jesse Dutton <jessedutton@gmail.com>
  *
- * Licensed under GPL v2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  *
  * DHCP Relay for 'DHCPv4 Configuration of IPSec Tunnel Mode' support
@@ -10 +10 @@
  * Upstream has GPL v2 or later
  */
-
 #include "common.h"
-#include "dhcpd.h"
-#include "options.h"
-
-/* constants */
-#define SELECT_TIMEOUT 5 /* select timeout in sec. */
-#define MAX_LIFETIME 2*60 /* lifetime of an xid entry in sec. */
-#define MAX_INTERFACES 9
-
+
+#define SERVER_PORT    67
+
+/* lifetime of an xid entry in sec. */
+#define MAX_LIFETIME   2*60
+/* select timeout in sec. */
+#define SELECT_TIMEOUT (MAX_LIFETIME / 8)
 
 /* This list holds information about clients. The xid_* functions manipulate this list. */
-static struct xid_item {
+struct xid_item {
+    unsigned timestamp;
+    int client;
     uint32_t xid;
     struct sockaddr_in ip;
-    int client;
-    time_t timestamp;
     struct xid_item *next;
-} dhcprelay_xid_list = {0, {0}, 0, 0, NULL};
-
+};
+
+#define dhcprelay_xid_list (*(struct xid_item*)&bb_common_bufsiz1)
 
 static struct xid_item *xid_add(uint32_t xid, struct sockaddr_in *ip, int client)
@@ -42 +41 @@
     item->xid = xid;
     item->client = client;
-    item->timestamp = time(NULL);
+    item->timestamp = monotonic_sec();
     item->next = dhcprelay_xid_list.next;
     dhcprelay_xid_list.next = item;
@@ -53 +52 @@
     struct xid_item *item = dhcprelay_xid_list.next;
     struct xid_item *last = &dhcprelay_xid_list;
-    time_t current_time = time(NULL);
+    unsigned current_time = monotonic_sec();
 
     while (item != NULL) {
@@ -72 +71 @@
     while (item != NULL) {
         if (item->xid == xid) {
-            return item;
+            break;
         }
         item = item->next;
     }
-    return NULL;
+    return item;
 }
 
@@ -100 +99 @@
  * returns the message type on success, -1 otherwise
  */
-static int get_dhcp_packet_type(struct dhcpMessage *p)
+static int get_dhcp_packet_type(struct dhcp_packet *p)
 {
     uint8_t *op;
@@ -108 +107 @@
         return -1;
     /* get message type option */
-    op = get_option(p, DHCP_MESSAGE_TYPE);
+    op = udhcp_get_option(p, DHCP_MESSAGE_TYPE);
     if (op != NULL)
         return op[0];
@@ -115 +114 @@
 
 /**
- * signal_handler - handles signals ;-)
- * sig - sent signal
- */
-static smallint dhcprelay_stopflag;
-
-static void dhcprelay_signal_handler(int sig)
-{
-    dhcprelay_stopflag = 1;
-}
-
-/**
- * get_client_devices - parses the devices list
- * dev_list - comma separated list of devices
+ * make_iface_list - parses client/server interface names
  * returns array
  */
-static char **get_client_devices(char *dev_list, int *client_number)
-{
-    char *s, *list, **client_dev;
+static char **make_iface_list(char **client_and_server_ifaces, int *client_number)
+{
+    char *s, **iface_list;
     int i, cn;
 
-    /* copy list */
-    list = xstrdup(dev_list);
-    if (list == NULL) return NULL;
-
     /* get number of items */
-    for (s = dev_list, cn = 1; *s; s++)
+    cn = 2; /* 1 server iface + at least 1 client one */
+    s = client_and_server_ifaces[0]; /* list of client ifaces */
+    while (*s) {
         if (*s == ',')
             cn++;
-
-    client_dev = xzalloc(cn * sizeof(*client_dev));
-
-    /* parse list */
-    s = strtok(list, ",");
-    i = 0;
-    while (s != NULL) {
-        client_dev[i++] = xstrdup(s);
-        s = strtok(NULL, ",");
-    }
-
-    /* free copy and exit */
-    free(list);
+        s++;
+    }
     *client_number = cn;
-    return client_dev;
-}
-
-
-/* Creates listen sockets (in fds) and returns the number allocated. */
-static int init_sockets(char **client, int num_clients,
-            char *server, int *fds, int *max_socket)
-{
-    int i;
-
-    /* talk to real server on bootps */
-    fds[0] = listen_socket(/*INADDR_ANY,*/ 67, server);
-    *max_socket = fds[0];
-
-    /* array starts at 1 since server is 0 */
-    num_clients++;
-
-    for (i = 1; i < num_clients; i++) {
-        /* listen for clients on bootps */
-        fds[i] = listen_socket(/*NADDR_ANY,*/ 67, client[i-1]);
-        if (fds[i] > *max_socket)
-            *max_socket = fds[i];
-    }
-
-    return i;
-}
-
+
+    /* create vector of pointers */
+    iface_list = xzalloc(cn * sizeof(iface_list[0]));
+
+    iface_list[0] = client_and_server_ifaces[1]; /* server iface */
+
+    i = 1;
+    s = xstrdup(client_and_server_ifaces[0]); /* list of client ifaces */
+    goto store_client_iface_name;
+
+    while (i < cn) {
+        if (*s++ == ',') {
+            s[-1] = '\0';
+ store_client_iface_name:
+            iface_list[i++] = s;
+        }
+    }
+
+    return iface_list;
+}
+
+/* Creates listen sockets (in fds) bound to client and server ifaces,
+ * and returns numerically max fd.
+ */
+static int init_sockets(char **iface_list, int num_clients, int *fds)
+{
+    int i, n;
+
+    n = 0;
+    for (i = 0; i < num_clients; i++) {
+        fds[i] = udhcp_listen_socket(/*INADDR_ANY,*/ SERVER_PORT, iface_list[i]);
+        if (n < fds[i])
+            n = fds[i];
+    }
+    return n;
+}
+
+static int sendto_ip4(int sock, const void *msg, int msg_len, struct sockaddr_in *to)
+{
+    int err;
+
+    errno = 0;
+    err = sendto(sock, msg, msg_len, 0, (struct sockaddr*) to, sizeof(*to));
+    err -= msg_len;
+    if (err)
+        bb_perror_msg("sendto");
+    return err;
+}
 
 /**
- * pass_on() - forwards dhcp packets from client to server
+ * pass_to_server() - forwards dhcp packets from client to server
  * p - packet to send
  * client - number of the client
  */
-static void pass_on(struct dhcpMessage *p, int packet_len, int client, int *fds,
+static void pass_to_server(struct dhcp_packet *p, int packet_len, int client, int *fds,
             struct sockaddr_in *client_addr, struct sockaddr_in *server_addr)
 {
-    int res, type;
-    struct xid_item *item;
+    int type;
 
     /* check packet_type */
@@ -206 +200 @@
 
     /* create new xid entry */
-    item = xid_add(p->xid, client_addr, client);
-
-    /* forward request to LAN (server) */
-    res = sendto(fds[0], p, packet_len, 0, (struct sockaddr*)server_addr,
-            sizeof(struct sockaddr_in));
-    if (res != packet_len) {
-        bb_perror_msg("pass_on");
-        return;
-    }
+    xid_add(p->xid, client_addr, client);
+
+    /* forward request to server */
+    /* note that we send from fds[0] which is bound to SERVER_PORT (67).
+     * IOW: we send _from_ SERVER_PORT! Although this may look strange,
+     * RFC 1542 not only allows, but prescribes this for BOOTP relays.
+     */
+    sendto_ip4(fds[0], p, packet_len, server_addr);
 }
 
 /**
- * pass_back() - forwards dhcp packets from server to client
+ * pass_to_client() - forwards dhcp packets from server to client
  * p - packet to send
  */
-static void pass_back(struct dhcpMessage *p, int packet_len, int *fds)
-{
-    int res, type;
+static void pass_to_client(struct dhcp_packet *p, int packet_len, int *fds)
+{
+    int type;
     struct xid_item *item;
 
@@ -238 +231 @@
     }
 
+//TODO: also do it if (p->flags & htons(BROADCAST_FLAG)) is set!
     if (item->ip.sin_addr.s_addr == htonl(INADDR_ANY))
         item->ip.sin_addr.s_addr = htonl(INADDR_BROADCAST);
-    if (item->client > MAX_INTERFACES)
-        return;
-    res = sendto(fds[item->client], p, packet_len, 0, (struct sockaddr*)(&item->ip),
-                sizeof(item->ip));
-    if (res != packet_len) {
-        bb_perror_msg("pass_back");
-        return;
+
+    if (sendto_ip4(fds[item->client], p, packet_len, &item->ip) != 0) {
+        return; /* send error occurred */
     }
 
@@ -253 +243 @@
 }
 
-static void dhcprelay_loop(int *fds, int num_sockets, int max_socket, char **clients,
-        struct sockaddr_in *server_addr, uint32_t gw_ip)
-{
-    struct dhcpMessage dhcp_msg;
-    fd_set rfds;
-    size_t packlen;
-    socklen_t addr_size;
-    struct sockaddr_in client_addr;
-    struct timeval tv;
-    int i;
-
-    while (!dhcprelay_stopflag) {
+int dhcprelay_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int dhcprelay_main(int argc, char **argv)
+{
+    struct sockaddr_in server_addr;
+    char **iface_list;
+    int *fds;
+    int num_sockets, max_socket;
+    uint32_t our_nip;
+
+    server_addr.sin_family = AF_INET;
+    server_addr.sin_addr.s_addr = htonl(INADDR_BROADCAST);
+    server_addr.sin_port = htons(SERVER_PORT);
+
+    /* dhcprelay CLIENT_IFACE1[,CLIENT_IFACE2...] SERVER_IFACE [SERVER_IP] */
+    if (argc == 4) {
+        if (!inet_aton(argv[3], &server_addr.sin_addr))
+            bb_perror_msg_and_die("bad server IP");
+    } else if (argc != 3) {
+        bb_show_usage();
+    }
+
+    iface_list = make_iface_list(argv + 1, &num_sockets);
+
+    fds = xmalloc(num_sockets * sizeof(fds[0]));
+
+    /* Create sockets and bind one to every iface */
+    max_socket = init_sockets(iface_list, num_sockets, fds);
+
+    /* Get our IP on server_iface */
+    if (udhcp_read_interface(argv[2], NULL, &our_nip, NULL))
+        return 1;
+
+    /* Main loop */
+    while (1) {
+// reinit stuff from time to time? go back to make_iface_list
+// every N minutes?
+        fd_set rfds;
+        struct timeval tv;
+        int i;
+
         FD_ZERO(&rfds);
         for (i = 0; i < num_sockets; i++)
@@ -271 +289 @@
         tv.tv_usec = 0;
         if (select(max_socket + 1, &rfds, NULL, NULL, &tv) > 0) {
+            int packlen;
+            struct dhcp_packet dhcp_msg;
+
             /* server */
             if (FD_ISSET(fds[0], &rfds)) {
-                packlen = udhcp_get_packet(&dhcp_msg, fds[0]);
+                packlen = udhcp_recv_kernel_packet(&dhcp_msg, fds[0]);
                 if (packlen > 0) {
-                    pass_back(&dhcp_msg, packlen, fds);
+                    pass_to_client(&dhcp_msg, packlen, fds);
                 }
             }
+
+            /* clients */
             for (i = 1; i < num_sockets; i++) {
-                /* clients */
+                struct sockaddr_in client_addr;
+                socklen_t addr_size;
+
                 if (!FD_ISSET(fds[i], &rfds))
                     continue;
-                addr_size = sizeof(struct sockaddr_in);
+
+                addr_size = sizeof(client_addr);
                 packlen = recvfrom(fds[i], &dhcp_msg, sizeof(dhcp_msg), 0,
-                            (struct sockaddr *)(&client_addr), &addr_size);
+                        (struct sockaddr *)(&client_addr), &addr_size);
                 if (packlen <= 0)
                     continue;
-                if (read_interface(clients[i-1], NULL, &dhcp_msg.giaddr, NULL))
-                    dhcp_msg.giaddr = gw_ip;
-                pass_on(&dhcp_msg, packlen, i, fds, &client_addr, server_addr);
+
+                /* Get our IP on corresponding client_iface */
+// RFC 1542
+// 4.1 General BOOTP Processing for Relay Agents
+// 4.1.1 BOOTREQUEST Messages
+//   If the relay agent does decide to relay the request, it MUST examine
+//   the 'giaddr' ("gateway" IP address) field.  If this field is zero,
+//   the relay agent MUST fill this field with the IP address of the
+//   interface on which the request was received.  If the interface has
+//   more than one IP address logically associated with it, the relay
+//   agent SHOULD choose one IP address associated with that interface and
+//   use it consistently for all BOOTP messages it relays.  If the
+//   'giaddr' field contains some non-zero value, the 'giaddr' field MUST
+//   NOT be modified.  The relay agent MUST NOT, under any circumstances,
+//   fill the 'giaddr' field with a broadcast address as is suggested in
+//   [1] (Section 8, sixth paragraph).
+
+// but why? what if server can't route such IP? Client ifaces may be, say, NATed!
+
+// 4.1.2 BOOTREPLY Messages
+//   BOOTP relay agents relay BOOTREPLY messages only to BOOTP clients.
+//   It is the responsibility of BOOTP servers to send BOOTREPLY messages
+//   directly to the relay agent identified in the 'giaddr' field.
+// (yeah right, unless it is impossible... see comment above)
+//   Therefore, a relay agent may assume that all BOOTREPLY messages it
+//   receives are intended for BOOTP clients on its directly-connected
+//   networks.
+//
+//   When a relay agent receives a BOOTREPLY message, it should examine
+//   the BOOTP 'giaddr', 'yiaddr', 'chaddr', 'htype', and 'hlen' fields.
+//   These fields should provide adequate information for the relay agent
+//   to deliver the BOOTREPLY message to the client.
+//
+//   The 'giaddr' field can be used to identify the logical interface from
+//   which the reply must be sent (i.e., the host or router interface
+//   connected to the same network as the BOOTP client).  If the content
+//   of the 'giaddr' field does not match one of the relay agent's
+//   directly-connected logical interfaces, the BOOTREPLY messsage MUST be
+//   silently discarded.
+                if (udhcp_read_interface(iface_list[i], NULL, &dhcp_msg.gateway_nip, NULL)) {
+                    /* Fall back to our IP on server iface */
+// this makes more sense!
+                    dhcp_msg.gateway_nip = our_nip;
+                }
+// maybe dhcp_msg.hops++? drop packets with too many hops (RFC 1542 says 4 or 16)?
+                pass_to_server(&dhcp_msg, packlen, i, fds, &client_addr, &server_addr);
             }
         }
         xid_expire();
-    }
-}
-
-int dhcprelay_main(int argc, char **argv);
-int dhcprelay_main(int argc, char **argv)
-{
-    int i, num_sockets, max_socket, fds[MAX_INTERFACES];
-    uint32_t gw_ip;
-    char **clients;
-    struct sockaddr_in server_addr;
-
-    server_addr.sin_family = AF_INET;
-    server_addr.sin_port = htons(67);
-    if (argc == 4) {
-        if (!inet_aton(argv[3], &server_addr.sin_addr))
-            bb_perror_msg_and_die("didn't grok server");
-    } else if (argc == 3) {
-        server_addr.sin_addr.s_addr = htonl(INADDR_BROADCAST);
-    } else {
-        bb_show_usage();
-    }
-    clients = get_client_devices(argv[1], &num_sockets);
-    if (!clients) return 0;
-
-    signal(SIGTERM, dhcprelay_signal_handler);
-    signal(SIGQUIT, dhcprelay_signal_handler);
-    signal(SIGINT, dhcprelay_signal_handler);
-
-    num_sockets = init_sockets(clients, num_sockets, argv[2], fds, &max_socket);
-
-    if (read_interface(argv[2], NULL, &gw_ip, NULL))
-        return 1;
-
-    dhcprelay_loop(fds, num_sockets, max_socket, clients, &server_addr, gw_ip);
-
-    if (ENABLE_FEATURE_CLEAN_UP) {
-        for (i = 0; i < num_sockets; i++) {
-            close(fds[i]);
-            free(clients[i]);
-        }
-    }
-
-    return 0;
-}
+    } /* while (1) */
+
+    /* return 0; - not reached */
+}

branches/2.2.9/mindi-busybox/networking/udhcp/domain_codec.c

@@ -5 +5 @@
  * Loosely based on the isc-dhcpd implementation by dhankins@isc.org
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
- */
-
-#if ENABLE_FEATURE_RFC3397
-
-#include "common.h"
-#include "options.h"
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
+#ifdef DNS_COMPR_TESTING
+# define FAST_FUNC /* nothing */
+# define xmalloc malloc
+# include <stdlib.h>
+# include <stdint.h>
+# include <string.h>
+# include <stdio.h>
+#else
+# include "common.h"
+#endif
 
 #define NS_MAXDNAME  1025   /* max domain name length */
@@ -20 +25 @@
 
 
-/* expand a RFC1035-compressed list of domain names "cstr", of length "clen";
+/* Expand a RFC1035-compressed list of domain names "cstr", of length "clen";
  * returns a newly allocated string containing the space-separated domains,
  * prefixed with the contents of string pre, or NULL if an error occurs.
  */
-char *dname_dec(const uint8_t *cstr, int clen, const char *pre)
-{
-    const uint8_t *c;
-    int crtpos, retpos, depth, plen = 0, len = 0;
+char* FAST_FUNC dname_dec(const uint8_t *cstr, int clen, const char *pre)
+{
+    char *ret = ret; /* for compiler */
     char *dst = NULL;
-
-    if (!cstr)
-        return NULL;
-
-    if (pre)
-        plen = strlen(pre);
 
     /* We make two passes over the cstr string. First, we compute
@@ -43 +41 @@
      * buffer, then having to check if it's sufficiently large, etc.
      */
-
-    while (!dst) {
-
-        if (len > 0) {  /* second pass? allocate dst buffer and copy pre */
-            dst = xmalloc(len + plen);
-            memcpy(dst, pre, plen);
-        }
+    while (1) {
+        /* note: "return NULL" below are leak-safe since
+         * dst isn't yet allocated */
+        const uint8_t *c;
+        unsigned crtpos, retpos, depth, len;
 
         crtpos = retpos = depth = len = 0;
-
         while (crtpos < clen) {
             c = cstr + crtpos;
 
-            if ((*c & NS_CMPRSFLGS) != 0) { /* pointer */
-                if (crtpos + 2 > clen)      /* no offset to jump to? abort */
+            if ((*c & NS_CMPRSFLGS) == NS_CMPRSFLGS) {
+                /* pointer */
+                if (crtpos + 2 > clen) /* no offset to jump to? abort */
                     return NULL;
-                if (retpos == 0)            /* toplevel? save return spot */
+                if (retpos == 0) /* toplevel? save return spot */
                     retpos = crtpos + 2;
                 depth++;
-                crtpos = ((*c & 0x3f) << 8) | (*(c + 1) & 0xff); /* jump */
-            } else if (*c) {            /* label */
-                if (crtpos + *c + 1 > clen)     /* label too long? abort */
+                crtpos = ((c[0] & 0x3f) << 8) | c[1]; /* jump */
+            } else if (*c) {
+                /* label */
+                if (crtpos + *c + 1 > clen) /* label too long? abort */
                     return NULL;
                 if (dst)
-                    memcpy(dst + plen + len, c + 1, *c);
+                    memcpy(dst + len, c + 1, *c);
                 len += *c + 1;
                 crtpos += *c + 1;
                 if (dst)
-                    *(dst + plen + len - 1) = '.';
-            } else {                    /* null: end of current domain name */
-                if (retpos == 0) {          /* toplevel? keep going */
+                    dst[len - 1] = '.';
+            } else {
+                /* NUL: end of current domain name */
+                if (retpos == 0) {
+                    /* toplevel? keep going */
                     crtpos++;
-                } else {                    /* return to toplevel saved spot */
+                } else {
+                    /* return to toplevel saved spot */
                     crtpos = retpos;
                     retpos = depth = 0;
                 }
                 if (dst)
-                    *(dst + plen + len - 1) = ' ';
-            }
-
-            if (depth > NS_MAXDNSRCH || /* too many jumps? abort, it's a loop */
-                len > NS_MAXDNAME * NS_MAXDNSRCH) /* result too long? abort */
+                    dst[len - 1] = ' ';
+            }
+
+            if (depth > NS_MAXDNSRCH /* too many jumps? abort, it's a loop */
+             || len > NS_MAXDNAME * NS_MAXDNSRCH /* result too long? abort */
+            ) {
                 return NULL;
-        }
-
-        if (!len)           /* expanded string has 0 length? abort */
+            }
+        }
+
+        if (!len) /* expanded string has 0 length? abort */
             return NULL;
 
-        if (dst)
-            *(dst + plen + len - 1) = '\0';
-    }
-
-    return dst;
+        if (!dst) { /* first pass? */
+            /* allocate dst buffer and copy pre */
+            unsigned plen = strlen(pre);
+            ret = dst = xmalloc(plen + len);
+            memcpy(dst, pre, plen);
+            dst += plen;
+        } else {
+            dst[len - 1] = '\0';
+            break;
+        }
+    }
+
+    return ret;
 }
 
@@ -104 +114 @@
 static uint8_t *convert_dname(const char *src)
 {
-    uint8_t c, *res, *lp, *rp;
+    uint8_t c, *res, *lenptr, *dst;
     int len;
 
     res = xmalloc(strlen(src) + 2);
-    rp = lp = res;
-    rp++;
+    dst = lenptr = res;
+    dst++;
 
     for (;;) {
         c = (uint8_t)*src++;
-        if (c == '.' || c == '\0') {    /* end of label */
-            len = rp - lp - 1;
+        if (c == '.' || c == '\0') {  /* end of label */
+            len = dst - lenptr - 1;
             /* label too long, too short, or two '.'s in a row? abort */
             if (len > NS_MAXLABEL || len == 0 || (c == '.' && *src == '.')) {
@@ -120 +130 @@
                 return NULL;
             }
-            *lp = len;
-            lp = rp++;
-            if (c == '\0' || *src == '\0')  /* end of dname */
+            *lenptr = len;
+            if (c == '\0' || *src == '\0')  /* "" or ".": end of src */
                 break;
-        } else {
-            if (c >= 0x41 && c <= 0x5A)     /* uppercase? convert to lower */
-                c += 0x20;
-            *rp++ = c;
-        }
-    }
-
-    *lp = 0;
-    if (rp - res > NS_MAXCDNAME) {  /* dname too long? abort */
+            lenptr = dst++;
+            continue;
+        }
+        if (c >= 'A' && c <= 'Z')  /* uppercase? convert to lower */
+            c += ('a' - 'A');
+        *dst++ = c;
+    }
+
+    if (dst - res >= NS_MAXCDNAME) {  /* dname too long? abort */
         free(res);
         return NULL;
     }
+
+    *dst = 0;
     return res;
 }
 
-/* returns the offset within cstr at which dname can be found, or -1
- */
+/* Returns the offset within cstr at which dname can be found, or -1 */
 static int find_offset(const uint8_t *cstr, int clen, const uint8_t *dname)
 {
     const uint8_t *c, *d;
-    int off, inc;
+    int off;
 
     /* find all labels in cstr */
@@ -151 +161 @@
         c = cstr + off;
 
-        if ((*c & NS_CMPRSFLGS) != 0) { /* pointer, skip */
+        if ((*c & NS_CMPRSFLGS) == NS_CMPRSFLGS) {  /* pointer, skip */
             off += 2;
-        } else if (*c) {    /* label, try matching dname */
-            inc = *c + 1;
+            continue;
+        }
+        if (*c) {  /* label, try matching dname */
             d = dname;
-            while (*c == *d && memcmp(c + 1, d + 1, *c) == 0) {
-                if (*c == 0)    /* match, return offset */
+            while (1) {
+                unsigned len1 = *c + 1;
+                if (memcmp(c, d, len1) != 0)
+                    break;
+                if (len1 == 1)  /* at terminating NUL - match, return offset */
                     return off;
-                d += *c + 1;
-                c += *c + 1;
-                if ((*c & NS_CMPRSFLGS) != 0)   /* pointer, jump */
-                    c = cstr + (((*c & 0x3f) << 8) | (*(c + 1) & 0xff));
-            }
-            off += inc;
-        } else {    /* null, skip */
-            off++;
-        }
+                d += len1;
+                c += len1;
+                if ((*c & NS_CMPRSFLGS) == NS_CMPRSFLGS)  /* pointer, jump */
+                    c = cstr + (((c[0] & 0x3f) << 8) | c[1]);
+            }
+            off += cstr[off] + 1;
+            continue;
+        }
+        /* NUL, skip */
+        off++;
     }
 
@@ -173 +188 @@
 }
 
-/* computes string to be appended to cstr so that src would be added to
+/* Computes string to be appended to cstr so that src would be added to
  * the compression (best case, it's a 2-byte pointer to some offset within
- * cstr; worst case, it's all of src, converted to rfc3011 format).
+ * cstr; worst case, it's all of src, converted to <4>host<3>com<0> format).
  * The computed string is returned directly; its length is returned via retlen;
  * NULL and 0, respectively, are returned if an error occurs.
  */
-uint8_t *dname_enc(const uint8_t *cstr, int clen, const char *src, int *retlen)
+uint8_t* FAST_FUNC dname_enc(const uint8_t *cstr, int clen, const char *src, int *retlen)
 {
     uint8_t *d, *dname;
@@ -190 +205 @@
     }
 
-    for (d = dname; *d != 0; d += *d + 1) {
-        off = find_offset(cstr, clen, d);
-        if (off >= 0) { /* found a match, add pointer and terminate string */
-            *d++ = NS_CMPRSFLGS;
-            *d = off;
-            break;
-        }
+    d = dname;
+    while (*d) {
+        if (cstr) {
+            off = find_offset(cstr, clen, d);
+            if (off >= 0) { /* found a match, add pointer and return */
+                *d++ = NS_CMPRSFLGS | (off >> 8);
+                *d = off;
+                break;
+            }
+        }
+        d += *d + 1;
     }
 
@@ -203 +222 @@
 }
 
-#endif /* ENABLE_FEATURE_RFC3397 */
+#ifdef DNS_COMPR_TESTING
+/* gcc -Wall -DDNS_COMPR_TESTING domain_codec.c -o domain_codec && ./domain_codec */
+int main(int argc, char **argv)
+{
+    int len;
+    uint8_t *encoded;
+
+#define DNAME_DEC(encoded,pre) dname_dec((uint8_t*)(encoded), sizeof(encoded), (pre))
+    printf("'%s'\n",       DNAME_DEC("\4host\3com\0", "test1:"));
+    printf("test2:'%s'\n", DNAME_DEC("\4host\3com\0\4host\3com\0", ""));
+    printf("test3:'%s'\n", DNAME_DEC("\4host\3com\0\xC0\0", ""));
+    printf("test4:'%s'\n", DNAME_DEC("\4host\3com\0\xC0\5", ""));
+    printf("test5:'%s'\n", DNAME_DEC("\4host\3com\0\xC0\5\1z\xC0\xA", ""));
+
+#define DNAME_ENC(cache,source,lenp) dname_enc((uint8_t*)(cache), sizeof(cache), (source), (lenp))
+    encoded = dname_enc(NULL, 0, "test.net", &len);
+    printf("test6:'%s' len:%d\n", dname_dec(encoded, len, ""), len);
+    encoded = DNAME_ENC("\3net\0", "test.net", &len);
+    printf("test7:'%s' len:%d\n", dname_dec(encoded, len, ""), len);
+    encoded = DNAME_ENC("\4test\3net\0", "test.net", &len);
+    printf("test8:'%s' len:%d\n", dname_dec(encoded, len, ""), len);
+    return 0;
+}
+#endif

branches/2.2.9/mindi-busybox/networking/udhcp/dumpleases.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-#include <getopt.h>
-
 #include "common.h"
 #include "dhcpd.h"
+#include "unicode.h"
 
-int dumpleases_main(int argc, char **argv);
-int dumpleases_main(int argc, char **argv)
+int dumpleases_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int dumpleases_main(int argc UNUSED_PARAM, char **argv)
 {
     int fd;
     int i;
     unsigned opt;
-    time_t expires;
+    int64_t written_at, curr, expires_abs;
     const char *file = LEASES_FILE;
-    struct dhcpOfferedAddr lease;
+    struct dyn_lease lease;
     struct in_addr addr;
 
     enum {
-        OPT_a   = 0x1,  // -a
-        OPT_r   = 0x2,  // -r
-        OPT_f   = 0x4,  // -f
+        OPT_a = 0x1, // -a
+        OPT_r = 0x2, // -r
+        OPT_f = 0x4, // -f
     };
-#if ENABLE_GETOPT_LONG
+#if ENABLE_LONG_OPTS
     static const char dumpleases_longopts[] ALIGN1 =
         "absolute\0"  No_argument       "a"
@@ -33 +32 @@
     applet_long_options = dumpleases_longopts;
 #endif
+    init_unicode();
+
     opt_complementary = "=0:a--r:r--a";
     opt = getopt32(argv, "arf:", &file);
@@ -38 +39 @@
     fd = xopen(file, O_RDONLY);
 
-    printf("Mac Address       IP-Address      Expires %s\n", (opt & OPT_a) ? "at" : "in");
-    /*     "00:00:00:00:00:00 255.255.255.255 Wed Jun 30 21:49:08 1993" */
+    printf("Mac Address       IP Address      Host Name           Expires %s\n", (opt & OPT_a) ? "at" : "in");
+    /*     "00:00:00:00:00:00 255.255.255.255 ABCDEFGHIJKLMNOPQRS Wed Jun 30 21:49:08 1993" */
+    /*     "123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 */
+
+    xread(fd, &written_at, sizeof(written_at));
+    written_at = SWAP_BE64(written_at);
+    curr = time(NULL);
+    if (curr < written_at)
+        written_at = curr; /* lease file from future! :) */
+
     while (full_read(fd, &lease, sizeof(lease)) == sizeof(lease)) {
-        printf(":%02x"+1, lease.chaddr[0]);
-        for (i = 1; i < 6; i++) {
-            printf(":%02x", lease.chaddr[i]);
+        const char *fmt = ":%02x" + 1;
+        for (i = 0; i < 6; i++) {
+            printf(fmt, lease.lease_mac[i]);
+            fmt = ":%02x";
         }
-        addr.s_addr = lease.yiaddr;
-        printf(" %-15s ", inet_ntoa(addr));
-        expires = ntohl(lease.expires);
+        addr.s_addr = lease.lease_nip;
+#if ENABLE_UNICODE_SUPPORT
+        {
+            char *uni_name = unicode_conv_to_printable_fixedwidth(NULL, lease.hostname, 19);
+            printf(" %-16s%s ", inet_ntoa(addr), uni_name);
+            free(uni_name);
+        }
+#else
+        /* actually, 15+1 and 19+1, +1 is a space between columns */
+        /* lease.hostname is char[20] and is always NUL terminated */
+        printf(" %-16s%-20s", inet_ntoa(addr), lease.hostname);
+#endif
+        expires_abs = ntohl(lease.expires) + written_at;
+        if (expires_abs <= curr) {
+            puts("expired");
+            continue;
+        }
         if (!(opt & OPT_a)) { /* no -a */
-            if (!expires)
-                puts("expired");
-            else {
-                unsigned d, h, m;
-                d = expires / (24*60*60); expires %= (24*60*60);
-                h = expires / (60*60); expires %= (60*60);
-                m = expires / 60; expires %= 60;
-                if (d) printf("%u days ", d);
-                printf("%02u:%02u:%02u\n", h, m, (unsigned)expires);
-            }
-        } else /* -a */
-            fputs(ctime(&expires), stdout);
+            unsigned d, h, m;
+            unsigned expires = expires_abs - curr;
+            d = expires / (24*60*60); expires %= (24*60*60);
+            h = expires / (60*60); expires %= (60*60);
+            m = expires / 60; expires %= 60;
+            if (d)
+                printf("%u days ", d);
+            printf("%02u:%02u:%02u\n", h, m, (unsigned)expires);
+        } else { /* -a */
+            time_t t = expires_abs;
+            fputs(ctime(&t), stdout);
+        }
     }
     /* close(fd); */

branches/2.2.9/mindi-busybox/networking/udhcp/files.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * files.c -- DHCP server file manipulation *
+ * DHCP server config and lease file manipulation
+ *
  * Rewrite by Russ Dill <Russ.Dill@asu.edu> July 2001
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-
 #include <netinet/ether.h>
 
 #include "common.h"
 #include "dhcpd.h"
-#include "options.h"
-
 
 /* on these functions, make sure your datatype matches */
-static int read_ip(const char *line, void *arg)
-{
-    len_and_sockaddr *lsa;
-
-    lsa = host_and_af2sockaddr(line, 0, AF_INET);
-    if (!lsa)
-        return 0;
-    *(uint32_t*)arg = lsa->sin.sin_addr.s_addr;
-    free(lsa);
-    return 1;
-}
-
-static int read_mac(const char *line, void *arg)
-{
-    uint8_t *mac_bytes = arg;
-    struct ether_addr *temp_ether_addr;
-
-    temp_ether_addr = ether_aton(line);
-    if (temp_ether_addr == NULL)
-        return 0;
-    memcpy(mac_bytes, temp_ether_addr, 6);
-    return 1;
-}
-
-
-static int read_str(const char *line, void *arg)
+static int FAST_FUNC read_str(const char *line, void *arg)
 {
     char **dest = arg;
@@ -47 +22 @@
 }
 
-
-static int read_u32(const char *line, void *arg)
+static int FAST_FUNC read_u32(const char *line, void *arg)
 {
     *(uint32_t*)arg = bb_strtou32(line, NULL, 10);
@@ -54 +28 @@
 }
 
-
-static int read_yn(const char *line, void *arg)
-{
-    char *dest = arg;
-
-    if (!strcasecmp("yes", line)) {
-        *dest = 1;
-        return 1;
-    }
-    if (!strcasecmp("no", line)) {
-        *dest = 0;
-        return 1;
-    }
-    return 0;
-}
-
-
-/* find option 'code' in opt_list */
-struct option_set *find_option(struct option_set *opt_list, char code)
-{
-    while (opt_list && opt_list->data[OPT_CODE] < code)
-        opt_list = opt_list->next;
-
-    if (opt_list && opt_list->data[OPT_CODE] == code)
-        return opt_list;
-    return NULL;
-}
-
-
-/* add an option to the opt_list */
-static void attach_option(struct option_set **opt_list,
-        const struct dhcp_option *option, char *buffer, int length)
-{
-    struct option_set *existing, *new, **curr;
-
-    existing = find_option(*opt_list, option->code);
-    if (!existing) {
-        DEBUG("Attaching option %s to list", option->name);
-
-#if ENABLE_FEATURE_RFC3397
-        if ((option->flags & TYPE_MASK) == OPTION_STR1035)
-            /* reuse buffer and length for RFC1035-formatted string */
-            buffer = dname_enc(NULL, 0, buffer, &length);
-#endif
-
-        /* make a new option */
-        new = xmalloc(sizeof(*new));
-        new->data = xmalloc(length + 2);
-        new->data[OPT_CODE] = option->code;
-        new->data[OPT_LEN] = length;
-        memcpy(new->data + 2, buffer, length);
-
-        curr = opt_list;
-        while (*curr && (*curr)->data[OPT_CODE] < option->code)
-            curr = &(*curr)->next;
-
-        new->next = *curr;
-        *curr = new;
-#if ENABLE_FEATURE_RFC3397
-        if ((option->flags & TYPE_MASK) == OPTION_STR1035 && buffer != NULL)
-            free(buffer);
-#endif
-        return;
-    }
-
-    /* add it to an existing option */
-    DEBUG("Attaching option %s to existing member of list", option->name);
-    if (option->flags & OPTION_LIST) {
-#if ENABLE_FEATURE_RFC3397
-        if ((option->flags & TYPE_MASK) == OPTION_STR1035)
-            /* reuse buffer and length for RFC1035-formatted string */
-            buffer = dname_enc(existing->data + 2,
-                    existing->data[OPT_LEN], buffer, &length);
-#endif
-        if (existing->data[OPT_LEN] + length <= 255) {
-            existing->data = xrealloc(existing->data,
-                    existing->data[OPT_LEN] + length + 3);
-            if ((option->flags & TYPE_MASK) == OPTION_STRING) {
-                /* ' ' can bring us to 256 - bad */
-                if (existing->data[OPT_LEN] + length >= 255)
-                    return;
-                /* add space separator between STRING options in a list */
-                existing->data[existing->data[OPT_LEN] + 2] = ' ';
-                existing->data[OPT_LEN]++;
-            }
-            memcpy(existing->data + existing->data[OPT_LEN] + 2, buffer, length);
-            existing->data[OPT_LEN] += length;
-        } /* else, ignore the data, we could put this in a second option in the future */
-#if ENABLE_FEATURE_RFC3397
-        if ((option->flags & TYPE_MASK) == OPTION_STR1035 && buffer != NULL)
-            free(buffer);
-#endif
-    } /* else, ignore the new data */
-}
-
-
-/* read a dhcp option and add it to opt_list */
-static int read_opt(const char *const_line, void *arg)
-{
-    struct option_set **opt_list = arg;
-    char *opt, *val, *endptr;
-    const struct dhcp_option *option;
-    int retval = 0, length;
-    char buffer[8];
-    char *line;
-    uint16_t *result_u16 = (uint16_t *) buffer;
-    uint32_t *result_u32 = (uint32_t *) buffer;
-
-    /* Cheat, the only const line we'll actually get is "" */
-    line = (char *) const_line;
-    opt = strtok(line, " \t=");
-    if (!opt) return 0;
-
-    option = dhcp_options;
-    while (1) {
-        if (!option->code)
-            return 0;
-        if (!strcasecmp(option->name, opt))
-            break;
-        option++;
-    }
-
-    do {
-        val = strtok(NULL, ", \t");
-        if (!val) break;
-        length = option_lengths[option->flags & TYPE_MASK];
-        retval = 0;
-        opt = buffer; /* new meaning for variable opt */
-        switch (option->flags & TYPE_MASK) {
-        case OPTION_IP:
-            retval = read_ip(val, buffer);
-            break;
-        case OPTION_IP_PAIR:
-            retval = read_ip(val, buffer);
-            val = strtok(NULL, ", \t/-");
-            if (!val)
-                retval = 0;
-            if (retval)
-                retval = read_ip(val, buffer + 4);
-            break;
-        case OPTION_STRING:
-#if ENABLE_FEATURE_RFC3397
-        case OPTION_STR1035:
-#endif
-            length = strlen(val);
-            if (length > 0) {
-                if (length > 254) length = 254;
-                opt = val;
-                retval = 1;
-            }
-            break;
-        case OPTION_BOOLEAN:
-            retval = read_yn(val, buffer);
-            break;
-        case OPTION_U8:
-            buffer[0] = strtoul(val, &endptr, 0);
-            retval = (endptr[0] == '\0');
-            break;
-        /* htonX are macros in older libc's, using temp var
-         * in code below for safety */
-        /* TODO: use bb_strtoX? */
-        case OPTION_U16: {
-            unsigned long tmp = strtoul(val, &endptr, 0);
-            *result_u16 = htons(tmp);
-            retval = (endptr[0] == '\0' /*&& tmp < 0x10000*/);
-            break;
-        }
-        case OPTION_S16: {
-            long tmp = strtol(val, &endptr, 0);
-            *result_u16 = htons(tmp);
-            retval = (endptr[0] == '\0');
-            break;
-        }
-        case OPTION_U32: {
-            unsigned long tmp = strtoul(val, &endptr, 0);
-            *result_u32 = htonl(tmp);
-            retval = (endptr[0] == '\0');
-            break;
-        }
-        case OPTION_S32: {
-            long tmp = strtol(val, &endptr, 0);
-            *result_u32 = htonl(tmp);
-            retval = (endptr[0] == '\0');
-            break;
-        }
-        default:
-            break;
-        }
-        if (retval)
-            attach_option(opt_list, option, opt, length);
-    } while (retval && option->flags & OPTION_LIST);
-    return retval;
-}
-
-static int read_staticlease(const char *const_line, void *arg)
+static int FAST_FUNC read_staticlease(const char *const_line, void *arg)
 {
     char *line;
     char *mac_string;
     char *ip_string;
-    uint8_t *mac_bytes;
-    uint32_t *ip;
-
-    /* Allocate memory for addresses */
-    mac_bytes = xmalloc(sizeof(unsigned char) * 8);
-    ip = xmalloc(sizeof(uint32_t));
+    struct ether_addr mac_bytes; /* it's "struct { uint8_t mac[6]; }" */
+    uint32_t nip;
 
     /* Read mac */
     line = (char *) const_line;
-    mac_string = strtok(line, " \t");
-    read_mac(mac_string, mac_bytes);
+    mac_string = strtok_r(line, " \t", &line);
+    if (!mac_string || !ether_aton_r(mac_string, &mac_bytes))
+        return 0;
 
     /* Read ip */
-    ip_string = strtok(NULL, " \t");
-    read_ip(ip_string, ip);
-
-    addStaticLease(arg, mac_bytes, ip);
-
-    if (ENABLE_FEATURE_UDHCP_DEBUG) printStaticLeases(arg);
+    ip_string = strtok_r(NULL, " \t", &line);
+    if (!ip_string || !udhcp_str2nip(ip_string, &nip))
+        return 0;
+
+    add_static_lease(arg, (uint8_t*) &mac_bytes, nip);
+
+    log_static_leases(arg);
 
     return 1;
@@ -279 +57 @@
 struct config_keyword {
     const char *keyword;
-    int (*handler)(const char *line, void *var);
+    int (*handler)(const char *line, void *var) FAST_FUNC;
     void *var;
     const char *def;
@@ -285 +63 @@
 
 static const struct config_keyword keywords[] = {
-    /* keyword       handler   variable address               default */
-    {"start",        read_ip,  &(server_config.start_ip),     "192.168.0.20"},
-    {"end",          read_ip,  &(server_config.end_ip),       "192.168.0.254"},
-    {"interface",    read_str, &(server_config.interface),    "eth0"},
-    {"option",       read_opt, &(server_config.options),      ""},
-    {"opt",          read_opt, &(server_config.options),      ""},
+    /* keyword        handler           variable address               default */
+    {"start"        , udhcp_str2nip   , &server_config.start_ip     , "192.168.0.20"},
+    {"end"          , udhcp_str2nip   , &server_config.end_ip       , "192.168.0.254"},
+    {"interface"    , read_str        , &server_config.interface    , "eth0"},
     /* Avoid "max_leases value not sane" warning by setting default
      * to default_end_ip - default_start_ip + 1: */
-    {"max_leases",   read_u32, &(server_config.max_leases),   "235"},
-    {"remaining",    read_yn,  &(server_config.remaining),    "yes"},
-    {"auto_time",    read_u32, &(server_config.auto_time),    "7200"},
-    {"decline_time", read_u32, &(server_config.decline_time), "3600"},
-    {"conflict_time",read_u32, &(server_config.conflict_time),"3600"},
-    {"offer_time",   read_u32, &(server_config.offer_time),   "60"},
-    {"min_lease",    read_u32, &(server_config.min_lease),    "60"},
-    {"lease_file",   read_str, &(server_config.lease_file),   LEASES_FILE},
-    {"pidfile",      read_str, &(server_config.pidfile),      "/var/run/udhcpd.pid"},
-    {"notify_file",  read_str, &(server_config.notify_file),  ""},
-    {"siaddr",       read_ip,  &(server_config.siaddr),       "0.0.0.0"},
-    {"sname",        read_str, &(server_config.sname),        ""},
-    {"boot_file",    read_str, &(server_config.boot_file),    ""},
-    {"static_lease", read_staticlease, &(server_config.static_leases), ""},
-    /* ADDME: static lease */
+    {"max_leases"   , read_u32        , &server_config.max_leases   , "235"},
+    {"auto_time"    , read_u32        , &server_config.auto_time    , "7200"},
+    {"decline_time" , read_u32        , &server_config.decline_time , "3600"},
+    {"conflict_time", read_u32        , &server_config.conflict_time, "3600"},
+    {"offer_time"   , read_u32        , &server_config.offer_time   , "60"},
+    {"min_lease"    , read_u32        , &server_config.min_lease_sec, "60"},
+    {"lease_file"   , read_str        , &server_config.lease_file   , LEASES_FILE},
+    {"pidfile"      , read_str        , &server_config.pidfile      , "/var/run/udhcpd.pid"},
+    {"siaddr"       , udhcp_str2nip   , &server_config.siaddr_nip   , "0.0.0.0"},
+    /* keywords with no defaults must be last! */
+    {"option"       , udhcp_str2optset, &server_config.options      , ""},
+    {"opt"          , udhcp_str2optset, &server_config.options      , ""},
+    {"notify_file"  , read_str        , &server_config.notify_file  , ""},
+    {"sname"        , read_str        , &server_config.sname        , ""},
+    {"boot_file"    , read_str        , &server_config.boot_file    , ""},
+    {"static_lease" , read_staticlease, &server_config.static_leases, ""},
 };
-
-
-/*
- * Domain names may have 254 chars, and string options can be 254
- * chars long. However, 80 bytes will be enough for most, and won't
- * hog up memory. If you have a special application, change it
- */
-#define READ_CONFIG_BUF_SIZE 80
-
-int read_config(const char *file)
-{
-    FILE *in;
-    char buffer[READ_CONFIG_BUF_SIZE], *token, *line;
-    int i, lm = 0;
-
-    for (i = 0; i < ARRAY_SIZE(keywords); i++)
-        if (keywords[i].def[0])
-            keywords[i].handler(keywords[i].def, keywords[i].var);
-
-    in = fopen_or_warn(file, "r");
-    if (!in) {
-        return 0;
-    }
-
-    while (fgets(buffer, READ_CONFIG_BUF_SIZE, in)) {
-        char debug_orig[READ_CONFIG_BUF_SIZE];
-        char *p;
-
-        lm++;
-        p = strchr(buffer, '\n');
-        if (p) *p = '\0';
-        if (ENABLE_FEATURE_UDHCP_DEBUG) strcpy(debug_orig, buffer);
-        p = strchr(buffer, '#');
-        if (p) *p = '\0';
-
-        if (!(token = strtok(buffer, " \t"))) continue;
-        if (!(line = strtok(NULL, ""))) continue;
-
-        /* eat leading whitespace */
-        line = skip_whitespace(line);
-        /* eat trailing whitespace */
-        i = strlen(line) - 1;
-        while (i >= 0 && isspace(line[i]))
-            line[i--] = '\0';
-
-        for (i = 0; i < ARRAY_SIZE(keywords); i++)
-            if (!strcasecmp(token, keywords[i].keyword))
-                if (!keywords[i].handler(line, keywords[i].var)) {
-                    bb_error_msg("cannot parse line %d of %s", lm, file);
-                    if (ENABLE_FEATURE_UDHCP_DEBUG)
-                        bb_error_msg("cannot parse '%s'", debug_orig);
+enum { KWS_WITH_DEFAULTS = ARRAY_SIZE(keywords) - 6 };
+
+void FAST_FUNC read_config(const char *file)
+{
+    parser_t *parser;
+    const struct config_keyword *k;
+    unsigned i;
+    char *token[2];
+
+    for (i = 0; i < KWS_WITH_DEFAULTS; i++)
+        keywords[i].handler(keywords[i].def, keywords[i].var);
+
+    parser = config_open(file);
+    while (config_read(parser, token, 2, 2, "# \t", PARSE_NORMAL)) {
+        for (k = keywords, i = 0; i < ARRAY_SIZE(keywords); k++, i++) {
+            if (strcasecmp(token[0], k->keyword) == 0) {
+                if (!k->handler(token[1], k->var)) {
+                    bb_error_msg("can't parse line %u in %s",
+                            parser->lineno, file);
                     /* reset back to the default value */
-                    keywords[i].handler(keywords[i].def, keywords[i].var);
+                    k->handler(k->def, k->var);
                 }
-    }
-    fclose(in);
+                break;
+            }
+        }
+    }
+    config_close(parser);
 
     server_config.start_ip = ntohl(server_config.start_ip);
     server_config.end_ip = ntohl(server_config.end_ip);
-
-    return 1;
-}
-
-
-void write_leases(void)
-{
-    int fp;
+}
+
+void FAST_FUNC write_leases(void)
+{
+    int fd;
     unsigned i;
-    time_t curr = time(0);
-    unsigned long tmp_time;
-
-    fp = open3_or_warn(server_config.lease_file, O_WRONLY|O_CREAT|O_TRUNC, 0666);
-    if (fp < 0) {
+    leasetime_t curr;
+    int64_t written_at;
+
+    fd = open_or_warn(server_config.lease_file, O_WRONLY|O_CREAT|O_TRUNC);
+    if (fd < 0)
         return;
-    }
+
+    curr = written_at = time(NULL);
+
+    written_at = SWAP_BE64(written_at);
+    full_write(fd, &written_at, sizeof(written_at));
 
     for (i = 0; i < server_config.max_leases; i++) {
-        if (leases[i].yiaddr != 0) {
-
-            /* screw with the time in the struct, for easier writing */
-            tmp_time = leases[i].expires;
-
-            if (server_config.remaining) {
-                if (lease_expired(&(leases[i])))
-                    leases[i].expires = 0;
-                else leases[i].expires -= curr;
-            } /* else stick with the time we got */
-            leases[i].expires = htonl(leases[i].expires);
-            // FIXME: error check??
-            full_write(fp, &leases[i], sizeof(leases[i]));
-
-            /* then restore it when done */
-            leases[i].expires = tmp_time;
-        }
-    }
-    close(fp);
+        leasetime_t tmp_time;
+
+        if (g_leases[i].lease_nip == 0)
+            continue;
+
+        /* Screw with the time in the struct, for easier writing */
+        tmp_time = g_leases[i].expires;
+
+        g_leases[i].expires -= curr;
+        if ((signed_leasetime_t) g_leases[i].expires < 0)
+            g_leases[i].expires = 0;
+        g_leases[i].expires = htonl(g_leases[i].expires);
+
+        /* No error check. If the file gets truncated,
+         * we lose some leases on restart. Oh well. */
+        full_write(fd, &g_leases[i], sizeof(g_leases[i]));
+
+        /* Then restore it when done */
+        g_leases[i].expires = tmp_time;
+    }
+    close(fd);
 
     if (server_config.notify_file) {
-        char *cmd = xasprintf("%s %s", server_config.notify_file, server_config.lease_file);
-        system(cmd);
-        free(cmd);
-    }
-}
-
-
-void read_leases(const char *file)
-{
-    int fp;
-    unsigned int i = 0;
-    struct dhcpOfferedAddr lease;
-
-    fp = open_or_warn(file, O_RDONLY);
-    if (fp < 0) {
+        char *argv[3];
+        argv[0] = server_config.notify_file;
+        argv[1] = server_config.lease_file;
+        argv[2] = NULL;
+        spawn_and_wait(argv);
+    }
+}
+
+void FAST_FUNC read_leases(const char *file)
+{
+    struct dyn_lease lease;
+    int64_t written_at, time_passed;
+    int fd;
+#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1
+    unsigned i = 0;
+#endif
+
+    fd = open_or_warn(file, O_RDONLY);
+    if (fd < 0)
         return;
-    }
-
-    while (i < server_config.max_leases
-     && full_read(fp, &lease, sizeof(lease)) == sizeof(lease)
-    ) {
-        /* ADDME: is it a static lease */
-        uint32_t y = ntohl(lease.yiaddr);
+
+    if (full_read(fd, &written_at, sizeof(written_at)) != sizeof(written_at))
+        goto ret;
+    written_at = SWAP_BE64(written_at);
+
+    time_passed = time(NULL) - written_at;
+    /* Strange written_at, or lease file from old version of udhcpd
+     * which had no "written_at" field? */
+    if ((uint64_t)time_passed > 12 * 60 * 60)
+        goto ret;
+
+    while (full_read(fd, &lease, sizeof(lease)) == sizeof(lease)) {
+//FIXME: what if it matches some static lease?
+        uint32_t y = ntohl(lease.lease_nip);
         if (y >= server_config.start_ip && y <= server_config.end_ip) {
-            lease.expires = ntohl(lease.expires);
-            if (!server_config.remaining)
-                lease.expires -= time(0);
-            if (!(add_lease(lease.chaddr, lease.yiaddr, lease.expires))) {
+            signed_leasetime_t expires = ntohl(lease.expires) - (signed_leasetime_t)time_passed;
+            if (expires <= 0)
+                continue;
+            /* NB: add_lease takes "relative time", IOW,
+             * lease duration, not lease deadline. */
+            if (add_lease(lease.lease_mac, lease.lease_nip,
+                    expires,
+                    lease.hostname, sizeof(lease.hostname)
+                ) == 0
+            ) {
                 bb_error_msg("too many leases while loading %s", file);
                 break;
             }
+#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1
             i++;
+#endif
         }
     }
-    DEBUG("Read %d leases", i);
-    close(fp);
-}
+    log1("Read %d leases", i);
+ ret:
+    close(fd);
+}

branches/2.2.9/mindi-busybox/networking/udhcp/leases.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * leases.c -- tools to manage DHCP leases
  * Russ Dill <Russ.Dill@asu.edu> July 2001
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-
 #include "common.h"
 #include "dhcpd.h"
 
-
 /* Find the oldest expired lease, NULL if there are no expired leases */
-static struct dhcpOfferedAddr *oldest_expired_lease(void)
+static struct dyn_lease *oldest_expired_lease(void)
 {
-    struct dhcpOfferedAddr *oldest = NULL;
-// TODO: use monotonic_sec()
-    unsigned long oldest_lease = time(0);
+    struct dyn_lease *oldest_lease = NULL;
+    leasetime_t oldest_time = time(NULL);
     unsigned i;
 
-    for (i = 0; i < server_config.max_leases; i++)
-        if (oldest_lease > leases[i].expires) {
-            oldest_lease = leases[i].expires;
-            oldest = &(leases[i]);
+    /* Unexpired leases have g_leases[i].expires >= current time
+     * and therefore can't ever match */
+    for (i = 0; i < server_config.max_leases; i++) {
+        if (g_leases[i].expires < oldest_time) {
+            oldest_time = g_leases[i].expires;
+            oldest_lease = &g_leases[i];
         }
-    return oldest;
+    }
+    return oldest_lease;
 }
 
+/* Clear out all leases with matching nonzero chaddr OR yiaddr.
+ * If chaddr == NULL, this is a conflict lease.
+ */
+static void clear_leases(const uint8_t *chaddr, uint32_t yiaddr)
+{
+    unsigned i;
 
-/* clear every lease out that chaddr OR yiaddr matches and is nonzero */
-static void clear_lease(const uint8_t *chaddr, uint32_t yiaddr)
-{
-    unsigned i, j;
-
-    for (j = 0; j < 16 && !chaddr[j]; j++)
-        continue;
-
-    for (i = 0; i < server_config.max_leases; i++)
-        if ((j != 16 && memcmp(leases[i].chaddr, chaddr, 16) == 0)
-         || (yiaddr && leases[i].yiaddr == yiaddr)
+    for (i = 0; i < server_config.max_leases; i++) {
+        if ((chaddr && memcmp(g_leases[i].lease_mac, chaddr, 6) == 0)
+         || (yiaddr && g_leases[i].lease_nip == yiaddr)
         ) {
-            memset(&(leases[i]), 0, sizeof(leases[i]));
+            memset(&g_leases[i], 0, sizeof(g_leases[i]));
         }
+    }
 }
 
-
-/* add a lease into the table, clearing out any old ones */
-struct dhcpOfferedAddr *add_lease(const uint8_t *chaddr, uint32_t yiaddr, unsigned long lease)
+/* Add a lease into the table, clearing out any old ones.
+ * If chaddr == NULL, this is a conflict lease.
+ */
+struct dyn_lease* FAST_FUNC add_lease(
+        const uint8_t *chaddr, uint32_t yiaddr,
+        leasetime_t leasetime,
+        const char *hostname, int hostname_len)
 {
-    struct dhcpOfferedAddr *oldest;
+    struct dyn_lease *oldest;
 
     /* clean out any old ones */
-    clear_lease(chaddr, yiaddr);
+    clear_leases(chaddr, yiaddr);
 
     oldest = oldest_expired_lease();
 
     if (oldest) {
-        memcpy(oldest->chaddr, chaddr, 16);
-        oldest->yiaddr = yiaddr;
-        oldest->expires = time(0) + lease;
+        memset(oldest, 0, sizeof(*oldest));
+        if (hostname) {
+            char *p;
+
+            hostname_len++; /* include NUL */
+            if (hostname_len > sizeof(oldest->hostname))
+                hostname_len = sizeof(oldest->hostname);
+            p = safe_strncpy(oldest->hostname, hostname, hostname_len);
+            /* sanitization (s/non-ASCII/^/g) */
+            while (*p) {
+                if (*p < ' ' || *p > 126)
+                    *p = '^';
+                p++;
+            }
+        }
+        if (chaddr)
+            memcpy(oldest->lease_mac, chaddr, 6);
+        oldest->lease_nip = yiaddr;
+        oldest->expires = time(NULL) + leasetime;
     }
 
@@ -62 +82 @@
 }
 
-
-/* true if a lease has expired */
-int lease_expired(struct dhcpOfferedAddr *lease)
+/* True if a lease has expired */
+int FAST_FUNC is_expired_lease(struct dyn_lease *lease)
 {
-    return (lease->expires < (unsigned long) time(0));
+    return (lease->expires < (leasetime_t) time(NULL));
 }
 
-
-/* Find the first lease that matches chaddr, NULL if no match */
-struct dhcpOfferedAddr *find_lease_by_chaddr(const uint8_t *chaddr)
+/* Find the first lease that matches MAC, NULL if no match */
+struct dyn_lease* FAST_FUNC find_lease_by_mac(const uint8_t *mac)
 {
     unsigned i;
 
     for (i = 0; i < server_config.max_leases; i++)
-        if (!memcmp(leases[i].chaddr, chaddr, 16))
-            return &(leases[i]);
+        if (memcmp(g_leases[i].lease_mac, mac, 6) == 0)
+            return &g_leases[i];
 
     return NULL;
 }
 
-
-/* Find the first lease that matches yiaddr, NULL is no match */
-struct dhcpOfferedAddr *find_lease_by_yiaddr(uint32_t yiaddr)
+/* Find the first lease that matches IP, NULL is no match */
+struct dyn_lease* FAST_FUNC find_lease_by_nip(uint32_t nip)
 {
     unsigned i;
 
     for (i = 0; i < server_config.max_leases; i++)
-        if (leases[i].yiaddr == yiaddr)
-            return &(leases[i]);
+        if (g_leases[i].lease_nip == nip)
+            return &g_leases[i];
 
     return NULL;
 }
 
-
-/* check is an IP is taken, if it is, add it to the lease table */
-static int nobody_responds_to_arp(uint32_t addr)
+/* Check if the IP is taken; if it is, add it to the lease table */
+static int nobody_responds_to_arp(uint32_t nip, const uint8_t *safe_mac)
 {
-    static const uint8_t blank_chaddr[16]; /* 16 zero bytes */
-
     struct in_addr temp;
     int r;
 
-    r = arpping(addr, server_config.server, server_config.arp, server_config.interface);
+    r = arpping(nip, safe_mac,
+            server_config.server_nip,
+            server_config.server_mac,
+            server_config.interface);
     if (r)
         return r;
 
-    temp.s_addr = addr;
+    temp.s_addr = nip;
     bb_info_msg("%s belongs to someone, reserving it for %u seconds",
         inet_ntoa(temp), (unsigned)server_config.conflict_time);
-    add_lease(blank_chaddr, addr, server_config.conflict_time);
+    add_lease(NULL, nip, server_config.conflict_time, NULL, 0);
     return 0;
 }
 
-
-/* find an assignable address, if check_expired is true, we check all the expired leases as well.
- * Maybe this should try expired leases by age... */
-uint32_t find_address(int check_expired)
+/* Find a new usable (we think) address */
+uint32_t FAST_FUNC find_free_or_expired_nip(const uint8_t *safe_mac)
 {
-    uint32_t addr, ret;
-    struct dhcpOfferedAddr *lease = NULL;
+    uint32_t addr;
+    struct dyn_lease *oldest_lease = NULL;
 
     addr = server_config.start_ip; /* addr is in host order here */
     for (; addr <= server_config.end_ip; addr++) {
+        uint32_t nip;
+        struct dyn_lease *lease;
+
         /* ie, 192.168.55.0 */
-        if (!(addr & 0xFF))
+        if ((addr & 0xff) == 0)
             continue;
         /* ie, 192.168.55.255 */
-        if ((addr & 0xFF) == 0xFF)
+        if ((addr & 0xff) == 0xff)
             continue;
-        /* Only do if it isn't assigned as a static lease */
-        ret = htonl(addr);
-        if (!reservedIp(server_config.static_leases, ret)) {
-            /* lease is not taken */
-            lease = find_lease_by_yiaddr(ret);
-            /* no lease or it expired and we are checking for expired leases */
-            if ((!lease || (check_expired && lease_expired(lease)))
-             && nobody_responds_to_arp(ret) /* it isn't used on the network */
-            ) {
-                return ret;
-            }
+        nip = htonl(addr);
+        /* is this a static lease addr? */
+        if (is_nip_reserved(server_config.static_leases, nip))
+            continue;
+
+        lease = find_lease_by_nip(nip);
+        if (!lease) {
+//TODO: DHCP servers do not always sit on the same subnet as clients: should *ping*, not arp-ping!
+            if (nobody_responds_to_arp(nip, safe_mac))
+                return nip;
+        } else {
+            if (!oldest_lease || lease->expires < oldest_lease->expires)
+                oldest_lease = lease;
         }
     }
+
+    if (oldest_lease
+     && is_expired_lease(oldest_lease)
+     && nobody_responds_to_arp(oldest_lease->lease_nip, safe_mac)
+    ) {
+        return oldest_lease->lease_nip;
+    }
+
     return 0;
 }

branches/2.2.9/mindi-busybox/networking/udhcp/packet.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
-
+/*
+ * Packet ops
+ *
+ * Rewrite by Russ Dill <Russ.Dill@asu.edu> July 2001
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
 #include <netinet/in.h>
 #if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined _NEWLIB_VERSION
-#include <netpacket/packet.h>
-#include <net/ethernet.h>
+# include <netpacket/packet.h>
+# include <net/ethernet.h>
 #else
-#include <asm/types.h>
-#include <linux/if_packet.h>
-#include <linux/if_ether.h>
+# include <asm/types.h>
+# include <linux/if_packet.h>
+# include <linux/if_ether.h>
 #endif
 
 #include "common.h"
 #include "dhcpd.h"
-#include "options.h"
-
-
-void udhcp_init_header(struct dhcpMessage *packet, char type)
-{
-    memset(packet, 0, sizeof(struct dhcpMessage));
+
+void FAST_FUNC udhcp_init_header(struct dhcp_packet *packet, char type)
+{
+    memset(packet, 0, sizeof(*packet));
+    packet->op = BOOTREQUEST; /* if client to a server */
     switch (type) {
-    case DHCPDISCOVER:
-    case DHCPREQUEST:
-    case DHCPRELEASE:
-    case DHCPINFORM:
-        packet->op = BOOTREQUEST;
-        break;
     case DHCPOFFER:
     case DHCPACK:
     case DHCPNAK:
-        packet->op = BOOTREPLY;
-    }
-    packet->htype = ETH_10MB;
-    packet->hlen = ETH_10MB_LEN;
+        packet->op = BOOTREPLY; /* if server to client */
+    }
+    packet->htype = 1; /* ethernet */
+    packet->hlen = 6;
     packet->cookie = htonl(DHCP_MAGIC);
-    packet->options[0] = DHCP_END;
-    add_simple_option(packet->options, DHCP_MESSAGE_TYPE, type);
-}
-
-
-/* read a packet from socket fd, return -1 on read error, -2 on packet error */
-int udhcp_get_packet(struct dhcpMessage *packet, int fd)
-{
-#if 0
-    static const char broken_vendors[][8] = {
-        "MSFT 98",
-        ""
-    };
+    if (DHCP_END != 0)
+        packet->options[0] = DHCP_END;
+    udhcp_add_simple_option(packet, DHCP_MESSAGE_TYPE, type);
+}
+
+#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 2
+void FAST_FUNC udhcp_dump_packet(struct dhcp_packet *packet)
+{
+    char buf[sizeof(packet->chaddr)*2 + 1];
+
+    if (dhcp_verbose < 2)
+        return;
+
+    bb_info_msg(
+        //" op %x"
+        //" htype %x"
+        " hlen %x"
+        //" hops %x"
+        " xid %x"
+        //" secs %x"
+        //" flags %x"
+        " ciaddr %x"
+        " yiaddr %x"
+        " siaddr %x"
+        " giaddr %x"
+        //" chaddr %s"
+        //" sname %s"
+        //" file %s"
+        //" cookie %x"
+        //" options %s"
+        //, packet->op
+        //, packet->htype
+        , packet->hlen
+        //, packet->hops
+        , packet->xid
+        //, packet->secs
+        //, packet->flags
+        , packet->ciaddr
+        , packet->yiaddr
+        , packet->siaddr_nip
+        , packet->gateway_nip
+        //, packet->chaddr[16]
+        //, packet->sname[64]
+        //, packet->file[128]
+        //, packet->cookie
+        //, packet->options[]
+    );
+    *bin2hex(buf, (void *) packet->chaddr, sizeof(packet->chaddr)) = '\0';
+    bb_info_msg(" chaddr %s", buf);
+}
 #endif
+
+/* Read a packet from socket fd, return -1 on read error, -2 on packet error */
+int FAST_FUNC udhcp_recv_kernel_packet(struct dhcp_packet *packet, int fd)
+{
     int bytes;
     unsigned char *vendor;
 
     memset(packet, 0, sizeof(*packet));
-    bytes = read(fd, packet, sizeof(*packet));
+    bytes = safe_read(fd, packet, sizeof(*packet));
     if (bytes < 0) {
-        DEBUG("cannot read on listening socket, ignoring");
-        return -1;
-    }
-
-    if (ntohl(packet->cookie) != DHCP_MAGIC) {
-        bb_error_msg("received bogus message, ignoring");
+        log1("Packet read error, ignoring");
+        return bytes; /* returns -1 */
+    }
+
+    if (packet->cookie != htonl(DHCP_MAGIC)) {
+        bb_info_msg("Packet with bad magic, ignoring");
         return -2;
     }
-    DEBUG("Received a packet");
+    log1("Received a packet");
+    udhcp_dump_packet(packet);
 
     if (packet->op == BOOTREQUEST) {
-        vendor = get_option(packet, DHCP_VENDOR);
+        vendor = udhcp_get_option(packet, DHCP_VENDOR);
         if (vendor) {
 #if 0
+            static const char broken_vendors[][8] = {
+                "MSFT 98",
+                ""
+            };
             int i;
             for (i = 0; broken_vendors[i][0]; i++) {
-                if (vendor[OPT_LEN - 2] == (uint8_t)strlen(broken_vendors[i])
-                 && !strncmp((char*)vendor, broken_vendors[i], vendor[OPT_LEN - 2])
+                if (vendor[OPT_LEN - OPT_DATA] == (uint8_t)strlen(broken_vendors[i])
+                 && strncmp((char*)vendor, broken_vendors[i], vendor[OPT_LEN - OPT_DATA]) == 0
                 ) {
-                    DEBUG("broken client (%s), forcing broadcast",
+                    log1("Broken client (%s), forcing broadcast replies",
                         broken_vendors[i]);
                     packet->flags |= htons(BROADCAST_FLAG);
@@ -79 +124 @@
             }
 #else
-            if (vendor[OPT_LEN - 2] == (uint8_t)(sizeof("MSFT 98")-1)
+            if (vendor[OPT_LEN - OPT_DATA] == (uint8_t)(sizeof("MSFT 98")-1)
              && memcmp(vendor, "MSFT 98", sizeof("MSFT 98")-1) == 0
             ) {
-                DEBUG("broken client (%s), forcing broadcast", "MSFT 98");
+                log1("Broken client (%s), forcing broadcast replies", "MSFT 98");
                 packet->flags |= htons(BROADCAST_FLAG);
             }
@@ -92 +137 @@
 }
 
-
-uint16_t udhcp_checksum(void *addr, int count)
+uint16_t FAST_FUNC udhcp_checksum(void *addr, int count)
 {
     /* Compute Internet Checksum for "count" bytes
-     *         beginning at location "addr".
+     * beginning at location "addr".
      */
     int32_t sum = 0;
@@ -112 +156 @@
          * with little and big endian hosts */
         uint16_t tmp = 0;
-        *(uint8_t *) (&tmp) = * (uint8_t *) source;
+        *(uint8_t*)&tmp = *(uint8_t*)source;
         sum += tmp;
     }
@@ -122 +166 @@
 }
 
-
-/* Construct a ip/udp header for a packet, and specify the source and dest hardware address */
-void BUG_sizeof_struct_udp_dhcp_packet_must_be_576(void);
-int udhcp_raw_packet(struct dhcpMessage *payload,
-        uint32_t source_ip, int source_port,
-        uint32_t dest_ip, int dest_port, const uint8_t *dest_arp, int ifindex)
-{
+/* Construct a ip/udp header for a packet, send packet */
+int FAST_FUNC udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt,
+        uint32_t source_nip, int source_port,
+        uint32_t dest_nip, int dest_port, const uint8_t *dest_arp,
+        int ifindex)
+{
+    struct sockaddr_ll dest_sll;
+    struct ip_udp_dhcp_packet packet;
+    unsigned padding;
     int fd;
-    int result;
-    struct sockaddr_ll dest;
-    struct udp_dhcp_packet packet;
+    int result = -1;
+    const char *msg;
 
     fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP));
     if (fd < 0) {
-        bb_perror_msg("socket");
-        return -1;
-    }
-
-    memset(&dest, 0, sizeof(dest));
-    memset(&packet, 0, sizeof(packet));
-
-    dest.sll_family = AF_PACKET;
-    dest.sll_protocol = htons(ETH_P_IP);
-    dest.sll_ifindex = ifindex;
-    dest.sll_halen = 6;
-    memcpy(dest.sll_addr, dest_arp, 6);
-    if (bind(fd, (struct sockaddr *)&dest, sizeof(struct sockaddr_ll)) < 0) {
-        bb_perror_msg("bind");
-        close(fd);
-        return -1;
-    }
+        msg = "socket(%s)";
+        goto ret_msg;
+    }
+
+    memset(&dest_sll, 0, sizeof(dest_sll));
+    memset(&packet, 0, offsetof(struct ip_udp_dhcp_packet, data));
+    packet.data = *dhcp_pkt; /* struct copy */
+
+    dest_sll.sll_family = AF_PACKET;
+    dest_sll.sll_protocol = htons(ETH_P_IP);
+    dest_sll.sll_ifindex = ifindex;
+    dest_sll.sll_halen = 6;
+    memcpy(dest_sll.sll_addr, dest_arp, 6);
+
+    if (bind(fd, (struct sockaddr *)&dest_sll, sizeof(dest_sll)) < 0) {
+        msg = "bind(%s)";
+        goto ret_close;
+    }
+
+    /* We were sending full-sized DHCP packets (zero padded),
+     * but some badly configured servers were seen dropping them.
+     * Apparently they drop all DHCP packets >576 *ethernet* octets big,
+     * whereas they may only drop packets >576 *IP* octets big
+     * (which for typical Ethernet II means 590 octets: 6+6+2 + 576).
+     *
+     * In order to work with those buggy servers,
+     * we truncate packets after end option byte.
+     */
+    padding = DHCP_OPTIONS_BUFSIZE - 1 - udhcp_end_option(packet.data.options);
 
     packet.ip.protocol = IPPROTO_UDP;
-    packet.ip.saddr = source_ip;
-    packet.ip.daddr = dest_ip;
+    packet.ip.saddr = source_nip;
+    packet.ip.daddr = dest_nip;
     packet.udp.source = htons(source_port);
     packet.udp.dest = htons(dest_port);
-    packet.udp.len = htons(sizeof(packet.udp) + sizeof(struct dhcpMessage)); /* cheat on the psuedo-header */
+    /* size, excluding IP header: */
+    packet.udp.len = htons(UDP_DHCP_SIZE - padding);
+    /* for UDP checksumming, ip.len is set to UDP packet len */
     packet.ip.tot_len = packet.udp.len;
-    memcpy(&(packet.data), payload, sizeof(struct dhcpMessage));
-    packet.udp.check = udhcp_checksum(&packet, sizeof(struct udp_dhcp_packet));
-
-    packet.ip.tot_len = htons(sizeof(struct udp_dhcp_packet));
+    packet.udp.check = udhcp_checksum(&packet, IP_UDP_DHCP_SIZE - padding);
+    /* but for sending, it is set to IP packet len */
+    packet.ip.tot_len = htons(IP_UDP_DHCP_SIZE - padding);
     packet.ip.ihl = sizeof(packet.ip) >> 2;
     packet.ip.version = IPVERSION;
     packet.ip.ttl = IPDEFTTL;
-    packet.ip.check = udhcp_checksum(&(packet.ip), sizeof(packet.ip));
-
-    if (sizeof(struct udp_dhcp_packet) != 576)
-        BUG_sizeof_struct_udp_dhcp_packet_must_be_576();
-
-    result = sendto(fd, &packet, sizeof(struct udp_dhcp_packet), 0,
-            (struct sockaddr *) &dest, sizeof(dest));
-    if (result <= 0) {
-        bb_perror_msg("sendto");
-    }
+    packet.ip.check = udhcp_checksum(&packet.ip, sizeof(packet.ip));
+
+    udhcp_dump_packet(dhcp_pkt);
+    result = sendto(fd, &packet, IP_UDP_DHCP_SIZE - padding, /*flags:*/ 0,
+            (struct sockaddr *) &dest_sll, sizeof(dest_sll));
+    msg = "sendto";
+ ret_close:
     close(fd);
+    if (result < 0) {
+ ret_msg:
+        bb_perror_msg(msg, "PACKET");
+    }
     return result;
 }
 
-
 /* Let the kernel do all the work for packet generation */
-int udhcp_kernel_packet(struct dhcpMessage *payload,
-        uint32_t source_ip, int source_port,
-        uint32_t dest_ip, int dest_port)
-{
-    int fd, result;
+int FAST_FUNC udhcp_send_kernel_packet(struct dhcp_packet *dhcp_pkt,
+        uint32_t source_nip, int source_port,
+        uint32_t dest_nip, int dest_port)
+{
     struct sockaddr_in client;
+    unsigned padding;
+    int fd;
+    int result = -1;
+    const char *msg;
 
     fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
-    if (fd < 0)
-        return -1;
-
+    if (fd < 0) {
+        msg = "socket(%s)";
+        goto ret_msg;
+    }
     setsockopt_reuseaddr(fd);
 
@@ -200 +262 @@
     client.sin_family = AF_INET;
     client.sin_port = htons(source_port);
-    client.sin_addr.s_addr = source_ip;
-
+    client.sin_addr.s_addr = source_nip;
     if (bind(fd, (struct sockaddr *)&client, sizeof(client)) == -1) {
-        close(fd);
-        return -1;
+        msg = "bind(%s)";
+        goto ret_close;
     }
 
@@ -210 +271 @@
     client.sin_family = AF_INET;
     client.sin_port = htons(dest_port);
-    client.sin_addr.s_addr = dest_ip;
-
-    if (connect(fd, (struct sockaddr *)&client, sizeof(struct sockaddr)) == -1) {
-        close(fd);
-        return -1;
-    }
-
-    result = write(fd, payload, sizeof(struct dhcpMessage));
+    client.sin_addr.s_addr = dest_nip;
+    if (connect(fd, (struct sockaddr *)&client, sizeof(client)) == -1) {
+        msg = "connect";
+        goto ret_close;
+    }
+
+    udhcp_dump_packet(dhcp_pkt);
+
+    padding = DHCP_OPTIONS_BUFSIZE - 1 - udhcp_end_option(dhcp_pkt->options);
+    result = safe_write(fd, dhcp_pkt, DHCP_SIZE - padding);
+    msg = "write";
+ ret_close:
     close(fd);
+    if (result < 0) {
+ ret_msg:
+        bb_perror_msg(msg, "UDP");
+    }
     return result;
 }

branches/2.2.9/mindi-busybox/networking/udhcp/signalpipe.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
-/* signalpipe.c
- *
+/*
  * Signal pipe infrastructure. A reliable way of delivering signals.
  *
@@ -20 +19 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-
 #include "common.h"
 
-
-static int signal_pipe[2];
+/* Global variable: we access it from signal handler */
+static struct fd_pair signal_pipe;
 
 static void signal_handler(int sig)
 {
     unsigned char ch = sig; /* use char, avoid dealing with partial writes */
-    if (write(signal_pipe[1], &ch, 1) != 1)
-        bb_perror_msg("cannot send signal");
+    if (write(signal_pipe.wr, &ch, 1) != 1)
+        bb_perror_msg("can't send signal");
 }
-
 
 /* Call this before doing anything else. Sets up the socket pair
  * and installs the signal handler */
-void udhcp_sp_setup(void)
+void FAST_FUNC udhcp_sp_setup(void)
 {
     /* was socketpair, but it needs AF_UNIX in kernel */
-    xpipe(signal_pipe);
-    fcntl(signal_pipe[0], F_SETFD, FD_CLOEXEC);
-    fcntl(signal_pipe[1], F_SETFD, FD_CLOEXEC);
-    fcntl(signal_pipe[1], F_SETFL, O_NONBLOCK);
-    signal(SIGUSR1, signal_handler);
-    signal(SIGUSR2, signal_handler);
-    signal(SIGTERM, signal_handler);
+    xpiped_pair(signal_pipe);
+    close_on_exec_on(signal_pipe.rd);
+    close_on_exec_on(signal_pipe.wr);
+    ndelay_on(signal_pipe.wr);
+    bb_signals(0
+        + (1 << SIGUSR1)
+        + (1 << SIGUSR2)
+        + (1 << SIGTERM)
+        , signal_handler);
 }
-
 
 /* Quick little function to setup the rfds. Will return the
  * max_fd for use with select. Limited in that you can only pass
  * one extra fd */
-int udhcp_sp_fd_set(fd_set *rfds, int extra_fd)
+int FAST_FUNC udhcp_sp_fd_set(fd_set *rfds, int extra_fd)
 {
     FD_ZERO(rfds);
-    FD_SET(signal_pipe[0], rfds);
+    FD_SET(signal_pipe.rd, rfds);
     if (extra_fd >= 0) {
-        fcntl(extra_fd, F_SETFD, FD_CLOEXEC);
+        close_on_exec_on(extra_fd);
         FD_SET(extra_fd, rfds);
     }
-    return signal_pipe[0] > extra_fd ? signal_pipe[0] : extra_fd;
+    return signal_pipe.rd > extra_fd ? signal_pipe.rd : extra_fd;
 }
-
 
 /* Read a signal from the signal pipe. Returns 0 if there is
  * no signal, -1 on error (and sets errno appropriately), and
  * your signal on success */
-int udhcp_sp_read(fd_set *rfds)
+int FAST_FUNC udhcp_sp_read(const fd_set *rfds)
 {
     unsigned char sig;
 
-    if (!FD_ISSET(signal_pipe[0], rfds))
+    if (!FD_ISSET(signal_pipe.rd, rfds))
         return 0;
 
-    if (read(signal_pipe[0], &sig, 1) != 1)
+    if (safe_read(signal_pipe.rd, &sig, 1) != 1)
         return -1;
 

branches/2.2.9/mindi-busybox/networking/udhcp/socket.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * socket.c -- DHCP server client/server socket creation
+ * DHCP server client/server socket creation
  *
  * udhcp client/server
@@ -23 +23 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-
 #include <net/if.h>
-#include <features.h>
 #if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined _NEWLIB_VERSION
-#include <netpacket/packet.h>
-#include <net/ethernet.h>
+# include <netpacket/packet.h>
+# include <net/ethernet.h>
 #else
-#include <asm/types.h>
-#include <linux/if_packet.h>
-#include <linux/if_ether.h>
+# include <asm/types.h>
+# include <linux/if_packet.h>
+# include <linux/if_ether.h>
 #endif
 
 #include "common.h"
 
-
-int read_interface(const char *interface, int *ifindex, uint32_t *addr, uint8_t *arp)
+int FAST_FUNC udhcp_read_interface(const char *interface, int *ifindex, uint32_t *nip, uint8_t *mac)
 {
     int fd;
@@ -48 +45 @@
 
     ifr.ifr_addr.sa_family = AF_INET;
-    strncpy(ifr.ifr_name, interface, sizeof(ifr.ifr_name));
-    if (addr) {
+    strncpy_IFNAMSIZ(ifr.ifr_name, interface);
+    if (nip) {
         if (ioctl_or_perror(fd, SIOCGIFADDR, &ifr,
             "is interface %s up and configured?", interface)
@@ -57 +54 @@
         }
         our_ip = (struct sockaddr_in *) &ifr.ifr_addr;
-        *addr = our_ip->sin_addr.s_addr;
-        DEBUG("%s (our ip) = %s", ifr.ifr_name, inet_ntoa(our_ip->sin_addr));
+        *nip = our_ip->sin_addr.s_addr;
+        log1("IP %s", inet_ntoa(our_ip->sin_addr));
     }
 
@@ -66 +63 @@
             return -1;
         }
-        DEBUG("adapter index %d", ifr.ifr_ifindex);
+        log1("Adapter index %d", ifr.ifr_ifindex);
         *ifindex = ifr.ifr_ifindex;
     }
 
-    if (arp) {
+    if (mac) {
         if (ioctl_or_warn(fd, SIOCGIFHWADDR, &ifr) != 0) {
             close(fd);
             return -1;
         }
-        memcpy(arp, ifr.ifr_hwaddr.sa_data, 6);
-        DEBUG("adapter hardware address %02x:%02x:%02x:%02x:%02x:%02x",
-            arp[0], arp[1], arp[2], arp[3], arp[4], arp[5]);
+        memcpy(mac, ifr.ifr_hwaddr.sa_data, 6);
+        log1("MAC %02x:%02x:%02x:%02x:%02x:%02x",
+            mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
     }
 
@@ -86 +83 @@
 /* 1. None of the callers expects it to ever fail */
 /* 2. ip was always INADDR_ANY */
-int listen_socket(/*uint32_t ip,*/ int port, const char *inf)
+int FAST_FUNC udhcp_listen_socket(/*uint32_t ip,*/ int port, const char *inf)
 {
     int fd;
-    struct ifreq interface;
     struct sockaddr_in addr;
 
-    DEBUG("Opening listen socket on *:%d %s", port, inf);
+    log1("Opening listen socket on *:%d %s", port, inf);
     fd = xsocket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
 
@@ -99 +95 @@
         bb_perror_msg_and_die("SO_BROADCAST");
 
-    strncpy(interface.ifr_name, inf, IFNAMSIZ);
-    if (setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, &interface, sizeof(interface)) == -1)
-        bb_perror_msg_and_die("SO_BINDTODEVICE");
+    /* NB: bug 1032 says this doesn't work on ethernet aliases (ethN:M) */
+    if (setsockopt_bindtodevice(fd, inf))
+        xfunc_die(); /* warning is already printed */
 
     memset(&addr, 0, sizeof(addr));

branches/2.2.9/mindi-busybox/networking/udhcp/static_leases.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * static_leases.c -- Couple of functions to assist with storing and
- * retrieving data for static leases
+ * Storing and retrieving data for static leases
  *
  * Wade Berrier <wberrier@myrealbox.com> September 2004
  *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-
 #include "common.h"
 #include "dhcpd.h"
 
+/* Takes the address of the pointer to the static_leases linked list,
+ * address to a 6 byte mac address,
+ * 4 byte IP address */
+void FAST_FUNC add_static_lease(struct static_lease **st_lease_pp,
+        uint8_t *mac,
+        uint32_t nip)
+{
+    struct static_lease *st_lease;
 
-/* Takes the address of the pointer to the static_leases linked list,
- *   Address to a 6 byte mac address
- *   Address to a 4 byte ip address */
-int addStaticLease(struct static_lease **lease_struct, uint8_t *mac, uint32_t *ip)
+    /* Find the tail of the list */
+    while ((st_lease = *st_lease_pp) != NULL) {
+        st_lease_pp = &st_lease->next;
+    }
+
+    /* Add new node */
+    *st_lease_pp = st_lease = xzalloc(sizeof(*st_lease));
+    memcpy(st_lease->mac, mac, 6);
+    st_lease->nip = nip;
+    /*st_lease->next = NULL;*/
+}
+
+/* Find static lease IP by mac */
+uint32_t FAST_FUNC get_static_nip_by_mac(struct static_lease *st_lease, void *mac)
+{
+    while (st_lease) {
+        if (memcmp(st_lease->mac, mac, 6) == 0)
+            return st_lease->nip;
+        st_lease = st_lease->next;
+    }
+
+    return 0;
+}
+
+/* Check to see if an IP is reserved as a static IP */
+int FAST_FUNC is_nip_reserved(struct static_lease *st_lease, uint32_t nip)
+{
+    while (st_lease) {
+        if (st_lease->nip == nip)
+            return 1;
+        st_lease = st_lease->next;
+    }
+
+    return 0;
+}
+
+#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 2
+/* Print out static leases just to check what's going on */
+/* Takes the address of the pointer to the static_leases linked list */
+void FAST_FUNC log_static_leases(struct static_lease **st_lease_pp)
 {
     struct static_lease *cur;
-    struct static_lease *new_static_lease;
 
-    /* Build new node */
-    new_static_lease = xmalloc(sizeof(struct static_lease));
-    new_static_lease->mac = mac;
-    new_static_lease->ip = ip;
-    new_static_lease->next = NULL;
+    if (dhcp_verbose < 2)
+        return;
 
-    /* If it's the first node to be added... */
-    if (*lease_struct == NULL) {
-        *lease_struct = new_static_lease;
-    } else {
-        cur = *lease_struct;
-        while (cur->next) {
-            cur = cur->next;
-        }
-
-        cur->next = new_static_lease;
-    }
-
-    return 1;
-}
-
-/* Check to see if a mac has an associated static lease */
-uint32_t getIpByMac(struct static_lease *lease_struct, void *arg)
-{
-    uint32_t return_ip;
-    struct static_lease *cur = lease_struct;
-    uint8_t *mac = arg;
-
-    return_ip = 0;
-
+    cur = *st_lease_pp;
     while (cur) {
-        /* If the client has the correct mac  */
-        if (memcmp(cur->mac, mac, 6) == 0) {
-            return_ip = *(cur->ip);
-        }
-
-        cur = cur->next;
-    }
-
-    return return_ip;
-}
-
-/* Check to see if an ip is reserved as a static ip */
-uint32_t reservedIp(struct static_lease *lease_struct, uint32_t ip)
-{
-    struct static_lease *cur = lease_struct;
-
-    uint32_t return_val = 0;
-
-    while (cur) {
-        /* If the client has the correct ip  */
-        if (*cur->ip == ip)
-            return_val = 1;
-
-        cur = cur->next;
-    }
-
-    return return_val;
-}
-
-#if ENABLE_FEATURE_UDHCP_DEBUG
-/* Print out static leases just to check what's going on */
-/* Takes the address of the pointer to the static_leases linked list */
-void printStaticLeases(struct static_lease **arg)
-{
-    /* Get a pointer to the linked list */
-    struct static_lease *cur = *arg;
-
-    while (cur) {
-        /* printf("PrintStaticLeases: Lease mac Address: %x\n", cur->mac); */
-        printf("PrintStaticLeases: Lease mac Value: %x\n", *(cur->mac));
-        /* printf("PrintStaticLeases: Lease ip Address: %x\n", cur->ip); */
-        printf("PrintStaticLeases: Lease ip Value: %x\n", *(cur->ip));
-
+        bb_info_msg("static lease: mac:%02x:%02x:%02x:%02x:%02x:%02x nip:%x",
+            cur->mac[0], cur->mac[1], cur->mac[2],
+            cur->mac[3], cur->mac[4], cur->mac[5],
+            cur->nip
+        );
         cur = cur->next;
     }

branches/2.2.9/mindi-busybox/networking/vconfig.c

@@ -5 +5 @@
  * Copyright (C) 2001  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
@@ -48 +48 @@
 };
 
-#define VLAN_GROUP_ARRAY_LEN 4096
-#define SIOCSIFVLAN 0x8983      /* Set 802.1Q VLAN options */
+#define VLAN_GROUP_ARRAY_LEN  4096
+#define SIOCSIFVLAN           0x8983  /* Set 802.1Q VLAN options */
 
-/* On entry, table points to the length of the current string plus
- * nul terminator plus data length for the subsequent entry.  The
- * return value is the last data entry for the matching string. */
+/* On entry, table points to the length of the current string
+ * plus NUL terminator plus data length for the subsequent entry.
+ * The return value is the last data entry for the matching string. */
 static const char *xfind_str(const char *table, const char *str)
 {
     while (strcasecmp(str, table+1) != 0) {
-        if (!*(table += table[0])) {
+        table += table[0];
+        if (!*table) {
             bb_show_usage();
         }
@@ -107 +108 @@
 static const char conf_file_name[] ALIGN1 = "/proc/net/vlan/config";
 
-int vconfig_main(int argc, char **argv);
+int vconfig_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int vconfig_main(int argc, char **argv)
 {
@@ -122 +123 @@
     xopen(conf_file_name, O_RDONLY);
 
-    memset(&ifr, 0, sizeof(struct vlan_ioctl_args));
+    memset(&ifr, 0, sizeof(ifr));
 
     ++argv;
@@ -134 +135 @@
         ifr.u.name_type = *xfind_str(name_types+1, argv[1]);
     } else {
-        if (strlen(argv[1]) >= IF_NAMESIZE) {
-            bb_error_msg_and_die("if_name >= %d chars", IF_NAMESIZE);
-        }
-        strcpy(ifr.device1, argv[1]);
+        strncpy_IFNAMSIZ(ifr.device1, argv[1]);
         p = argv[2];
 

branches/2.2.9/mindi-busybox/networking/wget.c

@@ -4 +4 @@
  *
  * Chip Rosenthal Covad Communications <chip@laserlink.net>
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  *
+ * Copyright (C) 2010 Bradley M. Kuhn <bkuhn@ebb.org>
+ * Kuhn's copyrights are licensed GPLv2-or-later.  File as a whole remains GPLv2.
  */
-
-/* We want libc to give us xxx64 functions also */
-/* http://www.unix.org/version2/whatsnew/lfs20mar.html */
-//#define _LARGEFILE64_SOURCE 1
-
-#include <getopt.h> /* for struct option */
 #include "libbb.h"
 
@@ -17 +14 @@
     // May be used if we ever will want to free() all xstrdup()s...
     /* char *allocated; */
-    char *host;
-    int port;
-    char *path;
-    int is_ftp;
-    char *user;
+    const char *path;
+    const char *user;
+    char       *host;
+    int         port;
+    smallint    is_ftp;
 };
 
-static void parse_url(char *url, struct host_info *h);
-static FILE *open_socket(len_and_sockaddr *lsa);
-static char *gethdr(char *buf, size_t bufsiz, FILE *fp, int *istrunc);
-static int ftpcmd(const char *s1, const char *s2, FILE *fp, char *buf);
-
-/* Globals (can be accessed from signal handlers */
-static off_t content_len;        /* Content-length of the file */
-static off_t beg_range;          /* Range at which continue begins */
+
+/* Globals */
+struct globals {
+    off_t content_len;        /* Content-length of the file */
+    off_t beg_range;          /* Range at which continue begins */
 #if ENABLE_FEATURE_WGET_STATUSBAR
-static off_t transferred;        /* Number of bytes transferred so far */
-#endif
-static bool chunked;                     /* chunked transfer encoding */
+    off_t transferred;        /* Number of bytes transferred so far */
+    const char *curfile;      /* Name of current file being transferred */
+    bb_progress_t pmt;
+#endif
+#if ENABLE_FEATURE_WGET_TIMEOUT
+    unsigned timeout_seconds;
+#endif
+    smallint chunked;         /* chunked transfer encoding */
+    smallint got_clen;        /* got content-length: from server  */
+} FIX_ALIASING;
+#define G (*(struct globals*)&bb_common_bufsiz1)
+struct BUG_G_too_big {
+    char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1];
+};
+#define INIT_G() do { \
+    IF_FEATURE_WGET_TIMEOUT(G.timeout_seconds = 900;) \
+} while (0)
+
+
+/* Must match option string! */
+enum {
+    WGET_OPT_CONTINUE   = (1 << 0),
+    WGET_OPT_SPIDER     = (1 << 1),
+    WGET_OPT_QUIET      = (1 << 2),
+    WGET_OPT_OUTNAME    = (1 << 3),
+    WGET_OPT_PREFIX     = (1 << 4),
+    WGET_OPT_PROXY      = (1 << 5),
+    WGET_OPT_USER_AGENT = (1 << 6),
+    WGET_OPT_NETWORK_READ_TIMEOUT = (1 << 7),
+    WGET_OPT_RETRIES    = (1 << 8),
+    WGET_OPT_PASSIVE    = (1 << 9),
+    WGET_OPT_HEADER     = (1 << 10) * ENABLE_FEATURE_WGET_LONG_OPTIONS,
+    WGET_OPT_POST_DATA  = (1 << 11) * ENABLE_FEATURE_WGET_LONG_OPTIONS,
+};
+
+enum {
+    PROGRESS_START = -1,
+    PROGRESS_END   = 0,
+    PROGRESS_BUMP  = 1,
+};
 #if ENABLE_FEATURE_WGET_STATUSBAR
-static void progressmeter(int flag);
-static const char *curfile;             /* Name of current file being transferred */
-enum {
-    STALLTIME = 5                   /* Seconds when xfer considered "stalled" */
-};
+static void progress_meter(int flag)
+{
+    if (option_mask32 & WGET_OPT_QUIET)
+        return;
+
+    if (flag == PROGRESS_START)
+        bb_progress_init(&G.pmt);
+
+    bb_progress_update(&G.pmt, G.curfile, G.beg_range, G.transferred,
+               G.chunked ? 0 : G.beg_range + G.transferred + G.content_len);
+
+    if (flag == PROGRESS_END) {
+        bb_putchar_stderr('\n');
+        G.transferred = 0;
+    }
+}
 #else
-static ALWAYS_INLINE void progressmeter(int flag) {}
-#endif
+static ALWAYS_INLINE void progress_meter(int flag UNUSED_PARAM) { }
+#endif
+
+
+/* IPv6 knows scoped address types i.e. link and site local addresses. Link
+ * local addresses can have a scope identifier to specify the
+ * interface/link an address is valid on (e.g. fe80::1%eth0). This scope
+ * identifier is only valid on a single node.
+ *
+ * RFC 4007 says that the scope identifier MUST NOT be sent across the wire,
+ * unless all nodes agree on the semantic. Apache e.g. regards zone identifiers
+ * in the Host header as invalid requests, see
+ * https://issues.apache.org/bugzilla/show_bug.cgi?id=35122
+ */
+static void strip_ipv6_scope_id(char *host)
+{
+    char *scope, *cp;
+
+    /* bbox wget actually handles IPv6 addresses without [], like
+     * wget "http://::1/xxx", but this is not standard.
+     * To save code, _here_ we do not support it. */
+
+    if (host[0] != '[')
+        return; /* not IPv6 */
+
+    scope = strchr(host, '%');
+    if (!scope)
+        return;
+
+    /* Remove the IPv6 zone identifier from the host address */
+    cp = strchr(host, ']');
+    if (!cp || (cp[1] != ':' && cp[1] != '\0')) {
+        /* malformed address (not "[xx]:nn" or "[xx]") */
+        return;
+    }
+
+    /* cp points to "]...", scope points to "%eth0]..." */
+    overlapping_strcpy(scope, cp);
+}
 
 /* Read NMEMB bytes into PTR from STREAM.  Returns the number of bytes read,
@@ -55 +134 @@
     do {
         clearerr(stream);
+        errno = 0;
         ret = fread(p, 1, nmemb, stream);
         p += ret;
@@ -71 +151 @@
     do {
         clearerr(stream);
+        errno = 0;
         ret = fgets(s, size, stream);
     } while (ret == NULL && ferror(stream) && errno == EINTR);
@@ -89 +170 @@
 #endif
 
-int wget_main(int argc, char **argv);
-int wget_main(int argc, char **argv)
-{
-    char buf[512];
-    struct host_info server, target;
-    len_and_sockaddr *lsa;
-    int n, status;
-    int port;
-    int try = 5;
-    unsigned opt;
-    char *str;
-    char *proxy = 0;
-    char *dir_prefix = NULL;
-#if ENABLE_FEATURE_WGET_LONG_OPTIONS
-    char *extra_headers = NULL;
-    llist_t *headers_llist = NULL;
-#endif
-
-    FILE *sfp = NULL;               /* socket to web/ftp server         */
-    FILE *dfp = NULL;               /* socket to ftp server (data)      */
-    char *fname_out = NULL;         /* where to direct output (-O)      */
-    bool got_clen = 0;              /* got content-length: from server  */
-    int output_fd = -1;
-    bool use_proxy = 1;             /* Use proxies if env vars are set  */
-    const char *proxy_flag = "on";  /* Use proxies if env vars are set  */
-    const char *user_agent = "Wget";/* "User-Agent" header field        */
-    static const char keywords[] ALIGN1 =
-        "content-length\0""transfer-encoding\0""chunked\0""location\0";
-    enum {
-        KEY_content_length = 1, KEY_transfer_encoding, KEY_chunked, KEY_location
-    };
-    enum {
-        WGET_OPT_CONTINUE   = 0x1,
-        WGET_OPT_SPIDER     = 0x2,
-        WGET_OPT_QUIET      = 0x4,
-        WGET_OPT_OUTNAME    = 0x8,
-        WGET_OPT_PREFIX     = 0x10,
-        WGET_OPT_PROXY      = 0x20,
-        WGET_OPT_USER_AGENT = 0x40,
-        WGET_OPT_PASSIVE    = 0x80,
-        WGET_OPT_HEADER     = 0x100,
-    };
-#if ENABLE_FEATURE_WGET_LONG_OPTIONS
-    static const char wget_longopts[] ALIGN1 =
-        /* name, has_arg, val */
-        "continue\0"         No_argument       "c"
-        "spider\0"           No_argument       "s"
-        "quiet\0"            No_argument       "q"
-        "output-document\0"  Required_argument "O"
-        "directory-prefix\0" Required_argument "P"
-        "proxy\0"            Required_argument "Y"
-        "user-agent\0"       Required_argument "U"
-        "passive-ftp\0"      No_argument       "\xff"
-        "header\0"           Required_argument "\xfe"
-        ;
-    applet_long_options = wget_longopts;
-#endif
-    /* server.allocated = target.allocated = NULL; */
-    opt_complementary = "-1" USE_FEATURE_WGET_LONG_OPTIONS(":\xfe::");
-    opt = getopt32(argv, "csqO:P:Y:U:",
-                &fname_out, &dir_prefix,
-                &proxy_flag, &user_agent
-                USE_FEATURE_WGET_LONG_OPTIONS(, &headers_llist)
-                );
-    if (strcmp(proxy_flag, "off") == 0) {
-        /* Use the proxy if necessary */
-        use_proxy = 0;
-    }
-#if ENABLE_FEATURE_WGET_LONG_OPTIONS
-    if (headers_llist) {
-        int size = 1;
-        char *cp;
-        llist_t *ll = headers_llist;
-        while (ll) {
-            size += strlen(ll->data) + 2;
-            ll = ll->link;
-        }
-        extra_headers = cp = xmalloc(size);
-        while (headers_llist) {
-            cp += sprintf(cp, "%s\r\n", headers_llist->data);
-            headers_llist = headers_llist->link;
-        }
-    }
-#endif
-
-    parse_url(argv[optind], &target);
-    server.host = target.host;
-    server.port = target.port;
-
-    /* Use the proxy if necessary */
-    if (use_proxy) {
-        proxy = getenv(target.is_ftp ? "ftp_proxy" : "http_proxy");
-        if (proxy && *proxy) {
-            parse_url(proxy, &server);
-        } else {
-            use_proxy = 0;
-        }
-    }
-
-    /* Guess an output filename */
-    if (!fname_out) {
-        // Dirty hack. Needed because bb_get_last_path_component
-        // will destroy trailing / by storing '\0' in last byte!
-        if (!last_char_is(target.path, '/')) {
-            fname_out = bb_get_last_path_component(target.path);
-#if ENABLE_FEATURE_WGET_STATUSBAR
-            curfile = fname_out;
-#endif
-        }
-        if (!fname_out || !fname_out[0]) {
-            /* bb_get_last_path_component writes
-             * to last '/' only. We don't have one here... */
-            fname_out = (char*)"index.html";
-#if ENABLE_FEATURE_WGET_STATUSBAR
-            curfile = fname_out;
-#endif
-        }
-        if (dir_prefix != NULL)
-            fname_out = concat_path_file(dir_prefix, fname_out);
-#if ENABLE_FEATURE_WGET_STATUSBAR
-    } else {
-        curfile = bb_get_last_path_component(fname_out);
-#endif
-    }
-    /* Impossible?
-    if ((opt & WGET_OPT_CONTINUE) && !fname_out)
-        bb_error_msg_and_die("cannot specify continue (-c) without a filename (-O)"); */
-
-    /* Determine where to start transfer */
-    if (LONE_DASH(fname_out)) {
-        output_fd = 1;
-        opt &= ~WGET_OPT_CONTINUE;
-    }
-    if (opt & WGET_OPT_CONTINUE) {
-        output_fd = open(fname_out, O_WRONLY);
-        if (output_fd >= 0) {
-            beg_range = xlseek(output_fd, 0, SEEK_END);
-        }
-        /* File doesn't exist. We do not create file here yet.
-           We are not sure it exists on remove side */
-    }
-
-    /* We want to do exactly _one_ DNS lookup, since some
-     * sites (i.e. ftp.us.debian.org) use round-robin DNS
-     * and we want to connect to only one IP... */
-    lsa = xhost2sockaddr(server.host, server.port);
-    if (!(opt & WGET_OPT_QUIET)) {
-        fprintf(stderr, "Connecting to %s (%s)\n", server.host,
-                xmalloc_sockaddr2dotted(&lsa->sa));
-        /* We leak result of xmalloc_sockaddr2dotted */
-    }
-
-    if (use_proxy || !target.is_ftp) {
-        /*
-         *  HTTP session
-         */
-        do {
-            got_clen = chunked = 0;
-
-            if (!--try)
-                bb_error_msg_and_die("too many redirections");
-
-            /* Open socket to http server */
-            if (sfp) fclose(sfp);
-            sfp = open_socket(lsa);
-
-            /* Send HTTP request.  */
-            if (use_proxy) {
-                fprintf(sfp, "GET %stp://%s/%s HTTP/1.1\r\n",
-                    target.is_ftp ? "f" : "ht", target.host,
-                    target.path);
-            } else {
-                fprintf(sfp, "GET /%s HTTP/1.1\r\n", target.path);
-            }
-
-            fprintf(sfp, "Host: %s\r\nUser-Agent: %s\r\n",
-                target.host, user_agent);
-
-#if ENABLE_FEATURE_WGET_AUTHENTICATION
-            if (target.user) {
-                fprintf(sfp, "Proxy-Authorization: Basic %s\r\n"+6,
-                    base64enc_512(buf, target.user));
-            }
-            if (use_proxy && server.user) {
-                fprintf(sfp, "Proxy-Authorization: Basic %s\r\n",
-                    base64enc_512(buf, server.user));
-            }
-#endif
-
-            if (beg_range)
-                fprintf(sfp, "Range: bytes=%"OFF_FMT"d-\r\n", beg_range);
-#if ENABLE_FEATURE_WGET_LONG_OPTIONS
-            if (extra_headers)
-                fputs(extra_headers, sfp);
-#endif
-            fprintf(sfp, "Connection: close\r\n\r\n");
-
-            /*
-            * Retrieve HTTP response line and check for "200" status code.
-            */
- read_response:
-            if (fgets(buf, sizeof(buf), sfp) == NULL)
-                bb_error_msg_and_die("no response from server");
-
-            str = buf;
-            str = skip_non_whitespace(str);
-            str = skip_whitespace(str);
-            // FIXME: no error check
-            // xatou wouldn't work: "200 OK"
-            status = atoi(str);
-            switch (status) {
-            case 0:
-            case 100:
-                while (gethdr(buf, sizeof(buf), sfp, &n) != NULL)
-                    /* eat all remaining headers */;
-                goto read_response;
-            case 200:
-                break;
-            case 300:   /* redirection */
-            case 301:
-            case 302:
-            case 303:
-                break;
-            case 206:
-                if (beg_range)
-                    break;
-                /*FALLTHRU*/
-            default:
-                /* Show first line only and kill any ESC tricks */
-                buf[strcspn(buf, "\n\r\x1b")] = '\0';
-                bb_error_msg_and_die("server returned error: %s", buf);
-            }
-
-            /*
-             * Retrieve HTTP headers.
-             */
-            while ((str = gethdr(buf, sizeof(buf), sfp, &n)) != NULL) {
-                /* gethdr did already convert the "FOO:" string to lowercase */
-                smalluint key = index_in_strings(keywords, *&buf) + 1;
-                if (key == KEY_content_length) {
-                    content_len = BB_STRTOOFF(str, NULL, 10);
-                    if (errno || content_len < 0) {
-                        bb_error_msg_and_die("content-length %s is garbage", str);
-                    }
-                    got_clen = 1;
-                    continue;
-                }
-                if (key == KEY_transfer_encoding) {
-                    if (index_in_strings(keywords, str_tolower(str)) + 1 != KEY_chunked)
-                        bb_error_msg_and_die("server wants to do %s transfer encoding", str);
-                    chunked = got_clen = 1;
-                }
-                if (key == KEY_location) {
-                    if (str[0] == '/')
-                        /* free(target.allocated); */
-                        target.path = /* target.allocated = */ xstrdup(str+1);
-                    else {
-                        parse_url(str, &target);
-                        if (use_proxy == 0) {
-                            server.host = target.host;
-                            server.port = target.port;
-                        }
-                        free(lsa);
-                        lsa = xhost2sockaddr(server.host, server.port);
-                        break;
-                    }
-                }
-            }
-        } while (status >= 300);
-
-        dfp = sfp;
-
-    } else {
-
-        /*
-         *  FTP session
-         */
-        if (!target.user)
-            target.user = xstrdup("anonymous:busybox@");
-
-        sfp = open_socket(lsa);
-        if (ftpcmd(NULL, NULL, sfp, buf) != 220)
-            bb_error_msg_and_die("%s", buf+4);
-
-        /*
-         * Splitting username:password pair,
-         * trying to log in
-         */
-        str = strchr(target.user, ':');
-        if (str)
-            *(str++) = '\0';
-        switch (ftpcmd("USER ", target.user, sfp, buf)) {
-        case 230:
-            break;
-        case 331:
-            if (ftpcmd("PASS ", str, sfp, buf) == 230)
-                break;
-            /* FALLTHRU (failed login) */
-        default:
-            bb_error_msg_and_die("ftp login: %s", buf+4);
-        }
-
-        ftpcmd("TYPE I", NULL, sfp, buf);
-
-        /*
-         * Querying file size
-         */
-        if (ftpcmd("SIZE ", target.path, sfp, buf) == 213) {
-            content_len = BB_STRTOOFF(buf+4, NULL, 10);
-            if (errno || content_len < 0) {
-                bb_error_msg_and_die("SIZE value is garbage");
-            }
-            got_clen = 1;
-        }
-
-        /*
-         * Entering passive mode
-         */
-        if (ftpcmd("PASV", NULL, sfp, buf) != 227) {
- pasv_error:
-            bb_error_msg_and_die("bad response to %s: %s", "PASV", buf);
-        }
-        // Response is "227 garbageN1,N2,N3,N4,P1,P2[)garbage]
-        // Server's IP is N1.N2.N3.N4 (we ignore it)
-        // Server's port for data connection is P1*256+P2
-        str = strrchr(buf, ')');
-        if (str) str[0] = '\0';
-        str = strrchr(buf, ',');
-        if (!str) goto pasv_error;
-        port = xatou_range(str+1, 0, 255);
-        *str = '\0';
-        str = strrchr(buf, ',');
-        if (!str) goto pasv_error;
-        port += xatou_range(str+1, 0, 255) * 256;
-        set_nport(lsa, htons(port));
-        dfp = open_socket(lsa);
-
-        if (beg_range) {
-            sprintf(buf, "REST %"OFF_FMT"d", beg_range);
-            if (ftpcmd(buf, NULL, sfp, buf) == 350)
-                content_len -= beg_range;
-        }
-
-        if (ftpcmd("RETR ", target.path, sfp, buf) > 150)
-            bb_error_msg_and_die("bad response to RETR: %s", buf);
-    }
-    if (opt & WGET_OPT_SPIDER) {
-        if (ENABLE_FEATURE_CLEAN_UP)
-            fclose(sfp);
-        goto done;
-    }
-
-    /*
-     * Retrieve file
-     */
-    if (chunked) {
-        fgets(buf, sizeof(buf), dfp);
-        content_len = STRTOOFF(buf, NULL, 16);
-        /* FIXME: error check?? */
-    }
-
-    /* Do it before progressmeter (want to have nice error message) */
-    if (output_fd < 0)
-        output_fd = xopen(fname_out,
-            O_WRONLY|O_CREAT|O_EXCL|O_TRUNC);
-
-    if (!(opt & WGET_OPT_QUIET))
-        progressmeter(-1);
+static char* sanitize_string(char *s)
+{
+    unsigned char *p = (void *) s;
+    while (*p >= ' ')
+        p++;
+    *p = '\0';
+    return s;
+}
+
+static FILE *open_socket(len_and_sockaddr *lsa)
+{
+    FILE *fp;
+
+    /* glibc 2.4 seems to try seeking on it - ??! */
+    /* hopefully it understands what ESPIPE means... */
+    fp = fdopen(xconnect_stream(lsa), "r+");
+    if (fp == NULL)
+        bb_perror_msg_and_die("fdopen");
+
+    return fp;
+}
+
+static int ftpcmd(const char *s1, const char *s2, FILE *fp, char *buf)
+{
+    int result;
+    if (s1) {
+        if (!s2) s2 = "";
+        fprintf(fp, "%s%s\r\n", s1, s2);
+        fflush(fp);
+    }
 
     do {
-        while (content_len > 0 || !got_clen) {
-            unsigned rdsz = sizeof(buf);
-            if (content_len < sizeof(buf) && (chunked || got_clen))
-                rdsz = (unsigned)content_len;
-            n = safe_fread(buf, rdsz, dfp);
-            if (n <= 0)
-                break;
-            if (full_write(output_fd, buf, n) != n) {
-                bb_perror_msg_and_die(bb_msg_write_error);
-            }
-#if ENABLE_FEATURE_WGET_STATUSBAR
-            transferred += n;
-#endif
-            if (got_clen) {
-                content_len -= n;
-            }
-        }
-
-        if (chunked) {
-            safe_fgets(buf, sizeof(buf), dfp); /* This is a newline */
-            safe_fgets(buf, sizeof(buf), dfp);
-            content_len = STRTOOFF(buf, NULL, 16);
-            /* FIXME: error check? */
-            if (content_len == 0) {
-                chunked = 0; /* all done! */
-            }
-        }
-
-        if (n == 0 && ferror(dfp)) {
-            bb_perror_msg_and_die(bb_msg_read_error);
-        }
-    } while (chunked);
-
-    if (!(opt & WGET_OPT_QUIET))
-        progressmeter(1);
-
-    if ((use_proxy == 0) && target.is_ftp) {
-        fclose(dfp);
-        if (ftpcmd(NULL, NULL, sfp, buf) != 226)
-            bb_error_msg_and_die("ftp error: %s", buf+4);
-        ftpcmd("QUIT", NULL, sfp, buf);
-    }
-done:
-    exit(EXIT_SUCCESS);
-}
-
+        char *buf_ptr;
+
+        if (fgets(buf, 510, fp) == NULL) {
+            bb_perror_msg_and_die("error getting response");
+        }
+        buf_ptr = strstr(buf, "\r\n");
+        if (buf_ptr) {
+            *buf_ptr = '\0';
+        }
+    } while (!isdigit(buf[0]) || buf[3] != ' ');
+
+    buf[3] = '\0';
+    result = xatoi_positive(buf);
+    buf[3] = ' ';
+    return result;
+}
 
 static void parse_url(char *src_url, struct host_info *h)
@@ -521 +234 @@
         h->is_ftp = 1;
     } else
-        bb_error_msg_and_die("not an http or ftp url: %s", url);
+        bb_error_msg_and_die("not an http or ftp url: %s", sanitize_string(url));
 
     // FYI:
@@ -539 +252 @@
     p = strchr(h->host, '#'); if (!sp || (p && sp > p)) sp = p;
     if (!sp) {
-        /* must be writable because of bb_get_last_path_component() */
-        static char nullstr[] ALIGN1 = "";
-        h->path = nullstr;
+        h->path = "";
     } else if (*sp == '/') {
         *sp = '\0';
@@ -549 +260 @@
         // memmove converts to:
         // http:/busybox.nett?login=john@doe...
-        memmove(h->host-1, h->host, sp - h->host);
+        memmove(h->host - 1, h->host, sp - h->host);
         h->host--;
         sp[-1] = '\0';
@@ -555 +266 @@
     }
 
+    // We used to set h->user to NULL here, but this interferes
+    // with handling of code 302 ("object was moved")
+
     sp = strrchr(h->host, '@');
-    h->user = NULL;
     if (sp != NULL) {
         h->user = h->host;
@@ -566 +279 @@
 }
 
-
-static FILE *open_socket(len_and_sockaddr *lsa)
-{
-    FILE *fp;
-
-    /* glibc 2.4 seems to try seeking on it - ??! */
-    /* hopefully it understands what ESPIPE means... */
-    fp = fdopen(xconnect_stream(lsa), "r+");
-    if (fp == NULL)
-        bb_perror_msg_and_die("fdopen");
-
-    return fp;
-}
-
-
-static char *gethdr(char *buf, size_t bufsiz, FILE *fp, int *istrunc)
+static char *gethdr(char *buf, size_t bufsiz, FILE *fp /*, int *istrunc*/)
 {
     char *s, *hdrval;
     int c;
 
-    *istrunc = 0;
+    /* *istrunc = 0; */
 
     /* retrieve header line */
@@ -594 +292 @@
     /* see if we are at the end of the headers */
     for (s = buf; *s == '\r'; ++s)
-        ;
-    if (s[0] == '\n')
+        continue;
+    if (*s == '\n')
         return NULL;
 
     /* convert the header name to lower case */
-    for (s = buf; isalnum(*s) || *s == '-'; ++s)
-        *s = tolower(*s);
+    for (s = buf; isalnum(*s) || *s == '-' || *s == '.'; ++s) {
+        /* tolower for "A-Z", no-op for "0-9a-z-." */
+        *s = (*s | 0x20);
+    }
 
     /* verify we are at the end of the header name */
     if (*s != ':')
-        bb_error_msg_and_die("bad header line: %s", buf);
+        bb_error_msg_and_die("bad header line: %s", sanitize_string(buf));
 
     /* locate the start of the header value */
-    for (*s++ = '\0'; *s == ' ' || *s == '\t'; ++s)
-        ;
-    hdrval = s;
+    *s++ = '\0';
+    hdrval = skip_whitespace(s);
 
     /* locate the end of header */
-    while (*s != '\0' && *s != '\r' && *s != '\n')
+    while (*s && *s != '\r' && *s != '\n')
         ++s;
 
     /* end of header found */
-    if (*s != '\0') {
+    if (*s) {
         *s = '\0';
         return hdrval;
     }
 
-    /* Rats!  The buffer isn't big enough to hold the entire header value. */
+    /* Rats! The buffer isn't big enough to hold the entire header value */
     while (c = getc(fp), c != EOF && c != '\n')
+        continue;
+    /* *istrunc = 1; */
+    return hdrval;
+}
+
+#if ENABLE_FEATURE_WGET_LONG_OPTIONS
+static char *URL_escape(const char *str)
+{
+    /* URL encode, see RFC 2396 */
+    char *dst;
+    char *res = dst = xmalloc(strlen(str) * 3 + 1);
+    unsigned char c;
+
+    while (1) {
+        c = *str++;
+        if (c == '\0'
+        /* || strchr("!&'()*-.=_~", c) - more code */
+         || c == '!'
+         || c == '&'
+         || c == '\''
+         || c == '('
+         || c == ')'
+         || c == '*'
+         || c == '-'
+         || c == '.'
+         || c == '='
+         || c == '_'
+         || c == '~'
+         || (c >= '0' && c <= '9')
+         || ((c|0x20) >= 'a' && (c|0x20) <= 'z')
+        ) {
+            *dst++ = c;
+            if (c == '\0')
+                return res;
+        } else {
+            *dst++ = '%';
+            *dst++ = bb_hexdigits_upcase[c >> 4];
+            *dst++ = bb_hexdigits_upcase[c & 0xf];
+        }
+    }
+}
+#endif
+
+static FILE* prepare_ftp_session(FILE **dfpp, struct host_info *target, len_and_sockaddr *lsa)
+{
+    char buf[512];
+    FILE *sfp;
+    char *str;
+    int port;
+
+    if (!target->user)
+        target->user = xstrdup("anonymous:busybox@");
+
+    sfp = open_socket(lsa);
+    if (ftpcmd(NULL, NULL, sfp, buf) != 220)
+        bb_error_msg_and_die("%s", sanitize_string(buf+4));
+
+    /*
+     * Splitting username:password pair,
+     * trying to log in
+     */
+    str = strchr(target->user, ':');
+    if (str)
+        *str++ = '\0';
+    switch (ftpcmd("USER ", target->user, sfp, buf)) {
+    case 230:
+        break;
+    case 331:
+        if (ftpcmd("PASS ", str, sfp, buf) == 230)
+            break;
+        /* fall through (failed login) */
+    default:
+        bb_error_msg_and_die("ftp login: %s", sanitize_string(buf+4));
+    }
+
+    ftpcmd("TYPE I", NULL, sfp, buf);
+
+    /*
+     * Querying file size
+     */
+    if (ftpcmd("SIZE ", target->path, sfp, buf) == 213) {
+        G.content_len = BB_STRTOOFF(buf+4, NULL, 10);
+        if (G.content_len < 0 || errno) {
+            bb_error_msg_and_die("SIZE value is garbage");
+        }
+        G.got_clen = 1;
+    }
+
+    /*
+     * Entering passive mode
+     */
+    if (ftpcmd("PASV", NULL, sfp, buf) != 227) {
+ pasv_error:
+        bb_error_msg_and_die("bad response to %s: %s", "PASV", sanitize_string(buf));
+    }
+    // Response is "227 garbageN1,N2,N3,N4,P1,P2[)garbage]
+    // Server's IP is N1.N2.N3.N4 (we ignore it)
+    // Server's port for data connection is P1*256+P2
+    str = strrchr(buf, ')');
+    if (str) str[0] = '\0';
+    str = strrchr(buf, ',');
+    if (!str) goto pasv_error;
+    port = xatou_range(str+1, 0, 255);
+    *str = '\0';
+    str = strrchr(buf, ',');
+    if (!str) goto pasv_error;
+    port += xatou_range(str+1, 0, 255) * 256;
+    set_nport(lsa, htons(port));
+
+    *dfpp = open_socket(lsa);
+
+    if (G.beg_range) {
+        sprintf(buf, "REST %"OFF_FMT"u", G.beg_range);
+        if (ftpcmd(buf, NULL, sfp, buf) == 350)
+            G.content_len -= G.beg_range;
+    }
+
+    if (ftpcmd("RETR ", target->path, sfp, buf) > 150)
+        bb_error_msg_and_die("bad response to %s: %s", "RETR", sanitize_string(buf));
+
+    return sfp;
+}
+
+static void NOINLINE retrieve_file_data(FILE *dfp, int output_fd)
+{
+    char buf[512];
+#if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT
+# if ENABLE_FEATURE_WGET_TIMEOUT
+    unsigned second_cnt;
+# endif
+    struct pollfd polldata;
+
+    polldata.fd = fileno(dfp);
+    polldata.events = POLLIN | POLLPRI;
+    ndelay_on(polldata.fd);
+#endif
+    progress_meter(PROGRESS_START);
+
+    if (G.chunked)
+        goto get_clen;
+
+    /* Loops only if chunked */
+    while (1) {
+        while (1) {
+            int n;
+            unsigned rdsz;
+
+            rdsz = sizeof(buf);
+            if (G.got_clen) {
+                if (G.content_len < (off_t)sizeof(buf)) {
+                    if ((int)G.content_len <= 0)
+                        break;
+                    rdsz = (unsigned)G.content_len;
+                }
+            }
+#if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT
+# if ENABLE_FEATURE_WGET_TIMEOUT
+            second_cnt = G.timeout_seconds;
+# endif
+            while (1) {
+                if (safe_poll(&polldata, 1, 1000) != 0)
+                    break; /* error, EOF, or data is available */
+# if ENABLE_FEATURE_WGET_TIMEOUT
+                if (second_cnt != 0 && --second_cnt == 0) {
+                    progress_meter(PROGRESS_END);
+                    bb_perror_msg_and_die("download timed out");
+                }
+# endif
+                /* Needed for "stalled" indicator */
+                progress_meter(PROGRESS_BUMP);
+            }
+#endif
+            n = safe_fread(buf, rdsz, dfp);
+            if (n <= 0) {
+                if (ferror(dfp)) {
+                    /* perror will not work: ferror doesn't set errno */
+                    bb_error_msg_and_die(bb_msg_read_error);
+                }
+                break;
+            }
+            xwrite(output_fd, buf, n);
+#if ENABLE_FEATURE_WGET_STATUSBAR
+            G.transferred += n;
+            progress_meter(PROGRESS_BUMP);
+#endif
+            if (G.got_clen)
+                G.content_len -= n;
+        }
+
+        if (!G.chunked)
+            break;
+
+        safe_fgets(buf, sizeof(buf), dfp); /* This is a newline */
+ get_clen:
+        safe_fgets(buf, sizeof(buf), dfp);
+        G.content_len = STRTOOFF(buf, NULL, 16);
+        /* FIXME: error check? */
+        if (G.content_len == 0)
+            break; /* all done! */
+        G.got_clen = 1;
+    }
+
+    progress_meter(PROGRESS_END);
+}
+
+int wget_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int wget_main(int argc UNUSED_PARAM, char **argv)
+{
+    char buf[512];
+    struct host_info server, target;
+    len_and_sockaddr *lsa;
+    unsigned opt;
+    int redir_limit;
+    char *proxy = NULL;
+    char *dir_prefix = NULL;
+#if ENABLE_FEATURE_WGET_LONG_OPTIONS
+    char *post_data;
+    char *extra_headers = NULL;
+    llist_t *headers_llist = NULL;
+#endif
+    FILE *sfp;                      /* socket to web/ftp server         */
+    FILE *dfp;                      /* socket to ftp server (data)      */
+    char *fname_out;                /* where to direct output (-O)      */
+    int output_fd = -1;
+    bool use_proxy;                 /* Use proxies if env vars are set  */
+    const char *proxy_flag = "on";  /* Use proxies if env vars are set  */
+    const char *user_agent = "Wget";/* "User-Agent" header field        */
+
+    static const char keywords[] ALIGN1 =
+        "content-length\0""transfer-encoding\0""chunked\0""location\0";
+    enum {
+        KEY_content_length = 1, KEY_transfer_encoding, KEY_chunked, KEY_location
+    };
+#if ENABLE_FEATURE_WGET_LONG_OPTIONS
+    static const char wget_longopts[] ALIGN1 =
+        /* name, has_arg, val */
+        "continue\0"         No_argument       "c"
+        "spider\0"           No_argument       "s"
+        "quiet\0"            No_argument       "q"
+        "output-document\0"  Required_argument "O"
+        "directory-prefix\0" Required_argument "P"
+        "proxy\0"            Required_argument "Y"
+        "user-agent\0"       Required_argument "U"
+#if ENABLE_FEATURE_WGET_TIMEOUT
+        "timeout\0"          Required_argument "T"
+#endif
+        /* Ignored: */
+        // "tries\0"            Required_argument "t"
+        /* Ignored (we always use PASV): */
+        "passive-ftp\0"      No_argument       "\xff"
+        "header\0"           Required_argument "\xfe"
+        "post-data\0"        Required_argument "\xfd"
+        /* Ignored (we don't do ssl) */
+        "no-check-certificate\0" No_argument   "\xfc"
         ;
-    *istrunc = 1;
-    return hdrval;
-}
-
-static int ftpcmd(const char *s1, const char *s2, FILE *fp, char *buf)
-{
-    int result;
-    if (s1) {
-        if (!s2) s2 = "";
-        fprintf(fp, "%s%s\r\n", s1, s2);
-        fflush(fp);
-    }
-
-    do {
-        char *buf_ptr;
-
-        if (fgets(buf, 510, fp) == NULL) {
-            bb_perror_msg_and_die("error getting response");
-        }
-        buf_ptr = strstr(buf, "\r\n");
-        if (buf_ptr) {
-            *buf_ptr = '\0';
-        }
-    } while (!isdigit(buf[0]) || buf[3] != ' ');
-
-    buf[3] = '\0';
-    result = xatoi_u(buf);
-    buf[3] = ' ';
-    return result;
-}
-
+#endif
+
+    INIT_G();
+
+#if ENABLE_FEATURE_WGET_LONG_OPTIONS
+    applet_long_options = wget_longopts;
+#endif
+    /* server.allocated = target.allocated = NULL; */
+    opt_complementary = "-1" IF_FEATURE_WGET_TIMEOUT(":T+") IF_FEATURE_WGET_LONG_OPTIONS(":\xfe::");
+    opt = getopt32(argv, "csqO:P:Y:U:T:" /*ignored:*/ "t:",
+                &fname_out, &dir_prefix,
+                &proxy_flag, &user_agent,
+                IF_FEATURE_WGET_TIMEOUT(&G.timeout_seconds) IF_NOT_FEATURE_WGET_TIMEOUT(NULL),
+                NULL /* -t RETRIES */
+                IF_FEATURE_WGET_LONG_OPTIONS(, &headers_llist)
+                IF_FEATURE_WGET_LONG_OPTIONS(, &post_data)
+                );
+#if ENABLE_FEATURE_WGET_LONG_OPTIONS
+    if (headers_llist) {
+        int size = 1;
+        char *cp;
+        llist_t *ll = headers_llist;
+        while (ll) {
+            size += strlen(ll->data) + 2;
+            ll = ll->link;
+        }
+        extra_headers = cp = xmalloc(size);
+        while (headers_llist) {
+            cp += sprintf(cp, "%s\r\n", (char*)llist_pop(&headers_llist));
+        }
+    }
+#endif
+
+    /* TODO: compat issue: should handle "wget URL1 URL2..." */
+
+    target.user = NULL;
+    parse_url(argv[optind], &target);
+
+    /* Use the proxy if necessary */
+    use_proxy = (strcmp(proxy_flag, "off") != 0);
+    if (use_proxy) {
+        proxy = getenv(target.is_ftp ? "ftp_proxy" : "http_proxy");
+        if (proxy && proxy[0]) {
+            server.user = NULL;
+            parse_url(proxy, &server);
+        } else {
+            use_proxy = 0;
+        }
+    }
+    if (!use_proxy) {
+        server.port = target.port;
+        if (ENABLE_FEATURE_IPV6) {
+            server.host = xstrdup(target.host);
+        } else {
+            server.host = target.host;
+        }
+    }
+
+    if (ENABLE_FEATURE_IPV6)
+        strip_ipv6_scope_id(target.host);
+
+    /* Guess an output filename, if there was no -O FILE */
+    if (!(opt & WGET_OPT_OUTNAME)) {
+        fname_out = bb_get_last_path_component_nostrip(target.path);
+        /* handle "wget http://kernel.org//" */
+        if (fname_out[0] == '/' || !fname_out[0])
+            fname_out = (char*)"index.html";
+        /* -P DIR is considered only if there was no -O FILE */
+        if (dir_prefix)
+            fname_out = concat_path_file(dir_prefix, fname_out);
+    } else {
+        if (LONE_DASH(fname_out)) {
+            /* -O - */
+            output_fd = 1;
+            opt &= ~WGET_OPT_CONTINUE;
+        }
+    }
 #if ENABLE_FEATURE_WGET_STATUSBAR
-/* Stuff below is from BSD rcp util.c, as added to openshh.
- * Original copyright notice is retained at the end of this file.
- */
-static int
-getttywidth(void)
-{
-    int width;
-    get_terminal_width_height(0, &width, NULL);
-    return width;
-}
-
-static void
-updateprogressmeter(int ignore)
-{
-    int save_errno = errno;
-
-    progressmeter(0);
-    errno = save_errno;
-}
-
-static void alarmtimer(int iwait)
-{
-    struct itimerval itv;
-
-    itv.it_value.tv_sec = iwait;
-    itv.it_value.tv_usec = 0;
-    itv.it_interval = itv.it_value;
-    setitimer(ITIMER_REAL, &itv, NULL);
-}
-
-static void
-progressmeter(int flag)
-{
-    static unsigned lastupdate_sec;
-    static unsigned start_sec;
-    static off_t lastsize, totalsize;
-
-    off_t abbrevsize;
-    unsigned since_last_update, elapsed;
-    unsigned ratio;
-    int barlength, i;
-
-    if (flag == -1) { /* first call to progressmeter */
-        start_sec = monotonic_sec();
-        lastupdate_sec = start_sec;
-        lastsize = 0;
-        totalsize = content_len + beg_range; /* as content_len changes.. */
-    }
-
-    ratio = 100;
-    if (totalsize != 0 && !chunked) {
-        /* long long helps to have it working even if !LFS */
-        ratio = (unsigned) (100ULL * (transferred+beg_range) / totalsize);
-        if (ratio > 100) ratio = 100;
-    }
-
-    fprintf(stderr, "\r%-20.20s%4d%% ", curfile, ratio);
-
-    barlength = getttywidth() - 49;
-    if (barlength > 0) {
-        /* god bless gcc for variable arrays :) */
-        i = barlength * ratio / 100;
-        {
-            char buf[i+1];
-            memset(buf, '*', i);
-            buf[i] = '\0';
-            fprintf(stderr, "|%s%*s|", buf, barlength - i, "");
-        }
-    }
-    i = 0;
-    abbrevsize = transferred + beg_range;
-    while (abbrevsize >= 100000) {
-        i++;
-        abbrevsize >>= 10;
-    }
-    /* see http://en.wikipedia.org/wiki/Tera */
-    fprintf(stderr, "%6d%c ", (int)abbrevsize, " kMGTPEZY"[i]);
-
-// Nuts! Ain't it easier to update progress meter ONLY when we transferred++?
-// FIXME: get rid of alarmtimer + updateprogressmeter mess
-
-    elapsed = monotonic_sec();
-    since_last_update = elapsed - lastupdate_sec;
-    if (transferred > lastsize) {
-        lastupdate_sec = elapsed;
-        lastsize = transferred;
-        if (since_last_update >= STALLTIME) {
-            /* We "cut off" these seconds from elapsed time
-             * by adjusting start time */
-            start_sec += since_last_update;
-        }
-        since_last_update = 0; /* we are un-stalled now */
-    }
-    elapsed -= start_sec; /* now it's "elapsed since start" */
-
-    if (since_last_update >= STALLTIME) {
-        fprintf(stderr, " - stalled -");
+    G.curfile = bb_get_last_path_component_nostrip(fname_out);
+#endif
+
+    /* Impossible?
+    if ((opt & WGET_OPT_CONTINUE) && !fname_out)
+        bb_error_msg_and_die("can't specify continue (-c) without a filename (-O)");
+    */
+
+    /* Determine where to start transfer */
+    if (opt & WGET_OPT_CONTINUE) {
+        output_fd = open(fname_out, O_WRONLY);
+        if (output_fd >= 0) {
+            G.beg_range = xlseek(output_fd, 0, SEEK_END);
+        }
+        /* File doesn't exist. We do not create file here yet.
+         * We are not sure it exists on remove side */
+    }
+
+    redir_limit = 5;
+ resolve_lsa:
+    lsa = xhost2sockaddr(server.host, server.port);
+    if (!(opt & WGET_OPT_QUIET)) {
+        char *s = xmalloc_sockaddr2dotted(&lsa->u.sa);
+        fprintf(stderr, "Connecting to %s (%s)\n", server.host, s);
+        free(s);
+    }
+ establish_session:
+    if (use_proxy || !target.is_ftp) {
+        /*
+         *  HTTP session
+         */
+        char *str;
+        int status;
+
+        /* Open socket to http server */
+        sfp = open_socket(lsa);
+
+        /* Send HTTP request */
+        if (use_proxy) {
+            fprintf(sfp, "GET %stp://%s/%s HTTP/1.1\r\n",
+                target.is_ftp ? "f" : "ht", target.host,
+                target.path);
+        } else {
+            if (opt & WGET_OPT_POST_DATA)
+                fprintf(sfp, "POST /%s HTTP/1.1\r\n", target.path);
+            else
+                fprintf(sfp, "GET /%s HTTP/1.1\r\n", target.path);
+        }
+
+        fprintf(sfp, "Host: %s\r\nUser-Agent: %s\r\n",
+            target.host, user_agent);
+
+#if ENABLE_FEATURE_WGET_AUTHENTICATION
+        if (target.user) {
+            fprintf(sfp, "Proxy-Authorization: Basic %s\r\n"+6,
+                base64enc_512(buf, target.user));
+        }
+        if (use_proxy && server.user) {
+            fprintf(sfp, "Proxy-Authorization: Basic %s\r\n",
+                base64enc_512(buf, server.user));
+        }
+#endif
+
+        if (G.beg_range)
+            fprintf(sfp, "Range: bytes=%"OFF_FMT"u-\r\n", G.beg_range);
+#if ENABLE_FEATURE_WGET_LONG_OPTIONS
+        if (extra_headers)
+            fputs(extra_headers, sfp);
+
+        if (opt & WGET_OPT_POST_DATA) {
+            char *estr = URL_escape(post_data);
+            fprintf(sfp, "Content-Type: application/x-www-form-urlencoded\r\n");
+            fprintf(sfp, "Content-Length: %u\r\n" "\r\n" "%s",
+                    (int) strlen(estr), estr);
+            /*fprintf(sfp, "Connection: Keep-Alive\r\n\r\n");*/
+            /*fprintf(sfp, "%s\r\n", estr);*/
+            free(estr);
+        } else
+#endif
+        { /* If "Connection:" is needed, document why */
+            fprintf(sfp, /* "Connection: close\r\n" */ "\r\n");
+        }
+
+        fflush(sfp);
+
+        /*
+         * Retrieve HTTP response line and check for "200" status code.
+         */
+ read_response:
+        if (fgets(buf, sizeof(buf), sfp) == NULL)
+            bb_error_msg_and_die("no response from server");
+
+        str = buf;
+        str = skip_non_whitespace(str);
+        str = skip_whitespace(str);
+        // FIXME: no error check
+        // xatou wouldn't work: "200 OK"
+        status = atoi(str);
+        switch (status) {
+        case 0:
+        case 100:
+            while (gethdr(buf, sizeof(buf), sfp /*, &n*/) != NULL)
+                /* eat all remaining headers */;
+            goto read_response;
+        case 200:
+/*
+Response 204 doesn't say "null file", it says "metadata
+has changed but data didn't":
+
+"10.2.5 204 No Content
+The server has fulfilled the request but does not need to return
+an entity-body, and might want to return updated metainformation.
+The response MAY include new or updated metainformation in the form
+of entity-headers, which if present SHOULD be associated with
+the requested variant.
+
+If the client is a user agent, it SHOULD NOT change its document
+view from that which caused the request to be sent. This response
+is primarily intended to allow input for actions to take place
+without causing a change to the user agent's active document view,
+although any new or updated metainformation SHOULD be applied
+to the document currently in the user agent's active view.
+
+The 204 response MUST NOT include a message-body, and thus
+is always terminated by the first empty line after the header fields."
+
+However, in real world it was observed that some web servers
+(e.g. Boa/0.94.14rc21) simply use code 204 when file size is zero.
+*/
+        case 204:
+            break;
+        case 300:  /* redirection */
+        case 301:
+        case 302:
+        case 303:
+            break;
+        case 206:
+            if (G.beg_range)
+                break;
+            /* fall through */
+        default:
+            bb_error_msg_and_die("server returned error: %s", sanitize_string(buf));
+        }
+
+        /*
+         * Retrieve HTTP headers.
+         */
+        while ((str = gethdr(buf, sizeof(buf), sfp /*, &n*/)) != NULL) {
+            /* gethdr converted "FOO:" string to lowercase */
+            smalluint key;
+            /* strip trailing whitespace */
+            char *s = strchrnul(str, '\0') - 1;
+            while (s >= str && (*s == ' ' || *s == '\t')) {
+                *s = '\0';
+                s--;
+            }
+            key = index_in_strings(keywords, buf) + 1;
+            if (key == KEY_content_length) {
+                G.content_len = BB_STRTOOFF(str, NULL, 10);
+                if (G.content_len < 0 || errno) {
+                    bb_error_msg_and_die("content-length %s is garbage", sanitize_string(str));
+                }
+                G.got_clen = 1;
+                continue;
+            }
+            if (key == KEY_transfer_encoding) {
+                if (index_in_strings(keywords, str_tolower(str)) + 1 != KEY_chunked)
+                    bb_error_msg_and_die("transfer encoding '%s' is not supported", sanitize_string(str));
+                G.chunked = G.got_clen = 1;
+            }
+            if (key == KEY_location && status >= 300) {
+                if (--redir_limit == 0)
+                    bb_error_msg_and_die("too many redirections");
+                fclose(sfp);
+                G.got_clen = 0;
+                G.chunked = 0;
+                if (str[0] == '/')
+                    /* free(target.allocated); */
+                    target.path = /* target.allocated = */ xstrdup(str+1);
+                    /* lsa stays the same: it's on the same server */
+                else {
+                    parse_url(str, &target);
+                    if (!use_proxy) {
+                        server.host = target.host;
+                        /* strip_ipv6_scope_id(target.host); - no! */
+                        /* we assume remote never gives us IPv6 addr with scope id */
+                        server.port = target.port;
+                        free(lsa);
+                        goto resolve_lsa;
+                    } /* else: lsa stays the same: we use proxy */
+                }
+                goto establish_session;
+            }
+        }
+//      if (status >= 300)
+//          bb_error_msg_and_die("bad redirection (no Location: header from server)");
+
+        /* For HTTP, data is pumped over the same connection */
+        dfp = sfp;
+
     } else {
-        off_t to_download = totalsize - beg_range;
-        if (transferred <= 0 || (int)elapsed <= 0 || transferred > to_download || chunked) {
-            fprintf(stderr, "--:--:-- ETA");
-        } else {
-            /* to_download / (transferred/elapsed) - elapsed: */
-            int eta = (int) ((unsigned long long)to_download*elapsed/transferred - elapsed);
-            /* (long long helps to have working ETA even if !LFS) */
-            i = eta % 3600;
-            fprintf(stderr, "%02d:%02d:%02d ETA", eta / 3600, i / 60, i % 60);
-        }
-    }
-
-    if (flag == -1) { /* first call to progressmeter */
-        struct sigaction sa;
-        sa.sa_handler = updateprogressmeter;
-        sigemptyset(&sa.sa_mask);
-        sa.sa_flags = SA_RESTART;
-        sigaction(SIGALRM, &sa, NULL);
-        alarmtimer(1);
-    } else if (flag == 1) { /* last call to progressmeter */
-        alarmtimer(0);
-        transferred = 0;
-        putc('\n', stderr);
-    }
-}
-#endif /* FEATURE_WGET_STATUSBAR */
-
-/* Original copyright notice which applies to the CONFIG_FEATURE_WGET_STATUSBAR stuff,
- * much of which was blatantly stolen from openssh.  */
-
-/*-
- * Copyright (c) 1992, 1993
- *  The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change
- *      ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change>
- *
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
+        /*
+         *  FTP session
+         */
+        sfp = prepare_ftp_session(&dfp, &target, lsa);
+    }
+
+    if (opt & WGET_OPT_SPIDER) {
+        if (ENABLE_FEATURE_CLEAN_UP)
+            fclose(sfp);
+        return EXIT_SUCCESS;
+    }
+
+    if (output_fd < 0) {
+        int o_flags = O_WRONLY | O_CREAT | O_TRUNC | O_EXCL;
+        /* compat with wget: -O FILE can overwrite */
+        if (opt & WGET_OPT_OUTNAME)
+            o_flags = O_WRONLY | O_CREAT | O_TRUNC;
+        output_fd = xopen(fname_out, o_flags);
+    }
+
+    retrieve_file_data(dfp, output_fd);
+    xclose(output_fd);
+
+    if (dfp != sfp) {
+        /* It's ftp. Close it properly */
+        fclose(dfp);
+        if (ftpcmd(NULL, NULL, sfp, buf) != 226)
+            bb_error_msg_and_die("ftp error: %s", sanitize_string(buf+4));
+        /* ftpcmd("QUIT", NULL, sfp, buf); - why bother? */
+    }
+
+    return EXIT_SUCCESS;
+}

branches/2.2.9/mindi-busybox/networking/zcip.c

@@ -7 +7 @@
  * Copyright (C) 2004 by David Brownell
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
@@ -24 +24 @@
 // - link status monitoring (restart on link-up; stop on link-down)
 
-#include <syslog.h>
-#include <poll.h>
-#include <sys/wait.h>
 #include <netinet/ether.h>
 #include <net/ethernet.h>
@@ -35 +32 @@
 
 #include "libbb.h"
+#include <syslog.h>
 
 /* We don't need more than 32 bits of the counter */
@@ -40 +38 @@
 
 struct arp_packet {
-    struct ether_header hdr;
+    struct ether_header eth;
     struct ether_arp arp;
-} ATTRIBUTE_PACKED;
+} PACKED;
 
 enum {
@@ -70 +68 @@
 };
 
-#define VDBG(fmt,args...) \
-    do { } while (0)
+#define VDBG(...) do { } while (0)
+
+
+enum {
+    sock_fd = 3
+};
+
+struct globals {
+    struct sockaddr saddr;
+    struct ether_addr eth_addr;
+} FIX_ALIASING;
+#define G (*(struct globals*)&bb_common_bufsiz1)
+#define saddr    (G.saddr   )
+#define eth_addr (G.eth_addr)
+
 
 /**
@@ -77 +88 @@
  * the first and last 256 addresses are reserved.
  */
-static void pick(struct in_addr *ip)
+static uint32_t pick(void)
 {
     unsigned tmp;
@@ -84 +95 @@
         tmp = rand() & IN_CLASSB_HOST;
     } while (tmp > (IN_CLASSB_HOST - 0x0200));
-    ip->s_addr = htonl((LINKLOCAL_ADDR + 0x0100) + tmp);
+    return htonl((LINKLOCAL_ADDR + 0x0100) + tmp);
 }
 
@@ -90 +101 @@
  * Broadcast an ARP packet.
  */
-static void arp(int fd, struct sockaddr *saddr, int op,
-    const struct ether_addr *source_addr, struct in_addr source_ip,
-    const struct ether_addr *target_addr, struct in_addr target_ip)
+static void arp(
+    /* int op, - always ARPOP_REQUEST */
+    /* const struct ether_addr *source_eth, - always &eth_addr */
+                    struct in_addr source_ip,
+    const struct ether_addr *target_eth, struct in_addr target_ip)
 {
+    enum { op = ARPOP_REQUEST };
+#define source_eth (&eth_addr)
+
     struct arp_packet p;
     memset(&p, 0, sizeof(p));
 
     // ether header
-    p.hdr.ether_type = htons(ETHERTYPE_ARP);
-    memcpy(p.hdr.ether_shost, source_addr, ETH_ALEN);
-    memset(p.hdr.ether_dhost, 0xff, ETH_ALEN);
+    p.eth.ether_type = htons(ETHERTYPE_ARP);
+    memcpy(p.eth.ether_shost, source_eth, ETH_ALEN);
+    memset(p.eth.ether_dhost, 0xff, ETH_ALEN);
 
     // arp request
@@ -108 +124 @@
     p.arp.arp_pln = 4;
     p.arp.arp_op = htons(op);
-    memcpy(&p.arp.arp_sha, source_addr, ETH_ALEN);
+    memcpy(&p.arp.arp_sha, source_eth, ETH_ALEN);
     memcpy(&p.arp.arp_spa, &source_ip, sizeof(p.arp.arp_spa));
-    memcpy(&p.arp.arp_tha, target_addr, ETH_ALEN);
+    memcpy(&p.arp.arp_tha, target_eth, ETH_ALEN);
     memcpy(&p.arp.arp_tpa, &target_ip, sizeof(p.arp.arp_tpa));
 
     // send it
-    xsendto(fd, &p, sizeof(p), saddr, sizeof(*saddr));
-
-    // Currently all callers ignore errors, that's why returns are
-    // commented out...
-    //return 0;
+    // Even though sock_fd is already bound to saddr, just send()
+    // won't work, because "socket is not connected"
+    // (and connect() won't fix that, "operation not supported").
+    // Thus we sendto() to saddr. I wonder which sockaddr
+    // (from bind() or from sendto()?) kernel actually uses
+    // to determine iface to emit the packet from...
+    xsendto(sock_fd, &p, sizeof(p), &saddr, sizeof(saddr));
+#undef source_eth
 }
 
 /**
- * Run a script. argv[2] is already NULL.
- */
-static int run(char *argv[3], const char *intf, struct in_addr *ip)
+ * Run a script.
+ * argv[0]:intf argv[1]:script_name argv[2]:junk argv[3]:NULL
+ */
+static int run(char *argv[3], const char *param, struct in_addr *ip)
 {
     int status;
-
-    VDBG("%s run %s %s\n", intf, argv[0], argv[1]);
+    char *addr = addr; /* for gcc */
+    const char *fmt = "%s %s %s" + 3;
+
+    argv[2] = (char*)param;
+
+    VDBG("%s run %s %s\n", argv[0], argv[1], argv[2]);
 
     if (ip) {
-        char *addr = inet_ntoa(*ip);
-        setenv("ip", addr, 1);
-        bb_info_msg("%s %s %s", argv[1], intf, addr);
+        addr = inet_ntoa(*ip);
+        xsetenv("ip", addr);
+        fmt -= 3;
     }
-
-    status = wait4pid(spawn(argv));
+    bb_info_msg(fmt, argv[2], argv[0], addr);
+
+    status = spawn_and_wait(argv + 1);
     if (status < 0) {
-        bb_perror_msg("%s %s", argv[1], intf);
+        bb_perror_msg("%s %s %s" + 3, argv[2], argv[0]);
         return -errno;
     }
     if (status != 0)
-        bb_error_msg("script %s %s failed, exitcode=%d", argv[0], argv[1], status);
+        bb_error_msg("script %s %s failed, exitcode=%d", argv[1], argv[2], status & 0xff);
     return status;
 }
@@ -149 +174 @@
  * Return milliseconds of random delay, up to "secs" seconds.
  */
-static unsigned ALWAYS_INLINE ms_rdelay(unsigned secs)
+static ALWAYS_INLINE unsigned random_delay_ms(unsigned secs)
 {
     return rand() % (secs * 1000);
@@ -157 +182 @@
  * main program
  */
-int zcip_main(int argc, char **argv);
-int zcip_main(int argc, char **argv)
+int zcip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int zcip_main(int argc UNUSED_PARAM, char **argv)
 {
-    int state = PROBE;
-    struct ether_addr eth_addr;
-    const char *why;
-    int fd;
+    int state;
     char *r_opt;
     unsigned opts;
 
-    /* Ugly trick, but I want these zeroed in one go */
+    // ugly trick, but I want these zeroed in one go
     struct {
         const struct in_addr null_ip;
         const struct ether_addr null_addr;
-        struct sockaddr saddr;
         struct in_addr ip;
         struct ifreq ifr;
-        char *intf;
-        char *script_av[3];
         int timeout_ms; /* must be signed */
         unsigned conflicts;
@@ -185 +204 @@
 #define null_ip    (L.null_ip   )
 #define null_addr  (L.null_addr )
-#define saddr      (L.saddr     )
 #define ip         (L.ip        )
 #define ifr        (L.ifr       )
-#define intf       (L.intf      )
-#define script_av  (L.script_av )
 #define timeout_ms (L.timeout_ms)
 #define conflicts  (L.conflicts )
@@ -205 +221 @@
     opt_complementary = "=2:vv:vf";
     opts = getopt32(argv, "fqr:v", &r_opt, &verbose);
+#if !BB_MMU
+    // on NOMMU reexec early (or else we will rerun things twice)
+    if (!FOREGROUND)
+        bb_daemonize_or_rexec(0 /*was: DAEMON_CHDIR_ROOT*/, argv);
+#endif
+    // open an ARP socket
+    // (need to do it before openlog to prevent openlog from taking
+    // fd 3 (sock_fd==3))
+    xmove_fd(xsocket(AF_PACKET, SOCK_PACKET, htons(ETH_P_ARP)), sock_fd);
     if (!FOREGROUND) {
-        /* Do it early, before all bb_xx_msg calls */
+        // do it before all bb_xx_msg calls
         openlog(applet_name, 0, LOG_DAEMON);
         logmode |= LOGMODE_SYSLOG;
@@ -217 +242 @@
         }
     }
-    // On NOMMU reexec early (or else we will rerun things twice)
-#if !BB_MMU
-    if (!FOREGROUND)
-        bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv);
-#endif
-    argc -= optind;
-    argv += optind;
-
-    intf = argv[0];
-    script_av[0] = argv[1];
-    setenv("interface", intf, 1);
+    argv += optind - 1;
+
+    /* Now: argv[0]:junk argv[1]:intf argv[2]:script argv[3]:NULL */
+    /* We need to make space for script argument: */
+    argv[0] = argv[1];
+    argv[1] = argv[2];
+    /* Now: argv[0]:intf argv[1]:script argv[2]:junk argv[3]:NULL */
+#define argv_intf (argv[0])
+
+    xsetenv("interface", argv_intf);
 
     // initialize the interface (modprobe, ifup, etc)
-    script_av[1] = (char*)"init";
-    if (run(script_av, intf, NULL))
+    if (run(argv, "init", NULL))
         return EXIT_FAILURE;
 
     // initialize saddr
+    // saddr is: { u16 sa_family; u8 sa_data[14]; }
     //memset(&saddr, 0, sizeof(saddr));
-    safe_strncpy(saddr.sa_data, intf, sizeof(saddr.sa_data));
-
-    // open an ARP socket
-    fd = xsocket(PF_PACKET, SOCK_PACKET, htons(ETH_P_ARP));
+    //TODO: are we leaving sa_family == 0 (AF_UNSPEC)?!
+    safe_strncpy(saddr.sa_data, argv_intf, sizeof(saddr.sa_data));
+
     // bind to the interface's ARP socket
-    xbind(fd, &saddr, sizeof(saddr));
+    xbind(sock_fd, &saddr, sizeof(saddr));
 
     // get the interface's ethernet address
     //memset(&ifr, 0, sizeof(ifr));
-    strncpy(ifr.ifr_name, intf, sizeof(ifr.ifr_name));
-    xioctl(fd, SIOCGIFHWADDR, &ifr);
+    strncpy_IFNAMSIZ(ifr.ifr_name, argv_intf);
+    xioctl(sock_fd, SIOCGIFHWADDR, &ifr);
     memcpy(&eth_addr, &ifr.ifr_hwaddr.sa_data, ETH_ALEN);
 
     // start with some stable ip address, either a function of
     // the hardware address or else the last address we used.
+    // we are taking low-order four bytes, as top-order ones
+    // aren't random enough.
     // NOTE: the sequence of addresses we try changes only
     // depending on when we detect conflicts.
-    srand(*(unsigned*)&ifr.ifr_hwaddr.sa_data);
+    {
+        uint32_t t;
+        move_from_unaligned32(t, ((char *)&eth_addr + 2));
+        srand(t);
+    }
     if (ip.s_addr == 0)
-        pick(&ip);
+        ip.s_addr = pick();
 
     // FIXME cases to handle:
@@ -264 +293 @@
     if (!FOREGROUND) {
 #if BB_MMU
-        bb_daemonize(DAEMON_CHDIR_ROOT);
+        bb_daemonize(0 /*was: DAEMON_CHDIR_ROOT*/);
 #endif
-        bb_info_msg("start, interface %s", intf);
+        bb_info_msg("start, interface %s", argv_intf);
     }
 
@@ -273 +302 @@
     //  - start with some address we want to try
     //  - short random delay
-    //  - arp probes to see if another host else uses it
+    //  - arp probes to see if another host uses it
     //  - arp announcements that we're claiming it
     //  - use it
     //  - defend it, within limits
+    // exit if:
+    // - address is successfully obtained and -q was given:
+    //   run "<script> config", then exit with exitcode 0
+    // - poll error (when does this happen?)
+    // - read error (when does this happen?)
+    // - sendto error (in arp()) (when does this happen?)
+    // - revents & POLLERR (link down). run "<script> deconfig" first
+    state = PROBE;
     while (1) {
         struct pollfd fds[1];
         unsigned deadline_us;
         struct arp_packet p;
-
-        int source_ip_conflict = 0;
-        int target_ip_conflict = 0;
-
-        fds[0].fd = fd;
+        int source_ip_conflict;
+        int target_ip_conflict;
+
+        fds[0].fd = sock_fd;
         fds[0].events = POLLIN;
         fds[0].revents = 0;
@@ -291 +327 @@
         // poll, being ready to adjust current timeout
         if (!timeout_ms) {
-            timeout_ms = ms_rdelay(PROBE_WAIT);
-            // FIXME setsockopt(fd, SO_ATTACH_FILTER, ...) to
+            timeout_ms = random_delay_ms(PROBE_WAIT);
+            // FIXME setsockopt(sock_fd, SO_ATTACH_FILTER, ...) to
             // make the kernel filter out all packets except
             // ones we'd care about.
@@ -300 +336 @@
 
         VDBG("...wait %d %s nprobes=%u, nclaims=%u\n",
-                timeout_ms, intf, nprobes, nclaims);
-        switch (poll(fds, 1, timeout_ms)) {
+                timeout_ms, argv_intf, nprobes, nclaims);
+
+        switch (safe_poll(fds, 1, timeout_ms)) {
+
+        default:
+            //bb_perror_msg("poll"); - done in safe_poll
+            return EXIT_FAILURE;
 
         // timeout
@@ -313 +354 @@
                     nprobes++;
                     VDBG("probe/%u %s@%s\n",
-                            nprobes, intf, inet_ntoa(ip));
-                    arp(fd, &saddr, ARPOP_REQUEST,
-                            &eth_addr, null_ip,
+                            nprobes, argv_intf, inet_ntoa(ip));
+                    arp(/* ARPOP_REQUEST, */
+                            /* &eth_addr, */ null_ip,
                             &null_addr, ip);
                     timeout_ms = PROBE_MIN * 1000;
-                    timeout_ms += ms_rdelay(PROBE_MAX - PROBE_MIN);
+                    timeout_ms += random_delay_ms(PROBE_MAX - PROBE_MIN);
                 }
                 else {
@@ -325 +366 @@
                     nclaims = 0;
                     VDBG("announce/%u %s@%s\n",
-                            nclaims, intf, inet_ntoa(ip));
-                    arp(fd, &saddr, ARPOP_REQUEST,
-                            &eth_addr, ip,
+                            nclaims, argv_intf, inet_ntoa(ip));
+                    arp(/* ARPOP_REQUEST, */
+                            /* &eth_addr, */ ip,
                             &eth_addr, ip);
                     timeout_ms = ANNOUNCE_INTERVAL * 1000;
@@ -338 +379 @@
                 nclaims = 0;
                 VDBG("announce/%u %s@%s\n",
-                        nclaims, intf, inet_ntoa(ip));
-                arp(fd, &saddr, ARPOP_REQUEST,
-                        &eth_addr, ip,
+                        nclaims, argv_intf, inet_ntoa(ip));
+                arp(/* ARPOP_REQUEST, */
+                        /* &eth_addr, */ ip,
                         &eth_addr, ip);
                 timeout_ms = ANNOUNCE_INTERVAL * 1000;
@@ -350 +391 @@
                     nclaims++;
                     VDBG("announce/%u %s@%s\n",
-                            nclaims, intf, inet_ntoa(ip));
-                    arp(fd, &saddr, ARPOP_REQUEST,
-                            &eth_addr, ip,
+                            nclaims, argv_intf, inet_ntoa(ip));
+                    arp(/* ARPOP_REQUEST, */
+                            /* &eth_addr, */ ip,
                             &eth_addr, ip);
                     timeout_ms = ANNOUNCE_INTERVAL * 1000;
@@ -361 +402 @@
                     // link is ok to use earlier
                     // FIXME update filters
-                    script_av[1] = (char*)"config";
-                    run(script_av, intf, &ip);
+                    run(argv, "config", &ip);
                     ready = 1;
                     conflicts = 0;
@@ -382 +422 @@
                 // Invalid, should never happen.  Restart the whole protocol.
                 state = PROBE;
-                pick(&ip);
+                ip.s_addr = pick();
                 timeout_ms = 0;
                 nprobes = 0;
@@ -389 +429 @@
             } // switch (state)
             break; // case 0 (timeout)
-        // packets arriving
+
+        // packets arriving, or link went down
         case 1:
             // We need to adjust the timeout in case we didn't receive
@@ -402 +443 @@
                 } else {
                     VDBG("adjusting timeout\n");
-                    timeout_ms = diff / 1000;
-                    if (!timeout_ms) timeout_ms = 1;
+                    timeout_ms = (diff / 1000) | 1; /* never 0 */
                 }
             }
@@ -411 +451 @@
                     // FIXME: links routinely go down;
                     // this shouldn't necessarily exit.
-                    bb_error_msg("%s: poll error", intf);
+                    bb_error_msg("iface %s is down", argv_intf);
                     if (ready) {
-                        script_av[1] = (char*)"deconfig";
-                        run(script_av, intf, &ip);
+                        run(argv, "deconfig", &ip);
                     }
                     return EXIT_FAILURE;
@@ -422 +461 @@
 
             // read ARP packet
-            if (recv(fd, &p, sizeof(p), 0) < 0) {
-                why = "recv";
-                goto bad;
+            if (safe_read(sock_fd, &p, sizeof(p)) < 0) {
+                bb_perror_msg_and_die(bb_msg_read_error);
             }
-            if (p.hdr.ether_type != htons(ETHERTYPE_ARP))
+            if (p.eth.ether_type != htons(ETHERTYPE_ARP))
                 continue;
-
 #ifdef DEBUG
             {
-                struct ether_addr * sha = (struct ether_addr *) p.arp.arp_sha;
-                struct ether_addr * tha = (struct ether_addr *) p.arp.arp_tha;
-                struct in_addr * spa = (struct in_addr *) p.arp.arp_spa;
-                struct in_addr * tpa = (struct in_addr *) p.arp.arp_tpa;
+                struct ether_addr *sha = (struct ether_addr *) p.arp.arp_sha;
+                struct ether_addr *tha = (struct ether_addr *) p.arp.arp_tha;
+                struct in_addr *spa = (struct in_addr *) p.arp.arp_spa;
+                struct in_addr *tpa = (struct in_addr *) p.arp.arp_tpa;
                 VDBG("%s recv arp type=%d, op=%d,\n",
-                    intf, ntohs(p.hdr.ether_type),
+                    argv_intf, ntohs(p.eth.ether_type),
                     ntohs(p.arp.arp_op));
                 VDBG("\tsource=%s %s\n",
@@ -447 +484 @@
 #endif
             if (p.arp.arp_op != htons(ARPOP_REQUEST)
-                    && p.arp.arp_op != htons(ARPOP_REPLY))
+             && p.arp.arp_op != htons(ARPOP_REPLY))
                 continue;
 
-            if (memcmp(p.arp.arp_spa, &ip.s_addr, sizeof(struct in_addr)) == 0 &&
-                memcmp(&eth_addr, &p.arp.arp_sha, ETH_ALEN) != 0) {
+            source_ip_conflict = 0;
+            target_ip_conflict = 0;
+
+            if (memcmp(p.arp.arp_spa, &ip.s_addr, sizeof(struct in_addr)) == 0
+             && memcmp(&p.arp.arp_sha, &eth_addr, ETH_ALEN) != 0
+            ) {
                 source_ip_conflict = 1;
             }
-            if (memcmp(p.arp.arp_tpa, &ip.s_addr, sizeof(struct in_addr)) == 0 &&
-                p.arp.arp_op == htons(ARPOP_REQUEST) &&
-                memcmp(&eth_addr, &p.arp.arp_tha, ETH_ALEN) != 0) {
+            if (p.arp.arp_op == htons(ARPOP_REQUEST)
+             && memcmp(p.arp.arp_tpa, &ip.s_addr, sizeof(struct in_addr)) == 0
+             && memcmp(&p.arp.arp_tha, &eth_addr, ETH_ALEN) != 0
+            ) {
                 target_ip_conflict = 1;
             }
@@ -470 +512 @@
                     conflicts++;
                     if (conflicts >= MAX_CONFLICTS) {
-                        VDBG("%s ratelimit\n", intf);
+                        VDBG("%s ratelimit\n", argv_intf);
                         timeout_ms = RATE_LIMIT_INTERVAL * 1000;
                         state = RATE_LIMIT_PROBE;
@@ -476 +518 @@
 
                     // restart the whole protocol
-                    pick(&ip);
+                    ip.s_addr = pick();
                     timeout_ms = 0;
                     nprobes = 0;
@@ -488 +530 @@
                     state = DEFEND;
                     timeout_ms = DEFEND_INTERVAL * 1000;
-                    arp(fd, &saddr,
-                            ARPOP_REQUEST,
-                            &eth_addr, ip,
-                            &eth_addr, ip);
+                    arp(/* ARPOP_REQUEST, */
+                        /* &eth_addr, */ ip,
+                        &eth_addr, ip);
                 }
                 break;
@@ -500 +541 @@
                     VDBG("defend conflict -- starting over\n");
                     ready = 0;
-                    script_av[1] = (char*)"deconfig";
-                    run(script_av, intf, &ip);
+                    run(argv, "deconfig", &ip);
 
                     // restart the whole protocol
-                    pick(&ip);
+                    ip.s_addr = pick();
                     timeout_ms = 0;
                     nprobes = 0;
@@ -514 +554 @@
                 VDBG("invalid state -- starting over\n");
                 state = PROBE;
-                pick(&ip);
+                ip.s_addr = pick();
                 timeout_ms = 0;
                 nprobes = 0;
@@ -520 +560 @@
                 break;
             } // switch state
-
             break; // case 1 (packets arriving)
-        default:
-            why = "poll";
-            goto bad;
         } // switch poll
-    }
- bad:
-    bb_perror_msg("%s, %s", intf, why);
-    return EXIT_FAILURE;
+    } // while (1)
+#undef argv_intf
 }