Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/networking

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

Location:

branches/3.2/mindi-busybox/networking

Files:

• Config.src (modified) (23 diffs)
• Kbuild.src (modified) (1 diff)
• arp.c (modified) (7 diffs)
• arping.c (modified) (1 diff)
• brctl.c (modified) (5 diffs)
• dnsd.c (modified) (1 diff)
• ether-wake.c (modified) (4 diffs)
• ftpd.c (modified) (7 diffs)
• ftpgetput.c (modified) (6 diffs)
• hostname.c (modified) (2 diffs)
• httpd.c (modified) (36 diffs)
• httpd_indexcgi.c (modified) (5 diffs)
• httpd_ssi.c (modified) (2 diffs)
• ifconfig.c (modified) (15 diffs)
• ifenslave.c (modified) (3 diffs)
• ifplugd.c (modified) (7 diffs)
• ifupdown.c (modified) (30 diffs)
• inetd.c (modified) (30 diffs)
• interface.c (modified) (6 diffs)
• ip.c (modified) (1 diff)
• ipcalc.c (modified) (1 diff)
• isrv_identd.c (modified) (1 diff)
• libiproute/ipaddress.c (modified) (3 diffs)
• libiproute/iplink.c (modified) (1 diff)
• libiproute/iproute.c (modified) (9 diffs)
• libiproute/iprule.c (modified) (1 diff)
• libiproute/iptunnel.c (modified) (1 diff)
• libiproute/libnetlink.c (modified) (2 diffs)
• libiproute/ll_proto.c (modified) (4 diffs)
• libiproute/ll_types.c (modified) (1 diff)
• libiproute/utils.c (modified) (7 diffs)
• libiproute/utils.h (modified) (2 diffs)
• nameif.c (modified) (10 diffs)
• nbd-client.c (modified) (1 diff)
• nc.c (modified) (2 diffs)
• nc_bloaty.c (modified) (12 diffs)
• netstat.c (modified) (2 diffs)
• nslookup.c (modified) (3 diffs)
• ntpd.c (modified) (57 diffs)
• ntpd_simple.c (modified) (2 diffs)
• ping.c (modified) (17 diffs)
• pscan.c (modified) (2 diffs)
• route.c (modified) (24 diffs)
• slattach.c (modified) (1 diff)
• tc.c (modified) (8 diffs)
• tcpudp.c (modified) (2 diffs)
• telnet.c (modified) (5 diffs)
• telnetd.c (modified) (5 diffs)
• tftp.c (modified) (21 diffs)
• traceroute.c (modified) (17 diffs)
• tunctl.c (modified) (1 diff)
• udhcp/Config.src (modified) (5 diffs)
• udhcp/arpping.c (modified) (1 diff)
• udhcp/common.c (modified) (14 diffs)
• udhcp/common.h (modified) (10 diffs)
• udhcp/dhcpc.c (modified) (62 diffs)
• udhcp/dhcpc.h (modified) (2 diffs)
• udhcp/dhcpd.c (modified) (15 diffs)
• udhcp/dhcprelay.c (modified) (2 diffs)
• udhcp/dumpleases.c (modified) (2 diffs)
• udhcp/files.c (modified) (1 diff)
• udhcp/leases.c (modified) (3 diffs)
• udhcp/packet.c (modified) (9 diffs)
• udhcp/socket.c (modified) (5 diffs)
• vconfig.c (modified) (6 diffs)
• wget.c (modified) (31 diffs)
• zcip.c (modified) (3 diffs)

branches/3.2/mindi-busybox/networking/Config.src

@@ -52 +52 @@
     bool "arp"
     default y
-    depends on PLATFORM_LINUX
+    select PLATFORM_LINUX
     help
       Manipulate the system ARP cache.
@@ -59 +59 @@
     bool "arping"
     default y
-    depends on PLATFORM_LINUX
+    select PLATFORM_LINUX
     help
       Ping hosts by ARP packets.
@@ -66 +66 @@
     bool "brctl"
     default y
-    depends on PLATFORM_LINUX
+    select PLATFORM_LINUX
     help
       Manage ethernet bridges.
@@ -83 +83 @@
 
 config FEATURE_BRCTL_SHOW
-    bool "Support show, showmac and showstp"
+    bool "Support show"
     default y
     depends on BRCTL && FEATURE_BRCTL_FANCY
     help
       Add support for option which prints the current config:
-        showmacs, showstp, show
+        show
 
 config DNSD
@@ -99 +99 @@
     bool "ether-wake"
     default y
-    depends on PLATFORM_LINUX
+    select PLATFORM_LINUX
     help
       Send a magic packet to wake up sleeping machines.
@@ -200 +200 @@
       Utilizes password settings from /etc/httpd.conf for basic
       authentication on a per url basis.
+      Example for httpd.conf file:
+      /adm:toor:PaSsWd
 
 config FEATURE_HTTPD_AUTH_MD5
@@ -206 +208 @@
     depends on FEATURE_HTTPD_BASIC_AUTH
     help
-      Enables basic per URL authentication from /etc/httpd.conf
-      using md5 passwords.
+      Enables encrypted passwords, and wildcard user/passwords
+      in httpd.conf file.
+      User '*' means 'any system user name is ok',
+      password of '*' means 'use system password for this user'
+      Examples:
+      /adm:toor:$1$P/eKnWXS$aI1aPGxT.dJD5SzqAKWrF0
+      /adm:root:*
+      /wiki:*:*
 
 config FEATURE_HTTPD_CGI
@@ -224 +232 @@
       This option enables support for running scripts through an
       interpreter. Turn this on if you want PHP scripts to work
-      properly. You need to supply an additional line in your httpd
-      config file:
+      properly. You need to supply an additional line in your
+      httpd.conf file:
       *.php:/path/to/your/php
 
@@ -282 +290 @@
     bool "ifconfig"
     default y
-    depends on PLATFORM_LINUX
+    select PLATFORM_LINUX
     help
       Ifconfig is used to configure the kernel-resident network interfaces.
@@ -330 +338 @@
     bool "ifenslave"
     default y
-    depends on PLATFORM_LINUX
+    select PLATFORM_LINUX
     help
       Userspace application to bind several interfaces
@@ -338 +346 @@
     bool "ifplugd"
     default y
-    depends on PLATFORM_LINUX
+    select PLATFORM_LINUX
     help
       Network interface plug detection daemon.
@@ -380 +388 @@
     bool "Use busybox ip applet"
     default y
-    depends on FEATURE_IFUPDOWN_IP && PLATFORM_LINUX
+    depends on FEATURE_IFUPDOWN_IP
+    select PLATFORM_LINUX
     select IP
     select FEATURE_IP_ADDRESS
@@ -499 +508 @@
     bool "ip"
     default y
-    depends on PLATFORM_LINUX
+    select PLATFORM_LINUX
     help
       The "ip" applet is a TCP/IP interface configuration and routing
@@ -612 +621 @@
       Support long options for the ipcalc applet.
 
-config NAMEIF
-    bool "nameif"
-    default y
-    depends on PLATFORM_LINUX
-    select FEATURE_SYSLOG
-    help
-      nameif is used to rename network interface by its MAC address.
-      Renamed interfaces MUST be in the down state.
-      It is possible to use a file (default: /etc/mactab)
-      with list of new interface names and MACs.
-      Maximum interface name length: IFNAMSIZ = 16
-      File fields are separated by space or tab.
-      File format:
-      # Comment
-      new_interface_name    XX:XX:XX:XX:XX:XX
-
-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 y
-    depends on PLATFORM_LINUX
+    select PLATFORM_LINUX
     help
       netstat prints information about the Linux networking subsystem.
@@ -673 +653 @@
     bool "ntpd"
     default y
-    depends on PLATFORM_LINUX
+    select PLATFORM_LINUX
     help
       The NTP client/server daemon.
@@ -685 +665 @@
       ntpd will be usable only as a NTP client.
 
-config PING
-    bool "ping"
-    default y
-    depends on PLATFORM_LINUX
-    help
-      ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to
-      elicit an ICMP ECHO_RESPONSE from a host or gateway.
-
-config PING6
-    bool "ping6"
-    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"
@@ -717 +674 @@
     bool "route"
     default y
-    depends on PLATFORM_LINUX
+    select PLATFORM_LINUX
     help
       Route displays or manipulates the kernel's IP routing tables.
@@ -724 +681 @@
     bool "slattach"
     default y
-    depends on PLATFORM_LINUX
+    select PLATFORM_LINUX
     help
       slattach is a small utility to attach network interfaces to serial
@@ -911 +868 @@
     bool "traceroute"
     default y
-    depends on PLATFORM_LINUX
+    select PLATFORM_LINUX
     help
       Utility to trace the route of IP packets.
@@ -948 +905 @@
     bool "tunctl"
     default y
-    depends on PLATFORM_LINUX
+    select PLATFORM_LINUX
     help
       tunctl creates or deletes tun devices.
@@ -981 +938 @@
     bool "vconfig"
     default y
-    depends on PLATFORM_LINUX
+    select PLATFORM_LINUX
     help
       Creates, removes, and configures VLAN interfaces
@@ -989 +946 @@
     default y
     help
-      wget is a utility for non-interactive download of files from HTTP,
-      HTTPS, and FTP servers.
+      wget is a utility for non-interactive download of files from HTTP
+      and FTP servers.
 
 config FEATURE_WGET_STATUSBAR
@@ -1028 +985 @@
     bool "zcip"
     default y
-    depends on PLATFORM_LINUX
+    select PLATFORM_LINUX
     select FEATURE_SYSLOG
     help

branches/3.2/mindi-busybox/networking/Kbuild.src

@@ -31 +31 @@
 lib-$(CONFIG_NSLOOKUP)     += nslookup.o
 lib-$(CONFIG_NTPD)         += ntpd.o
-lib-$(CONFIG_PING)         += ping.o
-lib-$(CONFIG_PING6)        += ping.o
 lib-$(CONFIG_PSCAN)        += pscan.o
 lib-$(CONFIG_ROUTE)        += route.o

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

@@ -14 +14 @@
  */
 
+//usage:#define arp_trivial_usage
+//usage:     "\n[-vn]   [-H HWTYPE] [-i IF] -a [HOSTNAME]"
+//usage:     "\n[-v]            [-i IF] -d HOSTNAME [pub]"
+//usage:     "\n[-v]    [-H HWTYPE] [-i IF] -s HOSTNAME HWADDR [temp]"
+//usage:     "\n[-v]    [-H HWTYPE] [-i IF] -s HOSTNAME HWADDR [netmask MASK] pub"
+//usage:     "\n[-v]    [-H HWTYPE] [-i IF] -Ds HOSTNAME IFACE [netmask MASK] pub"
+//usage:#define arp_full_usage "\n\n"
+//usage:       "Manipulate ARP cache\n"
+//usage:       "\n  -a      Display (all) hosts"
+//usage:       "\n  -s      Set new ARP entry"
+//usage:       "\n  -d      Delete a specified entry"
+//usage:       "\n  -v      Verbose"
+//usage:       "\n  -n      Don't resolve names"
+//usage:       "\n  -i IF       Network interface"
+//usage:       "\n  -D      Read <hwaddr> from given device"
+//usage:       "\n  -A,-p AF    Protocol family"
+//usage:       "\n  -H HWTYPE   Hardware address type"
+
 #include "libbb.h"
 #include "inet_common.h"
@@ -197 +215 @@
 /* Get the hardware address to a specified interface name */
 static void arp_getdevhw(char *ifname, struct sockaddr *sa,
-                         const struct hwtype *hwt)
+                        const struct hwtype *hwt)
 {
     struct ifreq ifr;
@@ -216 +234 @@
         }
         bb_error_msg("device '%s' has HW address %s '%s'",
-                     ifname, xhw->name,
-                     xhw->print((unsigned char *) &ifr.ifr_hwaddr.sa_data));
+                    ifname, xhw->name,
+                    xhw->print((unsigned char *) &ifr.ifr_hwaddr.sa_data));
     }
 }
@@ -328 +346 @@
 static void
 arp_disp(const char *name, char *ip, int type, int arp_flags,
-         char *hwa, char *mask, char *dev)
+        char *hwa, char *mask, char *dev)
 {
     static const int arp_masks[] = {
@@ -411 +429 @@
          * because fgets above reads limited amount of data */
         num = sscanf(line, "%s 0x%x 0x%x %s %s %s\n",
-                     ip, &type, &flags, hwa, mask, dev);
+                    ip, &type, &flags, hwa, mask, dev);
         if (num < 4)
             break;
@@ -444 +462 @@
     if (option_mask32 & ARP_OPT_v)
         printf("Entries: %d\tSkipped: %d\tFound: %d\n",
-               entries, entries - shown, shown);
+                entries, entries - shown, shown);
 
     if (!shown) {
@@ -500 +518 @@
     if (hw->alen <= 0) {
         bb_error_msg_and_die("%s: %s without ARP support",
-                             hw->name, "hardware type");
+                hw->name, "hardware type");
     }
 

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

@@ -6 +6 @@
  * Busybox port: Nick Fedchik <nick@fedchik.org.ua>
  */
+
+//usage:#define arping_trivial_usage
+//usage:       "[-fqbDUA] [-c CNT] [-w TIMEOUT] [-I IFACE] [-s SRC_IP] DST_IP"
+//usage:#define arping_full_usage "\n\n"
+//usage:       "Send ARP requests/replies\n"
+//usage:     "\n    -f      Quit on first ARP reply"
+//usage:     "\n    -q      Quiet"
+//usage:     "\n    -b      Keep broadcasting, don't go unicast"
+//usage:     "\n    -D      Duplicated address detection mode"
+//usage:     "\n    -U      Unsolicited ARP mode, update your neighbors"
+//usage:     "\n    -A      ARP answer mode, update your neighbors"
+//usage:     "\n    -c N        Stop after sending N ARP requests"
+//usage:     "\n    -w TIMEOUT  Time to wait for ARP reply, seconds"
+//usage:     "\n    -I IFACE    Interface to use (default eth0)"
+//usage:     "\n    -s SRC_IP   Sender IP address"
+//usage:     "\n    DST_IP      Target IP address"
 
 #include <arpa/inet.h>

branches/3.2/mindi-busybox/networking/brctl.c

@@ -13 +13 @@
  * At the time of this writing this was considered a feature.
  */
+
+//usage:#define brctl_trivial_usage
+//usage:       "COMMAND [BRIDGE [INTERFACE]]"
+//usage:#define brctl_full_usage "\n\n"
+//usage:       "Manage ethernet bridges\n"
+//usage:     "\nCommands:"
+//usage:    IF_FEATURE_BRCTL_SHOW(
+//usage:     "\n    show            Show a list of bridges"
+//usage:    )
+//usage:     "\n    addbr BRIDGE        Create BRIDGE"
+//usage:     "\n    delbr BRIDGE        Delete BRIDGE"
+//usage:     "\n    addif BRIDGE IFACE  Add IFACE to BRIDGE"
+//usage:     "\n    delif BRIDGE IFACE  Delete IFACE from BRIDGE"
+//usage:    IF_FEATURE_BRCTL_FANCY(
+//usage:     "\n    setageing BRIDGE TIME       Set ageing time"
+//usage:     "\n    setfd BRIDGE TIME       Set bridge forward delay"
+//usage:     "\n    sethello BRIDGE TIME        Set hello time"
+//usage:     "\n    setmaxage BRIDGE TIME       Set max message age"
+//usage:     "\n    setpathcost BRIDGE COST     Set path cost"
+//usage:     "\n    setportprio BRIDGE PRIO     Set port priority"
+//usage:     "\n    setbridgeprio BRIDGE PRIO   Set bridge priority"
+//usage:     "\n    stp BRIDGE [1/yes/on|0/no/off]  STP on/off"
+//usage:    )
+
 #include "libbb.h"
 #include <linux/sockios.h>
@@ -44 +68 @@
 
 /* FIXME: These 4 funcs are not really clean and could be improved */
-static ALWAYS_INLINE void strtotimeval(struct timeval *tv,
+static ALWAYS_INLINE void bb_strtotimeval(struct timeval *tv,
         const char *time_str)
 {
@@ -81 +105 @@
 {
     struct timeval tv;
-    strtotimeval(&tv, time_str);
+    bb_strtotimeval(&tv, time_str);
     return tv_to_jiffies(&tv);
 }
@@ -106 +130 @@
         "setpathcost\0" "setportprio\0" "setbridgeprio\0"
     )
-    IF_FEATURE_BRCTL_SHOW("showmacs\0" "show\0");
+    IF_FEATURE_BRCTL_SHOW("show\0");
 
     enum { ARG_addbr = 0, ARG_delbr, ARG_addif, ARG_delif
         IF_FEATURE_BRCTL_FANCY(,
-           ARG_stp,
-           ARG_setageing, ARG_setfd, ARG_sethello, ARG_setmaxage,
-           ARG_setpathcost, ARG_setportprio, ARG_setbridgeprio
+            ARG_stp,
+            ARG_setageing, ARG_setfd, ARG_sethello, ARG_setmaxage,
+            ARG_setpathcost, ARG_setportprio, ARG_setbridgeprio
         )
-        IF_FEATURE_BRCTL_SHOW(, ARG_showmacs, ARG_show)
+        IF_FEATURE_BRCTL_SHOW(, ARG_show)
     };
 
@@ -262 +286 @@
                 memset(ifidx, 0, sizeof ifidx);
                 arm_ioctl(args, BRCTL_GET_PORT_LIST, (unsigned long)ifidx,
-                          MAX_PORTS);
+                        MAX_PORTS);
                 xioctl(fd, SIOCDEVPRIVATE, &ifr);
                 for (i = 0; i < MAX_PORTS; i++) {

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

@@ -17 +17 @@
  * the first porting of oao' scdns to busybox also.
  */
+
+//usage:#define dnsd_trivial_usage
+//usage:       "[-dvs] [-c CONFFILE] [-t TTL_SEC] [-p PORT] [-i ADDR]"
+//usage:#define dnsd_full_usage "\n\n"
+//usage:       "Small static DNS server daemon\n"
+//usage:     "\n    -c FILE Config file"
+//usage:     "\n    -t SEC  TTL"
+//usage:     "\n    -p PORT Listen on PORT"
+//usage:     "\n    -i ADDR Listen on ADDR"
+//usage:     "\n    -d  Daemonize"
+//usage:     "\n    -v  Verbose"
+//usage:     "\n    -s  Send successful replies only. Use this if you want"
+//usage:     "\n        to use /etc/resolv.conf with two nameserver lines:"
+//usage:     "\n            nameserver DNSD_SERVER"
+//usage:     "\n            nameserver NORMAL_DNS_SERVER"
 
 #include "libbb.h"

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

@@ -50 +50 @@
  *
  *  The author may be reached as becker@scyld, or C/O
- *   Scyld Computing Corporation
- *   914 Bay Ridge Road, Suite 220
- *   Annapolis MD 21403
+ *  Scyld Computing Corporation
+ *  914 Bay Ridge Road, Suite 220
+ *  Annapolis MD 21403
  *
  *   Notes:
@@ -65 +65 @@
 */
 
-
+//usage:#define ether_wake_trivial_usage
+//usage:       "[-b] [-i iface] [-p aa:bb:cc:dd[:ee:ff]] MAC"
+//usage:#define ether_wake_full_usage "\n\n"
+//usage:       "Send a magic packet to wake up sleeping machines.\n"
+//usage:       "MAC must be a station address (00:11:22:33:44:55) or\n"
+//usage:       "a hostname with a known 'ethers' entry.\n"
+//usage:     "\n    -b      Send wake-up packet to the broadcast address"
+//usage:     "\n    -i iface    Interface to use (default eth0)"
+//usage:     "\n    -p pass     Append four or six byte password PW to the packet"
+
+#include "libbb.h"
 #include <netpacket/packet.h>
-#include <net/ethernet.h>
 #include <netinet/ether.h>
 #include <linux/if.h>
-
-#include "libbb.h"
 
 /* Note: PF_INET, SOCK_DGRAM, IPPROTO_UDP would allow SIOCGIFHWADDR to
@@ -107 +114 @@
  *    IP address string
  *    MAC address string
-*/
+ */
 static void get_dest_addr(const char *hostid, struct ether_addr *eaddr)
 {
@@ -232 +239 @@
             unsigned char *hwaddr = if_hwaddr.ifr_hwaddr.sa_data;
             printf("The hardware address (SIOCGIFHWADDR) of %s is type %d  "
-                   "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n\n", ifname,
-                   if_hwaddr.ifr_hwaddr.sa_family, hwaddr[0], hwaddr[1],
-                   hwaddr[2], hwaddr[3], hwaddr[4], hwaddr[5]);
+                "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n\n", ifname,
+                if_hwaddr.ifr_hwaddr.sa_family, hwaddr[0], hwaddr[1],
+                hwaddr[2], hwaddr[3], hwaddr[4], hwaddr[5]);
         }
 # endif

branches/3.2/mindi-busybox/networking/ftpd.c

@@ -12 +12 @@
  * You have to run this daemon via inetd.
  */
+
+//usage:#define ftpd_trivial_usage
+//usage:       "[-wvS] [-t N] [-T N] [DIR]"
+//usage:#define ftpd_full_usage "\n\n"
+//usage:       "Anonymous FTP server\n"
+//usage:       "\n"
+//usage:       "ftpd should be used as an inetd service.\n"
+//usage:       "ftpd's line for inetd.conf:\n"
+//usage:       "    21 stream tcp nowait root ftpd ftpd /files/to/serve\n"
+//usage:       "It also can be ran from tcpsvd:\n"
+//usage:       "    tcpsvd -vE 0.0.0.0 21 ftpd /files/to/serve\n"
+//usage:     "\n    -w  Allow upload"
+//usage:     "\n    -v  Log errors to stderr. -vv: verbose log"
+//usage:     "\n    -S  Log errors to syslog. -SS: verbose log"
+//usage:     "\n    -t,-T   Idle and absolute timeouts"
+//usage:     "\n    DIR Change root to this directory"
 
 #include "libbb.h"
@@ -207 +223 @@
     *(uint32_t *) G.msg_err = status;
     xwrite(STDOUT_FILENO, G.msg_err, sizeof("NNN " MSG_ERR) - 1);
-    if (G.verbose > 1)
+    if (G.verbose > 0)
         verbose_log(G.msg_err);
 }
@@ -417 +433 @@
     setsockopt_reuseaddr(fd);
 
-    set_nport(G.local_addr, 0);
+    set_nport(&G.local_addr->u.sa, 0);
     xbind(fd, &G.local_addr->u.sa, G.local_addr->len);
     xlisten(fd, 1);
@@ -526 +542 @@
 #else
     G.port_addr = get_peer_lsa(STDIN_FILENO);
-    set_nport(G.port_addr, htons(port));
+    set_nport(&G.port_addr->u.sa, htons(port));
 #endif
     WRITE_OK(FTP_PORTOK);
@@ -806 +822 @@
         sprintf(buf, STR(FTP_STATFILE_OK)" %04u%02u%02u%02u%02u%02u\r\n",
             broken_out.tm_year + 1900,
-            broken_out.tm_mon,
+            broken_out.tm_mon + 1,
             broken_out.tm_mday,
             broken_out.tm_hour,
@@ -912 +928 @@
      || !S_ISREG(statbuf.st_mode)
     ) {
+        free(tempname);
         WRITE_ERR(FTP_UPLOADFAIL);
         if (local_file_fd >= 0)
@@ -1164 +1181 @@
 
     if (argv[optind]) {
-        xchdir(argv[optind]);
-        chroot(".");
+        xchroot(argv[optind]);
     }
 

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

@@ -14 +14 @@
  */
 
+//usage:#define ftpget_trivial_usage
+//usage:       "[OPTIONS] HOST [LOCAL_FILE] REMOTE_FILE"
+//usage:#define ftpget_full_usage "\n\n"
+//usage:       "Download a file via FTP\n"
+//usage:    IF_FEATURE_FTPGETPUT_LONG_OPTIONS(
+//usage:     "\n    -c,--continue       Continue previous transfer"
+//usage:     "\n    -v,--verbose        Verbose"
+//usage:     "\n    -u,--username USER  Username"
+//usage:     "\n    -p,--password PASS  Password"
+//usage:     "\n    -P,--port NUM       Port"
+//usage:    )
+//usage:    IF_NOT_FEATURE_FTPGETPUT_LONG_OPTIONS(
+//usage:     "\n    -c  Continue previous transfer"
+//usage:     "\n    -v  Verbose"
+//usage:     "\n    -u USER Username"
+//usage:     "\n    -p PASS Password"
+//usage:     "\n    -P NUM  Port"
+//usage:    )
+//usage:
+//usage:#define ftpput_trivial_usage
+//usage:       "[OPTIONS] HOST [REMOTE_FILE] LOCAL_FILE"
+//usage:#define ftpput_full_usage "\n\n"
+//usage:       "Upload a file to a FTP server\n"
+//usage:    IF_FEATURE_FTPGETPUT_LONG_OPTIONS(
+//usage:     "\n    -v,--verbose        Verbose"
+//usage:     "\n    -u,--username USER  Username"
+//usage:     "\n    -p,--password PASS  Password"
+//usage:     "\n    -P,--port NUM       Port"
+//usage:    )
+//usage:    IF_NOT_FEATURE_FTPGETPUT_LONG_OPTIONS(
+//usage:     "\n    -v  Verbose"
+//usage:     "\n    -u USER Username"
+//usage:     "\n    -p PASS Password"
+//usage:     "\n    -P NUM  Port number"
+//usage:    )
+
 #include "libbb.h"
 
@@ -23 +59 @@
     int verbose_flag;
     int do_continue;
-    char buf[1]; /* actually [BUFSZ] */
+    char buf[4]; /* actually [BUFSZ] */
 } FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
@@ -68 +104 @@
 
     do {
-        strcpy(buf, "EOF");
+        strcpy(buf, "EOF"); /* for ftp_die */
         if (fgets(buf, BUFSZ - 2, control_stream) == NULL) {
             ftp_die(NULL);
@@ -152 +188 @@
     port_num += xatoul_range(buf_ptr + 1, 0, 255) * 256;
 
-    set_nport(lsa, htons(port_num));
+    set_nport(&lsa->u.sa, htons(port_num));
     return xconnect_stream(lsa);
 }
@@ -279 +315 @@
 int ftpgetput_main(int argc UNUSED_PARAM, char **argv)
 {
-    unsigned opt;
     const char *port = "ftp";
     /* socket to ftp server */
@@ -308 +343 @@
 #endif
     opt_complementary = "-2:vv:cc"; /* must have 2 to 3 params; -v and -c count */
-    opt = getopt32(argv, "cvu:p:P:", &user, &password, &port,
+    getopt32(argv, "cvu:p:P:", &user, &password, &port,
                     &verbose_flag, &do_continue);
     argv += optind;

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

@@ -10 +10 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+
+//usage:#define hostname_trivial_usage
+//usage:       "[OPTIONS] [HOSTNAME | -F FILE]"
+//usage:#define hostname_full_usage "\n\n"
+//usage:       "Get or set hostname or DNS domain name\n"
+//usage:     "\n    -s  Short"
+//usage:     "\n    -i  Addresses for the hostname"
+//usage:     "\n    -d  DNS domain name"
+//usage:     "\n    -f  Fully qualified domain name"
+//usage:     "\n    -F FILE Use FILE's content as hostname"
+//usage:
+//usage:#define hostname_example_usage
+//usage:       "$ hostname\n"
+//usage:       "sage\n"
+//usage:
+//usage:#define dnsdomainname_trivial_usage NOUSAGE_STR
+//usage:#define dnsdomainname_full_usage ""
+
 #include "libbb.h"
 
@@ -136 +154 @@
                 struct in_addr **h_addr_list = (struct in_addr **)hp->h_addr_list;
                 while (*h_addr_list) {
-                    printf("%s ", inet_ntoa(**h_addr_list));
+                    printf(h_addr_list[1] ? "%s " : "%s", inet_ntoa(**h_addr_list));
                     h_addr_list++;
                 }

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

@@ -21 +21 @@
  * The server changes directory to the location of the script and executes it
  * after setting QUERY_STRING and other environment variables.
+ *
+ * If directory URL is given, no index.html is found and CGI support is enabled,
+ * cgi-bin/index.cgi will be run. Directory to list is ../$QUERY_STRING.
+ * See httpd_indexcgi.c for an example GCI code.
  *
  * Doc:
@@ -51 +55 @@
  * /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/
+ * /adm:root:*       # or user root, pwd from /etc/passwd on urls starting with /adm/
+ * /wiki:*:*         # or any user from /etc/passwd with according pwd on urls starting with /wiki/
  * .au:audio/basic   # additional mime type for audio.au files
  * *.php:/path/php   # run xxx.php through an interpreter
@@ -72 +78 @@
  *     A:*             # (optional line added for clarity)
  *
- * If a sub directory contains a config file it is parsed and merged with
+ * If a sub directory contains config file, it is parsed and merged with
  * any existing settings as if it was appended to the original configuration.
  *
@@ -94 +100 @@
  /* TODO: use TCP_CORK, parse_config() */
 
+//usage:#define httpd_trivial_usage
+//usage:       "[-ifv[v]]"
+//usage:       " [-c CONFFILE]"
+//usage:       " [-p [IP:]PORT]"
+//usage:    IF_FEATURE_HTTPD_SETUID(" [-u USER[:GRP]]")
+//usage:    IF_FEATURE_HTTPD_BASIC_AUTH(" [-r REALM]")
+//usage:       " [-h HOME]\n"
+//usage:       "or httpd -d/-e" IF_FEATURE_HTTPD_AUTH_MD5("/-m") " STRING"
+//usage:#define httpd_full_usage "\n\n"
+//usage:       "Listen for incoming HTTP requests\n"
+//usage:     "\n    -i      Inetd mode"
+//usage:     "\n    -f      Don't daemonize"
+//usage:     "\n    -v[v]       Verbose"
+//usage:     "\n    -p [IP:]PORT    Bind to IP:PORT (default *:80)"
+//usage:    IF_FEATURE_HTTPD_SETUID(
+//usage:     "\n    -u USER[:GRP]   Set uid/gid after binding to port")
+//usage:    IF_FEATURE_HTTPD_BASIC_AUTH(
+//usage:     "\n    -r REALM    Authentication Realm for Basic Authentication")
+//usage:     "\n    -h HOME     Home directory (default .)"
+//usage:     "\n    -c FILE     Configuration file (default {/etc,HOME}/httpd.conf)"
+//usage:    IF_FEATURE_HTTPD_AUTH_MD5(
+//usage:     "\n    -m STRING   MD5 crypt STRING")
+//usage:     "\n    -e STRING   HTML encode STRING"
+//usage:     "\n    -d STRING   URL decode STRING"
+
 #include "libbb.h"
+#if ENABLE_PAM
+/* PAM may include <locale.h>. We may need to undefine bbox's stub define: */
+# undef setlocale
+/* For some obscure reason, PAM is not in pam/xxx, but in security/xxx.
+ * Apparently they like to confuse people. */
+# include <security/pam_appl.h>
+# include <security/pam_misc.h>
+#endif
 #if ENABLE_FEATURE_HTTPD_USE_SENDFILE
 # include <sys/sendfile.h>
@@ -310 +349 @@
 #else
 enum {
-    range_start = 0,
+    range_start = -1,
     range_end = MAXINT(off_t) - 1,
     range_len = MAXINT(off_t),
@@ -332 +371 @@
     SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
     IF_FEATURE_HTTPD_BASIC_AUTH(g_realm = "Web Server Authentication";) \
+    IF_FEATURE_HTTPD_RANGES(range_start = -1;) \
     bind_addr_or_port = "80"; \
     index_page = index_html; \
@@ -757 +797 @@
  config_error:
         bb_error_msg("config error '%s' in '%s'", buf, filename);
-     } /* while (fgets) */
-
-     fclose(f);
+    } /* while (fgets) */
+
+    fclose(f);
 }
 
@@ -791 +831 @@
 }
 #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 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.
- *
- * string    The first string to decode.
- * option_d  1 if called for httpd -d
- *
- * Returns a pointer to the decoded string (same as input).
- */
-static unsigned hex_to_bin(unsigned char c)
-{
-    unsigned v;
-
-    v = c - '0';
-    if (v <= 9)
-        return v;
-    /* c | 0x20: letters to lower case, non-letters
-     * to (potentially different) non-letters */
-    v = (unsigned)(c | 0x20) - 'a';
-    if (v <= 5)
-        return v + 10;
-    return ~0;
-/* For testing:
-void t(char c) { printf("'%c'(%u) %u\n", c, c, hex_to_bin(c)); }
-int main() { t(0x10); t(0x20); t('0'); t('9'); t('A'); t('F'); t('a'); t('f');
-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)
-{
-    /* note that decoded string is always shorter than original */
-    char *string = orig;
-    char *ptr = string;
-    char c;
-
-    while ((c = *ptr++) != '\0') {
-        unsigned v;
-
-        if (option_d && c == '+') {
-            *string++ = ' ';
-            continue;
-        }
-        if (c != '%') {
-            *string++ = c;
-            continue;
-        }
-        v = hex_to_bin(ptr[0]);
-        if (v > 15) {
- bad_hex:
-            if (!option_d)
-                return NULL;
-            *string++ = '%';
-            continue;
-        }
-        v = (v * 16) | hex_to_bin(ptr[1]);
-        if (v > 255)
-            goto bad_hex;
-        if (!option_d && (v == '/' || v == '\0')) {
-            /* caller takes it as indication of invalid
-             * (dangerous wrt exploits) chars */
-            return orig + 1;
-        }
-        *string++ = v;
-        ptr += 2;
-    }
-    *string = '\0';
-    return orig;
-}
 
 #if ENABLE_FEATURE_HTTPD_BASIC_AUTH
@@ -1066 +1034 @@
 static void send_headers_and_exit(int responseNum)
 {
+    IF_FEATURE_HTTPD_GZIP(content_gzip = 0;)
     send_headers(responseNum);
     log_and_exit();
@@ -1298 +1267 @@
  * Parameters:
  * const char *url              The requested URL (with leading /).
+ * const char *orig_uri         The original URI before rewriting (if any)
  * int post_len                 Length of the POST body.
  * const char *cookie           For set HTTP_COOKIE.
@@ -1304 +1274 @@
 static void send_cgi_and_exit(
         const char *url,
+        const char *orig_uri,
         const char *request,
         int post_len,
@@ -1310 +1281 @@
 static void send_cgi_and_exit(
         const char *url,
+        const char *orig_uri,
         const char *request,
         int post_len,
@@ -1317 +1289 @@
     struct fd_pair fromCgi;  /* CGI -> httpd pipe */
     struct fd_pair toCgi;    /* httpd -> CGI pipe */
-    char *script;
+    char *script, *last_slash;
     int pid;
 
@@ -1331 +1303 @@
 
     /* Check for [dirs/]script.cgi/PATH_INFO */
-    script = (char*)url;
+    last_slash = script = (char*)url;
     while ((script = strchr(script + 1, '/')) != NULL) {
+        int dir;
         *script = '\0';
-        if (!is_directory(url + 1, 1, NULL)) {
+        dir = is_directory(url + 1, /*followlinks:*/ 1);
+        *script = '/';
+        if (!dir) {
             /* not directory, found script.cgi/PATH_INFO */
-            *script = '/';
             break;
         }
-        *script = '/'; /* is directory, find next '/' */
+        /* is directory, find next '/' */
+        last_slash = script;
     }
     setenv1("PATH_INFO", script);   /* set to /PATH_INFO or "" */
     setenv1("REQUEST_METHOD", request);
     if (g_query) {
-        putenv(xasprintf("%s=%s?%s", "REQUEST_URI", url, g_query));
+        putenv(xasprintf("%s=%s?%s", "REQUEST_URI", orig_uri, g_query));
     } else {
-        setenv1("REQUEST_URI", url);
+        setenv1("REQUEST_URI", orig_uri);
     }
     if (script != NULL)
@@ -1420 +1395 @@
     }
 
-    if (!pid) {
+    if (pid == 0) {
         /* Child process */
         char *argv[3];
@@ -1436 +1411 @@
 
         /* Chdiring to script's dir */
-        script = strrchr(url, '/');
+        script = last_slash;
         if (script != url) { /* paranoia */
             *script = '\0';
             if (chdir(url + 1) != 0) {
-                bb_perror_msg("chdir(%s)", url + 1);
+                bb_perror_msg("can't change directory to '%s'", url + 1);
                 goto error_execing_cgi;
             }
@@ -1616 +1591 @@
      || content_gzip /* we are sending compressed page: can't do ranges */  ///why?
     ) {
-        range_start = 0;
+        range_start = -1;
     }
     range_len = MAXINT(off_t);
-    if (range_start) {
-        if (!range_end) {
+    if (range_start >= 0) {
+        if (!range_end || range_end > file_size - 1) {
             range_end = file_size - 1;
         }
@@ -1627 +1602 @@
         ) {
             lseek(fd, 0, SEEK_SET);
-            range_start = 0;
+            range_start = -1;
         } else {
             range_len = range_end - range_start + 1;
@@ -1650 +1625 @@
                 goto fin;
             }
-            IF_FEATURE_HTTPD_RANGES(range_len -= sz;)
+            IF_FEATURE_HTTPD_RANGES(range_len -= count;)
             if (count == 0 || range_len == 0)
                 log_and_exit();
@@ -1701 +1676 @@
 
 #if ENABLE_FEATURE_HTTPD_BASIC_AUTH
+
+# if ENABLE_PAM
+struct pam_userinfo {
+    const char *name;
+    const char *pw;
+};
+
+static int pam_talker(int num_msg,
+        const struct pam_message **msg,
+        struct pam_response **resp,
+        void *appdata_ptr)
+{
+    int i;
+    struct pam_userinfo *userinfo = (struct pam_userinfo *) appdata_ptr;
+    struct pam_response *response;
+
+    if (!resp || !msg || !userinfo)
+        return PAM_CONV_ERR;
+
+    /* allocate memory to store response */
+    response = xzalloc(num_msg * sizeof(*response));
+
+    /* copy values */
+    for (i = 0; i < num_msg; i++) {
+        const char *s;
+
+        switch (msg[i]->msg_style) {
+        case PAM_PROMPT_ECHO_ON:
+            s = userinfo->name;
+            break;
+        case PAM_PROMPT_ECHO_OFF:
+            s = userinfo->pw;
+            break;
+        case PAM_ERROR_MSG:
+            case PAM_TEXT_INFO:
+                s = "";
+            break;
+        default:
+            free(response);
+            return PAM_CONV_ERR;
+        }
+        response[i].resp = xstrdup(s);
+        if (PAM_SUCCESS != 0)
+            response[i].resp_retcode = PAM_SUCCESS;
+    }
+    *resp = response;
+    return PAM_SUCCESS;
+}
+# endif
+
 /*
  * Config file entries are of the form "/<path>:<user>:<passwd>".
@@ -1710 +1735 @@
  * Returns 1 if user_and_passwd is OK.
  */
-static int check_user_passwd(const char *path, const char *user_and_passwd)
+static int check_user_passwd(const char *path, char *user_and_passwd)
 {
     Htaccess *cur;
@@ -1718 +1743 @@
         const char *dir_prefix;
         size_t len;
+        int r;
 
         dir_prefix = cur->before_colon;
@@ -1733 +1759 @@
         if (len != 1 /* dir_prefix "/" matches all, don't need to check */
          && (strncmp(dir_prefix, path, len) != 0
-            || (path[len] != '/' && path[len] != '\0'))
+            || (path[len] != '/' && path[len] != '\0')
+            )
         ) {
             continue;
@@ -1742 +1769 @@
 
         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 *colon_after_user;
+            const char *passwd;
+# if ENABLE_FEATURE_SHADOWPASSWDS && !ENABLE_PAM
+            char sp_buf[256];
+# endif
+
+            colon_after_user = strchr(user_and_passwd, ':');
+            if (!colon_after_user)
+                goto bad_input;
+
+            /* compare "user:" */
+            if (cur->after_colon[0] != '*'
+             && strncmp(cur->after_colon, user_and_passwd,
+                    colon_after_user - user_and_passwd + 1) != 0
             ) {
+                continue;
+            }
+            /* this cfg entry is '*' or matches username from peer */
+
+            passwd = strchr(cur->after_colon, ':');
+            if (!passwd)
+                goto bad_input;
+            passwd++;
+            if (passwd[0] == '*') {
+# if ENABLE_PAM
+                struct pam_userinfo userinfo;
+                struct pam_conv conv_info = { &pam_talker, (void *) &userinfo };
+                pam_handle_t *pamh;
+
+                *colon_after_user = '\0';
+                userinfo.name = user_and_passwd;
+                userinfo.pw = colon_after_user + 1;
+                r = pam_start("httpd", user_and_passwd, &conv_info, &pamh) != PAM_SUCCESS;
+                if (r == 0) {
+                    r = pam_authenticate(pamh, PAM_DISALLOW_NULL_AUTHTOK) != PAM_SUCCESS
+                     || pam_acct_mgmt(pamh, PAM_DISALLOW_NULL_AUTHTOK)    != PAM_SUCCESS
+                    ;
+                    pam_end(pamh, PAM_SUCCESS);
+                }
+                *colon_after_user = ':';
+                goto end_check_passwd;
+# else
+#  if ENABLE_FEATURE_SHADOWPASSWDS
+                /* Using _r function to avoid pulling in static buffers */
+                struct spwd spw;
+#  endif
+                struct passwd *pw;
+
+                *colon_after_user = '\0';
+                pw = getpwnam(user_and_passwd);
+                *colon_after_user = ':';
+                if (!pw || !pw->pw_passwd)
+                    continue;
+                passwd = pw->pw_passwd;
+#  if ENABLE_FEATURE_SHADOWPASSWDS
+                if ((passwd[0] == 'x' || passwd[0] == '*') && !passwd[1]) {
+                    /* getspnam_r may return 0 yet set result to NULL.
+                     * At least glibc 2.4 does this. Be extra paranoid here. */
+                    struct spwd *result = NULL;
+                    r = getspnam_r(pw->pw_name, &spw, sp_buf, sizeof(sp_buf), &result);
+                    if (r == 0 && result)
+                        passwd = result->sp_pwdp;
+                }
+#  endif
+                /* In this case, passwd is ALWAYS encrypted:
+                 * it came from /etc/passwd or /etc/shadow!
+                 */
+                goto check_encrypted;
+# endif /* ENABLE_PAM */
+            }
+            /* Else: passwd is from httpd.conf, it is either plaintext or encrypted */
+
+            if (passwd[0] == '$' && isdigit(passwd[1])) {
                 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;
-                }
-
+# if !ENABLE_PAM
+ check_encrypted:
+# endif
+                /* encrypt pwd from peer and check match with local one */
                 encrypted = pw_encrypt(
-                    user_and_passwd + user_len_p1 /* cleartext pwd from user */,
-                    md5_passwd /*salt */, 1 /* cleanup */);
-                r = strcmp(encrypted, md5_passwd);
+                    /* pwd (from peer): */  colon_after_user + 1,
+                    /* salt: */ passwd,
+                    /* cleanup: */ 0
+                );
+                r = strcmp(encrypted, passwd);
                 free(encrypted);
-                if (r == 0)
-                    goto set_remoteuser_var; /* Ok */
-                continue;
-            }
-        }
-
+            } else {
+                /* local passwd is from httpd.conf and it's plaintext */
+                r = strcmp(colon_after_user + 1, passwd);
+            }
+            goto end_check_passwd;
+        }
+ bad_input:
         /* Comparing plaintext "user:pass" in one go */
-        if (strcmp(cur->after_colon, user_and_passwd) == 0) {
- set_remoteuser_var:
+        r = strcmp(cur->after_colon, user_and_passwd);
+ end_check_passwd:
+        if (r == 0) {
             remoteuser = xstrndup(user_and_passwd,
-                    strchrnul(user_and_passwd, ':') - user_and_passwd);
+                strchrnul(user_and_passwd, ':') - user_and_passwd
+            );
             return 1; /* Ok */
         }
@@ -1912 +2006 @@
 
     /* Extract url args if present */
-    g_query = NULL;
+    /* g_query = NULL; - already is */
     tptr = strchr(urlcopy, '?');
     if (tptr) {
@@ -1920 +2014 @@
 
     /* Decode URL escape sequences */
-    tptr = decodeString(urlcopy, 0);
+    tptr = percent_decode_in_place(urlcopy, /*strict:*/ 1);
     if (tptr == NULL)
         send_headers_and_exit(HTTP_BAD_REQUEST);
@@ -1932 +2026 @@
      * but don't strdup, retain trailing slash, protect root */
     urlp = tptr = urlcopy;
-    do {
+    for (;;) {
         if (*urlp == '/') {
             /* skip duplicate (or initial) slash */
             if (*tptr == '/') {
-                continue;
+                goto next_char;
             }
             if (*tptr == '.') {
-                /* skip extra "/./" */
-                if (tptr[1] == '/' || !tptr[1]) {
-                    continue;
+                if (tptr[1] == '.' && (tptr[2] == '/' || tptr[2] == '\0')) {
+                    /* "..": be careful */
+                    /* protect root */
+                    if (urlp == urlcopy)
+                        send_headers_and_exit(HTTP_BAD_REQUEST);
+                    /* omit previous dir */
+                    while (*--urlp != '/')
+                        continue;
+                    /* skip to "./" or ".<NUL>" */
+                    tptr++;
                 }
-                /* "..": be careful */
-                if (tptr[1] == '.' && (tptr[2] == '/' || !tptr[2])) {
-                    ++tptr;
-                    if (urlp == urlcopy) /* protect root */
-                        send_headers_and_exit(HTTP_BAD_REQUEST);
-                    while (*--urlp != '/') /* omit previous dir */;
-                        continue;
+                if (tptr[1] == '/' || tptr[1] == '\0') {
+                    /* skip extra "/./" */
+                    goto next_char;
                 }
             }
         }
         *++urlp = *tptr;
-    } while (*++tptr);
-    *++urlp = '\0';       /* terminate after last character */
+        if (*urlp == '\0')
+            break;
+ next_char:
+        tptr++;
+    }
 
     /* If URL is a directory, add '/' */
     if (urlp[-1] != '/') {
-        if (is_directory(urlcopy + 1, 1, NULL)) {
+        if (is_directory(urlcopy + 1, /*followlinks:*/ 1)) {
             found_moved_temporarily = urlcopy;
         }
@@ -1973 +2073 @@
         /* have path1/path2 */
         *tptr = '\0';
-        if (is_directory(urlcopy + 1, 1, NULL)) {
+        if (is_directory(urlcopy + 1, /*followlinks:*/ 1)) {
             /* may have subdir config */
             parse_conf(urlcopy + 1, SUBDIR_PARSE);
@@ -2072 +2172 @@
                     range_start = BB_STRTOOFF(s, &s, 10);
                     if (s[0] != '-' || range_start < 0) {
-                        range_start = 0;
+                        range_start = -1;
                     } else if (s[1]) {
                         range_end = BB_STRTOOFF(s+1, NULL, 10);
                         if (errno || range_end < range_start)
-                            range_start = 0;
+                            range_start = -1;
                     }
                 }
@@ -2110 +2210 @@
 
 #if ENABLE_FEATURE_HTTPD_BASIC_AUTH
-    /* Case: no "Authorization:" was seen, but page does require passwd.
+    /* Case: no "Authorization:" was seen, but page might require passwd.
      * Check that with dummy user:pass */
     if (authorized < 0)
-        authorized = check_user_passwd(urlcopy, ":");
+        authorized = check_user_passwd(urlcopy, (char *) "");
     if (!authorized)
         send_headers_and_exit(HTTP_UNAUTHORIZED);
@@ -2159 +2259 @@
             send_headers_and_exit(HTTP_FORBIDDEN);
         }
-        send_cgi_and_exit(urlcopy, prequest, length, cookie, content_type);
-    }
-#endif
-
-    if (urlp[-1] == '/')
+        send_cgi_and_exit(urlcopy, urlcopy, prequest, length, cookie, content_type);
+    }
+#endif
+
+    if (urlp[-1] == '/') {
+        /* When index_page string is appended to <dir>/ URL, it overwrites
+         * the query string. If we fall back to call /cgi-bin/index.cgi,
+         * query string would be lost and not available to the CGI.
+         * Work around it by making a deep copy.
+         */
+        if (ENABLE_FEATURE_HTTPD_CGI)
+            g_query = xstrdup(g_query); /* ok for NULL too */
         strcpy(urlp, index_page);
+    }
     if (stat(tptr, &sb) == 0) {
 #if ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
@@ -2172 +2280 @@
             for (cur = script_i; cur; cur = cur->next) {
                 if (strcmp(cur->before_colon + 1, suffix) == 0) {
-                    send_cgi_and_exit(urlcopy, prequest, length, cookie, content_type);
+                    send_cgi_and_exit(urlcopy, urlcopy, prequest, length, cookie, content_type);
                 }
             }
@@ -2185 +2293 @@
          * Try cgi-bin/index.cgi */
         if (access("/cgi-bin/index.cgi"+1, X_OK) == 0) {
-            urlp[0] = '\0';
-            g_query = urlcopy;
-            send_cgi_and_exit("/cgi-bin/index.cgi", prequest, length, cookie, content_type);
+            urlp[0] = '\0'; /* remove index_page */
+            send_cgi_and_exit("/cgi-bin/index.cgi", urlcopy, prequest, length, cookie, content_type);
         }
     }
@@ -2286 +2393 @@
             re_exec(argv_copy);
         }
+        argv_copy[0][0] &= 0x7f;
         /* parent, or vfork failed */
         close(n);
@@ -2379 +2487 @@
         );
     if (opt & OPT_DECODE_URL) {
-        fputs(decodeString(url_for_decode, 1), stdout);
+        fputs(percent_decode_in_place(url_for_decode, /*strict:*/ 0), stdout);
         return 0;
     }
@@ -2394 +2502 @@
         salt[1] = '1';
         salt[2] = '$';
-        crypt_make_salt(salt + 3, 4, 0);
-        puts(pw_encrypt(pass, salt, 1));
+        crypt_make_salt(salt + 3, 4);
+        puts(pw_encrypt(pass, salt, /*cleanup:*/ 0));
         return 0;
     }

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

@@ -36 +36 @@
  */
 
+#define _GNU_SOURCE 1  /* for strchrnul */
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -222 +223 @@
     int odd;
     DIR *dirp;
-    char *QUERY_STRING;
-
-    QUERY_STRING = getenv("QUERY_STRING");
-    if (!QUERY_STRING
-     || QUERY_STRING[0] != '/'
-     || strstr(QUERY_STRING, "//")
-     || strstr(QUERY_STRING, "/../")
-     || strcmp(strrchr(QUERY_STRING, '/'), "/..") == 0
+    char *location;
+
+    location = getenv("REQUEST_URI");
+    if (!location)
+        return 1;
+
+    /* drop URL arguments if any */
+    strchrnul(location, '?')[0] = '\0';
+
+    if (location[0] != '/'
+     || strstr(location, "//")
+     || strstr(location, "/../")
+     || strcmp(strrchr(location, '/'), "/..") == 0
     ) {
         return 1;
@@ -235 +241 @@
 
     if (chdir("..")
-     || (QUERY_STRING[1] && chdir(QUERY_STRING + 1))
+     || (location[1] && chdir(location + 1))
     ) {
         return 1;
@@ -272 +278 @@
         "<html><head><title>Index of ");
     /* Guard against directories with &, > etc */
-    fmt_html(QUERY_STRING);
+    fmt_html(location);
     fmt_str(
         "</title>\n"
@@ -279 +285 @@
         "<body>" "\n"
         "<h1>Index of ");
-    fmt_html(QUERY_STRING);
+    fmt_html(location);
     fmt_str(
         "</h1>" "\n"

branches/3.2/mindi-busybox/networking/httpd_ssi.c

@@ -53 +53 @@
 static char* skip_whitespace(char *s)
 {
-        while (*s == ' ' || *s == '\t') ++s;
+    while (*s == ' ' || *s == '\t') ++s;
 
-        return s;
+    return s;
 }
 
@@ -134 +134 @@
 
         /* Print everything after directive */
-            if (end) {
+        if (end) {
             fputs(end, stdout);
             free(end);

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

@@ -27 +27 @@
  */
 
+//usage:#define ifconfig_trivial_usage
+//usage:    IF_FEATURE_IFCONFIG_STATUS("[-a]") " interface [address]"
+//usage:#define ifconfig_full_usage "\n\n"
+//usage:       "Configure a network interface\n"
+//usage:     "\n"
+//usage:    IF_FEATURE_IPV6(
+//usage:       "    [add ADDRESS[/PREFIXLEN]]\n")
+//usage:    IF_FEATURE_IPV6(
+//usage:       "    [del ADDRESS[/PREFIXLEN]]\n")
+//usage:       "    [[-]broadcast [ADDRESS]] [[-]pointopoint [ADDRESS]]\n"
+//usage:       "    [netmask ADDRESS] [dstaddr ADDRESS]\n"
+//usage:    IF_FEATURE_IFCONFIG_SLIP(
+//usage:       "    [outfill NN] [keepalive NN]\n")
+//usage:       "    " IF_FEATURE_IFCONFIG_HW("[hw ether" IF_FEATURE_HWIB("|infiniband")" ADDRESS] ") "[metric NN] [mtu NN]\n"
+//usage:       "    [[-]trailers] [[-]arp] [[-]allmulti]\n"
+//usage:       "    [multicast] [[-]promisc] [txqueuelen NN] [[-]dynamic]\n"
+//usage:    IF_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ(
+//usage:       "    [mem_start NN] [io_addr NN] [irq NN]\n")
+//usage:       "    [up|down] ..."
+
+#include "libbb.h"
+#include "inet_common.h"
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <netinet/in.h>
-#if defined(__GLIBC__) && __GLIBC__ >=2 && __GLIBC_MINOR__ >= 1
-#include <netpacket/packet.h>
-#include <net/ethernet.h>
-#else
-#include <sys/types.h>
-#include <netinet/if_ether.h>
-#endif
-#include "libbb.h"
-#include "inet_common.h"
+#ifdef HAVE_NET_ETHERNET_H
+# include <net/ethernet.h>
+#endif
 
 #if ENABLE_FEATURE_IFCONFIG_SLIP
@@ -159 +175 @@
 
 
-/*
- * Set up the tables.  Warning!  They must have corresponding order!
- */
-
 struct arg1opt {
     const char *name;
@@ -182 +194 @@
 
 #define ifreq_offsetof(x)  offsetof(struct ifreq, x)
+
+/*
+ * Set up the tables.  Warning!  They must have corresponding order!
+ */
 
 static const struct arg1opt Arg1Opt[] = {
@@ -205 +221 @@
     { "SIFMAP",     SIOCSIFMAP,     ifreq_offsetof(ifr_map.irq) },
 #endif
-    /* Last entry if for unmatched (possibly hostname) arg. */
 #if ENABLE_FEATURE_IPV6
     { "SIFADDR",    SIOCSIFADDR,    ifreq_offsetof(ifr_addr) }, /* IPv6 version ignores the offset */
     { "DIFADDR",    SIOCDIFADDR,    ifreq_offsetof(ifr_addr) }, /* IPv6 version ignores the offset */
 #endif
+    /* Last entry is for unmatched (assumed to be hostname/address) arg. */
     { "SIFADDR",    SIOCSIFADDR,    ifreq_offsetof(ifr_addr) },
 };
@@ -250 +266 @@
 };
 
-/*
- * A couple of prototypes.
- */
 #if ENABLE_FEATURE_IFCONFIG_HW
-static int in_ether(const char *bufp, struct sockaddr *sap);
-#endif
-
-/*
- * Our main function.
- */
+/* Input an Ethernet address and convert to binary. */
+static int in_ether(const char *bufp, struct sockaddr *sap)
+{
+    char *ptr;
+    int i, j;
+    unsigned char val;
+    unsigned char c;
+
+    sap->sa_family = ARPHRD_ETHER;
+    ptr = (char *) sap->sa_data;
+
+    i = 0;
+    do {
+        j = val = 0;
+
+        /* We might get a semicolon here - not required. */
+        if (i && (*bufp == ':')) {
+            bufp++;
+        }
+
+        do {
+            c = *bufp;
+            if (((unsigned char)(c - '0')) <= 9) {
+                c -= '0';
+            } else if ((unsigned char)((c|0x20) - 'a') <= 5) {
+                c = (unsigned char)((c|0x20) - 'a') + 10;
+            } else if (j && (c == ':' || c == 0)) {
+                break;
+            } else {
+                return -1;
+            }
+            ++bufp;
+            val <<= 4;
+            val += c;
+        } while (++j < 2);
+        *ptr++ = val;
+    } while (++i < ETH_ALEN);
+
+    return *bufp; /* Error if we don't end at end of string. */
+}
+#endif
+
 int ifconfig_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int ifconfig_main(int argc UNUSED_PARAM, char **argv)
@@ -315 +364 @@
 
     /* Process the remaining arguments. */
-    while (*++argv != (char *) NULL) {
+    while (*++argv != NULL) {
         p = *argv;
         mask = N_MASK;
@@ -341 +390 @@
         if (mask & ARG_MASK) {
             mask = op->arg_flags;
-            a1op = Arg1Opt + (op - OptArray);
             if (mask & A_NETMASK & did_flags)
                 bb_show_usage();
+            a1op = Arg1Opt + (op - OptArray);
             if (*++argv == NULL) {
                 if (mask & A_ARG_REQ)
@@ -356 +405 @@
                     if (mask & A_CAST_RESOLVE) {
 #endif
-#if ENABLE_FEATURE_IPV6
-                        char *prefix;
-                        int prefix_len = 0;
-#endif
-                        /*safe_strncpy(host, *argv, (sizeof host));*/
                         host = *argv;
-#if ENABLE_FEATURE_IPV6
-                        prefix = strchr(host, '/');
-                        if (prefix) {
-                            prefix_len = xatou_range(prefix + 1, 0, 128);
-                            *prefix = '\0';
-                        }
-#endif
+                        if (strcmp(host, "inet") == 0)
+                            continue; /* compat stuff */
                         sai.sin_family = AF_INET;
                         sai.sin_port = 0;
@@ -376 +415 @@
                         }
 #if ENABLE_FEATURE_IFCONFIG_BROADCAST_PLUS
-                        else if ((host[0] == '+' && !host[1]) && (mask & A_BROADCAST)
+                        else if ((host[0] == '+' && !host[1])
+                         && (mask & A_BROADCAST)
                          && (did_flags & (A_NETMASK|A_HOSTNAME)) == (A_NETMASK|A_HOSTNAME)
                         ) {
@@ -385 +425 @@
                         else {
                             len_and_sockaddr *lsa;
-                            if (strcmp(host, "inet") == 0)
-                                continue; /* compat stuff */
+#if ENABLE_FEATURE_IPV6
+                            char *prefix;
+                            int prefix_len = 0;
+                            prefix = strchr(host, '/');
+                            if (prefix) {
+                                prefix_len = xatou_range(prefix + 1, 0, 128);
+                                *prefix = '\0';
+                            }
+ resolve:
+#endif
                             lsa = xhost2sockaddr(host, 0);
 #if ENABLE_FEATURE_IPV6
+                            if (lsa->u.sa.sa_family != AF_INET6 && prefix) {
+/* TODO: we do not support "ifconfig eth0 up 1.2.3.4/17".
+ * For now, just make it fail instead of silently ignoring "/17" part:
+ */
+                                *prefix = '/';
+                                goto resolve;
+                            }
                             if (lsa->u.sa.sa_family == AF_INET6) {
                                 int sockfd6;
                                 struct in6_ifreq ifr6;
 
-                                memcpy((char *) &ifr6.ifr6_addr,
-                                        (char *) &(lsa->u.sin6.sin6_addr),
-                                        sizeof(struct in6_addr));
-
-                                /* Create a channel to the NET kernel. */
                                 sockfd6 = xsocket(AF_INET6, SOCK_DGRAM, 0);
-                                xioctl(sockfd6, SIOGIFINDEX, &ifr);
+                                xioctl(sockfd6, SIOCGIFINDEX, &ifr);
                                 ifr6.ifr6_ifindex = ifr.ifr_ifindex;
                                 ifr6.ifr6_prefixlen = prefix_len;
+                                memcpy(&ifr6.ifr6_addr,
+                                        &lsa->u.sin6.sin6_addr,
+                                        sizeof(struct in6_addr));
                                 ioctl_or_perror_and_die(sockfd6, a1op->selector, &ifr6, "SIOC%s", a1op->name);
                                 if (ENABLE_FEATURE_CLEAN_UP)
@@ -422 +475 @@
                     } else {    /* A_CAST_HOST_COPY_IN_ETHER */
                         /* This is the "hw" arg case. */
-                        smalluint hw_class= index_in_substrings("ether\0"
+                        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 (hw_class == 1 ? in_ether(host, &sa) : in_ib(host, &sa))
@@ -433 +485 @@
                     }
 #endif
-                    memcpy( (((char *)&ifr) + a1op->ifr_offset),
-                           p, sizeof(struct sockaddr));
+                    memcpy( ((char *)&ifr) + a1op->ifr_offset,
+                        p, sizeof(struct sockaddr));
                 } else {
                     /* FIXME: error check?? */
@@ -443 +495 @@
                         xioctl(sockfd, SIOCGIFMAP, &ifr);
                         if ((mask & A_MAP_UCHAR) == A_MAP_UCHAR)
-                            *((unsigned char *) p) = i;
+                            *(unsigned char *) p = i;
                         else if (mask & A_MAP_USHORT)
-                            *((unsigned short *) p) = i;
+                            *(unsigned short *) p = i;
                         else
-                            *((unsigned long *) p) = i;
+                            *(unsigned long *) p = i;
                     } else
 #endif
                     if (mask & A_CAST_CHAR_PTR)
-                        *((caddr_t *) p) = (caddr_t) i;
+                        *(caddr_t *) p = (caddr_t) i;
                     else    /* A_CAST_INT */
-                        *((int *) p) = i;
+                        *(int *) p = i;
                 }
 
@@ -479 +531 @@
                 continue;
             mask = N_SET;
-        }
+        } /* if (mask & ARG_MASK) */
 
         xioctl(sockfd, SIOCGIFFLAGS, &ifr);
@@ -494 +546 @@
     return 0;
 }
-
-#if ENABLE_FEATURE_IFCONFIG_HW
-/* Input an Ethernet address and convert to binary. */
-static int in_ether(const char *bufp, struct sockaddr *sap)
-{
-    char *ptr;
-    int i, j;
-    unsigned char val;
-    unsigned char c;
-
-    sap->sa_family = ARPHRD_ETHER;
-    ptr = (char *) sap->sa_data;
-
-    i = 0;
-    do {
-        j = val = 0;
-
-        /* We might get a semicolon here - not required. */
-        if (i && (*bufp == ':')) {
-            bufp++;
-        }
-
-        do {
-            c = *bufp;
-            if (((unsigned char)(c - '0')) <= 9) {
-                c -= '0';
-            } else if (((unsigned char)((c|0x20) - 'a')) <= 5) {
-                c = (c|0x20) - ('a'-10);
-            } else if (j && (c == ':' || c == 0)) {
-                break;
-            } else {
-                return -1;
-            }
-            ++bufp;
-            val <<= 4;
-            val += c;
-        } while (++j < 2);
-        *ptr++ = val;
-    } while (++i < ETH_ALEN);
-
-    return *bufp; /* Error if we don't end at end of string. */
-}
-#endif

branches/3.2/mindi-busybox/networking/ifenslave.c

@@ -98 +98 @@
  *         set version to 1.1.0
  */
+
+//usage:#define ifenslave_trivial_usage
+//usage:       "[-cdf] MASTER_IFACE SLAVE_IFACE..."
+//usage:#define ifenslave_full_usage "\n\n"
+//usage:       "Configure network interfaces for parallel routing\n"
+//usage:     "\n    -c,--change-active  Change active slave"
+//usage:     "\n    -d,--detach     Remove slave interface from bonding device"
+//usage:     "\n    -f,--force      Force, even if interface is not Ethernet"
+/* //usage:  "\n    -r,--receive-slave  Create a receive-only slave" */
+//usage:
+//usage:#define ifenslave_example_usage
+//usage:       "To create a bond device, simply follow these three steps:\n"
+//usage:       "- ensure that the required drivers are properly loaded:\n"
+//usage:       "  # modprobe bonding ; modprobe <3c59x|eepro100|pcnet32|tulip|...>\n"
+//usage:       "- assign an IP address to the bond device:\n"
+//usage:       "  # ifconfig bond0 <addr> netmask <mask> broadcast <bcast>\n"
+//usage:       "- attach all the interfaces you need to the bond device:\n"
+//usage:       "  # ifenslave bond0 eth0 eth1 eth2\n"
+//usage:       "  If bond0 didn't have a MAC address, it will take eth0's. Then, all\n"
+//usage:       "  interfaces attached AFTER this assignment will get the same MAC addr.\n\n"
+//usage:       "  To detach a dead interface without setting the bond device down:\n"
+//usage:       "  # ifenslave -d bond0 eth1\n\n"
+//usage:       "  To set the bond device down and automatically release all the slaves:\n"
+//usage:       "  # ifconfig bond0 down\n\n"
+//usage:       "  To change active slave:\n"
+//usage:       "  # ifenslave -c bond0 eth0\n"
 
 #include "libbb.h"
@@ -245 +271 @@
             ifr.ifr_addr.sa_family = AF_INET;
             memset(ifr.ifr_addr.sa_data, 0,
-                   sizeof(ifr.ifr_addr.sa_data));
+                sizeof(ifr.ifr_addr.sa_data));
         }
 
@@ -521 +547 @@
     /* Neither -c[hange] nor -d[etach] -> it's "enslave" then;
      * and -f[orce] is not there too. Check that it's ethernet. */
-    if (!(opt & (OPT_d|OPT_c|OPT_f)) {
+    if (!(opt & (OPT_d|OPT_c|OPT_f))) {
         /* The family '1' is ARPHRD_ETHER for ethernet. */
         if (master.hwaddr.ifr_hwaddr.sa_family != 1) {

branches/3.2/mindi-busybox/networking/ifplugd.c

@@ -7 +7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+
+//usage:#define ifplugd_trivial_usage
+//usage:       "[OPTIONS]"
+//usage:#define ifplugd_full_usage "\n\n"
+//usage:       "Network interface plug detection daemon\n"
+//usage:     "\n    -n      Don't daemonize"
+//usage:     "\n    -s      Don't log to syslog"
+//usage:     "\n    -i IFACE    Interface"
+//usage:     "\n    -f/-F       Treat link detection error as link down/link up"
+//usage:     "\n            (otherwise exit on error)"
+//usage:     "\n    -a      Don't up interface at each link probe"
+//usage:     "\n    -M      Monitor creation/destruction of interface"
+//usage:     "\n            (otherwise it must exist)"
+//usage:     "\n    -r PROG     Script to run"
+//usage:     "\n    -x ARG      Extra argument for script"
+//usage:     "\n    -I      Don't exit on nonzero exit code from script"
+//usage:     "\n    -p      Don't run \"up\" script on startup"
+//usage:     "\n    -q      Don't run \"down\" script on exit"
+//usage:     "\n    -l      Always run script on startup"
+//usage:     "\n    -t SECS     Poll time in seconds"
+//usage:     "\n    -u SECS     Delay before running script after link up"
+//usage:     "\n    -d SECS     Delay after link down"
+//usage:     "\n    -m MODE     API mode (mii, priv, ethtool, wlan, iff, auto)"
+//usage:     "\n    -k      Kill running daemon"
+
 #include "libbb.h"
 
@@ -13 +38 @@
 #include <linux/mii.h>
 #include <linux/ethtool.h>
-#include <net/ethernet.h>
+#ifdef HAVE_NET_ETHERNET_H
+# include <net/ethernet.h>
+#endif
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
@@ -132 +159 @@
 static smallint detect_link_mii(void)
 {
-    struct ifreq ifreq;
-    struct mii_ioctl_data *mii = (void *)&ifreq.ifr_data;
-
-    set_ifreq_to_ifname(&ifreq);
-
-    if (network_ioctl(SIOCGMIIPHY, &ifreq, "SIOCGMIIPHY") < 0) {
+    /* char buffer instead of bona-fide struct avoids aliasing warning */
+    char buf[sizeof(struct ifreq)];
+    struct ifreq *const ifreq = (void *)buf;
+
+    struct mii_ioctl_data *mii = (void *)&ifreq->ifr_data;
+
+    set_ifreq_to_ifname(ifreq);
+
+    if (network_ioctl(SIOCGMIIPHY, ifreq, "SIOCGMIIPHY") < 0) {
         return IFSTATUS_ERR;
     }
@@ -143 +173 @@
     mii->reg_num = 1;
 
-    if (network_ioctl(SIOCGMIIREG, &ifreq, "SIOCGMIIREG") < 0) {
+    if (network_ioctl(SIOCGMIIREG, ifreq, "SIOCGMIIREG") < 0) {
         return IFSTATUS_ERR;
     }
@@ -152 +182 @@
 static smallint detect_link_priv(void)
 {
-    struct ifreq ifreq;
-    struct mii_ioctl_data *mii = (void *)&ifreq.ifr_data;
-
-    set_ifreq_to_ifname(&ifreq);
-
-    if (network_ioctl(SIOCDEVPRIVATE, &ifreq, "SIOCDEVPRIVATE") < 0) {
+    /* char buffer instead of bona-fide struct avoids aliasing warning */
+    char buf[sizeof(struct ifreq)];
+    struct ifreq *const ifreq = (void *)buf;
+
+    struct mii_ioctl_data *mii = (void *)&ifreq->ifr_data;
+
+    set_ifreq_to_ifname(ifreq);
+
+    if (network_ioctl(SIOCDEVPRIVATE, ifreq, "SIOCDEVPRIVATE") < 0) {
         return IFSTATUS_ERR;
     }
@@ -163 +196 @@
     mii->reg_num = 1;
 
-    if (network_ioctl(SIOCDEVPRIVATE+1, &ifreq, "SIOCDEVPRIVATE+1") < 0) {
+    if (network_ioctl(SIOCDEVPRIVATE+1, ifreq, "SIOCDEVPRIVATE+1") < 0) {
         return IFSTATUS_ERR;
     }
@@ -519 +552 @@
 
 #if ENABLE_FEATURE_PIDFILE
-    pidfile_name = xasprintf(_PATH_VARRUN"ifplugd.%s.pid", G.iface);
+    pidfile_name = xasprintf(CONFIG_PID_FILE_PATH "/ifplugd.%s.pid", G.iface);
     pid_from_pidfile = read_pid(pidfile_name);
 

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

@@ -18 +18 @@
  */
 
+//usage:#define ifup_trivial_usage
+//usage:       "[-an"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] [-i FILE] IFACE..."
+//usage:#define ifup_full_usage "\n\n"
+//usage:       "    -a  De/configure all interfaces automatically"
+//usage:     "\n    -i FILE Use FILE for interface definitions"
+//usage:     "\n    -n  Print out what would happen, but don't do it"
+//usage:    IF_FEATURE_IFUPDOWN_MAPPING(
+//usage:     "\n        (note: doesn't disable mappings)"
+//usage:     "\n    -m  Don't run any mappings"
+//usage:    )
+//usage:     "\n    -v  Print out what would happen before doing it"
+//usage:     "\n    -f  Force de/configuration"
+//usage:
+//usage:#define ifdown_trivial_usage
+//usage:       "[-an"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] [-i FILE] IFACE..."
+//usage:#define ifdown_full_usage "\n\n"
+//usage:       "    -a  De/configure all interfaces automatically"
+//usage:     "\n    -i FILE Use FILE for interface definitions"
+//usage:     "\n    -n  Print out what would happen, but don't do it"
+//usage:    IF_FEATURE_IFUPDOWN_MAPPING(
+//usage:     "\n        (note: doesn't disable mappings)"
+//usage:     "\n    -m  Don't run any mappings"
+//usage:    )
+//usage:     "\n    -v  Print out what would happen before doing it"
+//usage:     "\n    -f  Force de/configuration"
+
 #include "libbb.h"
 /* After libbb.h, since it needs sys/types.h on some systems */
@@ -24 +50 @@
 
 #define MAX_OPT_DEPTH 10
-#define EUNBALBRACK 10001
-#define EUNDEFVAR   10002
-#define EUNBALPER   10000
 
 #if ENABLE_FEATURE_IFUPDOWN_MAPPING
@@ -62 +85 @@
     char *script;
 
-    int max_mappings;
     int n_mappings;
     char **mapping;
@@ -77 +99 @@
 
     char *iface;
-    int max_options;
     int n_options;
     struct variable_t *option;
@@ -107 +128 @@
     char **my_environ;
     const char *startup_PATH;
+    char *shell;
 } FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
 #define INIT_G() do { } while (0)
+
+
+static const char keywords_up_down[] ALIGN1 =
+    "up\0"
+    "down\0"
+    "pre-up\0"
+    "post-down\0"
+;
 
 
@@ -201 +231 @@
 {
     size_t old_pos[MAX_OPT_DEPTH] = { 0 };
-    int okay[MAX_OPT_DEPTH] = { 1 };
+    smallint okay[MAX_OPT_DEPTH] = { 1 };
     int opt_depth = 1;
     char *result = NULL;
@@ -212 +242 @@
             break;
         case '\\':
-            if (command[1]) {
-                addstr(&result, command + 1, 1);
-                command += 2;
-            } else {
-                addstr(&result, command, 1);
+            if (command[1])
                 command++;
-            }
+            addstr(&result, command, 1);
+            command++;
             break;
         case '[':
@@ -227 +254 @@
                 command += 2;
             } else {
-                addstr(&result, "[", 1);
+                addstr(&result, command, 1);
                 command++;
             }
@@ -239 +266 @@
                 command += 2;
             } else {
-                addstr(&result, "]", 1);
+                addstr(&result, command, 1);
                 command++;
             }
@@ -251 +278 @@
                 nextpercent = strchr(command, '%');
                 if (!nextpercent) {
-                    errno = EUNBALPER;
+                    /* Unterminated %var% */
                     free(result);
                     return NULL;
@@ -296 +323 @@
 
     if (opt_depth > 1) {
-        errno = EUNBALBRACK;
+        /* Unbalanced bracket */
         free(result);
         return NULL;
@@ -302 +329 @@
 
     if (!okay[0]) {
-        errno = EUNDEFVAR;
+        /* Undefined variable and we aren't in a bracket */
         free(result);
         return NULL;
@@ -369 +396 @@
     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);
+    result += execute("[[ip route add ::/0 via %gateway%]][[ prio %metric%]]", ifd, exec);
 # 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);
+    result += execute("[[route -A inet6 add ::/0 gw %gateway%[[ metric %metric%]]]]", ifd, exec);
 # endif
     return ((result == 3) ? 3 : 0);
@@ -456 +483 @@
             "dev %iface%[[ peer %pointopoint%]][[ label %label%]]", 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);
+    result += execute("[[ip route add default via %gateway% dev %iface%[[ prio %metric%]]]]", ifd, exec);
     return ((result == 3) ? 3 : 0);
 # else
@@ -466 +493 @@
                 "[[ broadcast %broadcast%]][[ pointopoint %pointopoint%]] ",
                 ifd, exec);
-    result += execute("[[route add default gw %gateway% %iface%]]", ifd, exec);
+    result += execute("[[route add default gw %gateway%[[ metric %metric%]] %iface%]]", ifd, exec);
     return ((result == 3) ? 3 : 0);
 # endif
@@ -777 +804 @@
                 currmap->match[currmap->n_matches++] = xstrdup(first_word);
             }
-            /*currmap->max_mappings = 0; - done by xzalloc */
             /*currmap->n_mappings = 0;*/
             /*currmap->mapping = NULL;*/
@@ -862 +888 @@
                     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
-                ) {
+                if (strcmp(first_word, "post-up") == 0)
+                    first_word += 5; /* "up" */
+                else if (strcmp(first_word, "pre-down") == 0)
+                    first_word += 4; /* "down" */
+
+                /* If not one of "up", "down",... words... */
+                if (index_in_strings(keywords_up_down, first_word) < 0) {
                     int i;
                     for (i = 0; i < currif->n_options; i++) {
@@ -873 +901 @@
                     }
                 }
-                if (currif->n_options >= currif->max_options) {
-                    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 = xrealloc_vector(currif->option, 4, currif->n_options);
                 currif->option[currif->n_options].name = xstrdup(first_word);
                 currif->option[currif->n_options].value = xstrdup(rest_of_line);
@@ -890 +914 @@
                     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);
-                    }
+                    currmap->mapping = xrealloc_vector(currmap->mapping, 2, currmap->n_mappings);
                     currmap->mapping[currmap->n_mappings] = xstrdup(next_word(&rest_of_line));
                     currmap->n_mappings++;
@@ -941 +961 @@
 }
 
-static void set_environ(struct interface_defn_t *iface, const char *mode)
+static void set_environ(struct interface_defn_t *iface, const char *mode, const char *opt)
 {
     int i;
@@ -954 +974 @@
 
     /* note: last element will stay NULL: */
-    G.my_environ = xzalloc(sizeof(char *) * (iface->n_options + 6));
+    G.my_environ = xzalloc(sizeof(char *) * (iface->n_options + 7));
     pp = G.my_environ;
 
     for (i = 0; i < iface->n_options; i++) {
-        if (strcmp(iface->option[i].name, "up") == 0
-         || strcmp(iface->option[i].name, "down") == 0
-         || strcmp(iface->option[i].name, "pre-up") == 0
-         || strcmp(iface->option[i].name, "post-down") == 0
-        ) {
+        if (index_in_strings(keywords_up_down, iface->option[i].name) >= 0) {
             continue;
         }
@@ -972 +988 @@
     *pp++ = setlocalenv("%s=%s", "METHOD", iface->method->name);
     *pp++ = setlocalenv("%s=%s", "MODE", mode);
+    *pp++ = setlocalenv("%s=%s", "PHASE", opt);
     if (G.startup_PATH)
         *pp++ = setlocalenv("%s=%s", "PATH", G.startup_PATH);
@@ -987 +1004 @@
         fflush_all();
         child = vfork();
-        switch (child) {
-        case -1: /* failure */
+        if (child < 0) /* failure */
             return 0;
-        case 0: /* child */
-            execle(DEFAULT_SHELL, DEFAULT_SHELL, "-c", str, (char *) NULL, G.my_environ);
+        if (child == 0) { /* child */
+            execle(G.shell, G.shell, "-c", str, (char *) NULL, G.my_environ);
             _exit(127);
         }
@@ -1027 +1043 @@
 {
     if (!iface->method->up(iface, check)) return -1;
-    set_environ(iface, "start");
+    set_environ(iface, "start", "pre-up");
     if (!execute_all(iface, "pre-up")) return 0;
     if (!iface->method->up(iface, doit)) return 0;
+    set_environ(iface, "start", "post-up");
     if (!execute_all(iface, "up")) return 0;
     return 1;
@@ -1036 +1053 @@
 static int iface_down(struct interface_defn_t *iface)
 {
-    if (!iface->method->down(iface,check)) return -1;
-    set_environ(iface, "stop");
+    if (!iface->method->down(iface, check)) return -1;
+    set_environ(iface, "stop", "pre-down");
     if (!execute_all(iface, "down")) return 0;
     if (!iface->method->down(iface, doit)) return 0;
+    set_environ(iface, "stop", "post-down");
     if (!execute_all(iface, "post-down")) return 0;
     return 1;
@@ -1166 +1184 @@
 
     G.startup_PATH = getenv("PATH");
+    G.shell = xstrdup(get_shell_name());
 
     cmds = iface_down;
@@ -1221 +1240 @@
                 if (iface_state) {
                     bb_error_msg("interface %s already configured", iface);
-                    continue;
+                    goto next;
                 }
             } else {
@@ -1227 +1246 @@
                 if (!iface_state) {
                     bb_error_msg("interface %s not configured", iface);
-                    continue;
+                    goto next;
                 }
             }
@@ -1291 +1310 @@
             llist_t *iface_state = find_iface_state(state_list, iface);
 
-            if (cmds == iface_up) {
-                char * const newiface = xasprintf("%s=%s", iface, liface);
-                if (iface_state == NULL) {
+            if (cmds == iface_up && !any_failures) {
+                char *newiface = xasprintf("%s=%s", iface, liface);
+                if (!iface_state) {
                     llist_add_to_end(&state_list, newiface);
                 } else {
@@ -1317 +1336 @@
             llist_free(state_list, free);
         }
+ next:
+        free(iface);
+        free(liface);
     }
 

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

@@ -155 +155 @@
  */
 
+//usage:#define inetd_trivial_usage
+//usage:       "[-fe] [-q N] [-R N] [CONFFILE]"
+//usage:#define inetd_full_usage "\n\n"
+//usage:       "Listen for network connections and launch programs\n"
+//usage:     "\n    -f  Run in foreground"
+//usage:     "\n    -e  Log to stderr"
+//usage:     "\n    -q N    Socket listen queue (default: 128)"
+//usage:     "\n    -R N    Pause services after N connects/min"
+//usage:     "\n        (default: 0 - disabled)"
+
 #include <syslog.h>
+#include <sys/resource.h> /* setrlimit */
+#include <sys/socket.h> /* un.h may need this */
 #include <sys/un.h>
 
@@ -161 +173 @@
 
 #if ENABLE_FEATURE_INETD_RPC
-#include <rpc/rpc.h>
-#include <rpc/pmap_clnt.h>
+# if defined(__UCLIBC__) && ! defined(__UCLIBC_HAS_RPC__)
+#  error "You need to build uClibc with UCLIBC_HAS_RPC for NFS support"
+# endif
+# include <rpc/rpc.h>
+# include <rpc/pmap_clnt.h>
 #endif
 
@@ -171 +186 @@
 #define ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN 0
 #endif
-
-#define _PATH_INETDPID  "/var/run/inetd.pid"
 
 #define CNT_INTERVAL    60      /* servers in CNT_INTERVAL sec. */
@@ -345 +358 @@
 } while (0)
 
+#if 1
+# define dbg(...) ((void)0)
+#else
+# define dbg(...) \
+do { \
+    int dbg_fd = open("inetd_debug.log", O_WRONLY | O_CREAT | O_APPEND, 0666); \
+    if (dbg_fd >= 0) { \
+        fdprintf(dbg_fd, "%d: ", getpid()); \
+        fdprintf(dbg_fd, __VA_ARGS__); \
+        close(dbg_fd); \
+    } \
+} while (0)
+#endif
+
 static void maybe_close(int fd)
 {
-    if (fd >= 0)
+    if (fd >= 0) {
         close(fd);
+        dbg("closed fd:%d\n", fd);
+    }
 }
 
@@ -452 +481 @@
     if (fd >= 0) {
         FD_CLR(fd, &allsock);
+        dbg("stopped listening on fd:%d\n", fd);
         maxsock = -1;
+        dbg("maxsock:%d\n", maxsock);
     }
 }
@@ -460 +491 @@
     if (fd >= 0) {
         FD_SET(fd, &allsock);
+        dbg("started listening on fd:%d\n", fd);
         if (maxsock >= 0 && fd > maxsock) {
             prev_maxsock = maxsock = fd;
+            dbg("maxsock:%d\n", maxsock);
             if ((rlim_t)fd > rlim_ofile_cur - FD_MARGIN)
                 bump_nofile();
@@ -480 +513 @@
         fd++;
     }
+    dbg("recalculated maxsock:%d\n", maxsock);
     prev_maxsock = maxsock;
     if ((rlim_t)maxsock > rlim_ofile_cur - FD_MARGIN)
@@ -502 +536 @@
         /* zero out the port for all RPC services; let bind()
          * find one. */
-        set_nport(sep->se_lsa, 0);
+        set_nport(&sep->se_lsa->u.sa, 0);
 
         /* for RPC services, attempt to use a reserved port
@@ -537 +571 @@
         return;
     }
-    if (sep->se_socktype == SOCK_STREAM)
+
+    if (sep->se_socktype == SOCK_STREAM) {
         listen(fd, global_queuelen);
+        dbg("new sep->se_fd:%d (stream)\n", fd);
+    } else {
+        dbg("new sep->se_fd:%d (!stream)\n", fd);
+    }
 
     add_fd_to_set(fd);
@@ -960 +999 @@
             if (LONE_CHAR(sep->se_local_hostname, '*')) {
                 lsa = xzalloc_lsa(sep->se_family);
-                set_nport(lsa, port);
+                set_nport(&lsa->u.sa, port);
             } else {
                 lsa = host_and_af2sockaddr(sep->se_local_hostname,
@@ -1000 +1039 @@
     block_CHLD_HUP_ALRM(&omask);
     sepp = &serv_list;
-    while ((sep = *sepp)) {
+    while ((sep = *sepp) != NULL) {
         if (sep->se_checked) {
             sepp = &sep->se_next;
@@ -1092 +1131 @@
             close(sep->se_fd);
     }
-    remove_pidfile(_PATH_INETDPID);
+    remove_pidfile(CONFIG_PID_FILE_PATH "/inetd.pid");
     exit(EXIT_SUCCESS);
 }
@@ -1141 +1180 @@
     }
 
-    write_pidfile(_PATH_INETDPID);
+    write_pidfile(CONFIG_PID_FILE_PATH "/inetd.pid");
 
     /* never fails under Linux (except if you pass it bad arguments) */
@@ -1154 +1193 @@
     sigaddset(&sa.sa_mask, SIGCHLD);
     sigaddset(&sa.sa_mask, SIGHUP);
+//FIXME: explain why no SA_RESTART
+//FIXME: retry_network_setup is unsafe to run in signal handler (many reasons)!
     sa.sa_handler = retry_network_setup;
     sigaction_set(SIGALRM, &sa);
+//FIXME: reread_config_file is unsafe to run in signal handler(many reasons)!
     sa.sa_handler = reread_config_file;
     sigaction_set(SIGHUP, &sa);
+//FIXME: reap_child is unsafe to run in signal handler (uses stdio)!
     sa.sa_handler = reap_child;
     sigaction_set(SIGCHLD, &sa);
+//FIXME: clean_up_and_exit is unsafe to run in signal handler (uses stdio)!
     sa.sa_handler = clean_up_and_exit;
     sigaction_set(SIGTERM, &sa);
@@ -1189 +1233 @@
             continue;
         }
+        dbg("ready_fd_cnt:%d\n", ready_fd_cnt);
 
         for (sep = serv_list; ready_fd_cnt && sep; sep = sep->se_next) {
@@ -1194 +1239 @@
                 continue;
 
+            dbg("ready fd:%d\n", sep->se_fd);
             ready_fd_cnt--;
             ctrl = sep->se_fd;
@@ -1201 +1247 @@
                 if (sep->se_socktype == SOCK_STREAM) {
                     ctrl = accepted_fd = accept(sep->se_fd, NULL, NULL);
+                    dbg("accepted_fd:%d\n", accepted_fd);
                     if (ctrl < 0) {
                         if (errno != EINTR)
@@ -1221 +1268 @@
  * Parent must create and use new socket instead. */
                     new_udp_fd = socket(sep->se_family, SOCK_DGRAM, 0);
+                    dbg("new_udp_fd:%d\n", new_udp_fd);
                     if (new_udp_fd < 0) { /* error: eat packet, forget about it */
  udp_err:
@@ -1227 +1275 @@
                     }
                     setsockopt_reuseaddr(new_udp_fd);
-                    /* TODO: better do bind after vfork in parent,
+                    /* TODO: better do bind after fork 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) {
+                        dbg("bind(new_udp_fd) failed\n");
                         close(new_udp_fd);
                         goto udp_err;
                     }
+                    dbg("bind(new_udp_fd) succeeded\n");
                 }
             }
@@ -1261 +1311 @@
                             rearm_alarm(); /* will revive it in RETRYTIME sec */
                             restore_sigmask(&omask);
+                            maybe_close(new_udp_fd);
                             maybe_close(accepted_fd);
                             continue; /* -> check next fd in fd set */
@@ -1281 +1332 @@
                     sleep(1);
                     restore_sigmask(&omask);
+                    maybe_close(new_udp_fd);
                     maybe_close(accepted_fd);
                     continue; /* -> check next fd in fd set */
@@ -1287 +1339 @@
                     pid--; /* -1: "we did fork and we are child" */
             }
-            /* if pid == 0 here, we never forked */
+            /* if pid == 0 here, we didn't fork */
 
             if (pid > 0) { /* parent */
                 if (sep->se_wait) {
-                    /* tcp wait: we passed listening socket to child,
+                    /* wait: we passed socket to child,
                      * will wait for child to terminate */
                     sep->se_wait = pid;
@@ -1300 +1352 @@
                      * we created and will use new, unconnected one */
                     xmove_fd(new_udp_fd, sep->se_fd);
+                    dbg("moved new_udp_fd:%d to sep->se_fd:%d\n", new_udp_fd, sep->se_fd);
                 }
                 restore_sigmask(&omask);
@@ -1306 +1359 @@
             }
 
-            /* we are either child or didn't vfork at all */
+            /* we are either child or didn't fork at all */
 #ifdef INETD_BUILTINS_ENABLED
             if (sep->se_builtin) {
-                if (pid) { /* "pid" is -1: we did vfork */
+                if (pid) { /* "pid" is -1: we did fork */
                     close(sep->se_fd); /* listening socket */
+                    dbg("closed sep->se_fd:%d\n", sep->se_fd);
                     logmode = LOGMODE_NONE; /* make xwrite etc silent */
                 }
@@ -1318 +1372 @@
                 else
                     sep->se_builtin->bi_dgram_fn(ctrl, sep);
-                if (pid) /* we did vfork */
+                if (pid) /* we did fork */
                     _exit(EXIT_FAILURE);
                 maybe_close(accepted_fd);
@@ -1328 +1382 @@
             /* "nowait" udp */
             if (new_udp_fd >= 0) {
-                len_and_sockaddr *lsa = xzalloc_lsa(sep->se_family);
+                len_and_sockaddr *lsa;
+                int r;
+
+                close(new_udp_fd);
+                dbg("closed new_udp_fd:%d\n", new_udp_fd);
+                lsa = xzalloc_lsa(sep->se_family);
                 /* peek at the packet and remember peer addr */
-                int r = recvfrom(ctrl, NULL, 0, MSG_PEEK|MSG_DONTWAIT,
+                r = recvfrom(ctrl, NULL, 0, MSG_PEEK|MSG_DONTWAIT,
                     &lsa->u.sa, &lsa->len);
                 if (r < 0)
@@ -1338 +1397 @@
                  * and bare write()/send() will work on it */
                 connect(ctrl, &lsa->u.sa, lsa->len);
+                dbg("connected ctrl:%d to remote peer\n", ctrl);
                 free(lsa);
             }
@@ -1355 +1415 @@
                 goto do_exit1;
             }
-            if (pwd->pw_uid) {
+            if (pwd->pw_uid != 0) {
                 if (sep->se_group)
                     pwd->pw_gid = grp->gr_gid;
@@ -1374 +1434 @@
             xmove_fd(ctrl, STDIN_FILENO);
             xdup2(STDIN_FILENO, STDOUT_FILENO);
+            dbg("moved ctrl:%d to fd 0,1[,2]\n", ctrl);
             /* manpages of inetd I managed to find either say
              * that stderr is also redirected to the network,
@@ -1386 +1447 @@
             sigaction_set(SIGPIPE, &saved_pipe_handler);
             restore_sigmask(&omask);
+            dbg("execing:'%s'\n", sep->se_program);
             BB_EXECVP(sep->se_program, sep->se_argv);
             bb_perror_msg("can't execute '%s'", sep->se_program);

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

@@ -28 +28 @@
  *                     - gettext instead of catgets for i18n
  *          10/1998  - Andi Kleen. Use interface list primitives.
- *      20001008 - Bernd Eckenfels, Patch from RH for setting mtu
+ *          20001008 - Bernd Eckenfels, Patch from RH for setting mtu
  *          (default AF was wrong)
  */
+
+#include "libbb.h"
+#include "inet_common.h"
 #include <net/if.h>
 #include <net/if_arp.h>
-#if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined(_NEWLIB_VERSION)
+#ifdef HAVE_NET_ETHERNET_H
 # include <net/ethernet.h>
-#else
-# include <linux/if_ether.h>
-#endif
-#include "libbb.h"
-#include "inet_common.h"
+#endif
 
 #if ENABLE_FEATURE_HWIB
@@ -952 +951 @@
             sap.sin6_family = AF_INET6;
             printf("          inet6 addr: %s/%d",
-                   INET6_sprint((struct sockaddr *) &sap, 1),
-                   plen);
+                INET6_sprint((struct sockaddr *) &sap, 1),
+                plen);
             printf(" Scope:");
             switch (scope & IPV6_ADDR_SCOPE_MASK) {
@@ -1021 +1020 @@
     if (ptr->has_ip) {
         printf("          %s addr:%s ", ap->name,
-               ap->sprint(&ptr->addr, 1));
+            ap->sprint(&ptr->addr, 1));
         if (ptr->flags & IFF_POINTOPOINT) {
             printf(" P-t-P:%s ", ap->sprint(&ptr->dstaddr, 1));
@@ -1104 +1103 @@
 
         printf("RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n",
-               ptr->stats.rx_packets, ptr->stats.rx_errors,
-               ptr->stats.rx_dropped, ptr->stats.rx_fifo_errors,
-               ptr->stats.rx_frame_errors);
+            ptr->stats.rx_packets, ptr->stats.rx_errors,
+            ptr->stats.rx_dropped, ptr->stats.rx_fifo_errors,
+            ptr->stats.rx_frame_errors);
         if (can_compress)
             printf("             compressed:%lu\n",
-                   ptr->stats.rx_compressed);
+                ptr->stats.rx_compressed);
         printf("          ");
         printf("TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n",
-               ptr->stats.tx_packets, ptr->stats.tx_errors,
-               ptr->stats.tx_dropped, ptr->stats.tx_fifo_errors,
-               ptr->stats.tx_carrier_errors);
+            ptr->stats.tx_packets, ptr->stats.tx_errors,
+            ptr->stats.tx_dropped, ptr->stats.tx_fifo_errors,
+            ptr->stats.tx_carrier_errors);
         printf("          collisions:%lu ", ptr->stats.collisions);
         if (can_compress)
@@ -1131 +1130 @@
         if (ptr->map.irq)
             printf("Interrupt:%d ", ptr->map.irq);
-        if (ptr->map.base_addr >= 0x100)    /* Only print devices using it for
-                                               I/O maps */
+        if (ptr->map.base_addr >= 0x100) /* Only print devices using it for I/O maps */
             printf("Base address:0x%lx ",
-                   (unsigned long) ptr->map.base_addr);
+                (unsigned long) ptr->map.base_addr);
         if (ptr->map.mem_start) {
             printf("Memory:%lx-%lx ", ptr->map.mem_start,
-                   ptr->map.mem_end);
+                ptr->map.mem_end);
         }
         if (ptr->map.dma)
@@ -1170 +1168 @@
 #ifdef UNUSED
 static int for_all_interfaces(int (*doit) (struct interface *, void *),
-                              void *cookie)
+                            void *cookie)
 {
     struct interface *ife;

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

@@ -9 +9 @@
  * Bernhard Reutner-Fischer rewrote to use index_in_substr_array
  */
+
+/* would need to make the " | " optional depending on more than one selected: */
+//usage:#define ip_trivial_usage
+//usage:       "[OPTIONS] {"
+//usage:    IF_FEATURE_IP_ADDRESS("address | ")
+//usage:    IF_FEATURE_IP_ROUTE("route | ")
+//usage:    IF_FEATURE_IP_LINK("link | ")
+//usage:    IF_FEATURE_IP_TUNNEL("tunnel | ")
+//usage:    IF_FEATURE_IP_RULE("rule")
+//usage:       "} {COMMAND}"
+//usage:#define ip_full_usage "\n\n"
+//usage:       "ip [OPTIONS] OBJECT {COMMAND}\n"
+//usage:       "where OBJECT := {"
+//usage:    IF_FEATURE_IP_ADDRESS("address | ")
+//usage:    IF_FEATURE_IP_ROUTE("route | ")
+//usage:    IF_FEATURE_IP_LINK("link | ")
+//usage:    IF_FEATURE_IP_TUNNEL("tunnel | ")
+//usage:    IF_FEATURE_IP_RULE("rule")
+//usage:       "}\n"
+//usage:       "OPTIONS := { -f[amily] { inet | inet6 | link } | -o[neline] }"
+//usage:
+//usage:#define ipaddr_trivial_usage
+//usage:       "{ {add|del} IFADDR dev STRING | {show|flush}\n"
+//usage:       "        [dev STRING] [to PREFIX] }"
+//usage:#define ipaddr_full_usage "\n\n"
+//usage:       "ipaddr {add|delete} IFADDR dev STRING\n"
+//usage:       "ipaddr {show|flush} [dev STRING] [scope SCOPE-ID]\n"
+//usage:       "    [to PREFIX] [label PATTERN]\n"
+//usage:       "    IFADDR := PREFIX | ADDR peer PREFIX\n"
+//usage:       "    [broadcast ADDR] [anycast ADDR]\n"
+//usage:       "    [label STRING] [scope SCOPE-ID]\n"
+//usage:       "    SCOPE-ID := [host | link | global | NUMBER]"
+//usage:
+//usage:#define iplink_trivial_usage
+//usage:       "{ set DEVICE { up | down | arp { on | off } | show [DEVICE] }"
+//usage:#define iplink_full_usage "\n\n"
+//usage:       "iplink set DEVICE { up | down | arp | multicast { on | off } |\n"
+//usage:       "            dynamic { on | off } |\n"
+//usage:       "            mtu MTU }\n"
+//usage:       "iplink show [DEVICE]"
+//usage:
+//usage:#define iproute_trivial_usage
+//usage:       "{ list | flush | add | del | change | append |\n"
+//usage:       "        replace | test } ROUTE"
+//usage:#define iproute_full_usage "\n\n"
+//usage:       "iproute { list | flush } SELECTOR\n"
+//usage:       "iproute get ADDRESS [from ADDRESS iif STRING]\n"
+//usage:       "    [oif STRING] [tos TOS]\n"
+//usage:       "iproute { add | del | change | append | replace | test } ROUTE\n"
+//usage:       "    SELECTOR := [root PREFIX] [match PREFIX] [proto RTPROTO]\n"
+//usage:       "    ROUTE := [TYPE] PREFIX [tos TOS] [proto RTPROTO] [metric METRIC]"
+//usage:
+//usage:#define iprule_trivial_usage
+//usage:       "{[list | add | del] RULE}"
+//usage:#define iprule_full_usage "\n\n"
+//usage:       "iprule [list | add | del] SELECTOR ACTION\n"
+//usage:       "    SELECTOR := [from PREFIX] [to PREFIX] [tos TOS] [fwmark FWMARK]\n"
+//usage:       "            [dev STRING] [pref NUMBER]\n"
+//usage:       "    ACTION := [table TABLE_ID] [nat ADDRESS]\n"
+//usage:       "            [prohibit | reject | unreachable]\n"
+//usage:       "            [realms [SRCREALM/]DSTREALM]\n"
+//usage:       "    TABLE_ID := [local | main | default | NUMBER]"
+//usage:
+//usage:#define iptunnel_trivial_usage
+//usage:       "{ add | change | del | show } [NAME]\n"
+//usage:       "    [mode { ipip | gre | sit }]\n"
+//usage:       "    [remote ADDR] [local ADDR] [ttl TTL]"
+//usage:#define iptunnel_full_usage "\n\n"
+//usage:       "iptunnel { add | change | del | show } [NAME]\n"
+//usage:       "    [mode { ipip | gre | sit }] [remote ADDR] [local ADDR]\n"
+//usage:       "    [[i|o]seq] [[i|o]key KEY] [[i|o]csum]\n"
+//usage:       "    [ttl TTL] [tos TOS] [[no]pmtudisc] [dev PHYS_DEV]"
 
 #include "libbb.h"

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

@@ -12 +12 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+
+//usage:#define ipcalc_trivial_usage
+//usage:       "[OPTIONS] ADDRESS[[/]NETMASK] [NETMASK]"
+//usage:#define ipcalc_full_usage "\n\n"
+//usage:       "Calculate IP network settings from a IP address\n"
+//usage:    IF_FEATURE_IPCALC_LONG_OPTIONS(
+//usage:     "\n    -b,--broadcast  Display calculated broadcast address"
+//usage:     "\n    -n,--network    Display calculated network address"
+//usage:     "\n    -m,--netmask    Display default netmask for IP"
+//usage:    IF_FEATURE_IPCALC_FANCY(
+//usage:     "\n    -p,--prefix Display the prefix for IP/NETMASK"
+//usage:     "\n    -h,--hostname   Display first resolved host name"
+//usage:     "\n    -s,--silent Don't ever display error messages"
+//usage:    )
+//usage:    )
+//usage:    IF_NOT_FEATURE_IPCALC_LONG_OPTIONS(
+//usage:     "\n    -b  Display calculated broadcast address"
+//usage:     "\n    -n  Display calculated network address"
+//usage:     "\n    -m  Display default netmask for IP"
+//usage:    IF_FEATURE_IPCALC_FANCY(
+//usage:     "\n    -p  Display the prefix for IP/NETMASK"
+//usage:     "\n    -h  Display first resolved host name"
+//usage:     "\n    -s  Don't ever display error messages"
+//usage:    )
+//usage:    )
+
 #include "libbb.h"
 /* After libbb.h, because on some systems it needs other includes */

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

@@ -7 +7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
+
+//usage:#define fakeidentd_trivial_usage
+//usage:       "[-fiw] [-b ADDR] [STRING]"
+//usage:#define fakeidentd_full_usage "\n\n"
+//usage:       "Provide fake ident (auth) service\n"
+//usage:     "\n    -f  Run in foreground"
+//usage:     "\n    -i  Inetd mode"
+//usage:     "\n    -w  Inetd 'wait' mode"
+//usage:     "\n    -b ADDR Bind to specified address"
+//usage:     "\n    STRING  Ident answer string (default: nobody)"
 
 #include "libbb.h"

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

@@ -163 +163 @@
     }
 #endif
+/* IFLA_OPERSTATE was added to kernel with the same commit as IFF_DORMANT */
+#ifdef IFF_DORMANT
     if (tb[IFLA_OPERSTATE]) {
         static const char operstate_labels[] ALIGN1 =
@@ -170 +172 @@
                     *(uint8_t *)RTA_DATA(tb[IFLA_OPERSTATE])));
     }
+#endif
     if (G_filter.showqueue)
         print_queuelen((char*)RTA_DATA(tb[IFLA_IFNAME]));
@@ -312 +315 @@
         printf("brd %s ",
             rt_addr_n2a(ifa->ifa_family,
-                    RTA_DATA(rta_tb[IFA_BROADCAST]),
-                    abuf, sizeof(abuf)));
+                    RTA_DATA(rta_tb[IFA_BROADCAST]),
+                    abuf, sizeof(abuf))
+        );
     }
     if (rta_tb[IFA_ANYCAST]) {
         printf("any %s ",
             rt_addr_n2a(ifa->ifa_family,
-                    RTA_DATA(rta_tb[IFA_ANYCAST]),
-                    abuf, sizeof(abuf)));
+                    RTA_DATA(rta_tb[IFA_ANYCAST]),
+                    abuf, sizeof(abuf))
+        );
     }
     printf("scope %s ", rtnl_rtscope_n2a(ifa->ifa_scope, b1));

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

@@ -8 +8 @@
 #include <net/if_packet.h>
 #include <netpacket/packet.h>
-#include <net/ethernet.h>
+#include <netinet/if_ether.h>
 
 #include "ip_common.h"  /* #include "libbb.h" is inside */

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

@@ -32 +32 @@
     //int typemask; - unused
     //int tos, tosmask; - unused
-    int iif, iifmask;
-    int oif, oifmask;
+    int iif;
+    int oif;
     //int realm, realmmask; - unused
     //inet_prefix rprefsrc; - read-only
@@ -83 +83 @@
     struct rtmsg *r = NLMSG_DATA(n);
     int len = n->nlmsg_len;
-    struct rtattr * tb[RTA_MAX+1];
+    struct rtattr *tb[RTA_MAX+1];
     char abuf[256];
     inet_prefix dst;
@@ -160 +160 @@
 
     memset(tb, 0, sizeof(tb));
+    memset(&src, 0, sizeof(src));
+    memset(&dst, 0, sizeof(dst));
     parse_rtattr(tb, RTA_MAX, RTM_RTA(r), len);
+
+    if (tb[RTA_SRC]) {
+        src.bitlen = r->rtm_src_len;
+        src.bytelen = (r->rtm_family == AF_INET6 ? 16 : 4);
+        memcpy(src.data, RTA_DATA(tb[RTA_SRC]), src.bytelen);
+    }
+    if (tb[RTA_DST]) {
+        dst.bitlen = r->rtm_dst_len;
+        dst.bytelen = (r->rtm_family == AF_INET6 ? 16 : 4);
+        memcpy(dst.data, RTA_DATA(tb[RTA_DST]), dst.bytelen);
+    }
 
     if (G_filter.rdst.family
@@ -183 +196 @@
         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.oif != 0) {
+        if (!tb[RTA_OIF])
+            return 0;
+        if (G_filter.oif != *(int*)RTA_DATA(tb[RTA_OIF]))
+            return 0;
     }
 
     if (G_filter.flushb) {
         struct nlmsghdr *fn;
+
+        /* We are creating route flush commands */
+
+        if (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 (NLMSG_ALIGN(G_filter.flushp) + n->nlmsg_len > G_filter.flushe) {
             if (flush_update())
                 bb_error_msg_and_die("flush");
         }
-        fn = (struct nlmsghdr*)(G_filter.flushb + NLMSG_ALIGN(G_filter.flushp));
+        fn = (void*)(G_filter.flushb + NLMSG_ALIGN(G_filter.flushp));
         memcpy(fn, n, n->nlmsg_len);
         fn->nlmsg_type = RTM_DELROUTE;
@@ -208 +230 @@
         return 0;
     }
+
+    /* We are printing routes */
 
     if (n->nlmsg_type == RTM_DELROUTE) {
@@ -258 +282 @@
                     abuf, sizeof(abuf)));
     }
-    if (tb[RTA_OIF] && G_filter.oifmask != -1) {
+    if (tb[RTA_OIF]) {
         printf("dev %s ", ll_index_to_name(*(int*)RTA_DATA(tb[RTA_OIF])));
     }
+
+    /* Todo: parse & show "proto kernel", "scope link" here */
 
     if (tb[RTA_PREFSRC] && /*G_filter.rprefsrc.bitlen - always 0*/ 0 != host_len) {
@@ -293 +319 @@
         }
     }
-    if (tb[RTA_IIF] && G_filter.iifmask != -1) {
+    if (tb[RTA_IIF] && G_filter.iif == 0) {
         printf(" iif %s", ll_index_to_name(*(int*)RTA_DATA(tb[RTA_IIF])));
     }
@@ -414 +440 @@
             }
             if ((**argv < '0' || **argv > '9')
-             && rtnl_rtntype_a2n(&type, *argv) == 0) {
+             && rtnl_rtntype_a2n(&type, *argv) == 0
+            ) {
                 NEXT_ARG();
                 req.r.rtm_type = type;
@@ -663 +690 @@
             idx = xll_name_to_index(id);
             G_filter.iif = idx;
-            G_filter.iifmask = -1;
         }
         if (od) {
             idx = xll_name_to_index(od);
             G_filter.oif = idx;
-            G_filter.oifmask = -1;
         }
     }

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

@@ -74 +74 @@
         if (r->rtm_src_len != host_len) {
             printf("%s/%u", rt_addr_n2a(r->rtm_family,
-                             RTA_DATA(tb[RTA_SRC]),
-                             abuf, sizeof(abuf)),
+                            RTA_DATA(tb[RTA_SRC]),
+                            abuf, sizeof(abuf)),
                 r->rtm_src_len
-                );
+            );
         } else {
             fputs(format_host(r->rtm_family,
-                               RTA_PAYLOAD(tb[RTA_SRC]),
-                               RTA_DATA(tb[RTA_SRC]),
-                               abuf, sizeof(abuf)), stdout);
+                        RTA_PAYLOAD(tb[RTA_SRC]),
+                        RTA_DATA(tb[RTA_SRC]),
+                        abuf, sizeof(abuf)),
+                stdout
+            );
         }
     } else if (r->rtm_src_len) {

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

@@ -439 +439 @@
         if (p->iph.tos & ~1)
             printf("%c%s ", p->iph.tos & 1 ? '/' : ' ',
-                   rtnl_dsfield_n2a(p->iph.tos & ~1, b1));
+                rtnl_dsfield_n2a(p->iph.tos & ~1, b1));
     }
     if (!(p->iph.frag_off & htons(IP_DF)))

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

@@ -56 +56 @@
 }
 
+//TODO: pass rth->fd instead of full rth?
 int FAST_FUNC rtnl_send(struct rtnl_handle *rth, char *buf, int len)
 {
@@ -393 +394 @@
             tb[rta->rta_type] = rta;
         }
-        rta = RTA_NEXT(rta,len);
+        rta = RTA_NEXT(rta, len);
     }
     if (len) {

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

@@ -13 +13 @@
 #include "utils.h"
 
-#if defined(__GLIBC__) && __GLIBC__ >=2 && __GLIBC_MINOR__ >= 1
-#include <net/ethernet.h>
-#else
-#include <linux/if_ether.h>
-#endif
+#include <netinet/if_ether.h>
 
-#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" ...;)
- */
+/* Please conditionalize exotic protocols on CONFIG_something */
 
-#define __PF(f,n) { ETH_P_##f, #n },
-static struct {
-    int id;
-    const char *name;
-} llproto_names[] = {
+static const uint16_t llproto_ids[] = {
+#define __PF(f,n) ETH_P_##f,
 __PF(LOOP,loop)
 __PF(PUP,pup)
@@ -91 +78 @@
 #endif
 
-{ 0x8100, "802.1Q" },
-{ ETH_P_IP, "ipv4" },
+0x8100,
+ETH_P_IP
 };
+#undef __PF
+
+/* Keep declarations above and below in sync! */
+
+static const char llproto_names[] =
+#define __PF(f,n) #n "\0"
+__PF(LOOP,loop)
+__PF(PUP,pup)
+#ifdef ETH_P_PUPAT
+__PF(PUPAT,pupat)
+#endif
+__PF(IP,ip)
+__PF(X25,x25)
+__PF(ARP,arp)
+__PF(BPQ,bpq)
+#ifdef ETH_P_IEEEPUP
+__PF(IEEEPUP,ieeepup)
+#endif
+#ifdef ETH_P_IEEEPUPAT
+__PF(IEEEPUPAT,ieeepupat)
+#endif
+__PF(DEC,dec)
+__PF(DNA_DL,dna_dl)
+__PF(DNA_RC,dna_rc)
+__PF(DNA_RT,dna_rt)
+__PF(LAT,lat)
+__PF(DIAG,diag)
+__PF(CUST,cust)
+__PF(SCA,sca)
+__PF(RARP,rarp)
+__PF(ATALK,atalk)
+__PF(AARP,aarp)
+__PF(IPX,ipx)
+__PF(IPV6,ipv6)
+#ifdef ETH_P_PPP_DISC
+__PF(PPP_DISC,ppp_disc)
+#endif
+#ifdef ETH_P_PPP_SES
+__PF(PPP_SES,ppp_ses)
+#endif
+#ifdef ETH_P_ATMMPOA
+__PF(ATMMPOA,atmmpoa)
+#endif
+#ifdef ETH_P_ATMFATE
+__PF(ATMFATE,atmfate)
+#endif
+
+__PF(802_3,802_3)
+__PF(AX25,ax25)
+__PF(ALL,all)
+__PF(802_2,802_2)
+__PF(SNAP,snap)
+__PF(DDCMP,ddcmp)
+__PF(WAN_PPP,wan_ppp)
+__PF(PPP_MP,ppp_mp)
+__PF(LOCALTALK,localtalk)
+__PF(PPPTALK,ppptalk)
+__PF(TR_802_2,tr_802_2)
+__PF(MOBITEX,mobitex)
+__PF(CONTROL,control)
+__PF(IRDA,irda)
+#ifdef ETH_P_ECONET
+__PF(ECONET,econet)
+#endif
+
+"802.1Q" "\0"
+"ipv4" "\0"
+;
 #undef __PF
 
@@ -101 +156 @@
     unsigned i;
     id = ntohs(id);
-    for (i = 0; i < ARRAY_SIZE(llproto_names); i++) {
-         if (llproto_names[i].id == id)
-            return llproto_names[i].name;
+    for (i = 0; i < ARRAY_SIZE(llproto_ids); i++) {
+        if (llproto_ids[i] == id)
+            return nth_string(llproto_names, i);
     }
-    snprintf(buf, len, "[%d]", id);
+    snprintf(buf, len, "[%u]", id);
     return buf;
 }
@@ -112 +167 @@
 {
     unsigned i;
-    for (i = 0; i < ARRAY_SIZE(llproto_names); i++) {
-         if (strcasecmp(llproto_names[i].name, buf) == 0) {
-             i = llproto_names[i].id;
-             goto good;
-         }
+    const char *name = llproto_names;
+    for (i = 0; i < ARRAY_SIZE(llproto_ids); i++) {
+        if (strcasecmp(name, buf) == 0) {
+            i = llproto_ids[i];
+            goto good;
+        }
+        name += strlen(name) + 1;
     }
+    errno = 0;
     i = bb_strtou(buf, NULL, 0);
     if (errno || i > 0xffff)

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

@@ -8 +8 @@
  * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
+#include <sys/socket.h> /* linux/if_arp.h needs it on some systems */
 #include <arpa/inet.h>
 #include <linux/if_arp.h>

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

@@ -84 +84 @@
     }
 
-    addr->family = AF_INET;
     if (family != AF_UNSPEC && family != AF_INET)
         return -1;
+
+    /* Try to parse it as IPv4 */
+    addr->family = AF_INET;
+#if 0 /* Doesn't handle e.g. "10.10", for example, "ip r l root 10.10/16" */
     if (inet_pton(AF_INET, name, addr->data) <= 0)
         return -1;
+#else
+    {
+        unsigned i = 0;
+        unsigned n = 0;
+        const char *cp = name - 1;
+        while (*++cp) {
+            if ((unsigned char)(*cp - '0') <= 9) {
+                n = 10 * n + (unsigned char)(*cp - '0');
+                if (n >= 256)
+                    return -1;
+                ((uint8_t*)addr->data)[i] = n;
+                continue;
+            }
+            if (*cp == '.' && ++i <= 3) {
+                n = 0;
+                continue;
+            }
+            return -1;
+        }
+    }
+#endif
     addr->bytelen = 4;
     addr->bitlen = -1;
+
     return 0;
 }
 
-static int get_prefix_1(inet_prefix *dst, char *arg, int family)
-{
-    int err;
-    unsigned plen;
+static void get_prefix_1(inet_prefix *dst, char *arg, int family)
+{
     char *slash;
 
@@ -109 +132 @@
         /*dst->bytelen = 0; - done by memset */
         /*dst->bitlen = 0;*/
-        return 0;
+        return;
     }
 
@@ -115 +138 @@
     if (slash)
         *slash = '\0';
-    err = get_addr_1(dst, arg, family);
-    if (err == 0) {
+
+    if (get_addr_1(dst, arg, family) == 0) {
         dst->bitlen = (dst->family == AF_INET6) ? 128 : 32;
         if (slash) {
+            unsigned plen;
             inet_prefix netmask_pfx;
 
@@ -124 +148 @@
             plen = bb_strtou(slash + 1, NULL, 0);
             if ((errno || plen > dst->bitlen)
-             && (get_addr_1(&netmask_pfx, slash + 1, family)))
-                err = -1;
-            else if (netmask_pfx.family == AF_INET) {
+             && get_addr_1(&netmask_pfx, slash + 1, family) != 0
+            ) {
+                goto bad;
+            }
+            if (netmask_pfx.family == AF_INET) {
                 /* fill in prefix length of dotted quad */
                 uint32_t mask = ntohl(netmask_pfx.data[0]);
@@ -132 +158 @@
 
                 /* 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;
-            }
-        }
-    }
+                if (host & (host + 1))
+                    goto bad;
+
+                for (plen = 0; mask; mask <<= 1)
+                    ++plen;
+                if (plen > dst->bitlen)
+                    goto bad;
+                /* dst->flags |= PREFIXLEN_SPECIFIED; */
+            }
+            dst->bitlen = plen;
+        }
+    }
+
     if (slash)
         *slash = '/';
-    return err;
+    return;
+ bad:
+    bb_error_msg_and_die("an %s %s is expected rather than \"%s\"", "inet", "prefix", arg);
 }
 
@@ -164 +189 @@
 }
 
-int get_prefix(inet_prefix *dst, char *arg, int family)
+void get_prefix(inet_prefix *dst, char *arg, int family)
 {
     if (family == AF_PACKET) {
         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 %s %s is expected rather than \"%s\"", "inet", "prefix", arg);
-    }
-    return 0;
+    get_prefix_1(dst, arg, family);
 }
 
@@ -205 +227 @@
 }
 
-int inet_addr_match(inet_prefix *a, inet_prefix *b, int bits)
-{
-    uint32_t *a1 = a->data;
-    uint32_t *a2 = b->data;
+int inet_addr_match(const inet_prefix *a, const inet_prefix *b, int bits)
+{
+    const uint32_t *a1 = a->data;
+    const uint32_t *a2 = b->data;
     int words = bits >> 5;
 

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

@@ -59 +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 void 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 void get_prefix(inet_prefix *dst, char *arg, int family);
 
 extern unsigned get_unsigned(char *arg, const char *errmsg);
@@ -78 +78 @@
 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);
+int inet_addr_match(const inet_prefix *a, const inet_prefix *b, int bits);
 
 const char *dnet_ntop(int af, const void *addr, char *str, size_t len);

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

@@ -11 +11 @@
  */
 
+//config:config NAMEIF
+//config:   bool "nameif"
+//config:   default y
+//config:   select PLATFORM_LINUX
+//config:   select FEATURE_SYSLOG
+//config:   help
+//config:     nameif is used to rename network interface by its MAC address.
+//config:     Renamed interfaces MUST be in the down state.
+//config:     It is possible to use a file (default: /etc/mactab)
+//config:     with list of new interface names and MACs.
+//config:     Maximum interface name length: IFNAMSIZ = 16
+//config:     File fields are separated by space or tab.
+//config:     File format:
+//config:     # Comment
+//config:     new_interface_name    XX:XX:XX:XX:XX:XX
+//config:
+//config:config FEATURE_NAMEIF_EXTENDED
+//config:   bool "Extended nameif"
+//config:   default y
+//config:   depends on NAMEIF
+//config:   help
+//config:     This extends the nameif syntax to support the bus_info, driver,
+//config:     phyaddr selectors. The syntax is compatible to the normal nameif.
+//config:     File format:
+//config:       new_interface_name  driver=asix bus=usb-0000:00:08.2-3
+//config:       new_interface_name  bus=usb-0000:00:08.2-3 00:80:C8:38:91:B5
+//config:       new_interface_name  phy_address=2 00:80:C8:38:91:B5
+//config:       new_interface_name  mac=00:80:C8:38:91:B5
+//config:       new_interface_name  00:80:C8:38:91:B5
+
+//usage:#define nameif_trivial_usage
+//usage:    IF_NOT_FEATURE_NAMEIF_EXTENDED(
+//usage:        "[-s] [-c FILE] [IFNAME HWADDR]..."
+//usage:    )
+//usage:    IF_FEATURE_NAMEIF_EXTENDED(
+//usage:        "[-s] [-c FILE] [IFNAME SELECTOR]..."
+//usage:    )
+//usage:#define nameif_full_usage "\n\n"
+//usage:    "Rename network interface while it in the down state."
+//usage:    IF_NOT_FEATURE_NAMEIF_EXTENDED(
+//usage:     "\nThe device with address HWADDR is renamed to IFACE."
+//usage:    )
+//usage:    IF_FEATURE_NAMEIF_EXTENDED(
+//usage:     "\nThe device matched by SELECTOR is renamed to IFACE."
+//usage:     "\nSELECTOR can be a combination of:"
+//usage:     "\n    driver=STRING"
+//usage:     "\n    bus=STRING"
+//usage:     "\n    phy_address=NUM"
+//usage:     "\n    [mac=]XX:XX:XX:XX:XX:XX"
+//usage:    )
+//usage:     "\n"
+//usage:     "\n    -c FILE Configuration file (default: /etc/mactab)"
+//usage:     "\n    -s  Log to syslog"
+//usage:
+//usage:#define nameif_example_usage
+//usage:       "$ nameif -s dmz0 00:A0:C9:8C:F6:3F\n"
+//usage:       " or\n"
+//usage:       "$ nameif -c /etc/my_mactab_file\n"
+
 #include "libbb.h"
 #include <syslog.h>
@@ -39 +98 @@
     char *bus_info;
     char *driver;
+    int32_t phy_address;
 #endif
 } ethtable_t;
@@ -60 +120 @@
     uint32_t regdump_len;  /* Size of data from ETHTOOL_GREGS (bytes) */
 };
+
+struct ethtool_cmd {
+    uint32_t   cmd;
+    uint32_t   supported;      /* Features this interface supports */
+    uint32_t   advertising;    /* Features this interface advertises */
+    uint16_t   speed;          /* The forced speed, 10Mb, 100Mb, gigabit */
+    uint8_t    duplex;         /* Duplex, half or full */
+    uint8_t    port;           /* Which connector port */
+    uint8_t    phy_address;
+    uint8_t    transceiver;    /* Which transceiver to use */
+    uint8_t    autoneg;        /* Enable or disable autonegotiation */
+    uint32_t   maxtxpkt;       /* Tx pkts before generating tx int */
+    uint32_t   maxrxpkt;       /* Rx pkts before generating rx int */
+    uint16_t   speed_hi;
+    uint16_t   reserved2;
+    uint32_t   reserved[3];
+};
+
+#define ETHTOOL_GSET      0x00000001 /* Get settings. */
 #define ETHTOOL_GDRVINFO  0x00000003 /* Get driver info. */
 #endif
@@ -75 +154 @@
         selector = skip_whitespace(selector);
 #if ENABLE_FEATURE_NAMEIF_EXTENDED
+        ch->phy_address = -1;
         if (*selector == '\0')
             break;
@@ -88 +168 @@
             ch->driver = xstrdup(selector + 7);
             found_selector++;
+        } else if (strncmp(selector, "phyaddr=", 8) == 0) {
+            ch->phy_address = xatoi_positive(selector + 8);
+            found_selector++;
         } else {
 #endif
@@ -134 +217 @@
 
 int nameif_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int nameif_main(int argc, char **argv)
+int nameif_main(int argc UNUSED_PARAM, char **argv)
 {
     ethtable_t *clist = NULL;
@@ -149 +232 @@
         logmode |= LOGMODE_SYSLOG;
     }
-    argc -= optind;
     argv += optind;
 
-    if (argc & 1)
-        bb_show_usage();
-
-    if (argc) {
-        while (*argv) {
-            char *ifname = xstrdup(*argv++);
-            prepend_new_eth_table(&clist, ifname, *argv++);
-        }
+    if (argv[0]) {
+        do {
+            if (!argv[1])
+                bb_show_usage();
+            prepend_new_eth_table(&clist, argv[0], argv[1]);
+            argv += 2;
+        } while (*argv);
     } else {
         parser = config_open(fname);
@@ -174 +255 @@
 #if  ENABLE_FEATURE_NAMEIF_EXTENDED
         struct ethtool_drvinfo drvinfo;
-#endif
-        if (parser->lineno < 2)
+        struct ethtool_cmd eth_settings;
+#endif
+        if (parser->lineno <= 2)
             continue; /* Skip the first two lines */
 
@@ -183 +265 @@
 
 #if ENABLE_FEATURE_NAMEIF_EXTENDED
+        /* Check for phy address */
+        memset(&eth_settings, 0, sizeof(eth_settings));
+        eth_settings.cmd = ETHTOOL_GSET;
+        ifr.ifr_data = (caddr_t) &eth_settings;
+        ioctl(ctl_sk, SIOCETHTOOL, &ifr);
+
         /* Check for driver etc. */
-        memset(&drvinfo, 0, sizeof(struct ethtool_drvinfo));
+        memset(&drvinfo, 0, sizeof(drvinfo));
         drvinfo.cmd = ETHTOOL_GDRVINFO;
         ifr.ifr_data = (caddr_t) &drvinfo;
@@ -198 +286 @@
                 continue;
             if (ch->driver && strcmp(ch->driver, drvinfo.driver) != 0)
+                continue;
+            if (ch->phy_address != -1 && ch->phy_address != eth_settings.phy_address)
                 continue;
 #endif

branches/3.2/mindi-busybox/networking/nbd-client.c

@@ -8 +8 @@
 #include <linux/fs.h>
 
-//applet:IF_NBDCLIENT(APPLET_ODDNAME(nbd-client, nbdclient, _BB_DIR_USR_SBIN, _BB_SUID_DROP, nbdclient))
+//applet:IF_NBDCLIENT(APPLET_ODDNAME(nbd-client, nbdclient, BB_DIR_USR_SBIN, BB_SUID_DROP, nbdclient))
 
 //kbuild:lib-$(CONFIG_NBDCLIENT) += nbd-client.o

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

@@ -50 +50 @@
 //usage:
 //usage:#if ENABLE_NC_SERVER || ENABLE_NC_EXTRA
-//usage:#define NC_OPTIONS_STR "\n\nOptions:"
+//usage:#define NC_OPTIONS_STR "\n"
 //usage:#else
 //usage:#define NC_OPTIONS_STR
@@ -121 +121 @@
         ** it cannot handle "... -e PROG -prog-opt" */
         while ((opt = getopt(argc, argv,
-                "" IF_NC_SERVER("lp:") IF_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')

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

@@ -61 +61 @@
 //usage:    )
 //usage:#define nc_full_usage "\n\n"
-//usage:       "Options:"
-//usage:     "\n    -e PROG Run PROG after connect (must be last)"
+//usage:       "    -e PROG Run PROG after connect (must be last)"
 //usage:    IF_NC_SERVER(
 //usage:     "\n    -l  Listen mode, for inbound connects"
@@ -117 +116 @@
     unsigned wrote_net;          /* total net bytes */
 #endif
+    char *proggie0saved;
     /* ouraddr is never NULL and goes through three states as we progress:
      1 - local address before bind (IP/port possibly zero)
@@ -129 +129 @@
     jmp_buf jbuf;                /* timer crud */
 
-    /* will malloc up the following globals: */
     fd_set ding1;                /* for select loop */
     fd_set ding2;
@@ -161 +160 @@
 /* Must match getopt32 call! */
 enum {
-    OPT_h = (1 << 0),
-    OPT_n = (1 << 1),
-    OPT_p = (1 << 2),
-    OPT_s = (1 << 3),
-    OPT_u = (1 << 4),
-    OPT_v = (1 << 5),
-    OPT_w = (1 << 6),
-    OPT_l = (1 << 7) * ENABLE_NC_SERVER,
-    OPT_i = (1 << (7+ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
-    OPT_o = (1 << (8+ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
-    OPT_z = (1 << (9+ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
+    OPT_n = (1 << 0),
+    OPT_p = (1 << 1),
+    OPT_s = (1 << 2),
+    OPT_u = (1 << 3),
+    OPT_v = (1 << 4),
+    OPT_w = (1 << 5),
+    OPT_l = (1 << 6) * ENABLE_NC_SERVER,
+    OPT_i = (1 << (6+ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
+    OPT_o = (1 << (7+ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
+    OPT_z = (1 << (8+ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
 };
 
@@ -265 +263 @@
 static int doexec(char **proggie)
 {
+    if (G.proggie0saved)
+        proggie[0] = G.proggie0saved;
     xmove_fd(netfd, 0);
     dup2(0, 1);
     /* dup2(0, 2); - do we *really* want this? NO!
      * exec'ed prog can do it yourself, if needed */
-    execvp(proggie[0], proggie);
-    bb_perror_msg_and_die("can't execute '%s'", proggie[0]);
+    BB_EXECVP_or_die(proggie);
 }
 
@@ -388 +387 @@
                     /* "nc -nl -p LPORT RHOST" (w/o RPORT!):
                      * we should accept any remote port */
-                    set_nport(&remend, 0); /* blot out remote port# */
+                    set_nport(&remend.u.sa, 0); /* blot out remote port# */
                 }
                 r = memcmp(&remend.u.sa, &themaddr->u.sa, remend.len);
-                set_nport(&remend, sv_port); /* restore */
+                set_nport(&remend.u.sa, sv_port); /* restore */
                 if (r != 0) {
                     /* nc 1.10 bails out instead, and its error message
@@ -431 +430 @@
         rr = getsockopt(netfd, IPPROTO_IP, IP_OPTIONS, optbuf, &x);
         if (rr >= 0 && x) {    /* we've got options, lessee em... */
-            bin2hex(bigbuf_net, optbuf, x);
-            bigbuf_net[2*x] = '\0';
+            *bin2hex(bigbuf_net, optbuf, x) = '\0';
             fprintf(stderr, "IP options: %s\n", bigbuf_net);
         }
@@ -488 +486 @@
         o_wait = 5;                     /* enough that we'll notice?? */
         rr = xsocket(ouraddr->u.sa.sa_family, SOCK_STREAM, 0);
-        set_nport(themaddr, htons(SLEAZE_PORT));
+        set_nport(&themaddr->u.sa, htons(SLEAZE_PORT));
         connect_w_timeout(rr);
         /* don't need to restore themaddr's port, it's not used anymore */
@@ -730 +728 @@
     char *str_p, *str_s;
     IF_NC_EXTRA(char *str_i, *str_o;)
-    char *themdotted = themdotted; /* gcc */
+    char *themdotted = themdotted; /* for compiler */
     char **proggie;
     int x;
@@ -758 +756 @@
             goto e_found;
         }
+        /* -<other_opts>e PROG [ARGS] ? */
+        /* (aboriginal linux uses this form) */
+        if (proggie[0][0] == '-') {
+            char *optpos = *proggie + 1;
+            /* Skip all valid opts w/o params */
+            optpos = optpos + strspn(optpos, "nuv"IF_NC_SERVER("l")IF_NC_EXTRA("z"));
+            if (*optpos == 'e' && !optpos[1]) {
+                *optpos = '\0';
+                proggie++;
+                G.proggie0saved = *proggie;
+                *proggie = NULL; /* terminate argv for getopt32 */
+                goto e_found;
+            }
+        }
     }
     proggie = NULL;
@@ -764 +776 @@
     // -g -G -t -r deleted, unimplemented -a deleted too
     opt_complementary = "?2:vv:w+"; /* max 2 params; -v is a counter; -w N */
-    getopt32(argv, "hnp:s:uvw:" IF_NC_SERVER("l")
+    getopt32(argv, "np:s:uvw:" IF_NC_SERVER("l")
             IF_NC_EXTRA("i:o:z"),
             &str_p, &str_s, &o_wait
@@ -815 +827 @@
                 x);
         if (o_lport)
-            set_nport(ouraddr, htons(o_lport));
+            set_nport(&ouraddr->u.sa, htons(o_lport));
     }
     xmove_fd(x, netfd);

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

@@ -22 +22 @@
 //usage:#define netstat_full_usage "\n\n"
 //usage:       "Display networking information\n"
-//usage:     "\nOptions:"
 //usage:    IF_ROUTE(
 //usage:     "\n    -r  Routing table"
@@ -189 +188 @@
         if (pn->inode == inode) {
             /* Some warning should be appropriate here
-               as we got multiple processes for one i-node */
+             * as we got multiple processes for one i-node */
             return;
         }

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

@@ -11 +11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+
+//usage:#define nslookup_trivial_usage
+//usage:       "[HOST] [SERVER]"
+//usage:#define nslookup_full_usage "\n\n"
+//usage:       "Query the nameserver for the IP address of the given HOST\n"
+//usage:       "optionally using a specified DNS server"
+//usage:
+//usage:#define nslookup_example_usage
+//usage:       "$ nslookup localhost\n"
+//usage:       "Server:     default\n"
+//usage:       "Address:    default\n"
+//usage:       "\n"
+//usage:       "Name:       debian\n"
+//usage:       "Address:    127.0.0.1\n"
 
 #include <resolv.h>
@@ -67 +81 @@
     rc = getaddrinfo(hostname, NULL /*service*/, &hint, &result);
 
-    if (!rc) {
+    if (rc == 0) {
         struct addrinfo *cur = result;
         unsigned cnt = 0;
@@ -95 +109 @@
 #endif
     }
-    if (ENABLE_FEATURE_CLEAN_UP)
+    if (ENABLE_FEATURE_CLEAN_UP && result)
         freeaddrinfo(result);
     return (rc != 0);

branches/3.2/mindi-busybox/networking/ntpd.c

@@ -28 +28 @@
  ***********************************************************************
  */
+
+//usage:#define ntpd_trivial_usage
+//usage:    "[-dnqNw"IF_FEATURE_NTPD_SERVER("l")"] [-S PROG] [-p PEER]..."
+//usage:#define ntpd_full_usage "\n\n"
+//usage:       "NTP client/server\n"
+//usage:     "\n    -d  Verbose"
+//usage:     "\n    -n  Do not daemonize"
+//usage:     "\n    -q  Quit after clock is set"
+//usage:     "\n    -N  Run at high priority"
+//usage:     "\n    -w  Do not set time (only query peers), implies -n"
+//usage:    IF_FEATURE_NTPD_SERVER(
+//usage:     "\n    -l  Run as server on port 123"
+//usage:    )
+//usage:     "\n    -S PROG Run PROG after stepping time, stratum change, and every 11 mins"
+//usage:     "\n    -p PEER Obtain time from PEER (may be repeated)"
+
 #include "libbb.h"
 #include <math.h>
 #include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
+#include <sys/resource.h> /* setpriority */
 #include <sys/timex.h>
 #ifndef IPTOS_LOWDELAY
@@ -92 +109 @@
 #define BURSTPOLL       0       /* initial poll */
 #define MINPOLL         5       /* minimum poll interval. std ntpd uses 6 (6: 64 sec) */
-#define BIGPOLL         10      /* drop to lower poll at any trouble (10: 17 min) */
+/* If offset > discipline_jitter * POLLADJ_GATE, and poll interval is >= 2^BIGPOLL,
+ * then it is decreased _at once_. (If < 2^BIGPOLL, it will be decreased _eventually_).
+ */
+#define BIGPOLL         10      /* 2^10 sec ~= 17 min */
 #define MAXPOLL         12      /* maximum poll interval (12: 1.1h, 17: 36.4h). std ntpd uses 17 */
 /* Actively lower poll when we see such big offsets.
  * With STEP_THRESHOLD = 0.125, it means we try to sync more aggressively
- * if offset increases over 0.03 sec */
-#define POLLDOWN_OFFSET (STEP_THRESHOLD / 4)
+ * if offset increases over ~0.04 sec */
+#define POLLDOWN_OFFSET (STEP_THRESHOLD / 3)
 #define MINDISP         0.01    /* minimum dispersion (sec) */
 #define MAXDISP         16      /* maximum dispersion (sec) */
@@ -109 +129 @@
 /* Poll-adjust threshold.
  * When we see that offset is small enough compared to discipline jitter,
- * we grow a counter: += MINPOLL. When it goes over POLLADJ_LIMIT,
+ * we grow a counter: += MINPOLL. When counter goes over POLLADJ_LIMIT,
  * we poll_exp++. If offset isn't small, counter -= poll_exp*2,
- * and when it goes below -POLLADJ_LIMIT, we poll_exp--
- * (bumped from 30 to 36 since otherwise I often see poll_exp going *2* steps down)
+ * and when it goes below -POLLADJ_LIMIT, we poll_exp--.
+ * (Bumped from 30 to 40 since otherwise I often see poll_exp going *2* steps down)
  */
-#define POLLADJ_LIMIT   36
-/* If offset < POLLADJ_GATE * discipline_jitter, then we can increase
+#define POLLADJ_LIMIT   40
+/* If offset < discipline_jitter * POLLADJ_GATE, then we decide to increase
  * poll interval (we think we can't improve timekeeping
  * by staying at smaller poll).
  */
 #define POLLADJ_GATE    4
+#define TIMECONST_HACK_GATE 2
 /* Compromise Allan intercept (sec). doc uses 1500, std ntpd uses 512 */
 #define ALLAN           512
@@ -193 +214 @@
 
 typedef struct {
+    double d_offset;
     double d_recv_time;
-    double d_offset;
     double d_dispersion;
 } datapoint_t;
@@ -201 +222 @@
     len_and_sockaddr *p_lsa;
     char             *p_dotted;
-    /* when to send new query (if p_fd == -1)
-     * or when receive times out (if p_fd >= 0): */
     int              p_fd;
     int              datapoint_idx;
@@ -209 +228 @@
     uint8_t          lastpkt_stratum;
     uint8_t          reachable_bits;
+        /* when to send new query (if p_fd == -1)
+         * or when receive times out (if p_fd >= 0): */
     double           next_action_time;
     double           p_xmttime;
@@ -239 +260 @@
     OPT_S = (1 << 6),
     OPT_l = (1 << 7) * ENABLE_FEATURE_NTPD_SERVER,
+    /* We hijack some bits for other purposes */
+    OPT_qq = (1 << 31),
 };
 
@@ -255 +278 @@
 #if ENABLE_FEATURE_NTPD_SERVER
     int      listen_fd;
+# define G_listen_fd (G.listen_fd)
+#else
+# define G_listen_fd (-1)
 #endif
     unsigned verbose;
     unsigned peer_cnt;
     /* refid: 32-bit code identifying the particular server or reference clock
-     *  in stratum 0 packets this is a four-character ASCII string,
-     *  called the kiss code, used for debugging and monitoring
-     *  in stratum 1 packets this is a four-character ASCII string
-     *  assigned to the reference clock by IANA. Example: "GPS "
-     *  in stratum 2+ packets, it's IPv4 address or 4 first bytes of MD5 hash of IPv6
+     * in stratum 0 packets this is a four-character ASCII string,
+     * called the kiss code, used for debugging and monitoring
+     * in stratum 1 packets this is a four-character ASCII string
+     * assigned to the reference clock by IANA. Example: "GPS "
+     * in stratum 2+ packets, it's IPv4 address or 4 first bytes
+     * of MD5 hash of IPv6
      */
     uint32_t refid;
@@ -272 +299 @@
      * system clock hardware representation is to the nanosecond.
      *
-     * Delays, jitters of various kinds are clamper down to precision.
+     * Delays, jitters of various kinds are clamped down to precision.
      *
      * If precision_sec is too large, discipline_jitter gets clamped to it
-     * and if offset is much smaller than discipline_jitter, poll interval
-     * grows even though we really can benefit from staying at smaller one,
-     * collecting non-lagged datapoits and correcting the offset.
+     * and if offset is smaller than discipline_jitter * POLLADJ_GATE, poll
+     * interval grows even though we really can benefit from staying at
+     * smaller one, collecting non-lagged datapoits and correcting offset.
      * (Lagged datapoits exist when poll_exp is large but we still have
      * systematic offset error - the time distance between datapoints
-     * is significat and older datapoints have smaller offsets.
+     * is significant and older datapoints have smaller offsets.
      * This makes our offset estimation a bit smaller than reality)
      * Due to this effect, setting G_precision_sec close to
@@ -286 +313 @@
      * too big and we will step. I observed it with -6.
      *
-     * OTOH, setting precision too small would result in futile attempts
-     * to syncronize to the unachievable precision.
+     * OTOH, setting precision_sec far too small would result in futile
+     * attempts to syncronize to an unachievable precision.
      *
      * -6 is 1/64 sec, -7 is 1/128 sec and so on.
-     */
-#define G_precision_exp  -8
-#define G_precision_sec  (1.0 / (1 << (- G_precision_exp)))
+     * -8 is 1/256 ~= 0.003906 (worked well for me --vda)
+     * -9 is 1/512 ~= 0.001953 (let's try this for some time)
+     */
+#define G_precision_exp  -9
+    /*
+     * G_precision_exp is used only for construction outgoing packets.
+     * It's ok to set G_precision_sec to a slightly different value
+     * (One which is "nicer looking" in logs).
+     * Exact value would be (1.0 / (1 << (- G_precision_exp))):
+     */
+#define G_precision_sec  0.002
     uint8_t  stratum;
     /* Bool. After set to 1, never goes back to 0: */
@@ -310 +345 @@
     double   last_update_recv_time; // s.t
     double   discipline_jitter;     // c.jitter
+    /* Since we only compare it with ints, can simplify code
+     * by not making this variable floating point:
+     */
+    unsigned offset_to_jitter_ratio;
     //double   cluster_offset;        // s.offset
     //double   cluster_jitter;        // s.jitter
@@ -483 +522 @@
 {
     int i, idx;
+    double sum, wavg;
+    datapoint_t *fdp;
+
+#if 0
+/* Simulations have shown that use of *averaged* offset for p->filter_offset
+ * is in fact worse than simply using last received one: with large poll intervals
+ * (>= 2048) averaging code uses offset values which are outdated by hours,
+ * and time/frequency correction goes totally wrong when fed essentially bogus offsets.
+ */
     int got_newest;
-    double minoff, maxoff, wavg, sum, w;
+    double minoff, maxoff, w;
     double x = x; /* for compiler */
     double oldest_off = oldest_off;
@@ -491 +539 @@
     double newest_age = newest_age;
 
-    minoff = maxoff = p->filter_datapoint[0].d_offset;
+    fdp = p->filter_datapoint;
+
+    minoff = maxoff = fdp[0].d_offset;
     for (i = 1; i < NUM_DATAPOINTS; i++) {
-        if (minoff > p->filter_datapoint[i].d_offset)
-            minoff = p->filter_datapoint[i].d_offset;
-        if (maxoff < p->filter_datapoint[i].d_offset)
-            maxoff = p->filter_datapoint[i].d_offset;
-    }
-
-    idx = p->datapoint_idx; /* most recent datapoint */
+        if (minoff > fdp[i].d_offset)
+            minoff = fdp[i].d_offset;
+        if (maxoff < fdp[i].d_offset)
+            maxoff = fdp[i].d_offset;
+    }
+
+    idx = p->datapoint_idx; /* most recent datapoint's index */
     /* Average offset:
      * Drop two outliers and take weighted average of the rest:
@@ -521 +571 @@
             bb_error_msg("datapoint[%d]: off:%f disp:%f(%f) age:%f%s",
                 i,
-                p->filter_datapoint[idx].d_offset,
-                p->filter_datapoint[idx].d_dispersion, dispersion(&p->filter_datapoint[idx]),
-                G.cur_time - p->filter_datapoint[idx].d_recv_time,
-                (minoff == p->filter_datapoint[idx].d_offset || maxoff == p->filter_datapoint[idx].d_offset)
+                fdp[idx].d_offset,
+                fdp[idx].d_dispersion, dispersion(&fdp[idx]),
+                G.cur_time - fdp[idx].d_recv_time,
+                (minoff == fdp[idx].d_offset || maxoff == fdp[idx].d_offset)
                     ? " (outlier by offset)" : ""
             );
         }
 
-        sum += dispersion(&p->filter_datapoint[idx]) / (2 << i);
-
-        if (minoff == p->filter_datapoint[idx].d_offset) {
+        sum += dispersion(&fdp[idx]) / (2 << i);
+
+        if (minoff == fdp[idx].d_offset) {
             minoff -= 1; /* so that we don't match it ever again */
         } else
-        if (maxoff == p->filter_datapoint[idx].d_offset) {
+        if (maxoff == fdp[idx].d_offset) {
             maxoff += 1;
         } else {
-            oldest_off = p->filter_datapoint[idx].d_offset;
-            oldest_age = G.cur_time - p->filter_datapoint[idx].d_recv_time;
+            oldest_off = fdp[idx].d_offset;
+            oldest_age = G.cur_time - fdp[idx].d_recv_time;
             if (!got_newest) {
                 got_newest = 1;
@@ -570 +620 @@
     }
     p->filter_offset = wavg;
+
+#else
+
+    fdp = p->filter_datapoint;
+    idx = p->datapoint_idx; /* most recent datapoint's index */
+
+    /* filter_offset: simply use the most recent value */
+    p->filter_offset = fdp[idx].d_offset;
+
+    /*                     n-1
+     *                     ---    dispersion(i)
+     * filter_dispersion =  \     -------------
+     *                      /       (i+1)
+     *                     ---     2
+     *                     i=0
+     */
+    wavg = 0;
+    sum = 0;
+    for (i = 0; i < NUM_DATAPOINTS; i++) {
+        sum += dispersion(&fdp[idx]) / (2 << i);
+        wavg += fdp[idx].d_offset;
+        idx = (idx - 1) & (NUM_DATAPOINTS - 1);
+    }
+    wavg /= NUM_DATAPOINTS;
+    p->filter_dispersion = sum;
+#endif
 
     /*                  +-----                 -----+ ^ 1/2
@@ -584 +660 @@
     sum = 0;
     for (i = 0; i < NUM_DATAPOINTS; i++) {
-        sum += SQUARE(wavg - p->filter_datapoint[i].d_offset);
+        sum += SQUARE(wavg - fdp[i].d_offset);
     }
     sum = SQRT(sum / NUM_DATAPOINTS);
     p->filter_jitter = sum > G_precision_sec ? sum : G_precision_sec;
 
-    VERB3 bb_error_msg("filter offset:%f(corr:%e) disp:%f jitter:%f",
-            p->filter_offset, x,
+    VERB3 bb_error_msg("filter offset:%+f disp:%f jitter:%f",
+            p->filter_offset,
             p->filter_dispersion,
             p->filter_jitter);
@@ -605 +681 @@
             p->filter_datapoint[i].d_recv_time += offset;
             if (p->filter_datapoint[i].d_offset != 0) {
-                p->filter_datapoint[i].d_offset += offset;
+                p->filter_datapoint[i].d_offset -= offset;
+                //bb_error_msg("p->filter_datapoint[%d].d_offset %f -> %f",
+                //  i,
+                //  p->filter_datapoint[i].d_offset + offset,
+                //  p->filter_datapoint[i].d_offset);
             }
         } else {
@@ -702 +782 @@
     }
 
+    /* Emit message _before_ attempted send. Think of a very short
+     * roundtrip networks: we need to go back to recv loop ASAP,
+     * to reduce delay. Printing messages after send works against that.
+     */
+    VERB1 bb_error_msg("sending query to %s", p->p_dotted);
+
     /*
      * Send out a random 64-bit number as our transmit time.  The NTP
@@ -729 +815 @@
 
     p->reachable_bits <<= 1;
-    VERB1 bb_error_msg("sent query to %s", p->p_dotted);
     set_next(p, RESPONSE_INTERVAL);
 }
@@ -791 +876 @@
     llist_t *item;
     double dtime;
-    struct timeval tv;
-    char buf[80];
+    struct timeval tvc, tvn;
+    char buf[sizeof("yyyy-mm-dd hh:mm:ss") + /*paranoia:*/ 4];
     time_t tval;
 
-    gettimeofday(&tv, NULL); /* never fails */
-    dtime = offset + tv.tv_sec;
-    dtime += 1.0e-6 * tv.tv_usec;
-    d_to_tv(dtime, &tv);
-
-    if (settimeofday(&tv, NULL) == -1)
+    gettimeofday(&tvc, NULL); /* never fails */
+    dtime = tvc.tv_sec + (1.0e-6 * tvc.tv_usec) + offset;
+    d_to_tv(dtime, &tvn);
+    if (settimeofday(&tvn, NULL) == -1)
         bb_perror_msg_and_die("settimeofday");
 
-    tval = tv.tv_sec;
-    strftime(buf, sizeof(buf), "%a %b %e %H:%M:%S %Z %Y", localtime(&tval));
-
-    bb_error_msg("setting clock to %s (offset %fs)", buf, offset);
+    VERB2 {
+        tval = tvc.tv_sec;
+        strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", localtime(&tval));
+        bb_error_msg("current time is %s.%06u", buf, (unsigned)tvc.tv_usec);
+    }
+    tval = tvn.tv_sec;
+    strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", localtime(&tval));
+    bb_error_msg("setting time to %s.%06u (offset %+fs)", buf, (unsigned)tvn.tv_usec, offset);
 
     /* Correct various fields which contain time-relative values: */
+
+    /* Globals: */
+    G.cur_time += offset;
+    G.last_update_recv_time += offset;
+    G.last_script_run += offset;
 
     /* p->lastpkt_recv_time, p->next_action_time and such: */
@@ -814 +906 @@
         peer_t *pp = (peer_t *) item->data;
         reset_peer_stats(pp, offset);
-        //bb_error_msg("offset:%f pp->next_action_time:%f -> %f",
+        //bb_error_msg("offset:%+f pp->next_action_time:%f -> %f",
         //  offset, pp->next_action_time, pp->next_action_time + offset);
         pp->next_action_time += offset;
-    }
-    /* Globals: */
-    G.cur_time += offset;
-    G.last_update_recv_time += offset;
-    G.last_script_run += offset;
+        if (pp->p_fd >= 0) {
+            /* We wait for reply from this peer too.
+             * But due to step we are doing, reply's data is no longer
+             * useful (in fact, it'll be bogus). Stop waiting for it.
+             */
+            close(pp->p_fd);
+            pp->p_fd = -1;
+            set_next(pp, RETRY_INTERVAL);
+        }
+    }
 }
 
@@ -883 +980 @@
 //  if (p->refid == p->dstaddr || p->refid == s.refid)
 //      return 0;
-        return 1;
+    return 1;
 }
 static peer_t*
@@ -1150 +1247 @@
     G.last_update_peer = p;
  keep_old:
-    VERB3 bb_error_msg("selected peer %s filter_offset:%f age:%f",
+    VERB3 bb_error_msg("selected peer %s filter_offset:%+f age:%f",
             p->p_dotted,
             p->filter_offset,
@@ -1241 +1338 @@
         case STATE_SYNC:
             /* The first outlyer: ignore it, switch to SPIK state */
-            VERB3 bb_error_msg("offset:%f - spike detected", offset);
+            VERB3 bb_error_msg("offset:%+f - spike detected", offset);
             G.discipline_state = STATE_SPIK;
             return -1; /* "decrease poll interval" */
@@ -1278 +1375 @@
          * intervals.
          */
-        VERB3 bb_error_msg("stepping time by %f; poll_exp=MINPOLL", offset);
+        VERB3 bb_error_msg("stepping time by %+f; poll_exp=MINPOLL", offset);
         step_time(offset);
         if (option_mask32 & OPT_q) {
@@ -1297 +1394 @@
         }
 #endif
-        set_new_values(STATE_SYNC, /*offset:*/ 0, recv_time);
+        abs_offset = offset = 0;
+        set_new_values(STATE_SYNC, offset, recv_time);
 
     } else { /* abs_offset <= STEP_THRESHOLD */
 
         if (G.poll_exp < MINPOLL && G.initial_poll_complete) {
-            VERB3 bb_error_msg("small offset:%f, disabling burst mode", offset);
+            VERB3 bb_error_msg("small offset:%+f, disabling burst mode", offset);
             G.polladj_count = 0;
             G.poll_exp = MINPOLL;
@@ -1311 +1409 @@
          */
         etemp = SQUARE(G.discipline_jitter);
-        dtemp = SQUARE(MAXD(fabs(offset - G.last_update_offset), G_precision_sec));
+        dtemp = SQUARE(offset - G.last_update_offset);
         G.discipline_jitter = SQRT(etemp + (dtemp - etemp) / AVG);
-        VERB3 bb_error_msg("discipline jitter=%f", G.discipline_jitter);
 
         switch (G.discipline_state) {
@@ -1390 +1487 @@
     }
 
+    if (G.discipline_jitter < G_precision_sec)
+        G.discipline_jitter = G_precision_sec;
+    G.offset_to_jitter_ratio = abs_offset / G.discipline_jitter;
+
     G.reftime = G.cur_time;
     G.ntp_status = p->lastpkt_status;
@@ -1401 +1502 @@
     /* We are in STATE_SYNC now, but did not do adjtimex yet.
      * (Any other state does not reach this, they all return earlier)
-     * By this time, freq_drift and G.last_update_offset are set
+     * By this time, freq_drift and offset are set
      * to values suitable for adjtimex.
      */
@@ -1427 +1528 @@
         if (adjtimex(&tmx) < 0)
             bb_perror_msg_and_die("adjtimex");
-        VERB3 bb_error_msg("p adjtimex freq:%ld offset:%ld constant:%ld status:0x%x",
-                tmx.freq, tmx.offset, tmx.constant, tmx.status);
+        bb_error_msg("p adjtimex freq:%ld offset:%+ld status:0x%x tc:%ld",
+                tmx.freq, tmx.offset, tmx.status, tmx.constant);
     }
 
@@ -1440 +1541 @@
     /* 65536 is one ppm */
     tmx.freq = G.discipline_freq_drift * 65536e6;
-    tmx.offset = G.last_update_offset * 1000000; /* usec */
 #endif
     tmx.modes = ADJ_OFFSET | ADJ_STATUS | ADJ_TIMECONST;// | ADJ_MAXERROR | ADJ_ESTERROR;
-    tmx.offset = (G.last_update_offset * 1000000); /* usec */
-            /* + (G.last_update_offset < 0 ? -0.5 : 0.5) - too small to bother */
+    tmx.offset = (offset * 1000000); /* usec */
     tmx.status = STA_PLL;
     if (G.ntp_status & LI_PLUSSEC)
@@ -1450 +1549 @@
     if (G.ntp_status & LI_MINUSSEC)
         tmx.status |= STA_DEL;
+
     tmx.constant = G.poll_exp - 4;
-    //tmx.esterror = (u_int32)(clock_jitter * 1e6);
-    //tmx.maxerror = (u_int32)((sys_rootdelay / 2 + sys_rootdisp) * 1e6);
+    /* EXPERIMENTAL.
+     * The below if statement should be unnecessary, but...
+     * It looks like Linux kernel's PLL is far too gentle in changing
+     * tmx.freq in response to clock offset. Offset keeps growing
+     * and eventually we fall back to smaller poll intervals.
+     * We can make correction more agressive (about x2) by supplying
+     * PLL time constant which is one less than the real one.
+     * To be on a safe side, let's do it only if offset is significantly
+     * larger than jitter.
+     */
+    if (tmx.constant > 0 && G.offset_to_jitter_ratio >= TIMECONST_HACK_GATE)
+        tmx.constant--;
+
+    //tmx.esterror = (uint32_t)(clock_jitter * 1e6);
+    //tmx.maxerror = (uint32_t)((sys_rootdelay / 2 + sys_rootdisp) * 1e6);
     rc = adjtimex(&tmx);
     if (rc < 0)
@@ -1459 +1572 @@
      * Not sure why. Perhaps it is normal.
      */
-    VERB3 bb_error_msg("adjtimex:%d freq:%ld offset:%ld constant:%ld status:0x%x",
-                rc, tmx.freq, tmx.offset, tmx.constant, tmx.status);
-#if 0
-    VERB3 {
-        /* always gives the same output as above msg */
-        memset(&tmx, 0, sizeof(tmx));
-        if (adjtimex(&tmx) < 0)
-            bb_perror_msg_and_die("adjtimex");
-        VERB3 bb_error_msg("c adjtimex freq:%ld offset:%ld constant:%ld status:0x%x",
-                tmx.freq, tmx.offset, tmx.constant, tmx.status);
-    }
-#endif
+    VERB3 bb_error_msg("adjtimex:%d freq:%ld offset:%+ld status:0x%x",
+                rc, tmx.freq, tmx.offset, tmx.status);
     G.kernel_freq_drift = tmx.freq / 65536;
-    VERB2 bb_error_msg("update peer:%s, offset:%f, clock drift:%ld ppm",
-            p->p_dotted, G.last_update_offset, G.kernel_freq_drift);
+    VERB2 bb_error_msg("update from:%s offset:%+f jitter:%f clock drift:%+.3fppm tc:%d",
+            p->p_dotted, offset, G.discipline_jitter, (double)tmx.freq / 65536, (int)tmx.constant);
 
     return 1; /* "ok to increase poll interval" */
@@ -1532 +1635 @@
 //TODO: always do this?
             interval = retry_interval();
-            goto set_next_and_close_sock;
+            goto set_next_and_ret;
         }
         xfunc_die();
@@ -1539 +1642 @@
     if (size != NTP_MSGSIZE_NOAUTH && size != NTP_MSGSIZE) {
         bb_error_msg("malformed packet received from %s", p->p_dotted);
-        goto bail;
+        return;
     }
 
@@ -1545 +1648 @@
      || msg.m_orgtime.fractionl != p->p_xmt_msg.m_xmttime.fractionl
     ) {
-        goto bail;
-    }
+        /* Somebody else's packet */
+        return;
+    }
+
+    /* We do not expect any more packets from this peer for now.
+     * Closing the socket informs kernel about it.
+     * We open a new socket when we send a new query.
+     */
+    close(p->p_fd);
+    p->p_fd = -1;
 
     if ((msg.m_status & LI_ALARM) == LI_ALARM
@@ -1556 +1667 @@
 // "RATE" - peer is overloaded, reduce polling freq
         interval = poll_interval(0);
-        bb_error_msg("reply from %s: not synced, next query in %us", p->p_dotted, interval);
-        goto set_next_and_close_sock;
+        bb_error_msg("reply from %s: peer is unsynced, next query in %us", p->p_dotted, interval);
+        goto set_next_and_ret;
     }
 
@@ -1609 +1720 @@
         /* 1st datapoint ever - replicate offset in every element */
         int i;
-        for (i = 1; i < NUM_DATAPOINTS; i++) {
+        for (i = 0; i < NUM_DATAPOINTS; i++) {
             p->filter_datapoint[i].d_offset = datapoint->d_offset;
         }
@@ -1616 +1727 @@
     p->reachable_bits |= 1;
     if ((MAX_VERBOSE && G.verbose) || (option_mask32 & OPT_w)) {
-        bb_error_msg("reply from %s: reach 0x%02x offset %f delay %f status 0x%02x strat %d refid 0x%08x rootdelay %f",
+        bb_error_msg("reply from %s: offset:%+f delay:%f status:0x%02x strat:%d refid:0x%08x rootdelay:%f reach:0x%02x",
             p->p_dotted,
-            p->reachable_bits,
             datapoint->d_offset,
             p->lastpkt_delay,
@@ -1624 +1734 @@
             p->lastpkt_stratum,
             p->lastpkt_refid,
-            p->lastpkt_rootdelay
+            p->lastpkt_rootdelay,
+            p->reachable_bits
             /* not shown: m_ppoll, m_precision_exp, m_rootdisp,
              * m_reftime, m_orgtime, m_rectime, m_xmttime
@@ -1643 +1754 @@
              */
             if (fabs(q->filter_offset) >= POLLDOWN_OFFSET) {
-                VERB3 bb_error_msg("offset:%f > POLLDOWN_OFFSET", q->filter_offset);
+                VERB3 bb_error_msg("offset:%+f > POLLDOWN_OFFSET", q->filter_offset);
                 goto poll_down;
             }
@@ -1657 +1768 @@
          * helps calm the dance. Works best using burst mode.
          */
-        VERB4 if (rc > 0) {
-            bb_error_msg("offset:%f POLLADJ_GATE*discipline_jitter:%f poll:%s",
-                q->filter_offset, POLLADJ_GATE * G.discipline_jitter,
-                fabs(q->filter_offset) < POLLADJ_GATE * G.discipline_jitter
-                    ? "grows" : "falls"
-            );
-        }
-        if (rc > 0 && fabs(q->filter_offset) < POLLADJ_GATE * G.discipline_jitter) {
+        if (rc > 0 && G.offset_to_jitter_ratio <= POLLADJ_GATE) {
             /* was += G.poll_exp but it is a bit
              * too optimistic for my taste at high poll_exp's */
@@ -1710 +1814 @@
     interval = poll_interval(0);
 
- set_next_and_close_sock:
+ set_next_and_ret:
     set_next(p, interval);
-    /* We do not expect any more packets from this peer for now.
-     * Closing the socket informs kernel about it.
-     * We open a new socket when we send a new query.
-     */
-    close(p->p_fd);
-    p->p_fd = -1;
- bail:
-    return;
 }
 
@@ -1727 +1823 @@
 {
     ssize_t          size;
-    uint8_t          version;
+    //uint8_t          version;
     len_and_sockaddr *to;
     struct sockaddr  *from;
@@ -1734 +1830 @@
     l_fixedpt_t      query_xmttime;
 
-    to = get_sock_lsa(G.listen_fd);
+    to = get_sock_lsa(G_listen_fd);
     from = xzalloc(to->len);
 
-    size = recv_from_to(G.listen_fd, &msg, sizeof(msg), MSG_DONTWAIT, from, &to->u.sa, to->len);
+    size = recv_from_to(G_listen_fd, &msg, sizeof(msg), MSG_DONTWAIT, from, &to->u.sa, to->len);
     if (size != NTP_MSGSIZE_NOAUTH && size != NTP_MSGSIZE) {
         char *addr;
@@ -1756 +1852 @@
     /* Build a reply packet */
     memset(&msg, 0, sizeof(msg));
-    msg.m_status = G.stratum < MAXSTRAT ? G.ntp_status : LI_ALARM;
+    msg.m_status = G.stratum < MAXSTRAT ? (G.ntp_status & LI_MASK) : LI_ALARM;
     msg.m_status |= (query_status & VERSION_MASK);
     msg.m_status |= ((query_status & MODE_MASK) == MODE_CLIENT) ?
-             MODE_SERVER : MODE_SYM_PAS;
+            MODE_SERVER : MODE_SYM_PAS;
     msg.m_stratum = G.stratum;
     msg.m_ppoll = G.poll_exp;
@@ -1775 +1871 @@
 //simple code does not do this, fix simple code!
     msg.m_rootdisp = d_to_sfp(G.rootdisp);
-    version = (query_status & VERSION_MASK); /* ... >> VERSION_SHIFT - done below instead */
+    //version = (query_status & VERSION_MASK); /* ... >> VERSION_SHIFT - done below instead */
     msg.m_refid = G.refid; // (version > (3 << VERSION_SHIFT)) ? G.refid : G.refid3;
 
     /* We reply from the local address packet was sent to,
      * this makes to/from look swapped here: */
-    do_sendto(G.listen_fd,
+    do_sendto(G_listen_fd,
         /*from:*/ &to->u.sa, /*to:*/ from, /*addrlen:*/ to->len,
         &msg, size);
@@ -1919 +2015 @@
     }
 #if ENABLE_FEATURE_NTPD_SERVER
-    G.listen_fd = -1;
+    G_listen_fd = -1;
     if (opts & OPT_l) {
-        G.listen_fd = create_and_bind_dgram_or_die(NULL, 123);
-        socket_want_pktinfo(G.listen_fd);
-        setsockopt(G.listen_fd, IPPROTO_IP, IP_TOS, &const_IPTOS_LOWDELAY, sizeof(const_IPTOS_LOWDELAY));
+        G_listen_fd = create_and_bind_dgram_or_die(NULL, 123);
+        socket_want_pktinfo(G_listen_fd);
+        setsockopt(G_listen_fd, IPPROTO_IP, IP_TOS, &const_IPTOS_LOWDELAY, sizeof(const_IPTOS_LOWDELAY));
     }
 #endif
@@ -1931 +2027 @@
 
     /* If network is up, syncronization occurs in ~10 seconds.
-     * We give "ntpd -q" a full minute to finish, then we exit.
+     * We give "ntpd -q" 10 seconds to get first reply,
+     * then another 50 seconds to finish syncing.
      *
      * I tested ntpd 4.2.6p1 and apparently it never exits
@@ -1938 +2035 @@
      * after a reasonably small period of polling, or fail.
      */
-    if (opts & OPT_q)
-        alarm(60);
+    if (opts & OPT_q) {
+        option_mask32 |= OPT_qq;
+        alarm(10);
+    }
 
     bb_signals(0
@@ -1982 +2081 @@
     cnt = G.peer_cnt * (INITIAL_SAMPLES + 1);
 
+    write_pidfile(CONFIG_PID_FILE_PATH "/ntpd.pid");
+
     while (!bb_got_signal) {
         llist_t *item;
@@ -1994 +2095 @@
         i = 0;
 #if ENABLE_FEATURE_NTPD_SERVER
-        if (G.listen_fd != -1) {
-            pfd[0].fd = G.listen_fd;
+        if (G_listen_fd != -1) {
+            pfd[0].fd = G_listen_fd;
             pfd[0].events = POLLIN;
             i++;
@@ -2040 +2141 @@
 
         /* Here we may block */
-        VERB2 bb_error_msg("poll %us, sockets:%u, poll interval:%us", timeout, i, 1 << G.poll_exp);
+        VERB2 {
+            if (i > (ENABLE_FEATURE_NTPD_SERVER && G_listen_fd != -1)) {
+                /* We wait for at least one reply.
+                 * Poll for it, without wasting time for message.
+                 * Since replies often come under 1 second, this also
+                 * reduces clutter in logs.
+                 */
+                nfds = poll(pfd, i, 1000);
+                if (nfds != 0)
+                    goto did_poll;
+                if (--timeout <= 0)
+                    goto did_poll;
+            }
+            bb_error_msg("poll:%us sockets:%u interval:%us", timeout, i, 1 << G.poll_exp);
+        }
         nfds = poll(pfd, i, timeout * 1000);
+ did_poll:
         gettime1900d(); /* sets G.cur_time */
         if (nfds <= 0) {
@@ -2066 +2182 @@
         for (; nfds != 0 && j < i; j++) {
             if (pfd[j].revents /* & (POLLIN|POLLERR)*/) {
+                /*
+                 * At init, alarm was set to 10 sec.
+                 * Now we did get a reply.
+                 * Increase timeout to 50 seconds to finish syncing.
+                 */
+                if (option_mask32 & OPT_qq) {
+                    option_mask32 &= ~OPT_qq;
+                    alarm(50);
+                }
                 nfds--;
                 recv_and_process_peer_pkt(idx2peer[j]);
@@ -2073 +2198 @@
     } /* while (!bb_got_signal) */
 
+    remove_pidfile(CONFIG_PID_FILE_PATH "/ntpd.pid");
     kill_myself_with_sig(bb_got_signal);
 }
@@ -2203 +2329 @@
                 if (!(pll_status & STA_PPSTIME))
                     report_event(EVNT_KERN,
-                        NULL, "PPS enabled");
+                        NULL, "PPS enabled");
                 ntv.status |= STA_PPSTIME | STA_PPSFREQ;
             } else {
                 if (pll_status & STA_PPSTIME)
                     report_event(EVNT_KERN,
-                        NULL, "PPS disabled");
-                ntv.status &= ~(STA_PPSTIME |
-                    STA_PPSFREQ);
+                        NULL, "PPS disabled");
+                ntv.status &= ~(STA_PPSTIME | STA_PPSFREQ);
             }
             if (sys_leap == LEAP_ADDSECOND)
@@ -2226 +2351 @@
             if (!(ntv.status & STA_PPSSIGNAL))
                 report_event(EVNT_KERN, NULL,
-                    "PPS no signal");
+                        "PPS no signal");
         }
         pll_status = ntv.status;

branches/3.2/mindi-busybox/networking/ntpd_simple.c

@@ -8 +8 @@
 #include "libbb.h"
 #include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
+#include <sys/resource.h> /* setpriority */
 #ifndef IPTOS_LOWDELAY
 # define IPTOS_LOWDELAY 0x10
@@ -710 +711 @@
     msg.m_status |= (query_status & VERSION_MASK);
     msg.m_status |= ((query_status & MODE_MASK) == MODE_CLIENT) ?
-             MODE_SERVER : MODE_SYM_PAS;
+            MODE_SERVER : MODE_SYM_PAS;
     msg.m_stratum = G.stratum;
     msg.m_ppoll = query_ppoll;

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

@@ -29 +29 @@
 #include <netinet/ip_icmp.h>
 #include "libbb.h"
+
+#ifdef __BIONIC__
+/* should be in netinet/ip_icmp.h */
+# define ICMP_DEST_UNREACH    3  /* Destination Unreachable  */
+# define ICMP_SOURCE_QUENCH   4  /* Source Quench    */
+# define ICMP_REDIRECT        5  /* Redirect (change route)  */
+# define ICMP_ECHO            8  /* Echo Request      */
+# define ICMP_TIME_EXCEEDED  11  /* Time Exceeded    */
+# define ICMP_PARAMETERPROB  12  /* Parameter Problem    */
+# define ICMP_TIMESTAMP      13  /* Timestamp Request    */
+# define ICMP_TIMESTAMPREPLY 14  /* Timestamp Reply    */
+# define ICMP_INFO_REQUEST   15  /* Information Request    */
+# define ICMP_INFO_REPLY     16  /* Information Reply    */
+# define ICMP_ADDRESS        17  /* Address Mask Request    */
+# define ICMP_ADDRESSREPLY   18  /* Address Mask Reply    */
+#endif
+
+//config:config PING
+//config:   bool "ping"
+//config:   default y
+//config:   select PLATFORM_LINUX
+//config:   help
+//config:     ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to
+//config:     elicit an ICMP ECHO_RESPONSE from a host or gateway.
+//config:
+//config:config PING6
+//config:   bool "ping6"
+//config:   default y
+//config:   depends on FEATURE_IPV6 && PING
+//config:   help
+//config:     This will give you a ping that can talk IPv6.
+//config:
+//config:config FEATURE_FANCY_PING
+//config:   bool "Enable fancy ping output"
+//config:   default y
+//config:   depends on PING
+//config:   help
+//config:     Make the output from the ping applet include statistics, and at the
+//config:     same time provide full support for ICMP packets.
+
+/* Needs socket(AF_INET, SOCK_RAW, IPPROTO_ICMP), therefore BB_SUID_MAYBE: */
+//applet:IF_PING(APPLET(ping, BB_DIR_BIN, BB_SUID_MAYBE))
+//applet:IF_PING6(APPLET(ping6, BB_DIR_BIN, BB_SUID_MAYBE))
+
+//kbuild:lib-$(CONFIG_PING)  += ping.o
+//kbuild:lib-$(CONFIG_PING6) += ping.o
+
+//usage:#if !ENABLE_FEATURE_FANCY_PING
+//usage:# define ping_trivial_usage
+//usage:       "HOST"
+//usage:# define ping_full_usage "\n\n"
+//usage:       "Send ICMP ECHO_REQUEST packets to network hosts"
+//usage:# define ping6_trivial_usage
+//usage:       "HOST"
+//usage:# define ping6_full_usage "\n\n"
+//usage:       "Send ICMP ECHO_REQUEST packets to network hosts"
+//usage:#else
+//usage:# define ping_trivial_usage
+//usage:       "[OPTIONS] HOST"
+//usage:# define ping_full_usage "\n\n"
+//usage:       "Send ICMP ECHO_REQUEST packets to network hosts\n"
+//usage:     "\n    -4,-6       Force IP or IPv6 name resolution"
+//usage:     "\n    -c CNT      Send only CNT pings"
+//usage:     "\n    -s SIZE     Send SIZE data bytes in packets (default:56)"
+//usage:     "\n    -t TTL      Set TTL"
+//usage:     "\n    -I IFACE/IP Use interface or IP address as source"
+//usage:     "\n    -W SEC      Seconds to wait for the first response (default:10)"
+//usage:     "\n            (after all -c CNT packets are sent)"
+//usage:     "\n    -w SEC      Seconds until ping exits (default:infinite)"
+//usage:     "\n            (can exit earlier with -c CNT)"
+//usage:     "\n    -q      Quiet, only displays output at start"
+//usage:     "\n            and when finished"
+//usage:
+//usage:# define ping6_trivial_usage
+//usage:       "[OPTIONS] HOST"
+//usage:# define ping6_full_usage "\n\n"
+//usage:       "Send ICMP ECHO_REQUEST packets to network hosts\n"
+//usage:     "\n    -c CNT      Send only CNT pings"
+//usage:     "\n    -s SIZE     Send SIZE data bytes in packets (default:56)"
+//usage:     "\n    -I IFACE/IP Use interface or IP address as source"
+//usage:     "\n    -q      Quiet, only displays output at start"
+//usage:     "\n            and when finished"
+//usage:
+//usage:#endif
+//usage:
+//usage:#define ping_example_usage
+//usage:       "$ ping localhost\n"
+//usage:       "PING slag (127.0.0.1): 56 data bytes\n"
+//usage:       "64 bytes from 127.0.0.1: icmp_seq=0 ttl=255 time=20.1 ms\n"
+//usage:       "\n"
+//usage:       "--- debian ping statistics ---\n"
+//usage:       "1 packets transmitted, 1 packets received, 0% packet loss\n"
+//usage:       "round-trip min/avg/max = 20.1/20.1/20.1 ms\n"
+//usage:#define ping6_example_usage
+//usage:       "$ ping6 ip6-localhost\n"
+//usage:       "PING ip6-localhost (::1): 56 data bytes\n"
+//usage:       "64 bytes from ::1: icmp6_seq=0 ttl=64 time=20.1 ms\n"
+//usage:       "\n"
+//usage:       "--- ip6-localhost ping statistics ---\n"
+//usage:       "1 packets transmitted, 1 packets received, 0% packet loss\n"
+//usage:       "round-trip min/avg/max = 20.1/20.1/20.1 ms\n"
 
 #if ENABLE_PING6
@@ -49 +150 @@
 };
 
-/* Common routines */
-
-static int in_cksum(unsigned short *buf, int sz)
-{
-    int nleft = sz;
-    int sum = 0;
-    unsigned short *w = buf;
-    unsigned short ans = 0;
-
-    while (nleft > 1) {
-        sum += *w++;
-        nleft -= 2;
-    }
-
-    if (nleft == 1) {
-        *(unsigned char *) (&ans) = *(unsigned char *) w;
-        sum += ans;
-    }
-
-    sum = (sum >> 16) + (sum & 0xFFFF);
-    sum += (sum >> 16);
-    ans = ~sum;
-    return ans;
-}
-
 #if !ENABLE_FEATURE_FANCY_PING
 
@@ -101 +177 @@
     memset(pkt, 0, sizeof(G.packet));
     pkt->icmp_type = ICMP_ECHO;
-    pkt->icmp_cksum = in_cksum((unsigned short *) pkt, sizeof(G.packet));
+    pkt->icmp_cksum = inet_cksum((uint16_t *) pkt, sizeof(G.packet));
 
     xsendto(pingsock, G.packet, DEFDATALEN + ICMP_MINLEN, &lsa->u.sa, lsa->len);
@@ -224 +300 @@
 /* Full(er) version */
 
-#define OPT_STRING ("qvc:s:w:W:I:4" IF_PING6("6"))
+#define OPT_STRING ("qvc:s:t:w:W:I:4" IF_PING6("6"))
 enum {
     OPT_QUIET = 1 << 0,
@@ -230 +306 @@
     OPT_c = 1 << 2,
     OPT_s = 1 << 3,
-    OPT_w = 1 << 4,
-    OPT_W = 1 << 5,
-    OPT_I = 1 << 6,
-    OPT_IPV4 = 1 << 7,
-    OPT_IPV6 = (1 << 8) * ENABLE_PING6,
+    OPT_t = 1 << 4,
+    OPT_w = 1 << 5,
+    OPT_W = 1 << 6,
+    OPT_I = 1 << 7,
+    OPT_IPV4 = 1 << 8,
+    OPT_IPV6 = (1 << 9) * ENABLE_PING6,
 };
 
@@ -245 +322 @@
     unsigned datalen;
     unsigned pingcount; /* must be int-sized */
+    unsigned opt_ttl;
     unsigned long ntransmitted, nreceived, nrepeats;
     uint16_t myid;
@@ -276 +354 @@
 #define nrepeats     (G.nrepeats    )
 #define pingcount    (G.pingcount   )
+#define opt_ttl      (G.opt_ttl     )
 #define myid         (G.myid        )
 #define tmin         (G.tmin        )
@@ -330 +409 @@
 }
 
-static void sendping_tail(void (*sp)(int), const void *pkt, int size_pkt)
+static void sendping_tail(void (*sp)(int), int size_pkt)
 {
     int sz;
@@ -337 +416 @@
     ntransmitted++;
 
+    size_pkt += datalen;
+
     /* sizeof(pingaddr) can be larger than real sa size, but I think
      * it doesn't matter */
-    sz = xsendto(pingsock, pkt, size_pkt, &pingaddr.sa, sizeof(pingaddr));
+    sz = xsendto(pingsock, G.snd_packet, size_pkt, &pingaddr.sa, sizeof(pingaddr));
     if (sz != size_pkt)
         bb_error_msg_and_die(bb_msg_write_error);
@@ -388 +469 @@
         *(uint32_t*)&pkt->icmp_dun = monotonic_us();
 
-    pkt->icmp_cksum = in_cksum((unsigned short *) pkt, datalen + ICMP_MINLEN);
-
-    sendping_tail(sendping4, pkt, datalen + ICMP_MINLEN);
+    pkt->icmp_cksum = inet_cksum((uint16_t *) pkt, datalen + ICMP_MINLEN);
+
+    sendping_tail(sendping4, ICMP_MINLEN);
 }
 #if ENABLE_PING6
@@ -407 +488 @@
         *(uint32_t*)(&pkt->icmp6_data8[4]) = monotonic_us();
 
-    //TODO? pkt->icmp_cksum = in_cksum(...);
-
-    sendping_tail(sendping6, pkt, datalen + sizeof(struct icmp6_hdr));
+    //TODO? pkt->icmp_cksum = inet_cksum(...);
+
+    sendping_tail(sendping6, sizeof(struct icmp6_hdr));
 }
 #endif
@@ -533 +614 @@
 }
 #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;
@@ -553 +634 @@
             tp = (uint32_t *) &icmppkt->icmp6_data8[4];
         unpack_tail(sz, tp,
-            inet_ntop(AF_INET6, &pingaddr.sin6.sin6_addr,
+            inet_ntop(AF_INET6, &from->sin6_addr,
                     buf, sizeof(buf)),
             recv_seq, hoplimit);
@@ -586 +667 @@
     sockopt = (datalen * 2) + 7 * 1024; /* giving it a bit of extra room */
     setsockopt(pingsock, SOL_SOCKET, SO_RCVBUF, &sockopt, sizeof(sockopt));
+
+    if (opt_ttl != 0) {
+        setsockopt(pingsock, IPPROTO_IP, IP_TTL, &opt_ttl, sizeof(opt_ttl));
+        /* above doesnt affect packets sent to bcast IP, so... */
+        setsockopt(pingsock, IPPROTO_IP, IP_MULTICAST_TTL, &opt_ttl, sizeof(opt_ttl));
+    }
 
     signal(SIGINT, print_stats_and_exit);
@@ -638 +725 @@
         }
         if (setsockopt(pingsock, IPPROTO_ICMPV6, ICMP6_FILTER, &filt,
-                       sizeof(filt)) < 0)
+                    sizeof(filt)) < 0)
             bb_error_msg_and_die("setsockopt(ICMP6_FILTER)");
     }
@@ -697 +784 @@
             }
         }
-        unpack6(G.rcv_packet, c, /*&from,*/ hoplimit);
+        unpack6(G.rcv_packet, c, &from, hoplimit);
         if (pingcount && nreceived >= pingcount)
             break;
@@ -736 +823 @@
     INIT_G();
 
-    /* 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);
+    /* exactly one argument needed; -v and -q don't mix; -c NUM, -t NUM, -w NUM, -W NUM */
+    opt_complementary = "=1:q--v:v--q:c+:t+:w+:W+";
+    opt |= getopt32(argv, OPT_STRING, &pingcount, &str_s, &opt_ttl, &deadline, &timeout, &str_I);
     if (opt & OPT_s)
         datalen = xatou16(str_s); // -s

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

@@ -6 +6 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+
+//usage:#define pscan_trivial_usage
+//usage:       "[-cb] [-p MIN_PORT] [-P MAX_PORT] [-t TIMEOUT] [-T MIN_RTT] HOST"
+//usage:#define pscan_full_usage "\n\n"
+//usage:       "Scan a host, print all open ports\n"
+//usage:     "\n    -c  Show closed ports too"
+//usage:     "\n    -b  Show blocked ports too"
+//usage:     "\n    -p  Scan from this port (default 1)"
+//usage:     "\n    -P  Scan up to this port (default 1024)"
+//usage:     "\n    -t  Timeout (default 5000 ms)"
+//usage:     "\n    -T  Minimum rtt (default 5 ms, increase for congested hosts)"
 
 #include "libbb.h"
@@ -77 +88 @@
 
         /* The SOCK_STREAM socket type is implemented on the TCP/IP protocol. */
-        set_nport(lsap, htons(port));
+        set_nport(&lsap->u.sa, htons(port));
         s = xsocket(lsap->u.sa.sa_family, SOCK_STREAM, 0);
         /* We need unblocking socket so we don't need to wait for ETIMEOUT. */

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

@@ -26 +26 @@
  */
 
+//usage:#define route_trivial_usage
+//usage:       "[{add|del|delete}]"
+//usage:#define route_full_usage "\n\n"
+//usage:       "Edit kernel routing tables\n"
+//usage:     "\n    -n  Don't resolve names"
+//usage:     "\n    -e  Display other/more information"
+//usage:     "\n    -A inet" IF_FEATURE_IPV6("{6}") "   Select address family"
+
 #include <net/route.h>
 #include <net/if.h>
@@ -154 +162 @@
 static NOINLINE void INET_setroute(int action, char **args)
 {
-    struct rtentry rt;
+    /* char buffer instead of bona-fide struct avoids aliasing warning */
+    char rt_buf[sizeof(struct rtentry)];
+    struct rtentry *const rt = (void *)rt_buf;
+
     const char *netmask = NULL;
     int skfd, isnet, xflag;
@@ -167 +178 @@
 
     /* Clean out the RTREQ structure. */
-    memset(&rt, 0, sizeof(rt));
+    memset(rt, 0, sizeof(*rt));
 
     {
@@ -179 +190 @@
 
             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
-            rt.rt_genmask.sa_family = AF_INET;
+            rt->rt_genmask.sa_family = AF_INET;
 #endif
         } else {
@@ -189 +200 @@
         }
         /* Prefer hostname lookup is -host flag (xflag==1) was given. */
-        isnet = INET_resolve(target, (struct sockaddr_in *) &rt.rt_dst,
+        isnet = INET_resolve(target, (struct sockaddr_in *) &rt->rt_dst,
                              (xflag & HOST_FLAG));
         if (isnet < 0) {
@@ -205 +216 @@
 
     /* Fill in the other fields. */
-    rt.rt_flags = ((isnet) ? RTF_UP : (RTF_UP | RTF_HOST));
+    rt->rt_flags = ((isnet) ? RTF_UP : (RTF_UP | RTF_HOST));
 
     while (*args) {
@@ -212 +223 @@
 
         if (k & KW_IPVx_FLAG_ONLY) {
-            rt.rt_flags |= flags_ipvx[k & 3];
+            rt->rt_flags |= flags_ipvx[k & 3];
             continue;
         }
@@ -218 +229 @@
 #if HAVE_NEW_ADDRT
         if (k == KW_IPVx_METRIC) {
-            rt.rt_metric = xatoul(args_m1) + 1;
+            rt->rt_metric = xatoul(args_m1) + 1;
             continue;
         }
@@ -226 +237 @@
             struct sockaddr mask;
 
-            if (mask_in_addr(rt)) {
+            if (mask_in_addr(*rt)) {
                 bb_show_usage();
             }
@@ -235 +246 @@
                 bb_error_msg_and_die("resolving %s", netmask);
             }
-            rt.rt_genmask = full_mask(mask);
+            rt->rt_genmask = full_mask(mask);
             continue;
         }
 
         if (k == KW_IPVx_GATEWAY) {
-            if (rt.rt_flags & RTF_GATEWAY) {
+            if (rt->rt_flags & RTF_GATEWAY) {
                 bb_show_usage();
             }
 
             isnet = INET_resolve(args_m1,
-                                 (struct sockaddr_in *) &rt.rt_gateway, 1);
-            rt.rt_flags |= RTF_GATEWAY;
+                        (struct sockaddr_in *) &rt->rt_gateway, 1);
+            rt->rt_flags |= RTF_GATEWAY;
 
             if (isnet) {
@@ -258 +269 @@
 
         if (k == KW_IPVx_MSS) { /* Check valid MSS bounds. */
-            rt.rt_flags |= RTF_MSS;
-            rt.rt_mss = xatoul_range(args_m1, 64, 32768);
+            rt->rt_flags |= RTF_MSS;
+            rt->rt_mss = xatoul_range(args_m1, 64, 32768);
             continue;
         }
 
         if (k == KW_IPVx_WINDOW) {  /* Check valid window bounds. */
-            rt.rt_flags |= RTF_WINDOW;
-            rt.rt_window = xatoul_range(args_m1, 128, INT_MAX);
+            rt->rt_flags |= RTF_WINDOW;
+            rt->rt_window = xatoul_range(args_m1, 128, INT_MAX);
             continue;
         }
@@ -271 +282 @@
 #ifdef RTF_IRTT
         if (k == KW_IPVx_IRTT) {
-            rt.rt_flags |= RTF_IRTT;
-            rt.rt_irtt = xatoul(args_m1);
-            rt.rt_irtt *= (sysconf(_SC_CLK_TCK) / 100); /* FIXME */
+            rt->rt_flags |= RTF_IRTT;
+            rt->rt_irtt = xatoul(args_m1);
+            rt->rt_irtt *= (sysconf(_SC_CLK_TCK) / 100);    /* FIXME */
 #if 0                   /* FIXME: do we need to check anything of this? */
-            if (rt.rt_irtt < 1 || rt.rt_irtt > (120 * HZ)) {
+            if (rt->rt_irtt < 1 || rt->rt_irtt > (120 * HZ)) {
                 bb_error_msg_and_die("bad irtt");
             }
@@ -285 +296 @@
         /* Device is special in that it can be the last arg specified
          * and doesn't requre the dev/device keyword in that case. */
-        if (!rt.rt_dev && ((k == KW_IPVx_DEVICE) || (!k && !*++args))) {
+        if (!rt->rt_dev && ((k == KW_IPVx_DEVICE) || (!k && !*++args))) {
             /* Don't use args_m1 here since args may have changed! */
-            rt.rt_dev = args[-1];
+            rt->rt_dev = args[-1];
             continue;
         }
@@ -296 +307 @@
 
 #ifdef RTF_REJECT
-    if ((rt.rt_flags & RTF_REJECT) && !rt.rt_dev) {
-        rt.rt_dev = (char*)"lo";
+    if ((rt->rt_flags & RTF_REJECT) && !rt->rt_dev) {
+        rt->rt_dev = (char*)"lo";
     }
 #endif
 
     /* sanity checks.. */
-    if (mask_in_addr(rt)) {
-        uint32_t mask = mask_in_addr(rt);
+    if (mask_in_addr(*rt)) {
+        uint32_t mask = mask_in_addr(*rt);
 
         mask = ~ntohl(mask);
-        if ((rt.rt_flags & RTF_HOST) && mask != 0xffffffff) {
+        if ((rt->rt_flags & RTF_HOST) && mask != 0xffffffff) {
             bb_error_msg_and_die("netmask %.8x and host route conflict",
                                  (unsigned int) mask);
@@ -313 +324 @@
             bb_error_msg_and_die("bogus netmask %s", netmask);
         }
-        mask = ((struct sockaddr_in *) &rt.rt_dst)->sin_addr.s_addr;
-        if (mask & ~(uint32_t)mask_in_addr(rt)) {
+        mask = ((struct sockaddr_in *) &rt->rt_dst)->sin_addr.s_addr;
+        if (mask & ~(uint32_t)mask_in_addr(*rt)) {
             bb_error_msg_and_die("netmask and route address conflict");
         }
@@ -320 +331 @@
 
     /* Fill out netmask if still unset */
-    if ((action == RTACTION_ADD) && (rt.rt_flags & RTF_HOST)) {
-        mask_in_addr(rt) = 0xffffffff;
+    if ((action == RTACTION_ADD) && (rt->rt_flags & RTF_HOST)) {
+        mask_in_addr(*rt) = 0xffffffff;
     }
 
@@ -328 +339 @@
 
     if (action == RTACTION_ADD)
-        xioctl(skfd, SIOCADDRT, &rt);
+        xioctl(skfd, SIOCADDRT, rt);
     else
-        xioctl(skfd, SIOCDELRT, &rt);
+        xioctl(skfd, SIOCDELRT, rt);
 
     if (ENABLE_FEATURE_CLEAN_UP) close(skfd);
@@ -399 +410 @@
             }
             memcpy(&rt.rtmsg_gateway, sa6.sin6_addr.s6_addr,
-                   sizeof(struct in6_addr));
+                    sizeof(struct in6_addr));
             rt.rtmsg_flags |= RTF_GATEWAY;
             continue;
@@ -425 +436 @@
         memset(&ifr, 0, sizeof(ifr));
         strncpy_IFNAMSIZ(ifr.ifr_name, devname);
-        xioctl(skfd, SIOGIFINDEX, &ifr);
+        xioctl(skfd, SIOCGIFINDEX, &ifr);
         rt.rtmsg_ifindex = ifr.ifr_ifindex;
     }
@@ -488 +499 @@
 
     printf("Kernel IP routing table\n"
-           "Destination     Gateway         Genmask         Flags %s Iface\n",
+        "Destination     Gateway         Genmask         Flags %s Iface\n",
             netstatfmt ? "  MSS Window  irtt" : "Metric Ref    Use");
 
     if (fscanf(fp, "%*[^\n]\n") < 0) { /* Skip the first line. */
-        goto ERROR;        /* Empty or missing line, or read error. */
+        goto ERROR;                /* Empty or missing line, or read error. */
     }
     while (1) {
         int r;
         r = fscanf(fp, "%63s%lx%lx%X%d%d%d%lx%d%d%d\n",
-                   devname, &d, &g, &flgs, &ref, &use, &metric, &m,
-                   &mtu, &win, &ir);
+                devname, &d, &g, &flgs, &ref, &use, &metric, &m,
+                &mtu, &win, &ir);
         if (r != 11) {
             if ((r < 0) && feof(fp)) { /* EOF with no (nonspace) chars read. */
@@ -535 +546 @@
         }
     }
+    fclose(fp);
 }
 
@@ -556 +568 @@
 
     printf("Kernel IPv6 routing table\n%-44s%-40s"
-              "Flags Metric Ref    Use Iface\n",
-              "Destination", "Next Hop");
+            "Flags Metric Ref    Use Iface\n",
+            "Destination", "Next Hop");
 
     while (1) {
@@ -602 +614 @@
 
         r = 0;
-        do {
+        while (1) {
             inet_pton(AF_INET6, addr6x + r,
                       (struct sockaddr *) &snaddr6.sin6_addr);
             snaddr6.sin6_family = AF_INET6;
             naddr6 = INET6_rresolve((struct sockaddr_in6 *) &snaddr6,
-                           0x0fff /* Apparently, upstream never resolves. */
-                           );
+                        0x0fff /* Apparently, upstream never resolves. */
+                        );
 
             if (!r) {           /* 1st pass */
@@ -621 +633 @@
                 break;
             }
-        } while (1);
-    }
+        }
+    }
+    fclose(fp);
 }
 

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

@@ -13 +13 @@
  * - The -F options allows disabling of RTS/CTS flow control.
  */
+
+//usage:#define slattach_trivial_usage
+//usage:       "[-cehmLF] [-s SPEED] [-p PROTOCOL] DEVICE"
+//usage:#define slattach_full_usage "\n\n"
+//usage:       "Attach network interface(s) to serial line(s)\n"
+//usage:     "\n    -p PROT Set protocol (slip, cslip, slip6, clisp6 or adaptive)"
+//usage:     "\n    -s SPD  Set line speed"
+//usage:     "\n    -e  Exit after initializing device"
+//usage:     "\n    -h  Exit when the carrier is lost"
+//usage:     "\n    -c PROG Run PROG when the line is hung up"
+//usage:     "\n    -m  Do NOT initialize the line in raw 8 bits mode"
+//usage:     "\n    -L  Enable 3-wire operation"
+//usage:     "\n    -F  Disable RTS/CTS flow control"
 
 #include "libbb.h"

branches/3.2/mindi-busybox/networking/tc.c

@@ -7 +7 @@
  * Bernhard Reutner-Fischer adjusted for busybox
  */
+
+//usage:#define tc_trivial_usage
+/* //usage: "[OPTIONS] OBJECT CMD [dev STRING]" */
+//usage:    "OBJECT CMD [dev STRING]"
+//usage:#define tc_full_usage "\n\n"
+//usage:    "OBJECT: {qdisc|class|filter}\n"
+//usage:    "CMD: {add|del|change|replace|show}\n"
+//usage:    "\n"
+//usage:    "qdisc [ handle QHANDLE ] [ root |"IF_FEATURE_TC_INGRESS(" ingress |")" parent CLASSID ]\n"
+/* //usage: "[ estimator INTERVAL TIME_CONSTANT ]\n" */
+//usage:    "   [ [ QDISC_KIND ] [ help | OPTIONS ] ]\n"
+//usage:    "   QDISC_KIND := { [p|b]fifo | tbf | prio | cbq | red | etc. }\n"
+//usage:    "qdisc show [ dev STRING ]"IF_FEATURE_TC_INGRESS(" [ingress]")"\n"
+//usage:    "class [ classid CLASSID ] [ root | parent CLASSID ]\n"
+//usage:    "   [ [ QDISC_KIND ] [ help | OPTIONS ] ]\n"
+//usage:    "class show [ dev STRING ] [ root | parent CLASSID ]\n"
+//usage:    "filter [ pref PRIO ] [ protocol PROTO ]\n"
+/* //usage: "\t[ estimator INTERVAL TIME_CONSTANT ]\n" */
+//usage:    "   [ root | classid CLASSID ] [ handle FILTERID ]\n"
+//usage:    "   [ [ FILTER_TYPE ] [ help | OPTIONS ] ]\n"
+//usage:    "filter show [ dev STRING ] [ root | parent CLASSID ]"
 
 #include "libbb.h"
@@ -38 +59 @@
 struct globals {
     int filter_ifindex;
-    __u32 filter_qdisc;
-    __u32 filter_parent;
-    __u32 filter_prio;
-    __u32 filter_proto;
+    uint32_t filter_qdisc;
+    uint32_t filter_parent;
+    uint32_t filter_prio;
+    uint32_t filter_proto;
 } 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 filter_ifindex (G.filter_ifindex)
 #define filter_qdisc (G.filter_qdisc)
@@ -49 +73 @@
 #define filter_prio (G.filter_prio)
 #define filter_proto (G.filter_proto)
-
-void BUG_tc_globals_too_big(void);
-#define INIT_G() do { \
-    if (sizeof(G) > COMMON_BUFSIZE) \
-        BUG_tc_globals_too_big(); \
-} while (0)
+#define INIT_G() do { } while (0)
 
 /* Allocates a buffer containing the name of a class id.
@@ -76 +95 @@
 
 /* Get a qdisc handle.  Return 0 on success, !0 otherwise.  */
-static int get_qdisc_handle(__u32 *h, const char *str) {
-    __u32 maj;
+static int get_qdisc_handle(uint32_t *h, const char *str) {
+    uint32_t maj;
     char *p;
 
@@ -95 +114 @@
 
 /* Get class ID.  Return 0 on success, !0 otherwise.  */
-static int get_tc_classid(__u32 *h, const char *str) {
-    __u32 maj, min;
+static int get_tc_classid(uint32_t *h, const char *str) {
+    uint32_t maj, min;
     char *p;
 
@@ -373 +392 @@
     else if (msg->tcm_parent) {
         classid = print_tc_classid(filter_qdisc ?
-                                   TC_H_MIN(msg->tcm_parent) : msg->tcm_parent);
+                TC_H_MIN(msg->tcm_parent) : msg->tcm_parent);
         printf("parent %s ", classid);
         if (ENABLE_FEATURE_CLEAN_UP)
@@ -495 +514 @@
                 filter_parent = TC_H_ROOT;
         } else if (arg == ARG_parent) {
-            __u32 handle;
+            uint32_t handle;
             if (msg.tcm_parent)
                 duparg(*argv, "parent");
@@ -508 +527 @@
             /* reject LONG_MIN || LONG_MAX */
             /* TODO: for fw
-               if ((slash = strchr(handle, '/')) != NULL)
+            slash = strchr(handle, '/');
+            if (slash != NULL)
                    *slash = '\0';
              */
             msg.tcm_handle = get_u32(*argv, "handle");
-            /* if (slash) {if (get_u32(__u32 &mask, slash+1, NULL)) inv mask; addattr32(n, MAX_MSG, TCA_FW_MASK, mask); */
+            /* if (slash) {if (get_u32(uint32_t &mask, slash+1, NULL)) inv mask; addattr32(n, MAX_MSG, TCA_FW_MASK, mask); */
         } else if (arg == ARG_classid && obj == OBJ_class && cmd == CMD_change){
         } else if (arg == ARG_pref || arg == ARG_prio) { /* filter::list */

branches/3.2/mindi-busybox/networking/tcpudp.c

@@ -30 +30 @@
  */
 
+//usage:#define tcpsvd_trivial_usage
+//usage:       "[-hEv] [-c N] [-C N[:MSG]] [-b N] [-u USER] [-l NAME] IP PORT PROG"
+/* with not-implemented options: */
+/* //usage:    "[-hpEvv] [-c N] [-C N[:MSG]] [-b N] [-u USER] [-l NAME] [-i DIR|-x CDB] [-t SEC] IP PORT PROG" */
+//usage:#define tcpsvd_full_usage "\n\n"
+//usage:       "Create TCP socket, bind to IP:PORT and listen\n"
+//usage:       "for incoming connection. Run PROG for each connection.\n"
+//usage:     "\n    IP      IP to listen on, 0 = all"
+//usage:     "\n    PORT        Port to listen on"
+//usage:     "\n    PROG ARGS   Program to run"
+//usage:     "\n    -l NAME     Local hostname (else looks up local hostname in DNS)"
+//usage:     "\n    -u USER[:GRP]   Change to user/group after bind"
+//usage:     "\n    -c N        Handle up to N connections simultaneously"
+//usage:     "\n    -b N        Allow a backlog of approximately N TCP SYNs"
+//usage:     "\n    -C N[:MSG]  Allow only up to N connections from the same IP"
+//usage:     "\n            New connections from this IP address are closed"
+//usage:     "\n            immediately. MSG is written to the peer before close"
+//usage:     "\n    -h      Look up peer's hostname"
+//usage:     "\n    -E      Don't set up environment variables"
+//usage:     "\n    -v      Verbose"
+//usage:
+//usage:#define udpsvd_trivial_usage
+//usage:       "[-hEv] [-c N] [-u USER] [-l NAME] IP PORT PROG"
+//usage:#define udpsvd_full_usage "\n\n"
+//usage:       "Create UDP socket, bind to IP:PORT and wait\n"
+//usage:       "for incoming packets. Run PROG for each packet,\n"
+//usage:       "redirecting all further packets with same peer ip:port to it.\n"
+//usage:     "\n    IP      IP to listen on, 0 = all"
+//usage:     "\n    PORT        Port to listen on"
+//usage:     "\n    PROG ARGS   Program to run"
+//usage:     "\n    -l NAME     Local hostname (else looks up local hostname in DNS)"
+//usage:     "\n    -u USER[:GRP]   Change to user/group after bind"
+//usage:     "\n    -c N        Handle up to N connections simultaneously"
+//usage:     "\n    -h      Look up peer's hostname"
+//usage:     "\n    -E      Don't set up environment variables"
+//usage:     "\n    -v      Verbose"
+
 #include "libbb.h"
 
@@ -388 +425 @@
          * (otherwise we can move socket to fd #0 only if bind succeeds) */
         close(0);
-        set_nport(localp, htons(local_port));
+        set_nport(&localp->u.sa, htons(local_port));
         xmove_fd(xsocket(localp->u.sa.sa_family, SOCK_DGRAM, 0), 0);
         setsockopt_reuseaddr(0); /* crucial */

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

@@ -22 +22 @@
  */
 
+//usage:#if ENABLE_FEATURE_TELNET_AUTOLOGIN
+//usage:#define telnet_trivial_usage
+//usage:       "[-a] [-l USER] HOST [PORT]"
+//usage:#define telnet_full_usage "\n\n"
+//usage:       "Connect to telnet server\n"
+//usage:     "\n    -a  Automatic login with $USER variable"
+//usage:     "\n    -l USER Automatic login as USER"
+//usage:
+//usage:#else
+//usage:#define telnet_trivial_usage
+//usage:       "HOST [PORT]"
+//usage:#define telnet_full_usage "\n\n"
+//usage:       "Connect to telnet server"
+//usage:#endif
+
 #include <arpa/telnet.h>
 #include <netinet/in.h>
 #include "libbb.h"
 
+#ifdef __BIONIC__
+/* should be in arpa/telnet.h */
+# define IAC         255  /* interpret as command: */
+# define DONT        254  /* you are not to use option */
+# define DO          253  /* please, you use option */
+# define WONT        252  /* I won't use option */
+# define WILL        251  /* I will use option */
+# define SB          250  /* interpret as subnegotiation */
+# define SE          240  /* end sub negotiation */
+# define TELOPT_ECHO   1  /* echo */
+# define TELOPT_SGA    3  /* suppress go ahead */
+# define TELOPT_TTYPE 24  /* terminal type */
+# define TELOPT_NAWS  31  /* window size */
+#endif
+
 #ifdef DOTRACE
-#define TRACE(x, y) do { if (x) printf y; } while (0)
+# define TRACE(x, y) do { if (x) printf y; } while (0)
 #else
-#define TRACE(x, y)
+# define TRACE(x, y)
 #endif
 
@@ -157 +187 @@
 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 - 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.
-     */
     byte outbuf[2 * DATABUFSIZE];
-    byte *p = (byte*)G.buf;
-    int j = 0;
-
-    for (; len > 0; len--, p++) {
-        byte c = *p;
+    byte *dst = outbuf;
+    byte *src = (byte*)G.buf;
+    byte *end = src + len;
+
+    while (src < end) {
+        byte c = *src++;
         if (c == 0x1d) {
             con_escape();
             return;
         }
-        outbuf[j++] = c;
+        *dst = c;
         if (c == IAC)
-            outbuf[j++] = c; /* IAC -> IAC IAC */
-        else if (c == '\r')
-            outbuf[j++] = '\0'; /* CR -> CR NUL */
-    }
-    if (j > 0)
-        full_write(netfd, outbuf, j);
+            *++dst = c; /* IAC -> IAC IAC */
+        else
+        if (c == '\r' || c == '\n') {
+            /* Enter key sends '\r' in raw mode and '\n' in cooked one.
+             *
+             * See RFC 1123 3.3.1 Telnet End-of-Line Convention.
+             * Using CR LF instead of other allowed possibilities
+             * like CR NUL - easier to talk to HTTP/SMTP servers.
+             */
+            *dst = '\r'; /* Enter -> CR LF */
+            *++dst = '\n';
+        }
+        dst++;
+    }
+    if (dst - outbuf != 0)
+        full_write(netfd, outbuf, dst - outbuf);
 }
 
@@ -369 +394 @@
 #endif
 
-static char const escapecharis[] ALIGN1 = "\r\nEscape character is ";
-
 static void setConMode(void)
 {
@@ -376 +399 @@
         if (G.charmode == CHM_TRY) {
             G.charmode = CHM_ON;
-            printf("\r\nEntering character mode%s'^]'.\r\n", escapecharis);
+            printf("\r\nEntering %s mode"
+                "\r\nEscape character is '^%c'.\r\n", "character", ']');
             rawmode();
         }
@@ -382 +406 @@
         if (G.charmode != CHM_OFF) {
             G.charmode = CHM_OFF;
-            printf("\r\nEntering line mode%s'^C'.\r\n", escapecharis);
+            printf("\r\nEntering %s mode"
+                "\r\nEscape character is '^%c'.\r\n", "line", 'C');
             cookmode();
         }

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

@@ -21 +21 @@
  * Set process group corrections, initial busybox port
  */
+
+//usage:#define telnetd_trivial_usage
+//usage:       "[OPTIONS]"
+//usage:#define telnetd_full_usage "\n\n"
+//usage:       "Handle incoming telnet connections"
+//usage:    IF_NOT_FEATURE_TELNETD_STANDALONE(" via inetd") "\n"
+//usage:     "\n    -l LOGIN    Exec LOGIN on connect"
+//usage:     "\n    -f ISSUE_FILE   Display ISSUE_FILE instead of /etc/issue"
+//usage:     "\n    -K      Close connection as soon as login exits"
+//usage:     "\n            (normally wait until all programs close slave pty)"
+//usage:    IF_FEATURE_TELNETD_STANDALONE(
+//usage:     "\n    -p PORT     Port to listen on"
+//usage:     "\n    -b ADDR[:PORT]  Address to bind to"
+//usage:     "\n    -F      Run in foreground"
+//usage:     "\n    -i      Inetd mode"
+//usage:    IF_FEATURE_TELNETD_INETD_WAIT(
+//usage:     "\n    -w SEC      Inetd 'wait' mode, linger time SEC"
+//usage:     "\n    -S      Log to syslog (implied by -i or without -F and -w)"
+//usage:    )
+//usage:    )
+
 #define DEBUG 0
 
@@ -31 +52 @@
 #endif
 #include <arpa/telnet.h>
-
-#if ENABLE_FEATURE_UTMP
-# include <utmp.h> /* LOGIN_PROCESS */
-#endif
 
 
@@ -109 +126 @@
              * Many client implementations send \r\n when
              * the user hits the CarriageReturn key.
+             * See RFC 1123 3.3.1 Telnet End-of-Line Convention.
              */
             if (c == '\r' && ptr < end && (*ptr == '\n' || *ptr == '\0'))
@@ -315 +333 @@
     bb_signals((1 << SIGCHLD) + (1 << SIGPIPE), SIG_DFL);
 
+    pid = getpid();
+
     if (ENABLE_FEATURE_UTMP) {
         len_and_sockaddr *lsa = get_peer_lsa(sock);
@@ -336 +356 @@
     xdup2(0, 1);
     xdup2(0, 2);
-    pid = getpid();
     tcsetpgrp(0, pid); /* switch this tty's process group to us */
 

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

@@ -19 +19 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+
+//usage:#define tftp_trivial_usage
+//usage:       "[OPTIONS] HOST [PORT]"
+//usage:#define tftp_full_usage "\n\n"
+//usage:       "Transfer a file from/to tftp server\n"
+//usage:     "\n    -l FILE Local FILE"
+//usage:     "\n    -r FILE Remote FILE"
+//usage:    IF_FEATURE_TFTP_GET(
+//usage:     "\n    -g  Get file"
+//usage:    )
+//usage:    IF_FEATURE_TFTP_PUT(
+//usage:     "\n    -p  Put file"
+//usage:    )
+//usage:    IF_FEATURE_TFTP_BLOCKSIZE(
+//usage:     "\n    -b SIZE Transfer blocks of SIZE octets"
+//usage:    )
+//usage:
+//usage:#define tftpd_trivial_usage
+//usage:       "[-cr] [-u USER] [DIR]"
+//usage:#define tftpd_full_usage "\n\n"
+//usage:       "Transfer a file on tftp client's request\n"
+//usage:       "\n"
+//usage:       "tftpd should be used as an inetd service.\n"
+//usage:       "tftpd's line for inetd.conf:\n"
+//usage:       "    69 dgram udp nowait root tftpd tftpd -l /files/to/serve\n"
+//usage:       "It also can be ran from udpsvd:\n"
+//usage:       "    udpsvd -vE 0.0.0.0 69 tftpd /files/to/serve\n"
+//usage:     "\n    -r  Prohibit upload"
+//usage:     "\n    -c  Allow file creation via upload"
+//usage:     "\n    -u  Access files as USER"
+//usage:     "\n    -l  Log to syslog (inetd mode requires this)"
+
 #include "libbb.h"
+#include <syslog.h>
 
 #if ENABLE_FEATURE_TFTP_GET || ENABLE_FEATURE_TFTP_PUT
@@ -60 +93 @@
     TFTPD_OPT_c = (1 << 9) * ENABLE_TFTPD,
     TFTPD_OPT_u = (1 << 10) * ENABLE_TFTPD,
+    TFTPD_OPT_l = (1 << 11) * ENABLE_TFTPD,
 };
 
@@ -83 +117 @@
     /* u16 TFTP_ERROR; u16 reason; both network-endian, then error text: */
     uint8_t error_pkt[4 + 32];
-    char *user_opt;
+    struct passwd *pw;
     /* used in tftpd_main(), a bit big for stack: */
     char block_buf[TFTP_BLKSIZE_DEFAULT];
@@ -97 +131 @@
     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)
+#define G_error_pkt_reason (G.error_pkt[3])
+#define G_error_pkt_str    ((char*)(G.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);
+    bb_progress_update(&G.pmt, 0, G.pos, G.size);
 }
 static void tftp_progress_init(void)
 {
-    bb_progress_init(&G.pmt);
+    bb_progress_init(&G.pmt, G.file);
     tftp_progress_update();
 }
 static void tftp_progress_done(void)
 {
-    if (G.pmt.inited) {
+    if (is_bb_progress_inited(&G.pmt)) {
         tftp_progress_update();
         bb_putchar_stderr('\n');
-        G.pmt.inited = 0;
+        bb_progress_free(&G.pmt);
     }
 }
@@ -239 +270 @@
 
         /* Is there an error already? Send pkt and bail out */
-        if (error_pkt_reason || error_pkt_str[0])
+        if (G_error_pkt_reason || G_error_pkt_str[0])
             goto send_err_pkt;
 
-        if (user_opt) {
-            struct passwd *pw = xgetpwnam(user_opt);
-            change_identity(pw); /* initgroups, setgid, setuid */
+        if (G.pw) {
+            change_identity(G.pw); /* initgroups, setgid, setuid */
         }
     }
@@ -296 +326 @@
         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");
+            G_error_pkt_reason = ERR_NOFILE;
+            strcpy(G_error_pkt_str, "can't open file");
             goto send_err_pkt;
         }
@@ -423 +453 @@
             }
             cp += len;
+            IF_FEATURE_TFTP_PROGRESS_BAR(G.pos += len;)
         }
  send_pkt:
@@ -444 +475 @@
 
 #if ENABLE_FEATURE_TFTP_PROGRESS_BAR
-        if (ENABLE_TFTP && remote_file) /* tftp */
-            G.pos = (block_nr - 1) * (uoff_t)blksize;
-        if (G.pmt.inited)
+        if (is_bb_progress_inited(&G.pmt))
             tftp_progress_update();
 #endif
@@ -543 +572 @@
                     blksize = tftp_blksize_check(res, blksize);
                     if (blksize < 0) {
-                        error_pkt_reason = ERR_BAD_OPT;
+                        G_error_pkt_reason = ERR_BAD_OPT;
                         goto send_err_pkt;
                     }
@@ -582 +611 @@
                 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;
+                    strcpy(G_error_pkt_str, bb_msg_write_error);
+                    G_error_pkt_reason = ERR_WRITE;
                     goto send_err_pkt;
                 }
@@ -589 +618 @@
                     finished = 1;
                 }
+                IF_FEATURE_TFTP_PROGRESS_BAR(G.pos += sz;)
                 continue; /* send ACK */
             }
@@ -631 +661 @@
 
  send_read_err_pkt:
-    strcpy((char*)error_pkt_str, bb_msg_read_error);
+    strcpy(G_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),
+    if (G_error_pkt_str[0])
+        bb_error_msg("%s", G_error_pkt_str);
+    G.error_pkt[1] = TFTP_ERROR;
+    xsendto(socket_fd, G.error_pkt, 4 + 1 + strlen(G_error_pkt_str),
             &peer_lsa->u.sa, peer_lsa->len);
     return EXIT_FAILURE;
@@ -728 +758 @@
     len_and_sockaddr *our_lsa;
     len_and_sockaddr *peer_lsa;
-    char *local_file, *mode;
+    char *local_file, *mode, *user_opt;
     const char *error_msg;
     int opt, result, opcode;
@@ -750 +780 @@
 
     /* Shifting to not collide with TFTP_OPTs */
-    opt = option_mask32 = TFTPD_OPT | (getopt32(argv, "rcu:", &user_opt) << 8);
+    opt = option_mask32 = TFTPD_OPT | (getopt32(argv, "rcu:l", &user_opt) << 8);
     argv += optind;
-    if (argv[0])
-        xchdir(argv[0]);
-
-    result = recv_from_to(STDIN_FILENO, block_buf, sizeof(block_buf),
+    if (opt & TFTPD_OPT_l) {
+        openlog(applet_name, LOG_PID, LOG_DAEMON);
+        logmode = LOGMODE_SYSLOG;
+    }
+    if (opt & TFTPD_OPT_u) {
+        /* Must be before xchroot */
+        G.pw = xgetpwnam(user_opt);
+    }
+    if (argv[0]) {
+        xchroot(argv[0]);
+    }
+
+    result = recv_from_to(STDIN_FILENO, G.block_buf, sizeof(G.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'
+    opcode = ntohs(*(uint16_t*)G.block_buf);
+    if (result < 4 || result >= sizeof(G.block_buf)
+     || G.block_buf[result-1] != '\0'
      || (IF_FEATURE_TFTP_PUT(opcode != TFTP_RRQ) /* not download */
          IF_GETPUT(&&)
@@ -770 +809 @@
         goto err;
     }
-    local_file = block_buf + 2;
+    local_file = G.block_buf + 2;
     if (local_file[0] == '.' || strstr(local_file, "/.")) {
         error_msg = "dot in file name";
@@ -776 +815 @@
     }
     mode = local_file + strlen(local_file) + 1;
-    if (mode >= block_buf + result || strcmp(mode, "octet") != 0) {
+    /* RFC 1350 says mode string is case independent */
+    if (mode >= G.block_buf + result || strcasecmp(mode, "octet") != 0) {
         goto err;
     }
@@ -783 +823 @@
         char *res;
         char *opt_str = mode + sizeof("octet");
-        int opt_len = block_buf + result - opt_str;
+        int opt_len = G.block_buf + result - opt_str;
         if (opt_len > 0) {
             res = tftp_get_option("blksize", opt_str, opt_len);
@@ -789 +829 @@
                 blksize = tftp_blksize_check(res, 65564);
                 if (blksize < 0) {
-                    error_pkt_reason = ERR_BAD_OPT;
+                    G_error_pkt_reason = ERR_BAD_OPT;
                     /* will just send error pkt */
                     goto do_proto;
@@ -807 +847 @@
         if (opt & TFTPD_OPT_r) {
             /* This would mean "disk full" - not true */
-            /*error_pkt_reason = ERR_WRITE;*/
+            /*G_error_pkt_reason = ERR_WRITE;*/
             error_msg = bb_msg_write_error;
             goto err;
@@ -816 +856 @@
     }
 
-    /* NB: if error_pkt_str or error_pkt_reason is set up,
+    /* NB: if G_error_pkt_str or G_error_pkt_reason is set up,
      * tftp_protocol() just sends one error pkt and returns */
 
@@ -831 +871 @@
     return result;
  err:
-    strcpy((char*)error_pkt_str, error_msg);
+    strcpy(G_error_pkt_str, error_msg);
     goto do_proto;
 }

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

@@ -211 +211 @@
  */
 
+//usage:#define traceroute_trivial_usage
+//usage:       "[-"IF_TRACEROUTE6("46")"FIldnrv] [-f 1ST_TTL] [-m MAXTTL] [-p PORT] [-q PROBES]\n"
+//usage:       "    [-s SRC_IP] [-t TOS] [-w WAIT_SEC] [-g GATEWAY] [-i IFACE]\n"
+//usage:       "    [-z PAUSE_MSEC] HOST [BYTES]"
+//usage:#define traceroute_full_usage "\n\n"
+//usage:       "Trace the route to HOST\n"
+//usage:    IF_TRACEROUTE6(
+//usage:     "\n    -4,-6   Force IP or IPv6 name resolution"
+//usage:    )
+//usage:     "\n    -F  Set the don't fragment bit"
+//usage:     "\n    -I  Use ICMP ECHO instead of UDP datagrams"
+//usage:     "\n    -l  Display the TTL value of the returned packet"
+//usage:     "\n    -d  Set SO_DEBUG options to socket"
+//usage:     "\n    -n  Print numeric addresses"
+//usage:     "\n    -r  Bypass routing tables, send directly to HOST"
+//usage:     "\n    -v  Verbose"
+//usage:     "\n    -m  Max time-to-live (max number of hops)"
+//usage:     "\n    -p  Base UDP port number used in probes"
+//usage:     "\n        (default 33434)"
+//usage:     "\n    -q  Number of probes per TTL (default 3)"
+//usage:     "\n    -s  IP address to use as the source address"
+//usage:     "\n    -t  Type-of-service in probe packets (default 0)"
+//usage:     "\n    -w  Time in seconds to wait for a response (default 3)"
+//usage:     "\n    -g  Loose source route gateway (8 max)"
+//usage:
+//usage:#define traceroute6_trivial_usage
+//usage:       "[-dnrv] [-m MAXTTL] [-p PORT] [-q PROBES]\n"
+//usage:       "    [-s SRC_IP] [-t TOS] [-w WAIT_SEC] [-i IFACE]\n"
+//usage:       "    HOST [BYTES]"
+//usage:#define traceroute6_full_usage "\n\n"
+//usage:       "Trace the route to HOST\n"
+//usage:     "\n    -d  Set SO_DEBUG options to socket"
+//usage:     "\n    -n  Print numeric addresses"
+//usage:     "\n    -r  Bypass routing tables, send directly to HOST"
+//usage:     "\n    -v  Verbose"
+//usage:     "\n    -m  Max time-to-live (max number of hops)"
+//usage:     "\n    -p  Base UDP port number used in probes"
+//usage:     "\n        (default is 33434)"
+//usage:     "\n    -q  Number of probes per TTL (default 3)"
+//usage:     "\n    -s  IP address to use as the source address"
+//usage:     "\n    -t  Type-of-service in probe packets (default 0)"
+//usage:     "\n    -w  Time in seconds to wait for a response (default 3)"
+
 #define TRACEROUTE_SO_DEBUG 0
 
@@ -248 +291 @@
 
 
-#define OPT_STRING "FIlnrdvxt:i:m:p:q:s:w:z:f:" \
-            IF_FEATURE_TRACEROUTE_SOURCE_ROUTE("g:") \
-            "4" IF_TRACEROUTE6("6")
+#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 */
@@ -354 +398 @@
 
 static int
-wait_for_reply(len_and_sockaddr *from_lsa, struct sockaddr *to)
+wait_for_reply(len_and_sockaddr *from_lsa, struct sockaddr *to, unsigned *timestamp_us, int *left_ms)
 {
     struct pollfd pfd[1];
@@ -361 +405 @@
     pfd[0].fd = rcvsock;
     pfd[0].events = POLLIN;
-    if (safe_poll(pfd, 1, waittime * 1000) > 0) {
+    if (*left_ms >= 0 && safe_poll(pfd, 1, *left_ms) > 0) {
+        unsigned t;
+
         read_len = recv_from_to(rcvsock,
                 recv_pkt, sizeof(recv_pkt),
-                /*flags:*/ 0,
+                /*flags:*/ MSG_DONTWAIT,
                 &from_lsa->u.sa, to, from_lsa->len);
+        t = monotonic_us();
+        *left_ms -= (t - *timestamp_us) / 1000;
+        *timestamp_us = t;
     }
 
     return read_len;
-}
-
-/*
- * Checksum routine for Internet Protocol family headers (C Version)
- */
-static uint16_t
-in_cksum(uint16_t *addr, int len)
-{
-    int nleft = len;
-    uint16_t *w = addr;
-    uint16_t answer;
-    int sum = 0;
-
-    /*
-     * 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) {
-        sum += *w++;
-        nleft -= 2;
-    }
-
-    /* mop up an odd byte, if necessary */
-    if (nleft == 1)
-        sum += *(unsigned char *)w;
-
-    /* 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 */
-    answer = ~sum;                          /* truncate to 16 bits */
-    return answer;
 }
 
@@ -430 +446 @@
             /* Always calculate checksum for icmp packets */
             outicmp->icmp_cksum = 0;
-            outicmp->icmp_cksum = in_cksum((uint16_t *)outicmp,
+            outicmp->icmp_cksum = inet_cksum((uint16_t *)outicmp,
                         packlen - (sizeof(*outip) + optlen));
             if (outicmp->icmp_cksum == 0)
@@ -483 +499 @@
             out = outdata;
             len -= sizeof(*outudp);
-            set_nport(dest_lsa, htons(port + seq));
+            set_nport(&dest_lsa->u.sa, htons(port + seq));
         }
     }
@@ -686 +702 @@
 
         read_len -= sizeof(struct icmp6_hdr);
-        for (i = 0; i < read_len ; i++) {
+        for (i = 0; i < read_len; i++) {
             if (i % 16 == 0)
                 printf("%04x:", i);
@@ -752 +768 @@
 #endif
         {
-            read_len -= ((struct ip*)recv_pkt)->ip_hl << 2;
+            struct ip *ip4packet = (struct ip*)recv_pkt;
+            read_len -= ip4packet->ip_hl << 2;
         }
         printf(" %d bytes to %s", read_len, ina);
@@ -774 +791 @@
 common_traceroute_main(int op, char **argv)
 {
-    int i;
     int minpacket;
     int tos = 0;
@@ -928 +944 @@
         if (lsrr > 0) {
             unsigned char optlist[MAX_IPOPTLEN];
+            unsigned size;
 
             /* final hop */
@@ -937 +954 @@
             /* loose source route option */
             optlist[1] = IPOPT_LSRR;
-            i = lsrr * sizeof(gwlist[0]);
-            optlist[2] = i + 3;
+            size = lsrr * sizeof(gwlist[0]);
+            optlist[2] = size + 3;
             /* pointer to LSRR addresses */
             optlist[3] = IPOPT_MINOFF;
-            memcpy(optlist + 4, gwlist, i);
+            memcpy(optlist + 4, gwlist, size);
 
             if (setsockopt(sndsock, IPPROTO_IP, IP_OPTIONS,
-                    (char *)optlist, i + sizeof(gwlist[0])) < 0) {
+                    (char *)optlist, size + sizeof(gwlist[0])) < 0) {
                 bb_perror_msg_and_die("IP_OPTIONS");
             }
@@ -1018 +1035 @@
         if (op & OPT_DEVICE)
             setsockopt_bindtodevice(probe_fd, device);
-        set_nport(dest_lsa, htons(1025));
+        set_nport(&dest_lsa->u.sa, 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));
+        set_nport(&dest_lsa->u.sa, htons(port));
 
         /* read IP and port */
@@ -1031 +1048 @@
 
         /* bind our sockets to this IP (but not port) */
-        set_nport(source_lsa, 0);
+        set_nport(&source_lsa->u.sa, 0);
         xbind(sndsock, &source_lsa->u.sa, source_lsa->len);
         xbind(rcvsock, &source_lsa->u.sa, source_lsa->len);
@@ -1058 +1075 @@
         int gotlastaddr = 0; /* flags */
         int got_there = 0;
-        int first = 1;
 
         printf("%2d", ttl);
@@ -1065 +1081 @@
             unsigned t1;
             unsigned t2;
+            int left_ms;
             struct ip *ip;
 
-            if (!first && pausemsecs > 0)
+            fflush_all();
+            if (probe != 0 && pausemsecs > 0)
                 usleep(pausemsecs * 1000);
-            fflush_all();
-
-            t1 = monotonic_us();
+
             send_probe(++seq, ttl);
-
-            first = 0;
-            while ((read_len = wait_for_reply(from_lsa, to)) != 0) {
-                t2 = monotonic_us();
-                i = packet_ok(read_len, from_lsa, to, seq);
+            t2 = t1 = monotonic_us();
+
+            left_ms = waittime * 1000;
+            while ((read_len = wait_for_reply(from_lsa, to, &t2, &left_ms)) != 0) {
+                int icmp_code;
+
+                /* Recv'ed a packet, or read error */
+                /* t2 = monotonic_us() - set by wait_for_reply */
+
+                if (read_len < 0)
+                    continue;
+                icmp_code = packet_ok(read_len, from_lsa, to, seq);
                 /* Skip short packet */
-                if (i == 0)
+                if (icmp_code == 0)
                     continue;
 
@@ -1098 +1121 @@
 
                 /* time exceeded in transit */
-                if (i == -1)
-                    break;
-                i--;
-                switch (i) {
+                if (icmp_code == -1)
+                    break;
+                icmp_code--;
+                switch (icmp_code) {
 #if ENABLE_TRACEROUTE6
                 case ICMP6_DST_UNREACH_NOPORT << 8:
@@ -1174 +1197 @@
                     break;
                 default:
-                    printf(" !<%d>", i);
+                    printf(" !<%d>", icmp_code);
                     ++unreachable;
                     break;
                 }
                 break;
-            }
+            } /* while (wait and read a packet) */
+
             /* there was no packet at all? */
             if (read_len == 0)
                 printf("  *");
-        }
+        } /* for (nprobes) */
+
         bb_putchar('\n');
         if (got_there

branches/3.2/mindi-busybox/networking/tunctl.c

@@ -10 +10 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
+
+//usage:#define tunctl_trivial_usage
+//usage:       "[-f device] ([-t name] | -d name)" IF_FEATURE_TUNCTL_UG(" [-u owner] [-g group] [-b]")
+//usage:#define tunctl_full_usage "\n\n"
+//usage:       "Create or delete tun interfaces\n"
+//usage:     "\n    -f name     tun device (/dev/net/tun)"
+//usage:     "\n    -t name     Create iface 'name'"
+//usage:     "\n    -d name     Delete iface 'name'"
+//usage:    IF_FEATURE_TUNCTL_UG(
+//usage:     "\n    -u owner    Set iface owner"
+//usage:     "\n    -g group    Set iface group"
+//usage:     "\n    -b      Brief output"
+//usage:    )
+//usage:
+//usage:#define tunctl_example_usage
+//usage:       "# tunctl\n"
+//usage:       "# tunctl -d tun0\n"
+
 #include <netinet/in.h>
 #include <net/if.h>

branches/3.2/mindi-busybox/networking/udhcp/Config.src

@@ -9 +9 @@
     bool "udhcp server (udhcpd)"
     default y
-    depends on PLATFORM_LINUX
+    select PLATFORM_LINUX
     help
       udhcpd is a DHCP server geared primarily toward embedded systems,
@@ -40 +40 @@
       time a new lease has been accepted, thus eliminating the need
       to send SIGUSR1 for the initial writing or updating. Any timed
-      rewriting remains undisturbed
+      rewriting remains undisturbed.
+
+config FEATURE_UDHCPD_BASE_IP_ON_MAC
+    bool "Select IP address based on client MAC"
+    default n
+    depends on UDHCPD
+    help
+      If selected, udhcpd will base its selection of IP address to offer
+      on the client's hardware address. Otherwise udhcpd uses the next
+      consecutive free address.
+
+      This reduces the frequency of IP address changes for clients
+      which let their lease expire, and makes consecutive DHCPOFFERS
+      for the same client to (almost always) contain the same
+      IP address.
 
 config DHCPD_LEASES_FILE
@@ -53 +67 @@
     bool "udhcp client (udhcpc)"
     default y
-    depends on PLATFORM_LINUX
+    select PLATFORM_LINUX
     help
       udhcpc is a DHCP client geared primarily toward embedded systems,
@@ -73 +87 @@
 config FEATURE_UDHCP_PORT
     bool "Enable '-P port' option for udhcpd and udhcpc"
-    default y
+    default n
     depends on UDHCPD || UDHCPC
     help
@@ -99 +113 @@
       search lists via option 119, specified in RFC 3397,
       and SIP servers option 120, specified in RFC 3361.
+
+config FEATURE_UDHCP_8021Q
+    bool "Support for 802.1Q VLAN parameters"
+    default y
+    depends on UDHCPD || UDHCPC
+    help
+      If selected, both client and server will support passing of VLAN
+      ID and priority via options 132 and 133 as per 802.1Q.
 
 config UDHCPC_DEFAULT_SCRIPT

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

@@ -119 +119 @@
             }
         }
-        timeout_ms -= (unsigned)monotonic_ms() - prevTime;
-    } while (timeout_ms > 0);
+        timeout_ms -= (unsigned)monotonic_ms() - prevTime + 1;
+
+        /* We used to check "timeout_ms > 0", but
+         * this is more under/overflow-resistant
+         * (people did see overflows here when system time jumps):
+         */
+    } while ((unsigned)timeout_ms <= 2000);
 
  ret:

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

@@ -30 +30 @@
 //  { 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_STRING_HOST          | OPTION_REQ, 0x0c }, /* DHCP_HOST_NAME     */
     { OPTION_U16                              , 0x0d }, /* DHCP_BOOT_SIZE     */
-    { OPTION_STRING               | OPTION_REQ, 0x0f }, /* DHCP_DOMAIN_NAME   */
+    { OPTION_STRING_HOST          | 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           */
+//TODO: why do we request DHCP_BROADCAST? Can't we assume that
+//in the unlikely case it is different from typical N.N.255.255,
+//server would let us know anyway?
     { OPTION_IP                   | OPTION_REQ, 0x1c }, /* DHCP_BROADCAST     */
     { OPTION_IP_PAIR | OPTION_LIST            , 0x21 }, /* DHCP_ROUTES        */
-    { OPTION_STRING                           , 0x28 }, /* DHCP_NIS_DOMAIN    */
+    { OPTION_STRING_HOST                      , 0x28 }, /* DHCP_NIS_DOMAIN    */
     { OPTION_IP | OPTION_LIST                 , 0x29 }, /* DHCP_NIS_SERVER    */
     { OPTION_IP | OPTION_LIST     | OPTION_REQ, 0x2a }, /* DHCP_NTP_SERVER    */
@@ -47 +50 @@
     { OPTION_STRING                           , 0x38 }, /* DHCP_ERR_MESSAGE   */
 //TODO: must be combined with 'sname' and 'file' handling:
-    { OPTION_STRING                           , 0x42 }, /* DHCP_TFTP_SERVER_NAME */
+    { OPTION_STRING_HOST                      , 0x42 }, /* DHCP_TFTP_SERVER_NAME */
     { OPTION_STRING                           , 0x43 }, /* DHCP_BOOT_FILE     */
 //TODO: not a string, but a set of LASCII strings:
@@ -55 +58 @@
     { OPTION_SIP_SERVERS                      , 0x78 }, /* DHCP_SIP_SERVERS   */
 #endif
-    { OPTION_STATIC_ROUTES                    , 0x79 }, /* DHCP_STATIC_ROUTES */
-    { OPTION_STATIC_ROUTES                    , 0xf9 }, /* DHCP_MS_STATIC_ROUTES */
+    { OPTION_STATIC_ROUTES | OPTION_LIST      , 0x79 }, /* DHCP_STATIC_ROUTES */
+#if ENABLE_FEATURE_UDHCP_8021Q
+    { OPTION_U16                              , 0x84 }, /* DHCP_VLAN_ID       */
+    { OPTION_U8                               , 0x85 }, /* DHCP_VLAN_PRIORITY */
+#endif
+    { OPTION_6RD                              , 0xd4 }, /* DHCP_6RD           */
+    { OPTION_STATIC_ROUTES | OPTION_LIST      , 0xf9 }, /* DHCP_MS_STATIC_ROUTES */
     { OPTION_STRING                           , 0xfc }, /* DHCP_WPAD          */
 
@@ -116 +124 @@
     "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  */
+#if ENABLE_FEATURE_UDHCP_8021Q
+    "vlanid" "\0"      /* DHCP_VLAN_ID        */
+    "vlanpriority" "\0"/* DHCP_VLAN_PRIORITY  */
+#endif
+    "ip6rd" "\0"       /* DHCP_6RD            */
     "msstaticroutes""\0"/* DHCP_MS_STATIC_ROUTES */
     "wpad" "\0"        /* DHCP_WPAD           */
@@ -136 +147 @@
 //  [OPTION_BOOLEAN] = 1,
     [OPTION_STRING] =  1,  /* ignored by udhcp_str2optset */
+    [OPTION_STRING_HOST] = 1,  /* ignored by udhcp_str2optset */
 #if ENABLE_FEATURE_UDHCP_RFC3397
     [OPTION_DNS_STRING] = 1,  /* ignored by both udhcp_str2optset and xmalloc_optname_optval */
@@ -147 +159 @@
     /* Just like OPTION_STRING, we use minimum length here */
     [OPTION_STATIC_ROUTES] = 5,
+    [OPTION_6RD] =    22,  /* ignored by udhcp_str2optset */
 };
 
@@ -324 +337 @@
     if (!lsa)
         return 0;
-    *(uint32_t*)arg = lsa->u.sin.sin_addr.s_addr;
+    /* arg maybe unaligned */
+    move_to_unaligned32((uint32_t*)arg, lsa->u.sin.sin_addr.s_addr);
     free(lsa);
     return 1;
@@ -404 +418 @@
 
             existing->data = xrealloc(existing->data, OPT_DATA + 1 + old_len + length);
-            if ((optflag->flags & OPTION_TYPE_MASK) == OPTION_STRING) {
+            if ((optflag->flags & OPTION_TYPE_MASK) == OPTION_STRING
+             || (optflag->flags & OPTION_TYPE_MASK) == OPTION_STRING_HOST
+            ) {
                 /* add space separator between STRING options in a list */
                 existing->data[OPT_DATA + old_len] = ' ';
@@ -421 +437 @@
 {
     struct option_set **opt_list = arg;
-    char *opt, *val, *endptr;
+    char *opt, *val;
     char *str;
     const struct dhcp_optflag *optflag;
@@ -427 +443 @@
     unsigned optcode;
     int retval, length;
-    char buffer[8] ALIGNED(4);
+    /* IP_PAIR needs 8 bytes, STATIC_ROUTES needs 9 max */
+    char buffer[9] ALIGNED(4);
     uint16_t *result_u16 = (uint16_t *) buffer;
     uint32_t *result_u32 = (uint32_t *) buffer;
@@ -468 +485 @@
             break;
         case OPTION_STRING:
+        case OPTION_STRING_HOST:
 #if ENABLE_FEATURE_UDHCP_RFC3397
         case OPTION_DNS_STRING:
@@ -484 +502 @@
 //      }
         case OPTION_U8:
-            buffer[0] = strtoul(val, &endptr, 0);
-            retval = (endptr[0] == '\0');
+            buffer[0] = bb_strtou32(val, NULL, 0);
+            retval = (errno == 0);
             break;
         /* htonX are macros in older libc's, using temp var
@@ -491 +509 @@
         /* TODO: use bb_strtoX? */
         case OPTION_U16: {
-            unsigned long tmp = strtoul(val, &endptr, 0);
+            uint32_t tmp = bb_strtou32(val, NULL, 0);
             *result_u16 = htons(tmp);
-            retval = (endptr[0] == '\0' /*&& tmp < 0x10000*/);
+            retval = (errno == 0 /*&& tmp < 0x10000*/);
             break;
         }
 //      case OPTION_S16: {
-//          long tmp = strtol(val, &endptr, 0);
+//          long tmp = bb_strtoi32(val, NULL, 0);
 //          *result_u16 = htons(tmp);
-//          retval = (endptr[0] == '\0');
+//          retval = (errno == 0);
 //          break;
 //      }
         case OPTION_U32: {
-            unsigned long tmp = strtoul(val, &endptr, 0);
+            uint32_t tmp = bb_strtou32(val, NULL, 0);
             *result_u32 = htonl(tmp);
-            retval = (endptr[0] == '\0');
+            retval = (errno == 0);
             break;
         }
         case OPTION_S32: {
-            long tmp = strtol(val, &endptr, 0);
+            int32_t tmp = bb_strtoi32(val, NULL, 0);
             *result_u32 = htonl(tmp);
-            retval = (endptr[0] == '\0');
+            retval = (errno == 0);
+            break;
+        }
+        case OPTION_STATIC_ROUTES: {
+            /* Input: "a.b.c.d/m" */
+            /* Output: mask(1 byte),pfx(0-4 bytes),gw(4 bytes) */
+            unsigned mask;
+            char *slash = strchr(val, '/');
+            if (slash) {
+                *slash = '\0';
+                retval = udhcp_str2nip(val, buffer + 1);
+                buffer[0] = mask = bb_strtou(slash + 1, NULL, 10);
+                val = strtok(NULL, ", \t/-");
+                if (!val || mask > 32 || errno)
+                    retval = 0;
+                if (retval) {
+                    length = ((mask + 7) >> 3) + 5;
+                    retval = udhcp_str2nip(val, buffer + (length - 4));
+                }
+            }
             break;
         }
@@ -522 +559 @@
         if (retval)
             attach_option(opt_list, optflag, opt, length);
-    } while (retval && optflag->flags & OPTION_LIST);
+    } while (retval && (optflag->flags & OPTION_LIST));
 
     return retval;
 }
+
+/* note: ip is a pointer to an IPv6 in network order, possibly misaliged */
+int FAST_FUNC sprint_nip6(char *dest, /*const char *pre,*/ const uint8_t *ip)
+{
+    char hexstrbuf[16 * 2];
+    bin2hex(hexstrbuf, (void*)ip, 16);
+    return sprintf(dest, /* "%s" */
+        "%.4s:%.4s:%.4s:%.4s:%.4s:%.4s:%.4s:%.4s",
+        /* pre, */
+        hexstrbuf + 0 * 4,
+        hexstrbuf + 1 * 4,
+        hexstrbuf + 2 * 4,
+        hexstrbuf + 3 * 4,
+        hexstrbuf + 4 * 4,
+        hexstrbuf + 5 * 4,
+        hexstrbuf + 6 * 4,
+        hexstrbuf + 7 * 4
+    );
+}

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

@@ -15 +15 @@
 PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 
-extern const uint8_t MAC_BCAST_ADDR[6]; /* six all-ones */
+extern const uint8_t MAC_BCAST_ADDR[6] ALIGN2; /* six all-ones */
 
 
@@ -81 +81 @@
     OPTION_IP_PAIR,
     OPTION_STRING,
+    /* Opts of STRING_HOST type will be sanitized before they are passed
+     * to udhcpc script's environment: */
+    OPTION_STRING_HOST,
 //  OPTION_BOOLEAN,
     OPTION_U8,
@@ -89 +92 @@
     OPTION_BIN,
     OPTION_STATIC_ROUTES,
+    OPTION_6RD,
 #if ENABLE_FEATURE_UDHCP_RFC3397
     OPTION_DNS_STRING,  /* RFC1035 compressed domain name list */
@@ -104 +108 @@
  * 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).
+ * uncommented ones have special cases (grep for them to see).
  */
 #define DHCP_PADDING            0x00
@@ -146 +150 @@
 //#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_VLAN_ID            0x84 /* 802.1P VLAN ID */
+#define DHCP_VLAN_PRIORITY      0x85 /* 802.1Q VLAN priority */
 //#define DHCP_MS_STATIC_ROUTES 0xf9 /* Microsoft's pre-RFC 3442 code for 0x79? */
 //#define DHCP_WPAD             0xfc /* MSIE's Web Proxy Autodiscovery Protocol */
@@ -182 +188 @@
 
 extern const struct dhcp_optflag dhcp_optflags[];
-extern const char dhcp_option_strings[];
-extern const uint8_t dhcp_option_lengths[];
+extern const char dhcp_option_strings[] ALIGN1;
+extern const uint8_t dhcp_option_lengths[] ALIGN1;
 
 unsigned FAST_FUNC udhcp_option_idx(const char *name);
@@ -247 +253 @@
 
 #if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1
+# define IF_UDHCP_VERBOSE(...) __VA_ARGS__
 extern unsigned dhcp_verbose;
 # define log1(...) do { if (dhcp_verbose >= 1) bb_info_msg(__VA_ARGS__); } while (0)
@@ -262 +269 @@
 # endif
 #else
+# define IF_UDHCP_VERBOSE(...)
 # define udhcp_dump_packet(...) ((void)0)
 # define log1(...) ((void)0)
@@ -275 +283 @@
 /* 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;
@@ -306 +312 @@
         const char *interface) FAST_FUNC;
 
+/* note: ip is a pointer to an IPv6 in network order, possibly misaliged */
+int sprint_nip6(char *dest, /*const char *pre,*/ const uint8_t *ip) FAST_FUNC;
+
 POP_SAVED_FUNCTION_VISIBILITY
 

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

@@ -26 +26 @@
 #include "dhcpc.h"
 
-#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>
+#include <netinet/if_ether.h>
+#include <linux/filter.h>
+#include <linux/if_packet.h>
+
+/* "struct client_config_t client_config" is in bb_common_bufsiz1 */
+
+
+#if ENABLE_LONG_OPTS
+static const char udhcpc_longopts[] ALIGN1 =
+    "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"
+    "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"
+    "broadcast\0"      No_argument       "B"
+    IF_FEATURE_UDHCPC_ARPING("arping\0" No_argument       "a")
+    IF_FEATURE_UDHCP_PORT("client-port\0"   Required_argument "P")
+    ;
 #endif
-#include <linux/filter.h>
-
-/* struct client_config_t client_config is in bb_common_bufsiz1 */
+/* Must match getopt32 option string order */
+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,
+    OPT_B = 1 << 20,
+/* The rest has variable bit positions, need to be clever */
+    OPTBIT_B = 20,
+    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,)
+};
 
 
@@ -46 +100 @@
     [OPTION_IP_PAIR         ] = sizeof("255.255.255.255 ") * 2,
     [OPTION_STATIC_ROUTES   ] = sizeof("255.255.255.255/32 255.255.255.255 "),
+    [OPTION_6RD             ] = sizeof("32 128 ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff 255.255.255.255 "),
     [OPTION_STRING          ] = 1,
+    [OPTION_STRING_HOST     ] = 1,
 #if ENABLE_FEATURE_UDHCP_RFC3397
     [OPTION_DNS_STRING      ] = 1, /* unused */
@@ -81 +137 @@
 }
 
+/* Check if a given label represents a valid DNS label
+ * Return pointer to the first character after the label upon success,
+ * NULL otherwise.
+ * See RFC1035, 2.3.1
+ */
+/* We don't need to be particularly anal. For example, allowing _, hyphen
+ * at the end, or leading and trailing dots would be ok, since it
+ * can't be used for attacks. (Leading hyphen can be, if someone uses
+ * cmd "$hostname"
+ * in the script: then hostname may be treated as an option)
+ */
+static const char *valid_domain_label(const char *label)
+{
+    unsigned char ch;
+    unsigned pos = 0;
+
+    for (;;) {
+        ch = *label;
+        if ((ch|0x20) < 'a' || (ch|0x20) > 'z') {
+            if (pos == 0) {
+                /* label must begin with letter */
+                return NULL;
+            }
+            if (ch < '0' || ch > '9') {
+                if (ch == '\0' || ch == '.')
+                    return label;
+                /* DNS allows only '-', but we are more permissive */
+                if (ch != '-' && ch != '_')
+                    return NULL;
+            }
+        }
+        label++;
+        pos++;
+        //Do we want this?
+        //if (pos > 63) /* NS_MAXLABEL; labels must be 63 chars or less */
+        //  return NULL;
+    }
+}
+
+/* Check if a given name represents a valid DNS name */
+/* See RFC1035, 2.3.1 */
+static int good_hostname(const char *name)
+{
+    //const char *start = name;
+
+    for (;;) {
+        name = valid_domain_label(name);
+        if (!name)
+            return 0;
+        if (!name[0])
+            return 1;
+            //Do we want this?
+            //return ((name - start) < 1025); /* NS_MAXDNAME */
+        name++;
+    }
+}
+
 /* Create "opt_name=opt_value" string */
 static NOINLINE char *xmalloc_optname_optval(uint8_t *option, const struct dhcp_optflag *optflag, const char *opt_name)
@@ -88 +201 @@
     char *dest, *ret;
 
-    /* option points to OPT_DATA, need to go back and get OPT_LEN */
-    len = option[OPT_LEN - OPT_DATA];
+    /* option points to OPT_DATA, need to go back to get OPT_LEN */
+    len = option[-OPT_DATA + OPT_LEN];
 
     type = optflag->flags & OPTION_TYPE_MASK;
     optlen = dhcp_option_lengths[type];
-    upper_length = len_of_option_as_string[type] * ((unsigned)len / (unsigned)optlen);
+    upper_length = len_of_option_as_string[type]
+        * ((unsigned)(len + optlen - 1) / (unsigned)optlen);
 
     dest = ret = xmalloc(upper_length + strlen(opt_name) + 2);
@@ -99 +213 @@
 
     while (len >= optlen) {
-        unsigned ip_ofs = 0;
-
         switch (type) {
+        case OPTION_IP:
         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);
+            if (type == OPTION_IP)
+                break;
+            dest += sprint_nip(dest, "/", option + 4);
             break;
 //      case OPTION_BOOLEAN:
@@ -130 +241 @@
             break;
         }
+        /* Note: options which use 'return' instead of 'break'
+         * (for example, OPTION_STRING) skip the code which handles
+         * the case of list of options.
+         */
         case OPTION_STRING:
+        case OPTION_STRING_HOST:
             memcpy(dest, option, len);
             dest[len] = '\0';
-            return ret;  /* Short circuit this case */
+            if (type == OPTION_STRING_HOST && !good_hostname(dest))
+                safe_strncpy(dest, "bad", len);
+            return ret;
         case OPTION_STATIC_ROUTES: {
             /* Option binary format:
@@ -178 +296 @@
             return ret;
         }
+        case OPTION_6RD:
+            /* Option binary format (see RFC 5969):
+             *  0                   1                   2                   3
+             *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+             * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+             * |  OPTION_6RD   | option-length |  IPv4MaskLen  |  6rdPrefixLen |
+             * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+             * |                           6rdPrefix                           |
+             * ...                        (16 octets)                        ...
+             * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+             * ...                   6rdBRIPv4Address(es)                    ...
+             * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+             * We convert it to a string
+             * "IPv4MaskLen 6rdPrefixLen 6rdPrefix 6rdBRIPv4Address..."
+             *
+             * Sanity check: ensure that our length is at least 22 bytes, that
+             * IPv4MaskLen <= 32,
+             * 6rdPrefixLen <= 128,
+             * 6rdPrefixLen + (32 - IPv4MaskLen) <= 128
+             * (2nd condition need no check - it follows from 1st and 3rd).
+             * Else, return envvar with empty value ("optname=")
+             */
+            if (len >= (1 + 1 + 16 + 4)
+             && option[0] <= 32
+             && (option[1] + 32 - option[0]) <= 128
+            ) {
+                /* IPv4MaskLen */
+                dest += sprintf(dest, "%u ", *option++);
+                /* 6rdPrefixLen */
+                dest += sprintf(dest, "%u ", *option++);
+                /* 6rdPrefix */
+                dest += sprint_nip6(dest, /* "", */ option);
+                option += 16;
+                len -= 1 + 1 + 16 + 4;
+                /* "+ 4" above corresponds to the length of IPv4 addr
+                 * we consume in the loop below */
+                while (1) {
+                    /* 6rdBRIPv4Address(es) */
+                    dest += sprint_nip(dest, " ", option);
+                    option += 4;
+                    len -= 4; /* do we have yet another 4+ bytes? */
+                    if (len < 0)
+                        break; /* no */
+                }
+            }
+
+            return ret;
 #if ENABLE_FEATURE_UDHCP_RFC3397
         case OPTION_DNS_STRING:
@@ -217 +382 @@
 #endif
         } /* switch */
+
+        /* If we are here, try to format any remaining data
+         * in the option as another, similarly-formatted option
+         */
         option += optlen;
         len -= optlen;
@@ -222 +391 @@
 // 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) */)
+        if (len < optlen /* || !(optflag->flags & OPTION_LIST) */)
             break;
         *dest++ = ' ';
         *dest = '\0';
-    }
+    } /* while */
+
     return ret;
 }
@@ -239 +409 @@
     uint8_t *temp;
     uint8_t overload = 0;
+
+#define BITMAP unsigned
+#define BBITS (sizeof(BITMAP) * 8)
+#define BMASK(i) (1 << (i & (sizeof(BITMAP) * 8 - 1)))
+#define FOUND_OPTS(i) (found_opts[(unsigned)i / BBITS])
+    BITMAP found_opts[256 / BBITS];
+
+    memset(found_opts, 0, sizeof(found_opts));
 
     /* We need 6 elements for:
@@ -251 +429 @@
     /* +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 */
+        /* note: do not search for "pad" (0) and "end" (255) options */
+//TODO: change logic to scan packet _once_
+        for (i = 1; i < 255; i++) {
+            temp = udhcp_get_option(packet, i);
+            if (temp) {
+                if (i == DHCP_OPTION_OVERLOAD)
+                    overload = *temp;
+                else if (i == DHCP_SUBNET)
+                    envc++; /* for $mask */
                 envc++;
+                /*if (i != DHCP_MESSAGE_TYPE)*/
+                FOUND_OPTS(i) |= BMASK(i);
             }
         }
-        temp = udhcp_get_option(packet, DHCP_OPTION_OVERLOAD);
-        if (temp)
-            overload = *temp;
-    }
-    curr = envp = xzalloc(sizeof(char *) * envc);
+    }
+    curr = envp = xzalloc(sizeof(envp[0]) * envc);
 
     *curr = xasprintf("interface=%s", client_config.interface);
@@ -270 +452 @@
         return envp;
 
+    /* Export BOOTP fields. Fields we don't (yet?) export:
+     * uint8_t op;      // always 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;
+     * uint16_t secs;   // elapsed since client began acquisition/renewal
+     * uint16_t flags;  // only one flag so far: bcast. Never set by server
+     * uint32_t ciaddr; // client IP (usually == yiaddr. can it be different
+     *                  // if during renew server wants to give us differn IP?)
+     * uint32_t gateway_nip; // relay agent IP address
+     * uint8_t chaddr[16]; // link-layer client hardware address (MAC)
+     * TODO: export gateway_nip as $giaddr?
+     */
+    /* Most important one: yiaddr as $ip */
     *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) {
+        /* IP address of next server to use in bootstrap */
         *curr = xmalloc(sizeof("siaddr=255.255.255.255"));
         sprint_nip(*curr, "siaddr=", (uint8_t *) &packet->siaddr_nip);
@@ -308 +486 @@
         putenv(*curr++);
     }
+
+    /* Export known DHCP options */
+    opt_name = dhcp_option_strings;
+    i = 0;
+    while (*opt_name) {
+        uint8_t code = dhcp_optflags[i].code;
+        BITMAP *found_ptr = &FOUND_OPTS(code);
+        BITMAP found_mask = BMASK(code);
+        if (!(*found_ptr & found_mask))
+            goto next;
+        *found_ptr &= ~found_mask; /* leave only unknown options */
+        temp = udhcp_get_option(packet, code);
+        *curr = xmalloc_optname_optval(temp, &dhcp_optflags[i], opt_name);
+        putenv(*curr++);
+        if (code == DHCP_SUBNET) {
+            /* Subnet option: make things like "$ip/$mask" possible */
+            uint32_t subnet;
+            move_from_unaligned32(subnet, temp);
+            *curr = xasprintf("mask=%u", mton(subnet));
+            putenv(*curr++);
+        }
+ next:
+        opt_name += strlen(opt_name) + 1;
+        i++;
+    }
+    /* Export unknown options */
+    for (i = 0; i < 256;) {
+        BITMAP bitmap = FOUND_OPTS(i);
+        if (!bitmap) {
+            i += BBITS;
+            continue;
+        }
+        if (bitmap & BMASK(i)) {
+            unsigned len, ofs;
+
+            temp = udhcp_get_option(packet, i);
+            /* udhcp_get_option returns ptr to data portion,
+             * need to go back to get len
+             */
+            len = temp[-OPT_DATA + OPT_LEN];
+            *curr = xmalloc(sizeof("optNNN=") + 1 + len*2);
+            ofs = sprintf(*curr, "opt%u=", i);
+            *bin2hex(*curr + ofs, (void*) temp, len) = '\0';
+            putenv(*curr++);
+        }
+        i++;
+    }
+
     return envp;
 }
@@ -316 +542 @@
     char **envp, **curr;
     char *argv[3];
-
-    if (client_config.script == NULL)
-        return;
 
     envp = fill_envp(packet);
@@ -347 +570 @@
 static void init_packet(struct dhcp_packet *packet, char type)
 {
+    uint16_t secs;
+
     /* Fill in: op, htype, hlen, cookie fields; message type option: */
     udhcp_init_header(packet, type);
 
     packet->xid = random_xid();
+
+    client_config.last_secs = monotonic_sec();
+    if (client_config.first_secs == 0)
+        client_config.first_secs = client_config.last_secs;
+    secs = client_config.last_secs - client_config.first_secs;
+    packet->secs = htons(secs);
 
     memcpy(packet->chaddr, client_config.client_mac, 6);
@@ -359 +590 @@
 static void add_client_options(struct dhcp_packet *packet)
 {
-    uint8_t c;
     int i, end, len;
 
@@ -369 +599 @@
     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;
+    for (i = 1; i < DHCP_END; i++) {
+        if (client_config.opt_mask[i >> 3] & (1 << (i & 7))) {
+            packet->options[end + OPT_DATA + len] = i;
             len++;
         }
@@ -392 +618 @@
         udhcp_add_binary_option(packet, client_config.fqdn);
 
+    /* Request broadcast replies if we have no IP addr */
+    if ((option_mask32 & OPT_B) && packet->ciaddr == 0)
+        packet->flags |= htons(BROADCAST_FLAG);
+
     /* Add -x options if any */
     {
@@ -404 +634 @@
 //          strncpy((char*)packet->file, client_config.boot_file, sizeof(packet->file) - 1);
     }
+
+    // This will be needed if we remove -V VENDOR_STR in favor of
+    // -x vendor:VENDOR_STR
+    //if (!udhcp_find_option(packet.options, DHCP_VENDOR))
+    //  /* not set, set the default vendor ID */
+    //  ...add (DHCP_VENDOR, "udhcp "BB_VER) opt...
 }
 
@@ -548 +784 @@
 /* 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)
+static NOINLINE int send_decline(/*uint32_t xid,*/ uint32_t server, uint32_t requested)
 {
     struct dhcp_packet packet;
@@ -557 +793 @@
     init_packet(&packet, DHCPDECLINE);
 
+#if 0
     /* RFC 2131 says DHCPDECLINE's xid is randomly selected by client,
      * but in case the server is buggy and wants DHCPDECLINE's xid
@@ -563 +800 @@
      */
     packet.xid = xid;
+#endif
     /* DHCPDECLINE uses "requested ip", not ciaddr, to store offered IP */
     udhcp_add_simple_option(&packet, DHCP_REQUESTED_IP, requested);
@@ -599 +837 @@
     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 */
+    unsigned char cmsgbuf[CMSG_LEN(sizeof(struct tpacket_auxdata))];
+    struct iovec iov;
+    struct msghdr msg;
+    struct cmsghdr *cmsg;
+
+    /* used to use just safe_read(fd, &packet, sizeof(packet))
+     * but we need to check for TP_STATUS_CSUMNOTREADY :(
+     */
+    iov.iov_base = &packet;
+    iov.iov_len = sizeof(packet);
+    memset(&msg, 0, sizeof(msg));
+    msg.msg_iov = &iov;
+    msg.msg_iovlen = 1;
+    msg.msg_control = cmsgbuf;
+    msg.msg_controllen = sizeof(cmsgbuf);
+    for (;;) {
+        bytes = recvmsg(fd, &msg, 0);
+        if (bytes < 0) {
+            if (errno == EINTR)
+                continue;
+            log1("Packet read error, ignoring");
+            /* NB: possible down interface, etc. Caller should pause. */
+            return bytes; /* returns -1 */
+        }
+        break;
     }
 
@@ -623 +879 @@
 
     /* make sure its the right packet for us, and that it passes sanity checks */
-    if (packet.ip.protocol != IPPROTO_UDP || packet.ip.version != IPVERSION
+    if (packet.ip.protocol != IPPROTO_UDP
+     || packet.ip.version != IPVERSION
      || packet.ip.ihl != (sizeof(packet.ip) >> 2)
      || packet.udp.dest != htons(CLIENT_PORT)
@@ -636 +893 @@
     check = packet.ip.check;
     packet.ip.check = 0;
-    if (check != udhcp_checksum(&packet.ip, sizeof(packet.ip))) {
+    if (check != inet_cksum((uint16_t *)&packet.ip, sizeof(packet.ip))) {
         log1("Bad IP header checksum, ignoring");
         return -2;
+    }
+
+    for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
+        if (cmsg->cmsg_level == SOL_PACKET
+         && cmsg->cmsg_type == PACKET_AUXDATA
+        ) {
+            /* some VMs don't checksum UDP and TCP data
+             * they send to the same physical machine,
+             * here we detect this case:
+             */
+            struct tpacket_auxdata *aux = (void *)CMSG_DATA(cmsg);
+            if (aux->tp_status & TP_STATUS_CSUMNOTREADY)
+                goto skip_udp_sum_check;
+        }
     }
 
@@ -647 +918 @@
     check = packet.udp.check;
     packet.udp.check = 0;
-    if (check && check != udhcp_checksum(&packet, bytes)) {
+    if (check && check != inet_cksum((uint16_t *)&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)) {
+ skip_udp_sum_check:
+
+    if (packet.data.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));
+
+    log1("Received a packet");
+    udhcp_dump_packet(&packet.data);
+
+    bytes -= sizeof(packet.ip) + sizeof(packet.udp);
+    memcpy(dhcp_pkt, &packet.data, bytes);
+    return bytes;
 }
 
@@ -715 +989 @@
      * TODO: make conditional?
      */
-#define SERVER_AND_CLIENT_PORTS  ((67 << 16) + 68)
     static const struct sock_filter filter_instr[] = {
-        /* check for udp */
+        /* load 9th byte (protocol) */
         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 */
+        /* jump to L1 if it is IPPROTO_UDP, else to L4 */
+        BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, IPPROTO_UDP, 0, 6),
+        /* L1: load halfword from offset 6 (flags and frag offset) */
+        BPF_STMT(BPF_LD|BPF_H|BPF_ABS, 6),
+        /* jump to L4 if any bits in frag offset field are set, else to L2 */
+        BPF_JUMP(BPF_JMP|BPF_JSET|BPF_K, 0x1fff, 4, 0),
+        /* L2: skip IP header (load index reg with header len) */
+        BPF_STMT(BPF_LDX|BPF_B|BPF_MSH, 0),
+        /* load udp destination port from halfword[header_len + 2] */
+        BPF_STMT(BPF_LD|BPF_H|BPF_IND, 2),
+        /* jump to L3 if udp dport is CLIENT_PORT, else to L4 */
+        BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, 68, 0, 1),
+        /* L3: accept packet */
+        BPF_STMT(BPF_RET|BPF_K, 0xffffffff),
+        /* L4: discard packet */
+        BPF_STMT(BPF_RET|BPF_K, 0),
     };
     static const struct sock_fprog filter_prog = {
@@ -741 +1018 @@
 
     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?
-    }
+    log1("Got raw socket fd"); //log2?
 
     sock.sll_family = AF_PACKET;
@@ -755 +1024 @@
     sock.sll_ifindex = ifindex;
     xbind(fd, (struct sockaddr *) &sock, sizeof(sock));
+
+    if (CLIENT_PORT == 68) {
+        /* Use only if standard port is 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"); // log?
+    }
+
+    if (setsockopt(fd, SOL_PACKET, PACKET_AUXDATA,
+            &const_int_1, sizeof(int)) < 0
+    ) {
+        if (errno != ENOPROTOOPT)
+            log1("Can't set PACKET_AUXDATA on raw socket");
+    }
+
     log1("Created raw socket");
 
@@ -780 +1065 @@
 }
 
+/* Called only on SIGUSR1 */
 static void perform_renew(void)
 {
@@ -802 +1088 @@
 }
 
-static void perform_release(uint32_t requested_ip, uint32_t server_addr)
+static void perform_release(uint32_t server_addr, uint32_t requested_ip)
 {
     char buffer[sizeof("255.255.255.255")];
@@ -850 +1136 @@
 //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:       "[-fbnq"IF_UDHCP_VERBOSE("v")"oCRB] [-i IFACE] [-r IP] [-s PROG] [-p PIDFILE]\n"
+//usage:       "    [-V VENDOR] [-x OPT:VAL]... [-O OPT]..." IF_FEATURE_UDHCP_PORT(" [-P N]")
 //usage:#define udhcpc_full_usage "\n"
 //usage:    IF_LONG_OPTS(
@@ -857 +1143 @@
 //usage:     "\n    -p,--pidfile FILE   Create pidfile"
 //usage:     "\n    -s,--script PROG    Run PROG at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")"
+//usage:     "\n    -B,--broadcast      Request broadcast replies"
 //usage:     "\n    -t,--retries N      Send up to N discover packets"
 //usage:     "\n    -T,--timeout N      Pause between packets (default 3 seconds)"
@@ -883 +1170 @@
 //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"
@@ -894 +1180 @@
 //usage:     "\n    -p FILE     Create pidfile"
 //usage:     "\n    -s PROG     Run PROG at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")"
+//usage:     "\n    -B      Request broadcast replies"
 //usage:     "\n    -t N        Send up to N discover packets"
 //usage:     "\n    -T N        Pause between packets (default 3 seconds)"
@@ -920 +1207 @@
 //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"
@@ -927 +1213 @@
 //usage:    )
 //usage:    )
+//usage:     "\nSignals:"
+//usage:     "\n    USR1    Renew lease"
+//usage:     "\n    USR2    Release lease"
+
 
 int udhcpc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -942 +1232 @@
     uint32_t server_addr = server_addr; /* for compiler */
     uint32_t requested_ip = 0;
-    uint32_t xid = 0;
-    uint32_t lease_seconds = 0; /* can be given as 32-bit quantity */
+    uint32_t xid = xid; /* for compiler */
     int packet_num;
     int timeout; /* must be signed */
@@ -950 +1239 @@
     int max_fd;
     int retval;
-    struct timeval tv;
-    struct dhcp_packet packet;
     fd_set rfds;
-
-#if ENABLE_LONG_OPTS
-    static const char udhcpc_longopts[] ALIGN1 =
-        "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
-    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 */
@@ -1020 +1250 @@
     /* Parse command line */
     /* 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_complementary = "O::x::T+:t+:A+" IF_UDHCP_VERBOSE(":vv") ;
     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"
+    opt = getopt32(argv, "CV:H:h:F:i:np:qRr:s:T:t:SA:O:ox:fB"
         USE_FOR_MMU("b")
         IF_FEATURE_UDHCPC_ARPING("a")
@@ -1038 +1264 @@
         , &list_x
         IF_FEATURE_UDHCP_PORT(, &str_P)
-#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1
-        , &dhcp_verbose
-#endif
-        );
-    if (opt & (OPT_h|OPT_H))
+        IF_UDHCP_VERBOSE(, &dhcp_verbose)
+    );
+    if (opt & (OPT_h|OPT_H)) {
+        //msg added 2011-11
+        bb_error_msg("option -h NAME is deprecated, use -x hostname:NAME");
         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> */
@@ -1067 +1294 @@
     }
 #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;
+        unsigned n = bb_strtou(optstr, NULL, 0);
+        if (errno || n > 254) {
+            n = udhcp_option_idx(optstr);
+            n = dhcp_optflags[n].code;
+        }
         client_config.opt_mask[n >> 3] |= 1 << (n & 7);
+    }
+    if (!(opt & OPT_o)) {
+        unsigned i, n;
+        for (i = 0; (n = dhcp_optflags[i].code) != 0; i++) {
+            if (dhcp_optflags[i].flags & OPTION_REQ) {
+                client_config.opt_mask[n >> 3] |= 1 << (n & 7);
+            }
+        }
     }
     while (list_x) {
@@ -1101 +1337 @@
         memcpy(clientid_mac_ptr, client_config.client_mac, 6);
     }
-    if (str_V[0] != '\0')
+    if (str_V[0] != '\0') {
+        // can drop -V, str_V, client_config.vendorclass,
+        // but need to add "vendor" to the list of recognized
+        // string opts for this to work;
+        // and need to tweak add_client_options() too...
+        // ...so the question is, should we?
+        //bb_error_msg("option -V VENDOR is deprecated, use -x vendor:VENDOR");
         client_config.vendorclass = alloc_dhcp_option(DHCP_VENDOR, str_V, 0);
+    }
+
 #if !BB_MMU
     /* on NOMMU reexec (i.e., background) early */
@@ -1140 +1384 @@
      */
     for (;;) {
+        struct timeval tv;
+        struct dhcp_packet packet;
         /* silence "uninitialized!" warning */
         unsigned timestamp_before_wait = timestamp_before_wait;
@@ -1159 +1405 @@
         /* If we already timed out, fall through with retval = 0, else... */
         if ((int)tv.tv_sec > 0) {
+            log1("Waiting on select %u seconds", (int)tv.tv_sec);
             timestamp_before_wait = (unsigned)monotonic_sec();
-            log1("Waiting on select...");
             retval = select(max_fd + 1, &rfds, NULL, NULL, &tv);
             if (retval < 0) {
@@ -1187 +1433 @@
                     client_config.client_mac)
             ) {
-                return 1; /* iface is gone? */
+                goto ret0; /* iface is gone? */
             }
             if (clientid_mac_ptr)
@@ -1197 +1443 @@
             switch (state) {
             case INIT_SELECTING:
-                if (packet_num < discover_retries) {
+                if (!discover_retries || packet_num < discover_retries) {
                     if (packet_num == 0)
                         xid = random_xid();
@@ -1226 +1472 @@
                 continue;
             case REQUESTING:
-                if (packet_num < discover_retries) {
+                if (!discover_retries || packet_num < discover_retries) {
                     /* send broadcast select packet */
                     send_select(xid, server_addr, requested_ip);
@@ -1243 +1489 @@
                 /* 1/2 lease passed, enter renewing state */
                 state = RENEWING;
+                client_config.first_secs = 0; /* make secs field count from 0 */
                 change_listen_mode(LISTEN_KERNEL);
                 log1("Entering renew state");
@@ -1282 +1529 @@
                 udhcp_run_script(NULL, "deconfig");
                 state = INIT_SELECTING;
+                client_config.first_secs = 0; /* make secs field count from 0 */
                 /*timeout = 0; - already is */
                 packet_num = 0;
@@ -1298 +1546 @@
         switch (udhcp_sp_read(&rfds)) {
         case SIGUSR1:
+            client_config.first_secs = 0; /* make secs field count from 0 */
+            already_waited_sec = 0;
             perform_renew();
-            if (state == RENEW_REQUESTED)
+            if (state == RENEW_REQUESTED) {
+                /* We might be either on the same network
+                 * (in which case renew might work),
+                 * or we might be on a completely different one
+                 * (in which case renew won't ever succeed).
+                 * For the second case, must make sure timeout
+                 * is not too big, or else we can send
+                 * futile renew requests for hours.
+                 * (Ab)use -A TIMEOUT value (usually 20 sec)
+                 * as a cap on the timeout.
+                 */
+                if (timeout > tryagain_timeout)
+                    timeout = tryagain_timeout;
                 goto case_RENEW_REQUESTED;
+            }
             /* Start things over */
             packet_num = 0;
@@ -1307 +1570 @@
             continue;
         case SIGUSR2:
-            perform_release(requested_ip, server_addr);
+            perform_release(server_addr, requested_ip);
             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;
         }
@@ -1366 +1627 @@
         switch (state) {
         case INIT_SELECTING:
-            /* Must be a DHCPOFFER to one of our xid's */
+            /* Must be a DHCPOFFER */
             if (*message == DHCPOFFER) {
-        /* TODO: why we don't just fetch server's IP from IP header? */
+/* What exactly is server's IP? There are several values.
+ * Example DHCP offer captured with tchdump:
+ *
+ * 10.34.25.254:67 > 10.34.25.202:68 // IP header's src
+ * BOOTP fields:
+ * Your-IP 10.34.25.202
+ * Server-IP 10.34.32.125   // "next server" IP
+ * Gateway-IP 10.34.25.254  // relay's address (if DHCP relays are in use)
+ * DHCP options:
+ * DHCP-Message Option 53, length 1: Offer
+ * Server-ID Option 54, length 4: 10.34.255.7       // "server ID"
+ * Default-Gateway Option 3, length 4: 10.34.25.254 // router
+ *
+ * We think that real server IP (one to use in renew/release)
+ * is one in Server-ID option. But I am not 100% sure.
+ * IP header's src and Gateway-IP (same in this example)
+ * might work too.
+ * "Next server" and router are definitely wrong ones to use, though...
+ */
                 temp = udhcp_get_option(&packet, DHCP_SERVER_ID);
                 if (!temp) {
@@ -1392 +1671 @@
         case REBINDING:
             if (*message == DHCPACK) {
+                uint32_t lease_seconds;
+                struct in_addr temp_addr;
+
                 temp = udhcp_get_option(&packet, DHCP_LEASE_TIME);
                 if (!temp) {
@@ -1400 +1682 @@
                     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;
+                    /* paranoia: must not be too small and not prone to overflows */
+                    if (lease_seconds < 0x10)
+                        lease_seconds = 0x10;
+                    if (lease_seconds >= 0x10000000)
+                        lease_seconds = 0x0fffffff;
                 }
 #if ENABLE_FEATURE_UDHCPC_ARPING
@@ -1423 +1707 @@
                         bb_info_msg("Offered address is in use "
                             "(got ARP reply), declining");
-                        send_decline(xid, server_addr, packet.yiaddr);
+                        send_decline(/*xid,*/ server_addr, packet.yiaddr);
 
                         if (state != REQUESTING)
@@ -1429 +1713 @@
                         change_listen_mode(LISTEN_RAW);
                         state = INIT_SELECTING;
+                        client_config.first_secs = 0; /* make secs field count from 0 */
                         requested_ip = 0;
                         timeout = tryagain_timeout;
@@ -1439 +1724 @@
                 /* 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_seconds);
-                }
+                temp_addr.s_addr = packet.yiaddr;
+                bb_info_msg("Lease of %s obtained, lease time %u",
+                    inet_ntoa(temp_addr), (unsigned)lease_seconds);
                 requested_ip = packet.yiaddr;
                 udhcp_run_script(&packet, state == REQUESTING ? "bound" : "renew");
@@ -1451 +1733 @@
                 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;
                 }
@@ -1464 +1744 @@
                 }
 #endif
+                /* make future renew packets use different xid */
+                /* xid = random_xid(); ...but why bother? */
                 already_waited_sec = 0;
                 continue; /* back to main loop */
@@ -1476 +1758 @@
                 sleep(3); /* avoid excessive network traffic */
                 state = INIT_SELECTING;
+                client_config.first_secs = 0; /* make secs field count from 0 */
                 requested_ip = 0;
                 timeout = 0;
@@ -1489 +1772 @@
 
  ret0:
+    if (opt & OPT_R) /* release on quit */
+        perform_release(server_addr, requested_ip);
     retval = 0;
  ret:

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

@@ -10 +10 @@
 struct client_config_t {
     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 */
@@ -22 +21 @@
     uint8_t *hostname;              /* Optional hostname to use */
     uint8_t *fqdn;                  /* Optional fully qualified domain name to use */
+
+    uint16_t first_secs;
+    uint16_t last_secs;
 } FIX_ALIASING;
 

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

@@ -21 +21 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
+//usage:#define udhcpd_trivial_usage
+//usage:       "[-fS]" IF_FEATURE_UDHCP_PORT(" [-P N]") " [CONFFILE]"
+//usage:#define udhcpd_full_usage "\n\n"
+//usage:       "DHCP server\n"
+//usage:     "\n    -f  Run in foreground"
+//usage:     "\n    -S  Log to syslog too"
+//usage:    IF_FEATURE_UDHCP_PORT(
+//usage:     "\n    -P N    Use port N (default 67)"
+//usage:    )
+
 #include <syslog.h>
 #include "common.h"
@@ -134 +145 @@
 /* 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)
+static NOINLINE void send_offer(struct dhcp_packet *oldpacket,
+        uint32_t static_lease_nip,
+        struct dyn_lease *lease,
+        uint8_t *requested_ip_opt)
 {
     struct dhcp_packet packet;
@@ -148 +162 @@
         /* We have no static lease for client's chaddr */
         uint32_t req_nip;
-        uint8_t *req_ip_opt;
         const char *p_host_name;
 
@@ -159 +172 @@
         }
         /* Or: if client has requested an IP */
-        else if ((req_ip_opt = udhcp_get_option(oldpacket, DHCP_REQUESTED_IP)) != NULL
+        else if (requested_ip_opt != NULL
          /* (read IP) */
-         && (move_from_unaligned32(req_nip, req_ip_opt), 1)
+         && (move_from_unaligned32(req_nip, requested_ip_opt), 1)
          /* and the IP is in the lease range */
          && ntohl(req_nip) >= server_config.start_ip
@@ -284 +297 @@
 int udhcpd_main(int argc UNUSED_PARAM, char **argv)
 {
-    fd_set rfds;
     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 dyn_lease *lease, fake_lease;
     IF_FEATURE_UDHCP_PORT(char *str_P;)
 
@@ -306 +315 @@
     opt = getopt32(argv, "fSv"
         IF_FEATURE_UDHCP_PORT("P:", &str_P)
-#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1
-        , &dhcp_verbose
-#endif
+        IF_UDHCP_VERBOSE(, &dhcp_verbose)
         );
     if (!(opt & 1)) { /* no -f */
@@ -371 +378 @@
     udhcp_sp_setup();
 
+ continue_with_autotime:
     timeout_end = monotonic_sec() + server_config.auto_time;
     while (1) { /* loop until universe collapses */
+        fd_set rfds;
+        struct dhcp_packet packet;
         int bytes;
         struct timeval tv;
         uint8_t *server_id_opt;
-        uint8_t *requested_opt;
+        uint8_t *requested_ip_opt;
         uint32_t requested_nip = requested_nip; /* for compiler */
+        uint32_t static_lease_nip;
+        struct dyn_lease *lease, fake_lease;
 
         if (server_socket < 0) {
@@ -396 +408 @@
         if (retval == 0) {
             write_leases();
-            timeout_end = monotonic_sec() + server_config.auto_time;
-            continue;
+            goto continue_with_autotime;
         }
         if (retval < 0 && errno != EINTR) {
@@ -409 +420 @@
             write_leases();
             /* why not just reset the timeout, eh */
-            timeout_end = monotonic_sec() + server_config.auto_time;
-            continue;
+            goto continue_with_autotime;
         case SIGTERM:
             bb_info_msg("Received SIGTERM");
+            write_leases();
             goto ret0;
         case 0: /* no signal: read a packet */
@@ -442 +453 @@
             bb_error_msg("no or bad message type option, ignoring packet");
             continue;
+        }
+
+        /* Get SERVER_ID if present */
+        server_id_opt = udhcp_get_option(&packet, DHCP_SERVER_ID);
+        if (server_id_opt) {
+            uint32_t server_id_network_order;
+            move_from_unaligned32(server_id_network_order, server_id_opt);
+            if (server_id_network_order != server_config.server_nip) {
+                /* client talks to somebody else */
+                log1("server ID doesn't match, ignoring");
+                continue;
+            }
         }
 
@@ -456 +479 @@
         }
 
-        /* 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);
+        /* Get REQUESTED_IP if present */
+        requested_ip_opt = udhcp_get_option(&packet, DHCP_REQUESTED_IP);
+        if (requested_ip_opt) {
+            move_from_unaligned32(requested_nip, requested_ip_opt);
         }
 
@@ -477 +490 @@
             log1("Received DISCOVER");
 
-            send_offer(&packet, static_lease_nip, lease);
+            send_offer(&packet, static_lease_nip, lease, requested_ip_opt);
             break;
 
@@ -568 +581 @@
    administrative authority to do so.
 */
-            if (!requested_opt) {
+            if (!requested_ip_opt) {
                 requested_nip = packet.ciaddr;
                 if (requested_nip == 0) {
@@ -581 +594 @@
                 break;
             }
-            if (server_id_opt) {
-                /* client was talking specifically to us.
-                 * "No, we don't have this IP for you". */
+            /* No lease for this MAC, or lease IP != requested IP */
+
+            if (server_id_opt    /* client is in SELECTING state */
+             || requested_ip_opt /* client is in INIT-REBOOT state */
+            ) {
+                /* "No, we don't have this IP for you" */
                 send_NAK(&packet);
-            }
+            } /* else: client is in RENEWING or REBINDING, do not answer */
+
             break;
 
@@ -604 +621 @@
             log1("Received DECLINE");
             if (server_id_opt
-             && requested_opt
+             && requested_ip_opt
              && lease  /* chaddr matches this lease */
              && requested_nip == lease->lease_nip

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

@@ -10 +10 @@
  * Upstream has GPL v2 or later
  */
+
+//usage:#define dhcprelay_trivial_usage
+//usage:       "CLIENT_IFACE[,CLIENT_IFACE2]... SERVER_IFACE [SERVER_IP]"
+//usage:#define dhcprelay_full_usage "\n\n"
+//usage:       "Relay DHCP requests between clients and server"
+
 #include "common.h"
 
@@ -26 +32 @@
     struct sockaddr_in ip;
     struct xid_item *next;
-};
+} FIX_ALIASING;
 
 #define dhcprelay_xid_list (*(struct xid_item*)&bb_common_bufsiz1)

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

@@ -3 +3 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+
+//usage:#define dumpleases_trivial_usage
+//usage:       "[-r|-a] [-f LEASEFILE]"
+//usage:#define dumpleases_full_usage "\n\n"
+//usage:       "Display DHCP leases granted by udhcpd\n"
+//usage:    IF_LONG_OPTS(
+//usage:     "\n    -f,--file=FILE  Lease file"
+//usage:     "\n    -r,--remaining  Show remaining time"
+//usage:     "\n    -a,--absolute   Show expiration time"
+//usage:    )
+//usage:    IF_NOT_LONG_OPTS(
+//usage:     "\n    -f FILE Lease file"
+//usage:     "\n    -r  Show remaining time"
+//usage:     "\n    -a  Show expiration time"
+//usage:    )
+
 #include "common.h"
 #include "dhcpd.h"
@@ -58 +74 @@
 #if ENABLE_UNICODE_SUPPORT
         {
-            char *uni_name = unicode_conv_to_printable_fixedwidth(NULL, lease.hostname, 19);
+            char *uni_name = unicode_conv_to_printable_fixedwidth(/*NULL,*/ lease.hostname, 19);
             printf(" %-16s%s ", inet_ntoa(addr), uni_name);
             free(uni_name);

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

@@ -81 +81 @@
     {"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    , ""},
+    {"notify_file"  , read_str        , &server_config.notify_file  , NULL},
+    {"sname"        , read_str        , &server_config.sname        , NULL},
+    {"boot_file"    , read_str        , &server_config.boot_file    , NULL},
     {"static_lease" , read_staticlease, &server_config.static_leases, ""},
 };

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

@@ -138 +138 @@
     struct dyn_lease *oldest_lease = NULL;
 
-    addr = server_config.start_ip; /* addr is in host order here */
-    for (; addr <= server_config.end_ip; addr++) {
+#if ENABLE_FEATURE_UDHCPD_BASE_IP_ON_MAC
+    uint32_t stop;
+    unsigned i, hash;
+
+    /* hash hwaddr: use the SDBM hashing algorithm.  Seems to give good
+     * dispersal even with similarly-valued "strings".
+     */
+    hash = 0;
+    for (i = 0; i < 6; i++)
+        hash += safe_mac[i] + (hash << 6) + (hash << 16) - hash;
+
+    /* pick a seed based on hwaddr then iterate until we find a free address. */
+    addr = server_config.start_ip
+        + (hash % (1 + server_config.end_ip - server_config.start_ip));
+    stop = addr;
+#else
+    addr = server_config.start_ip;
+#define stop (server_config.end_ip + 1)
+#endif
+    do {
         uint32_t nip;
         struct dyn_lease *lease;
@@ -145 +163 @@
         /* ie, 192.168.55.0 */
         if ((addr & 0xff) == 0)
-            continue;
+            goto next_addr;
         /* ie, 192.168.55.255 */
         if ((addr & 0xff) == 0xff)
-            continue;
+            goto next_addr;
         nip = htonl(addr);
+        /* skip our own address */
+        if (nip == server_config.server_nip)
+            goto next_addr;
         /* is this a static lease addr? */
         if (is_nip_reserved(server_config.static_leases, nip))
-            continue;
+            goto next_addr;
 
         lease = find_lease_by_nip(nip);
@@ -163 +184 @@
                 oldest_lease = lease;
         }
-    }
+
+ next_addr:
+        addr++;
+#if ENABLE_FEATURE_UDHCPD_BASE_IP_ON_MAC
+        if (addr > server_config.end_ip)
+            addr = server_config.start_ip;
+#endif
+    } while (addr != stop);
 
     if (oldest_lease

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

@@ -7 +7 @@
  * 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>
-#else
-# include <asm/types.h>
-# include <linux/if_packet.h>
-# include <linux/if_ether.h>
-#endif
-
 #include "common.h"
 #include "dhcpd.h"
+#include <netinet/in.h>
+#include <netinet/if_ether.h>
+#include <netpacket/packet.h>
 
 void FAST_FUNC udhcp_init_header(struct dhcp_packet *packet, char type)
@@ -89 +82 @@
 {
     int bytes;
-    unsigned char *vendor;
 
     memset(packet, 0, sizeof(*packet));
@@ -98 +90 @@
     }
 
-    if (packet->cookie != htonl(DHCP_MAGIC)) {
+    if (bytes < offsetof(struct dhcp_packet, options)
+     || packet->cookie != htonl(DHCP_MAGIC)
+    ) {
         bb_info_msg("Packet with bad magic, ignoring");
         return -2;
@@ -105 +99 @@
     udhcp_dump_packet(packet);
 
-    if (packet->op == BOOTREQUEST) {
-        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 - OPT_DATA] == (uint8_t)strlen(broken_vendors[i])
-                 && strncmp((char*)vendor, broken_vendors[i], vendor[OPT_LEN - OPT_DATA]) == 0
-                ) {
-                    log1("Broken client (%s), forcing broadcast replies",
-                        broken_vendors[i]);
-                    packet->flags |= htons(BROADCAST_FLAG);
-                }
-            }
-#else
-            if (vendor[OPT_LEN - OPT_DATA] == (uint8_t)(sizeof("MSFT 98")-1)
-             && memcmp(vendor, "MSFT 98", sizeof("MSFT 98")-1) == 0
-            ) {
-                log1("Broken client (%s), forcing broadcast replies", "MSFT 98");
-                packet->flags |= htons(BROADCAST_FLAG);
-            }
-#endif
-        }
-    }
-
     return bytes;
-}
-
-uint16_t FAST_FUNC udhcp_checksum(void *addr, int count)
-{
-    /* Compute Internet Checksum for "count" bytes
-     * beginning at location "addr".
-     */
-    int32_t sum = 0;
-    uint16_t *source = (uint16_t *) addr;
-
-    while (count > 1)  {
-        /*  This is the inner loop */
-        sum += *source++;
-        count -= 2;
-    }
-
-    /*  Add left-over byte, if any */
-    if (count > 0) {
-        /* Make sure that the left-over byte is added correctly both
-         * with little and big endian hosts */
-        uint16_t tmp = 0;
-        *(uint8_t*)&tmp = *(uint8_t*)source;
-        sum += tmp;
-    }
-    /*  Fold 32-bit sum to 16 bits */
-    while (sum >> 16)
-        sum = (sum & 0xffff) + (sum >> 16);
-
-    return ~sum;
 }
 
@@ -220 +156 @@
     /* for UDP checksumming, ip.len is set to UDP packet len */
     packet.ip.tot_len = packet.udp.len;
-    packet.udp.check = udhcp_checksum(&packet, IP_UDP_DHCP_SIZE - padding);
+    packet.udp.check = inet_cksum((uint16_t *)&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);
@@ -226 +163 @@
     packet.ip.version = IPVERSION;
     packet.ip.ttl = IPDEFTTL;
-    packet.ip.check = udhcp_checksum(&packet.ip, sizeof(packet.ip));
+    packet.ip.check = inet_cksum((uint16_t *)&packet.ip, sizeof(packet.ip));
 
     udhcp_dump_packet(dhcp_pkt);
@@ -246 +183 @@
         uint32_t dest_nip, int dest_port)
 {
-    struct sockaddr_in client;
+    struct sockaddr_in sa;
     unsigned padding;
     int fd;
@@ -259 +196 @@
     setsockopt_reuseaddr(fd);
 
-    memset(&client, 0, sizeof(client));
-    client.sin_family = AF_INET;
-    client.sin_port = htons(source_port);
-    client.sin_addr.s_addr = source_nip;
-    if (bind(fd, (struct sockaddr *)&client, sizeof(client)) == -1) {
+    memset(&sa, 0, sizeof(sa));
+    sa.sin_family = AF_INET;
+    sa.sin_port = htons(source_port);
+    sa.sin_addr.s_addr = source_nip;
+    if (bind(fd, (struct sockaddr *)&sa, sizeof(sa)) == -1) {
         msg = "bind(%s)";
         goto ret_close;
     }
 
-    memset(&client, 0, sizeof(client));
-    client.sin_family = AF_INET;
-    client.sin_port = htons(dest_port);
-    client.sin_addr.s_addr = dest_nip;
-    if (connect(fd, (struct sockaddr *)&client, sizeof(client)) == -1) {
+    memset(&sa, 0, sizeof(sa));
+    sa.sin_family = AF_INET;
+    sa.sin_port = htons(dest_port);
+    sa.sin_addr.s_addr = dest_nip;
+    if (connect(fd, (struct sockaddr *)&sa, sizeof(sa)) == -1) {
         msg = "connect";
         goto ret_close;
@@ -278 +215 @@
 
     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);

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

@@ -23 +23 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include "common.h"
 #include <net/if.h>
-#if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined _NEWLIB_VERSION
-# include <netpacket/packet.h>
-# include <net/ethernet.h>
-#else
-# include <asm/types.h>
-# include <linux/if_packet.h>
-# include <linux/if_ether.h>
-#endif
-
-#include "common.h"
 
 int FAST_FUNC udhcp_read_interface(const char *interface, int *ifindex, uint32_t *nip, uint8_t *mac)
 {
+    /* char buffer instead of bona-fide struct avoids aliasing warning */
+    char ifr_buf[sizeof(struct ifreq)];
+    struct ifreq *const ifr = (void *)ifr_buf;
+
     int fd;
-    struct ifreq ifr;
     struct sockaddr_in *our_ip;
 
-    memset(&ifr, 0, sizeof(ifr));
+    memset(ifr, 0, sizeof(*ifr));
     fd = xsocket(AF_INET, SOCK_RAW, IPPROTO_RAW);
 
-    ifr.ifr_addr.sa_family = AF_INET;
-    strncpy_IFNAMSIZ(ifr.ifr_name, interface);
+    ifr->ifr_addr.sa_family = AF_INET;
+    strncpy_IFNAMSIZ(ifr->ifr_name, interface);
     if (nip) {
-        if (ioctl_or_perror(fd, SIOCGIFADDR, &ifr,
+        if (ioctl_or_perror(fd, SIOCGIFADDR, ifr,
             "is interface %s up and configured?", interface)
         ) {
@@ -53 +47 @@
             return -1;
         }
-        our_ip = (struct sockaddr_in *) &ifr.ifr_addr;
+        our_ip = (struct sockaddr_in *) &ifr->ifr_addr;
         *nip = our_ip->sin_addr.s_addr;
         log1("IP %s", inet_ntoa(our_ip->sin_addr));
@@ -59 +53 @@
 
     if (ifindex) {
-        if (ioctl_or_warn(fd, SIOCGIFINDEX, &ifr) != 0) {
+        if (ioctl_or_warn(fd, SIOCGIFINDEX, ifr) != 0) {
             close(fd);
             return -1;
         }
-        log1("Adapter index %d", ifr.ifr_ifindex);
-        *ifindex = ifr.ifr_ifindex;
+        log1("Adapter index %d", ifr->ifr_ifindex);
+        *ifindex = ifr->ifr_ifindex;
     }
 
     if (mac) {
-        if (ioctl_or_warn(fd, SIOCGIFHWADDR, &ifr) != 0) {
+        if (ioctl_or_warn(fd, SIOCGIFHWADDR, ifr) != 0) {
             close(fd);
             return -1;
         }
-        memcpy(mac, ifr.ifr_hwaddr.sa_data, 6);
+        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]);
@@ -87 +81 @@
     int fd;
     struct sockaddr_in addr;
+    char *colon;
 
     log1("Opening listen socket on *:%d %s", port, inf);
@@ -95 +90 @@
         bb_perror_msg_and_die("SO_BROADCAST");
 
-    /* NB: bug 1032 says this doesn't work on ethernet aliases (ethN:M) */
+    /* SO_BINDTODEVICE doesn't work on ethernet aliases (ethN:M) */
+    colon = strrchr(inf, ':');
+    if (colon)
+        *colon = '\0';
+
     if (setsockopt_bindtodevice(fd, inf))
         xfunc_die(); /* warning is already printed */
+
+    if (colon)
+        *colon = ':';
 
     memset(&addr, 0, sizeof(addr));

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

@@ -9 +9 @@
 
 /* BB_AUDIT SUSv3 N/A */
+
+//usage:#define vconfig_trivial_usage
+//usage:       "COMMAND [OPTIONS]"
+//usage:#define vconfig_full_usage "\n\n"
+//usage:       "Create and remove virtual ethernet devices\n"
+//usage:     "\n    add     IFACE VLAN_ID"
+//usage:     "\n    rem     VLAN_NAME"
+//usage:     "\n    set_flag    IFACE 0|1 VLAN_QOS"
+//usage:     "\n    set_egress_map  VLAN_NAME SKB_PRIO VLAN_QOS"
+//usage:     "\n    set_ingress_map VLAN_NAME SKB_PRIO VLAN_QOS"
+//usage:     "\n    set_name_type   NAME_TYPE"
 
 #include "libbb.h"
@@ -56 +67 @@
 static const char *xfind_str(const char *table, const char *str)
 {
-    while (strcasecmp(str, table+1) != 0) {
+    while (strcasecmp(str, table + 1) != 0) {
+        if (!table[0])
+            bb_show_usage();
         table += table[0];
-        if (!*table) {
-            bb_show_usage();
-        }
     }
     return table - 1;
@@ -67 +77 @@
 static const char cmds[] ALIGN1 = {
     4, ADD_VLAN_CMD, 7,
-    'a', 'd', 'd', 0,
+    'a','d','d',0,
     3, DEL_VLAN_CMD, 7,
-    'r', 'e', 'm', 0,
+    'r','e','m',0,
     3, SET_VLAN_NAME_TYPE_CMD, 17,
-    's', 'e', 't', '_',
-    'n', 'a', 'm', 'e', '_',
-    't', 'y', 'p', 'e', 0,
+    's','e','t','_','n','a','m','e','_','t','y','p','e',0,
     5, SET_VLAN_FLAG_CMD, 12,
-    's', 'e', 't', '_',
-    'f', 'l', 'a', 'g', 0,
+    's','e','t','_','f','l','a','g',0,
     5, SET_VLAN_EGRESS_PRIORITY_CMD, 18,
-    's', 'e', 't', '_',
-    'e', 'g', 'r', 'e', 's', 's', '_',
-    'm', 'a', 'p', 0,
-    5, SET_VLAN_INGRESS_PRIORITY_CMD, 16,
-    's', 'e', 't', '_',
-    'i', 'n', 'g', 'r', 'e', 's', 's', '_',
-    'm', 'a', 'p', 0,
+    's','e','t','_','e','g','r','e','s','s','_','m','a','p',0,
+    5, SET_VLAN_INGRESS_PRIORITY_CMD, 0,
+    's','e','t','_','i','n','g','r','e','s','s','_','m','a','p',0,
 };
 
 static const char name_types[] ALIGN1 = {
     VLAN_NAME_TYPE_PLUS_VID, 16,
-    'V', 'L', 'A', 'N',
-    '_', 'P', 'L', 'U', 'S', '_', 'V', 'I', 'D',
-    0,
+    'V','L','A','N','_','P','L','U','S','_','V','I','D',0,
     VLAN_NAME_TYPE_PLUS_VID_NO_PAD, 22,
-    'V', 'L', 'A', 'N',
-    '_', 'P', 'L', 'U', 'S', '_', 'V', 'I', 'D',
-    '_', 'N', 'O', '_', 'P', 'A', 'D', 0,
+    'V','L','A','N','_','P','L','U','S','_','V','I','D','_','N','O','_','P','A','D',0,
     VLAN_NAME_TYPE_RAW_PLUS_VID, 15,
-    'D', 'E', 'V',
-    '_', 'P', 'L', 'U', 'S', '_', 'V', 'I', 'D',
-    0,
-    VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD, 20,
-    'D', 'E', 'V',
-    '_', 'P', 'L', 'U', 'S', '_', 'V', 'I', 'D',
-    '_', 'N', 'O', '_', 'P', 'A', 'D', 0,
+    'D','E','V','_','P','L','U','S','_','V','I','D',0,
+    VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD, 0,
+    'D','E','V','_','P','L','U','S','_','V','I','D','_','N','O','_','P','A','D',0,
 };
-
-static const char conf_file_name[] ALIGN1 = "/proc/net/vlan/config";
 
 int vconfig_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -115 +108 @@
     int fd;
 
-    if (argc < 3) {
-        bb_show_usage();
-    }
-
-    /* Don't bother closing the filedes.  It will be closed on cleanup. */
-    /* Will die if 802.1q is not present */
-    xopen(conf_file_name, O_RDONLY);
-
     memset(&ifr, 0, sizeof(ifr));
 
     ++argv;
-    p = xfind_str(cmds+2, *argv);
+    if (!argv[0])
+        bb_show_usage();
+    p = xfind_str(cmds + 2, argv[0]);
     ifr.cmd = *p;
-    if (argc != p[-1]) {
+    if (argc != p[-1])
         bb_show_usage();
-    }
 
-    if (ifr.cmd == SET_VLAN_NAME_TYPE_CMD) { /* set_name_type */
-        ifr.u.name_type = *xfind_str(name_types+1, argv[1]);
+    if (ifr.cmd == SET_VLAN_NAME_TYPE_CMD) {
+        /* set_name_type */
+        ifr.u.name_type = *xfind_str(name_types + 1, argv[1]);
     } else {
         strncpy_IFNAMSIZ(ifr.device1, argv[1]);
@@ -142 +129 @@
          * (unsigned) int members of a unions.  But because of the range checking,
          * doing so wouldn't save that much space and would also make maintainence
-         * more of a pain. */
-        if (ifr.cmd == SET_VLAN_FLAG_CMD) { /* set_flag */
-            ifr.u.flag = xatoul_range(p, 0, 1);
+         * more of a pain.
+         */
+        if (ifr.cmd == SET_VLAN_FLAG_CMD) {
+            /* set_flag */
+            ifr.u.flag = xatou_range(p, 0, 1);
             /* DM: in order to set reorder header, qos must be set */
-            ifr.vlan_qos = xatoul_range(argv[3], 0, 7);
-        } else if (ifr.cmd == ADD_VLAN_CMD) { /* add */
-            ifr.u.VID = xatoul_range(p, 0, VLAN_GROUP_ARRAY_LEN-1);
-        } else if (ifr.cmd != DEL_VLAN_CMD) { /* set_{egress|ingress}_map */
+            ifr.vlan_qos = xatou_range(argv[3], 0, 7);
+        } else if (ifr.cmd == ADD_VLAN_CMD) {
+            /* add */
+            ifr.u.VID = xatou_range(p, 0, VLAN_GROUP_ARRAY_LEN - 1);
+        } else if (ifr.cmd != DEL_VLAN_CMD) {
+            /* set_{egress|ingress}_map */
             ifr.u.skb_priority = xatou(p);
-            ifr.vlan_qos = xatoul_range(argv[3], 0, 7);
+            ifr.vlan_qos = xatou_range(argv[3], 0, 7);
         }
     }
@@ -157 +148 @@
     fd = xsocket(AF_INET, SOCK_STREAM, 0);
     ioctl_or_perror_and_die(fd, SIOCSIFVLAN, &ifr,
-                        "ioctl error for %s", *argv);
+                        "ioctl error for %s", argv[0]);
 
     return 0;

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

@@ -9 +9 @@
  * Kuhn's copyrights are licensed GPLv2-or-later.  File as a whole remains GPLv2.
  */
+
+//usage:#define wget_trivial_usage
+//usage:    IF_FEATURE_WGET_LONG_OPTIONS(
+//usage:       "[-c|--continue] [-s|--spider] [-q|--quiet] [-O|--output-document FILE]\n"
+//usage:       "    [--header 'header: value'] [-Y|--proxy on/off] [-P DIR]\n"
+/* Since we ignore these opts, we don't show them in --help */
+/* //usage:    "    [--no-check-certificate] [--no-cache]" */
+//usage:       "    [-U|--user-agent AGENT]" IF_FEATURE_WGET_TIMEOUT(" [-T SEC]") " URL..."
+//usage:    )
+//usage:    IF_NOT_FEATURE_WGET_LONG_OPTIONS(
+//usage:       "[-csq] [-O FILE] [-Y on/off] [-P DIR] [-U AGENT]"
+//usage:            IF_FEATURE_WGET_TIMEOUT(" [-T SEC]") " URL..."
+//usage:    )
+//usage:#define wget_full_usage "\n\n"
+//usage:       "Retrieve files via HTTP or FTP\n"
+//usage:     "\n    -s  Spider mode - only check file existence"
+//usage:     "\n    -c  Continue retrieval of aborted transfer"
+//usage:     "\n    -q  Quiet"
+//usage:     "\n    -P DIR  Save to DIR (default .)"
+//usage:    IF_FEATURE_WGET_TIMEOUT(
+//usage:     "\n    -T SEC  Network read timeout is SEC seconds"
+//usage:    )
+//usage:     "\n    -O FILE Save to FILE ('-' for stdout)"
+//usage:     "\n    -U STR  Use STR for User-Agent header"
+//usage:     "\n    -Y  Use proxy ('on' or 'off')"
+
 #include "libbb.h"
 
+#if 0
+# define log_io(...) bb_error_msg(__VA_ARGS__)
+#else
+# define log_io(...) ((void)0)
+#endif
+
+
 struct host_info {
-    // May be used if we ever will want to free() all xstrdup()s...
-    /* char *allocated; */
+    char *allocated;
     const char *path;
     const char *user;
@@ -31 +63 @@
     bb_progress_t pmt;
 #endif
+        char *dir_prefix;
+#if ENABLE_FEATURE_WGET_LONG_OPTIONS
+        char *post_data;
+        char *extra_headers;
+#endif
+        char *fname_out;        /* where to direct output (-O) */
+        const char *proxy_flag; /* Use proxies if env vars are set */
+        const char *user_agent; /* "User-Agent" header field */
 #if ENABLE_FEATURE_WGET_TIMEOUT
     unsigned timeout_seconds;
 #endif
+    int output_fd;
+    int o_flags;
     smallint chunked;         /* chunked transfer encoding */
     smallint got_clen;        /* got content-length: from server  */
+    /* Local downloads do benefit from big buffer.
+     * With 512 byte buffer, it was measured to be
+     * an order of magnitude slower than with big one.
+     */
+    uint64_t just_to_align_next_member;
+    char wget_buf[CONFIG_FEATURE_COPYBUF_KB*1024];
 } 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 G (*ptr_to_globals)
 #define INIT_G() do { \
+        SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
     IF_FEATURE_WGET_TIMEOUT(G.timeout_seconds = 900;) \
 } while (0)
@@ -74 +120 @@
 
     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);
+        bb_progress_init(&G.pmt, G.curfile);
+
+    bb_progress_update(&G.pmt,
+            G.beg_range,
+            G.transferred,
+            (G.chunked || !G.got_clen) ? 0 : G.beg_range + G.transferred + G.content_len
+    );
 
     if (flag == PROGRESS_END) {
+        bb_progress_free(&G.pmt);
         bb_putchar_stderr('\n');
         G.transferred = 0;
@@ -125 +175 @@
 }
 
-/* Read NMEMB bytes into PTR from STREAM.  Returns the number of bytes read,
- * and a short count if an eof or non-interrupt error is encountered.  */
-static size_t safe_fread(void *ptr, size_t nmemb, FILE *stream)
-{
-    size_t ret;
-    char *p = (char*)ptr;
-
-    do {
-        clearerr(stream);
-        errno = 0;
-        ret = fread(p, 1, nmemb, stream);
-        p += ret;
-        nmemb -= ret;
-    } while (nmemb && ferror(stream) && errno == EINTR);
-
-    return p - (char*)ptr;
-}
-
-/* Read a line or SIZE-1 bytes into S, whichever is less, from STREAM.
- * Returns S, or NULL if an eof or non-interrupt error is encountered.  */
-static char *safe_fgets(char *s, int size, FILE *stream)
-{
-    char *ret;
-
-    do {
-        clearerr(stream);
-        errno = 0;
-        ret = fgets(s, size, stream);
-    } while (ret == NULL && ferror(stream) && errno == EINTR);
-
-    return ret;
-}
-
 #if ENABLE_FEATURE_WGET_AUTHENTICATION
-/* Base64-encode character string. buf is assumed to be char buf[512]. */
-static char *base64enc_512(char buf[512], const char *str)
+/* Base64-encode character string. */
+static char *base64enc(const char *str)
 {
     unsigned len = strlen(str);
-    if (len > 512/4*3 - 10) /* paranoia */
-        len = 512/4*3 - 10;
-    bb_uuencode(buf, str, len, bb_uuenc_tbl_base64);
-    return buf;
+    if (len > sizeof(G.wget_buf)/4*3 - 10) /* paranoia */
+        len = sizeof(G.wget_buf)/4*3 - 10;
+    bb_uuencode(G.wget_buf, str, len, bb_uuenc_tbl_base64);
+    return G.wget_buf;
 }
 #endif
@@ -187 +204 @@
     fp = fdopen(xconnect_stream(lsa), "r+");
     if (fp == NULL)
-        bb_perror_msg_and_die("fdopen");
+        bb_perror_msg_and_die(bb_msg_memory_exhausted);
 
     return fp;
 }
 
-static int ftpcmd(const char *s1, const char *s2, FILE *fp, char *buf)
+/* Returns '\n' if it was seen, else '\0'. Trims at first '\r' or '\n' */
+static char fgets_and_trim(FILE *fp)
+{
+    char c;
+    char *buf_ptr;
+
+    if (fgets(G.wget_buf, sizeof(G.wget_buf) - 1, fp) == NULL)
+        bb_perror_msg_and_die("error getting response");
+
+    buf_ptr = strchrnul(G.wget_buf, '\n');
+    c = *buf_ptr;
+    *buf_ptr = '\0';
+    buf_ptr = strchrnul(G.wget_buf, '\r');
+    *buf_ptr = '\0';
+
+    log_io("< %s", G.wget_buf);
+
+    return c;
+}
+
+static int ftpcmd(const char *s1, const char *s2, FILE *fp)
 {
     int result;
     if (s1) {
-        if (!s2) s2 = "";
+        if (!s2)
+            s2 = "";
         fprintf(fp, "%s%s\r\n", s1, s2);
         fflush(fp);
+        log_io("> %s%s", s1, s2);
     }
 
     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_positive(buf);
-    buf[3] = ' ';
+        fgets_and_trim(fp);
+    } while (!isdigit(G.wget_buf[0]) || G.wget_buf[3] != ' ');
+
+    G.wget_buf[3] = '\0';
+    result = xatoi_positive(G.wget_buf);
+    G.wget_buf[3] = ' ';
     return result;
 }
 
-static void parse_url(char *src_url, struct host_info *h)
+static void parse_url(const char *src_url, struct host_info *h)
 {
     char *url, *p, *sp;
 
-    /* h->allocated = */ url = xstrdup(src_url);
+    free(h->allocated);
+    h->allocated = url = xstrdup(src_url);
 
     if (strncmp(url, "http://", 7) == 0) {
@@ -271 +303 @@
     sp = strrchr(h->host, '@');
     if (sp != NULL) {
-        h->user = h->host;
+        // URL-decode "user:password" string before base64-encoding:
+        // wget http://test:my%20pass@example.com should send
+        // Authorization: Basic dGVzdDpteSBwYXNz
+        // which decodes to "test:my pass".
+        // Standard wget and curl do this too.
         *sp = '\0';
+        h->user = percent_decode_in_place(h->host, /*strict:*/ 0);
         h->host = sp + 1;
     }
@@ -279 +316 @@
 }
 
-static char *gethdr(char *buf, size_t bufsiz, FILE *fp /*, int *istrunc*/)
+static char *gethdr(FILE *fp)
 {
     char *s, *hdrval;
     int c;
 
-    /* *istrunc = 0; */
-
     /* retrieve header line */
-    if (fgets(buf, bufsiz, fp) == NULL)
+    c = fgets_and_trim(fp);
+
+    /* end of the headers? */
+    if (G.wget_buf[0] == '\0')
         return NULL;
 
-    /* see if we are at the end of the headers */
-    for (s = buf; *s == '\r'; ++s)
-        continue;
-    if (*s == '\n')
-        return NULL;
-
     /* convert the header name to lower case */
-    for (s = buf; isalnum(*s) || *s == '-' || *s == '.'; ++s) {
+    for (s = G.wget_buf; isalnum(*s) || *s == '-' || *s == '.'; ++s) {
         /* tolower for "A-Z", no-op for "0-9a-z-." */
-        *s = (*s | 0x20);
+        *s |= 0x20;
     }
 
     /* verify we are at the end of the header name */
     if (*s != ':')
-        bb_error_msg_and_die("bad header line: %s", sanitize_string(buf));
+        bb_error_msg_and_die("bad header line: %s", sanitize_string(G.wget_buf));
 
     /* locate the start of the header value */
@@ -310 +342 @@
     hdrval = skip_whitespace(s);
 
-    /* locate the end of header */
-    while (*s && *s != '\r' && *s != '\n')
-        ++s;
-
-    /* end of header found */
-    if (*s) {
-        *s = '\0';
-        return hdrval;
-    }
-
-    /* Rats! The buffer isn't big enough to hold the entire header value */
-    while (c = getc(fp), c != EOF && c != '\n')
-        continue;
-    /* *istrunc = 1; */
+    if (c != '\n') {
+        /* Rats! The buffer isn't big enough to hold the entire header value */
+        while (c = getc(fp), c != EOF && c != '\n')
+            continue;
+    }
+
     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 void reset_beg_range_to_zero(void)
+{
+    bb_error_msg("restart failed");
+    G.beg_range = 0;
+    xlseek(G.output_fd, 0, SEEK_SET);
+    /* Done at the end instead: */
+    /* ftruncate(G.output_fd, 0); */
+}
 
 static FILE* prepare_ftp_session(FILE **dfpp, struct host_info *target, len_and_sockaddr *lsa)
 {
-    char buf[512];
     FILE *sfp;
     char *str;
@@ -376 +370 @@
 
     sfp = open_socket(lsa);
-    if (ftpcmd(NULL, NULL, sfp, buf) != 220)
-        bb_error_msg_and_die("%s", sanitize_string(buf+4));
+    if (ftpcmd(NULL, NULL, sfp) != 220)
+        bb_error_msg_and_die("%s", sanitize_string(G.wget_buf + 4));
 
     /*
@@ -386 +380 @@
     if (str)
         *str++ = '\0';
-    switch (ftpcmd("USER ", target->user, sfp, buf)) {
+    switch (ftpcmd("USER ", target->user, sfp)) {
     case 230:
         break;
     case 331:
-        if (ftpcmd("PASS ", str, sfp, buf) == 230)
+        if (ftpcmd("PASS ", str, sfp) == 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);
+        bb_error_msg_and_die("ftp login: %s", sanitize_string(G.wget_buf + 4));
+    }
+
+    ftpcmd("TYPE I", NULL, sfp);
 
     /*
      * Querying file size
      */
-    if (ftpcmd("SIZE ", target->path, sfp, buf) == 213) {
-        G.content_len = BB_STRTOOFF(buf+4, NULL, 10);
+    if (ftpcmd("SIZE ", target->path, sfp) == 213) {
+        G.content_len = BB_STRTOOFF(G.wget_buf + 4, NULL, 10);
         if (G.content_len < 0 || errno) {
             bb_error_msg_and_die("SIZE value is garbage");
@@ -413 +407 @@
      * Entering passive mode
      */
-    if (ftpcmd("PASV", NULL, sfp, buf) != 227) {
+    if (ftpcmd("PASV", NULL, sfp) != 227) {
  pasv_error:
-        bb_error_msg_and_die("bad response to %s: %s", "PASV", sanitize_string(buf));
+        bb_error_msg_and_die("bad response to %s: %s", "PASV", sanitize_string(G.wget_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, ')');
+    str = strrchr(G.wget_buf, ')');
     if (str) str[0] = '\0';
-    str = strrchr(buf, ',');
+    str = strrchr(G.wget_buf, ',');
     if (!str) goto pasv_error;
     port = xatou_range(str+1, 0, 255);
     *str = '\0';
-    str = strrchr(buf, ',');
+    str = strrchr(G.wget_buf, ',');
     if (!str) goto pasv_error;
     port += xatou_range(str+1, 0, 255) * 256;
-    set_nport(lsa, htons(port));
+    set_nport(&lsa->u.sa, 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)
+    if (G.beg_range != 0) {
+        sprintf(G.wget_buf, "REST %"OFF_FMT"u", G.beg_range);
+        if (ftpcmd(G.wget_buf, NULL, sfp) == 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));
+        else
+            reset_beg_range_to_zero();
+    }
+
+    if (ftpcmd("RETR ", target->path, sfp) > 150)
+        bb_error_msg_and_die("bad response to %s: %s", "RETR", sanitize_string(G.wget_buf));
 
     return sfp;
 }
 
-static void NOINLINE retrieve_file_data(FILE *dfp, int output_fd)
-{
-    char buf[4*1024]; /* made bigger to speed up local xfers */
+static void NOINLINE retrieve_file_data(FILE *dfp)
+{
 #if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT
 # if ENABLE_FEATURE_WGET_TIMEOUT
-    unsigned second_cnt;
+    unsigned second_cnt = G.timeout_seconds;
 # endif
     struct pollfd polldata;
@@ -466 +461 @@
 
 #if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT
+        /* Must use nonblocking I/O, otherwise fread will loop
+         * and *block* until it reads full buffer,
+         * which messes up progress bar and/or timeout logic.
+         * Because of nonblocking I/O, we need to dance
+         * very carefully around EAGAIN. See explanation at
+         * clearerr() calls.
+         */
         ndelay_on(polldata.fd);
 #endif
@@ -472 +474 @@
             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
             /* fread internally uses read loop, which in our case
              * is usually exited when we get EAGAIN.
@@ -506 +484 @@
              */
             clearerr(dfp);
+#endif
             errno = 0;
-            n = safe_fread(buf, rdsz, dfp);
-            /* man fread:
+            rdsz = sizeof(G.wget_buf);
+            if (G.got_clen) {
+                if (G.content_len < (off_t)sizeof(G.wget_buf)) {
+                    if ((int)G.content_len <= 0)
+                        break;
+                    rdsz = (unsigned)G.content_len;
+                }
+            }
+            n = fread(G.wget_buf, 1, rdsz, dfp);
+
+            if (n > 0) {
+                xwrite(G.output_fd, G.wget_buf, n);
+#if ENABLE_FEATURE_WGET_STATUSBAR
+                G.transferred += n;
+#endif
+                if (G.got_clen) {
+                    G.content_len -= n;
+                    if (G.content_len == 0)
+                        break;
+                }
+#if ENABLE_FEATURE_WGET_TIMEOUT
+                second_cnt = G.timeout_seconds;
+#endif
+                continue;
+            }
+
+            /* n <= 0.
+             * man fread:
              * If error occurs, or EOF is reached, the return value
              * is a short item count (or zero).
              * fread does not distinguish between EOF and error.
              */
-            if (n <= 0) {
-#if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT
-                if (errno == EAGAIN) /* poll lied, there is no data? */
-                    continue; /* yes */
-#endif
-                if (ferror(dfp))
+            if (errno != EAGAIN) {
+                if (ferror(dfp)) {
+                    progress_meter(PROGRESS_END);
                     bb_perror_msg_and_die(bb_msg_read_error);
+                }
                 break; /* EOF, not error */
             }
 
-            xwrite(output_fd, buf, n);
-#if ENABLE_FEATURE_WGET_STATUSBAR
-            G.transferred += n;
+#if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT
+            /* It was EAGAIN. There is no data. Wait up to one second
+             * then abort if timed out, or update the bar and try reading again.
+             */
+            if (safe_poll(&polldata, 1, 1000) == 0) {
+# if ENABLE_FEATURE_WGET_TIMEOUT
+                if (second_cnt != 0 && --second_cnt == 0) {
+                    progress_meter(PROGRESS_END);
+                    bb_error_msg_and_die("download timed out");
+                }
+# endif
+                /* We used to loop back to poll here,
+                 * but there is no great harm in letting fread
+                 * to try reading anyway.
+                 */
+            }
+            /* Need to do it _every_ second for "stalled" indicator
+             * to be shown properly.
+             */
             progress_meter(PROGRESS_BUMP);
 #endif
-            if (G.got_clen) {
-                G.content_len -= n;
-                if (G.content_len == 0)
-                    break;
-            }
-        }
+        } /* while (reading data) */
+
 #if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT
-        ndelay_off(polldata.fd);
-#endif
-
+        clearerr(dfp);
+        ndelay_off(polldata.fd); /* else fgets can get very unhappy */
+#endif
         if (!G.chunked)
             break;
 
-        safe_fgets(buf, sizeof(buf), dfp); /* This is a newline */
+        fgets_and_trim(dfp); /* Eat empty line */
  get_clen:
-        safe_fgets(buf, sizeof(buf), dfp);
-        G.content_len = STRTOOFF(buf, NULL, 16);
+        fgets_and_trim(dfp);
+        G.content_len = STRTOOFF(G.wget_buf, NULL, 16);
         /* FIXME: error check? */
         if (G.content_len == 0)
             break; /* all done! */
         G.got_clen = 1;
-    }
-
+        /*
+         * Note that fgets may result in some data being buffered in dfp.
+         * We loop back to fread, which will retrieve this data.
+         * Also note that code has to be arranged so that fread
+         * is done _before_ one-second poll wait - poll doesn't know
+         * about stdio buffering and can result in spurious one second waits!
+         */
+    }
+
+    /* If -c failed, we restart from the beginning,
+     * but we do not truncate file then, we do it only now, at the end.
+     * This lets user to ^C if his 99% complete 10 GB file download
+     * failed to restart *without* losing the almost complete file.
+     */
+    {
+        off_t pos = lseek(G.output_fd, 0, SEEK_CUR);
+        if (pos != (off_t)-1)
+            ftruncate(G.output_fd, pos);
+    }
+
+    /* Draw full bar and free its resources */
+    G.chunked = 0;  /* makes it show 100% even for chunked download */
+    G.got_clen = 1; /* makes it show 100% even for download of (formerly) unknown size */
     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;
+static void download_one_url(const char *url)
+{
+    bool use_proxy;                 /* Use proxies if env vars are set  */
+    int redir_limit;
     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"
-        ;
-#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..." */
-
+    char *proxy = NULL;
+    char *fname_out_alloc;
+    char *redirected_path = NULL;
+    struct host_info server;
+    struct host_info target;
+
+    server.allocated = NULL;
+    target.allocated = NULL;
+    server.user = NULL;
     target.user = NULL;
-    parse_url(argv[optind], &target);
+
+    parse_url(url, &target);
 
     /* Use the proxy if necessary */
-    use_proxy = (strcmp(proxy_flag, "off") != 0);
+    use_proxy = (strcmp(G.proxy_flag, "off") != 0);
     if (use_proxy) {
         proxy = getenv(target.is_ftp ? "ftp_proxy" : "http_proxy");
-        if (proxy && proxy[0]) {
-            server.user = NULL;
+        use_proxy = (proxy && proxy[0]);
+        if (use_proxy)
             parse_url(proxy, &server);
-        } else {
-            use_proxy = 0;
-        }
     }
     if (!use_proxy) {
         server.port = target.port;
         if (ENABLE_FEATURE_IPV6) {
-            server.host = xstrdup(target.host);
+            //free(server.allocated); - can't be non-NULL
+            server.host = server.allocated = xstrdup(target.host);
         } else {
             server.host = target.host;
@@ -665 +631 @@
         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);
+    /* If there was no -O FILE, guess output filename */
+    fname_out_alloc = NULL;
+    if (!(option_mask32 & WGET_OPT_OUTNAME)) {
+        G.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";
+        if (G.fname_out[0] == '/' || !G.fname_out[0])
+            G.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 (G.dir_prefix)
+            G.fname_out = fname_out_alloc = concat_path_file(G.dir_prefix, G.fname_out);
+        else {
+            /* redirects may free target.path later, need to make a copy */
+            G.fname_out = fname_out_alloc = xstrdup(G.fname_out);
         }
     }
 #if ENABLE_FEATURE_WGET_STATUSBAR
-    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)");
-    */
+    G.curfile = bb_get_last_path_component_nostrip(G.fname_out);
+#endif
 
     /* 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);
+    G.beg_range = 0;
+    if (option_mask32 & WGET_OPT_CONTINUE) {
+        G.output_fd = open(G.fname_out, O_WRONLY);
+        if (G.output_fd >= 0) {
+            G.beg_range = xlseek(G.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 are not sure it exists on remote side */
     }
 
@@ -703 +664 @@
  resolve_lsa:
     lsa = xhost2sockaddr(server.host, server.port);
-    if (!(opt & WGET_OPT_QUIET)) {
+    if (!(option_mask32 & WGET_OPT_QUIET)) {
         char *s = xmalloc_sockaddr2dotted(&lsa->u.sa);
         fprintf(stderr, "Connecting to %s (%s)\n", server.host, s);
@@ -709 +670 @@
     }
  establish_session:
+    /*G.content_len = 0; - redundant, got_clen = 0 is enough */
+    G.got_clen = 0;
+    G.chunked = 0;
     if (use_proxy || !target.is_ftp) {
         /*
@@ -716 +680 @@
         int status;
 
+
         /* Open socket to http server */
         sfp = open_socket(lsa);
@@ -725 +690 @@
                 target.path);
         } else {
-            if (opt & WGET_OPT_POST_DATA)
+            if (option_mask32 & WGET_OPT_POST_DATA)
                 fprintf(sfp, "POST /%s HTTP/1.1\r\n", target.path);
             else
@@ -732 +697 @@
 
         fprintf(sfp, "Host: %s\r\nUser-Agent: %s\r\n",
-            target.host, user_agent);
+            target.host, G.user_agent);
 
         /* Ask server to close the connection as soon as we are done
@@ -742 +707 @@
         if (target.user) {
             fprintf(sfp, "Proxy-Authorization: Basic %s\r\n"+6,
-                base64enc_512(buf, target.user));
+                base64enc(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)
+                base64enc(server.user));
+        }
+#endif
+
+        if (G.beg_range != 0)
             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);
+        if (G.extra_headers)
+            fputs(G.extra_headers, sfp);
+
+        if (option_mask32 & WGET_OPT_POST_DATA) {
             fprintf(sfp,
                 "Content-Type: application/x-www-form-urlencoded\r\n"
@@ -764 +728 @@
                 "\r\n"
                 "%s",
-                (int) strlen(estr), estr
+                (int) strlen(G.post_data), G.post_data
             );
-            free(estr);
         } else
 #endif
@@ -779 +742 @@
          */
  read_response:
-        if (fgets(buf, sizeof(buf), sfp) == NULL)
-            bb_error_msg_and_die("no response from server");
-
-        str = buf;
+        fgets_and_trim(sfp);
+
+        str = G.wget_buf;
         str = skip_non_whitespace(str);
         str = skip_whitespace(str);
@@ -791 +753 @@
         case 0:
         case 100:
-            while (gethdr(buf, sizeof(buf), sfp /*, &n*/) != NULL)
+            while (gethdr(sfp) != NULL)
                 /* eat all remaining headers */;
             goto read_response;
@@ -820 +782 @@
 */
         case 204:
+            if (G.beg_range != 0) {
+                /* "Range:..." was not honored by the server.
+                 * Restart download from the beginning.
+                 */
+                reset_beg_range_to_zero();
+            }
             break;
         case 300:  /* redirection */
@@ -826 +794 @@
         case 303:
             break;
-        case 206:
-            if (G.beg_range)
+        case 206: /* Partial Content */
+            if (G.beg_range != 0)
+                /* "Range:..." worked. Good. */
                 break;
+            /* Partial Content even though we did not ask for it??? */
             /* fall through */
         default:
-            bb_error_msg_and_die("server returned error: %s", sanitize_string(buf));
+            bb_error_msg_and_die("server returned error: %s", sanitize_string(G.wget_buf));
         }
 
@@ -837 +807 @@
          * Retrieve HTTP headers.
          */
-        while ((str = gethdr(buf, sizeof(buf), sfp /*, &n*/)) != NULL) {
+        while ((str = gethdr(sfp)) != NULL) {
+            static const char keywords[] ALIGN1 =
+                "content-length\0""transfer-encoding\0""location\0";
+            enum {
+                KEY_content_length = 1, KEY_transfer_encoding, KEY_location
+            };
+            smalluint key;
+
             /* gethdr converted "FOO:" string to lowercase */
-            smalluint key;
+
             /* strip trailing whitespace */
             char *s = strchrnul(str, '\0') - 1;
@@ -846 +823 @@
                 s--;
             }
-            key = index_in_strings(keywords, buf) + 1;
+            key = index_in_strings(keywords, G.wget_buf) + 1;
             if (key == KEY_content_length) {
                 G.content_len = BB_STRTOOFF(str, NULL, 10);
@@ -856 +833 @@
             }
             if (key == KEY_transfer_encoding) {
-                if (index_in_strings(keywords, str_tolower(str)) + 1 != KEY_chunked)
+                if (strcmp(str_tolower(str), "chunked") != 0)
                     bb_error_msg_and_die("transfer encoding '%s' is not supported", sanitize_string(str));
-                G.chunked = G.got_clen = 1;
+                G.chunked = 1;
             }
             if (key == KEY_location && status >= 300) {
@@ -864 +841 @@
                     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);
+                if (str[0] == '/') {
+                    free(redirected_path);
+                    target.path = redirected_path = xstrdup(str+1);
                     /* lsa stays the same: it's on the same server */
-                else {
+                } else {
                     parse_url(str, &target);
                     if (!use_proxy) {
+                        free(server.allocated);
+                        server.allocated = NULL;
                         server.host = target.host;
                         /* strip_ipv6_scope_id(target.host); - no! */
@@ -897 +874 @@
     }
 
-    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;
+    free(lsa);
+
+    if (!(option_mask32 & WGET_OPT_SPIDER)) {
+        if (G.output_fd < 0)
+            G.output_fd = xopen(G.fname_out, G.o_flags);
+        retrieve_file_data(dfp);
+        if (!(option_mask32 & WGET_OPT_OUTNAME)) {
+            xclose(G.output_fd);
+            G.output_fd = -1;
+        }
+    }
+
+    if (dfp != sfp) {
+        /* It's ftp. Close data connection properly */
+        fclose(dfp);
+        if (ftpcmd(NULL, NULL, sfp) != 226)
+            bb_error_msg_and_die("ftp error: %s", sanitize_string(G.wget_buf + 4));
+        /* ftpcmd("QUIT", NULL, sfp); - why bother? */
+    }
+    fclose(sfp);
+
+    free(server.allocated);
+    free(target.allocated);
+    free(fname_out_alloc);
+    free(redirected_path);
+}
+
+int wget_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int wget_main(int argc UNUSED_PARAM, char **argv)
+{
+#if ENABLE_FEATURE_WGET_LONG_OPTIONS
+    static const char wget_longopts[] ALIGN1 =
+        /* name, has_arg, val */
+        "continue\0"         No_argument       "c"
+//FIXME: -s isn't --spider, it's --save-headers!
+        "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"
+        /* Ignored (we don't support caching) */
+        "no-cache\0"         No_argument       "\xfb"
+        ;
+#endif
+
+#if ENABLE_FEATURE_WGET_LONG_OPTIONS
+    llist_t *headers_llist = NULL;
+#endif
+
+    INIT_G();
+
+    IF_FEATURE_WGET_TIMEOUT(G.timeout_seconds = 900;)
+    G.proxy_flag = "on";   /* use proxies if env vars are set */
+    G.user_agent = "Wget"; /* "User-Agent" header field */
+
+#if ENABLE_FEATURE_WGET_LONG_OPTIONS
+    applet_long_options = wget_longopts;
+#endif
+    opt_complementary = "-1" IF_FEATURE_WGET_TIMEOUT(":T+") IF_FEATURE_WGET_LONG_OPTIONS(":\xfe::");
+    getopt32(argv, "csqO:P:Y:U:T:" /*ignored:*/ "t:",
+        &G.fname_out, &G.dir_prefix,
+        &G.proxy_flag, &G.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(, &G.post_data)
+    );
+    argv += optind;
+
+#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;
+        }
+        G.extra_headers = cp = xmalloc(size);
+        while (headers_llist) {
+            cp += sprintf(cp, "%s\r\n", (char*)llist_pop(&headers_llist));
+        }
+    }
+#endif
+
+    G.output_fd = -1;
+    G.o_flags = O_WRONLY | O_CREAT | O_TRUNC | O_EXCL;
+    if (G.fname_out) { /* -O FILE ? */
+        if (LONE_DASH(G.fname_out)) { /* -O - ? */
+            G.output_fd = 1;
+            option_mask32 &= ~WGET_OPT_CONTINUE;
+        }
         /* 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? */
-    }
+        G.o_flags = O_WRONLY | O_CREAT | O_TRUNC;
+    }
+
+    while (*argv)
+        download_one_url(*argv++);
+
+    if (G.output_fd >= 0)
+        xclose(G.output_fd);
 
     return EXIT_SUCCESS;

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

@@ -24 +24 @@
 // - link status monitoring (restart on link-up; stop on link-down)
 
+//usage:#define zcip_trivial_usage
+//usage:       "[OPTIONS] IFACE SCRIPT"
+//usage:#define zcip_full_usage "\n\n"
+//usage:       "Manage a ZeroConf IPv4 link-local address\n"
+//usage:     "\n    -f      Run in foreground"
+//usage:     "\n    -q      Quit after obtaining address"
+//usage:     "\n    -r 169.254.x.x  Request this address first"
+//usage:     "\n    -v      Verbose"
+//usage:     "\n"
+//usage:     "\nWith no -q, runs continuously monitoring for ARP conflicts,"
+//usage:     "\nexits only on I/O errors (link down etc)"
+
+#include "libbb.h"
 #include <netinet/ether.h>
-#include <net/ethernet.h>
 #include <net/if.h>
 #include <net/if_arp.h>
-#include <linux/if_packet.h>
 #include <linux/sockios.h>
 
-#include "libbb.h"
 #include <syslog.h>
 
@@ -82 +92 @@
 #define saddr    (G.saddr   )
 #define eth_addr (G.eth_addr)
+#define INIT_G() do { } while (0)
 
 
@@ -214 +225 @@
 
     memset(&L, 0, sizeof(L));
+    INIT_G();
 
 #define FOREGROUND (opts & 1)