Merge branch 'busybox' into merge

36 files changed, 117 insertions, 64 deletions

diff --git a/networking/arping.c b/networking/arping.c
index 86f0221ed..967f1ac04 100644
--- a/networking/arping.c
+++ b/networking/arping.c
@@ -6,7 +6,7 @@
  * Busybox port: Nick Fedchik <nick@fedchik.org.ua>
  */
 //config:config ARPING
-//config:       bool "arping (9 kb)"
+//config:       bool "arping (9.1 kb)"
 //config:       default y
 //config:       help
 //config:       Ping hosts by ARP packets.
diff --git a/networking/brctl.c b/networking/brctl.c
index 956bd91f3..7b0270b51 100644
--- a/networking/brctl.c
+++ b/networking/brctl.c
@@ -10,7 +10,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config BRCTL
-//config:       bool "brctl (4.7 kb)"
+//config:       bool "brctl (9.9 kb)"
 //config:       default y
 //config:       help
 //config:       Manage ethernet bridges.
diff --git a/networking/dnsd.c b/networking/dnsd.c
index a0f320c6c..a11d83f49 100644
--- a/networking/dnsd.c
+++ b/networking/dnsd.c
@@ -17,7 +17,7 @@
  * the first porting of oao' scdns to busybox also.
  */
 //config:config DNSD
-//config:       bool "dnsd (9.8 kb)"
+//config:       bool "dnsd (10 kb)"
 //config:       default y
 //config:       help
 //config:       Small and static DNS server daemon.
diff --git a/networking/ether-wake.c b/networking/ether-wake.c
index 36e90acfb..68df19361 100644
--- a/networking/ether-wake.c
+++ b/networking/ether-wake.c
@@ -64,7 +64,7 @@
  *   filter.  That configuration consumes more power.
  */
 //config:config ETHER_WAKE
-//config:       bool "ether-wake (4.9 kb)"
+//config:       bool "ether-wake (5.2 kb)"
 //config:       default y
 //config:       help
 //config:       Send a magic packet to wake up sleeping machines.
diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index ef0973a84..86342769b 100644
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -13,13 +13,13 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config FTPGET
-//config:       bool "ftpget (7.8 kb)"
+//config:       bool "ftpget (7.9 kb)"
 //config:       default y
 //config:       help
 //config:       Retrieve a remote file via FTP.
 //config:
 //config:config FTPPUT
-//config:       bool "ftpput (7.5 kb)"
+//config:       bool "ftpput (7.6 kb)"
 //config:       default y
 //config:       help
 //config:       Store a remote file via FTP.
diff --git a/networking/hostname.c b/networking/hostname.c
index 549103485..36cb70866 100644
--- a/networking/hostname.c
+++ b/networking/hostname.c
@@ -10,13 +10,13 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config HOSTNAME
-//config:       bool "hostname (5.5 kb)"
+//config:       bool "hostname (5.8 kb)"
 //config:       default y
 //config:       help
 //config:       Show or set the system's host name.
 //config:
 //config:config DNSDOMAINNAME
-//config:       bool "dnsdomainname (3.6 kb)"
+//config:       bool "dnsdomainname (3.8 kb)"
 //config:       default y
 //config:       help
 //config:       Alias to "hostname -d".
diff --git a/networking/ifplugd.c b/networking/ifplugd.c
index 0b55bf4e5..a776d4121 100644
--- a/networking/ifplugd.c
+++ b/networking/ifplugd.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config IFPLUGD
-//config:       bool "ifplugd (10 kb)"
+//config:       bool "ifplugd (11 kb)"
 //config:       default y
 //config:       help
 //config:       Network interface plug detection daemon.
diff --git a/networking/inetd.c b/networking/inetd.c
index fb2fbe323..e63edcd9d 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -1449,7 +1449,7 @@ int inetd_main(int argc UNUSED_PARAM, char **argv)
                                 else
                                         sep->se_builtin->bi_dgram_fn(ctrl, sep);
                                 if (pid) /* we did fork */
-                                        _exit(EXIT_FAILURE);
+                                        _exit_FAILURE();
                                 maybe_close(accepted_fd);
                                 continue; /* -> check next fd in fd set */
                         }
@@ -1530,7 +1530,7 @@ int inetd_main(int argc UNUSED_PARAM, char **argv)
                         /* eat packet in udp case */
                         if (sep->se_socktype != SOCK_STREAM)
                                 recv(0, line, LINE_SIZE, MSG_DONTWAIT);
-                        _exit(EXIT_FAILURE);
+                        _exit_FAILURE();
                 } /* for (sep = servtab...) */
         } /* for (;;) */
 }
diff --git a/networking/ip.c b/networking/ip.c
index 7c3208699..36126b747 100644
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -19,7 +19,7 @@
 //config:       trying to be portable, it's better to use "ip CMD" forms.
 //config:
 //config:config IPADDR
-//config:       bool "ipaddr (14 kb)"
+//config:       bool "ipaddr (15 kb)"
 //config:       default y
 //config:       select FEATURE_IP_ADDRESS
 //config:       help
@@ -40,7 +40,7 @@
 //config:       Short form of "ip route"
 //config:
 //config:config IPTUNNEL
-//config:       bool "iptunnel (9.6 kb)"
+//config:       bool "iptunnel (9.8 kb)"
 //config:       default y
 //config:       select FEATURE_IP_TUNNEL
 //config:       help
@@ -54,7 +54,7 @@
 //config:       Short form of "ip rule"
 //config:
 //config:config IPNEIGH
-//config:       bool "ipneigh (8.3 kb)"
+//config:       bool "ipneigh (8.6 kb)"
 //config:       default y
 //config:       select FEATURE_IP_NEIGH
 //config:       help
diff --git a/networking/ipcalc.c b/networking/ipcalc.c
index e82e35dd5..92e7b289d 100644
--- a/networking/ipcalc.c
+++ b/networking/ipcalc.c
@@ -12,7 +12,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config IPCALC
-//config:       bool "ipcalc (4.4 kb)"
+//config:       bool "ipcalc (4.6 kb)"
 //config:       default y
 //config:       help
 //config:       ipcalc takes an IP address and netmask and calculates the
diff --git a/networking/isrv_identd.c b/networking/isrv_identd.c
index f564d604a..a92afc7e1 100644
--- a/networking/isrv_identd.c
+++ b/networking/isrv_identd.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config FAKEIDENTD
-//config:       bool "fakeidentd (8.7 kb)"
+//config:       bool "fakeidentd (9 kb)"
 //config:       default y
 //config:       select FEATURE_SYSLOG
 //config:       help
diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c
index 68d199044..9eb0b4f5f 100644
--- a/networking/libiproute/iplink.c
+++ b/networking/libiproute/iplink.c
@@ -215,7 +215,7 @@ static void parse_address(char *dev, int hatype, int halen, char *lla, struct if
         alen = hatype == 1/*ARPHRD_ETHER*/ ? 14/*ETH_HLEN*/ : 19/*INFINIBAND_HLEN*/;
         alen = ll_addr_a2n((unsigned char *)(ifr->ifr_hwaddr.sa_data), alen, lla);
         if (alen < 0)
-                exit(EXIT_FAILURE);
+                exit_FAILURE();
         if (alen != halen) {
                 bb_error_msg_and_die("wrong address (%s) length: expected %d bytes", lla, halen);
         }
diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c
index 5a972f8b2..cd77f642f 100644
--- a/networking/libiproute/iproute.c
+++ b/networking/libiproute/iproute.c
@@ -111,15 +111,7 @@ static int FAST_FUNC print_route(const struct sockaddr_nl *who UNUSED_PARAM,
                                 if (r->rtm_flags & RTM_F_CLONED) {
                                         return 0;
                                 }
-                                if (G_filter.tb == RT_TABLE_LOCAL) {
-                                        if (r->rtm_type != RTN_LOCAL) {
-                                                return 0;
-                                        }
-                                } else if (G_filter.tb == RT_TABLE_MAIN) {
-                                        if (r->rtm_type == RTN_LOCAL) {
-                                                return 0;
-                                        }
-                                } else {
+                                if (G_filter.tb != tid) {
                                         return 0;
                                 }
                         }
diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c
index c9fa632f3..1ec81c635 100644
--- a/networking/libiproute/iptunnel.c
+++ b/networking/libiproute/iptunnel.c
@@ -319,7 +319,7 @@ static void parse_args(char **argv, int cmd, struct ip_tunnel_parm *p)
                                 struct ip_tunnel_parm old_p;
                                 memset(&old_p, 0, sizeof(old_p));
                                 if (do_get_ioctl(*argv, &old_p))
-                                        exit(EXIT_FAILURE);
+                                        exit_FAILURE();
                                 *p = old_p;
                         }
                 }
diff --git a/networking/nameif.c b/networking/nameif.c
index 66e042688..461745c70 100644
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -10,7 +10,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config NAMEIF
-//config:       bool "nameif (6.6 kb)"
+//config:       bool "nameif (6.9 kb)"
 //config:       default y
 //config:       select FEATURE_SYSLOG
 //config:       help
diff --git a/networking/nbd-client.c b/networking/nbd-client.c
index 755b42ccd..556fa8c97 100644
--- a/networking/nbd-client.c
+++ b/networking/nbd-client.c
@@ -4,7 +4,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config NBDCLIENT
-//config:       bool "nbd-client (6 kb)"
+//config:       bool "nbd-client (6.3 kb)"
 //config:       default y
 //config:       help
 //config:       Network block device client
diff --git a/networking/nslookup.c b/networking/nslookup.c
index 249083e24..b67d354f7 100644
--- a/networking/nslookup.c
+++ b/networking/nslookup.c
@@ -1,7 +1,7 @@
 /* vi: set sw=4 ts=4: */
 
 //config:config NSLOOKUP
-//config:       bool "nslookup (9.7 kb)"
+//config:       bool "nslookup (10 kb)"
 //config:       default y
 //config:       help
 //config:       nslookup is a tool to query Internet name servers.
diff --git a/networking/ntpd.c b/networking/ntpd.c
index c7519b8fb..dcbdb8e60 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -41,7 +41,7 @@
  ***********************************************************************
  */
 //config:config NTPD
-//config:       bool "ntpd (22 kb)"
+//config:       bool "ntpd (23 kb)"
 //config:       default y
 //config:       help
 //config:       The NTP client/server daemon.
@@ -1632,7 +1632,7 @@ update_local_clock(peer_t *p)
                 if (adjtimex(&tmx) < 0)
                         bb_simple_perror_msg_and_die("adjtimex");
                 bb_error_msg("p adjtimex freq:%ld offset:%+ld status:0x%x tc:%ld",
-                                tmx.freq, tmx.offset, tmx.status, tmx.constant);
+                                (long)tmx.freq, (long)tmx.offset, tmx.status, (long)tmx.constant);
         }
 
         memset(&tmx, 0, sizeof(tmx));
@@ -1747,7 +1747,7 @@ update_local_clock(peer_t *p)
          * Not sure why. Perhaps it is normal.
          */
         VERB4 bb_error_msg("adjtimex:%d freq:%ld offset:%+ld status:0x%x",
-                                rc, tmx.freq, tmx.offset, tmx.status);
+                                rc, (long)tmx.freq, (long)tmx.offset, tmx.status);
         G.kernel_freq_drift = tmx.freq / 65536;
         VERB2 bb_error_msg("update from:%s offset:%+f delay:%f jitter:%f clock drift:%+.3fppm tc:%d",
                         p->p_dotted,
diff --git a/networking/ping.c b/networking/ping.c
index 9805695a1..b7e6955a9 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -247,7 +247,7 @@ struct globals {
 static void noresp(int ign UNUSED_PARAM)
 {
         printf("No response from %s\n", G.hostname);
-        exit(EXIT_FAILURE);
+        exit_FAILURE();
 }
 
 static void ping4(len_and_sockaddr *lsa)
diff --git a/networking/pscan.c b/networking/pscan.c
index 816178bbc..13785deca 100644
--- a/networking/pscan.c
+++ b/networking/pscan.c
@@ -6,7 +6,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config PSCAN
-//config:       bool "pscan (6 kb)"
+//config:       bool "pscan (6.2 kb)"
 //config:       default y
 //config:       help
 //config:       Simple network port scanner.
diff --git a/networking/route.c b/networking/route.c
index 26146f8e9..6e2d30cfd 100644
--- a/networking/route.c
+++ b/networking/route.c
@@ -25,7 +25,7 @@
  * remove ridiculous amounts of bloat.
  */
 //config:config ROUTE
-//config:       bool "route (8.7 kb)"
+//config:       bool "route (9 kb)"
 //config:       default y
 //config:       help
 //config:       Route displays or manipulates the kernel's IP routing tables.
diff --git a/networking/slattach.c b/networking/slattach.c
index 6d2a252fc..2f5cd15ab 100644
--- a/networking/slattach.c
+++ b/networking/slattach.c
@@ -13,7 +13,7 @@
  * - The -F options allows disabling of RTS/CTS flow control.
  */
 //config:config SLATTACH
-//config:       bool "slattach (6.2 kb)"
+//config:       bool "slattach (6.3 kb)"
 //config:       default y
 //config:       help
 //config:       slattach configures serial line as SLIP network interface.
@@ -80,7 +80,7 @@ static void restore_state_and_exit(int exitcode)
 
         /* Restore line status */
         if (tcsetattr_serial_or_warn(&G.saved_state))
-                exit(EXIT_FAILURE);
+                exit_FAILURE();
 
         if (ENABLE_FEATURE_CLEAN_UP)
                 close(serial_fd);
diff --git a/networking/ssl_client.c b/networking/ssl_client.c
index 27575a2bf..757745896 100644
--- a/networking/ssl_client.c
+++ b/networking/ssl_client.c
@@ -4,7 +4,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config SSL_CLIENT
-//config:       bool "ssl_client (25 kb)"
+//config:       bool "ssl_client (28 kb)"
 //config:       default y
 //config:       select TLS
 //config:       help
diff --git a/networking/telnetd.c b/networking/telnetd.c
index 0805e464f..bfeea1400 100644
--- a/networking/telnetd.c
+++ b/networking/telnetd.c
@@ -21,7 +21,7 @@
  * Set process group corrections, initial busybox port
  */
 //config:config TELNETD
-//config:       bool "telnetd (12 kb)"
+//config:       bool "telnetd (13 kb)"
 //config:       default y
 //config:       select FEATURE_SYSLOG
 //config:       help
@@ -571,7 +571,7 @@ make_new_session(
         BB_EXECVP(G.loginpath, (char **)login_argv);
         /* _exit is safer with vfork, and we shouldn't send message
          * to remote clients anyway */
-        _exit(EXIT_FAILURE); /*bb_perror_msg_and_die("execv %s", G.loginpath);*/
+        _exit_FAILURE(); /*bb_perror_msg_and_die("execv %s", G.loginpath);*/
 }
 
 #if ENABLE_FEATURE_TELNETD_STANDALONE
diff --git a/networking/traceroute.c b/networking/traceroute.c
index 4bbe1ab8e..767f537ce 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -216,7 +216,7 @@
 //config:       Utility to trace the route of IP packets.
 //config:
 //config:config TRACEROUTE6
-//config:       bool "traceroute6 (13 kb)"
+//config:       bool "traceroute6 (12 kb)"
 //config:       default y
 //config:       depends on FEATURE_IPV6
 //config:       help
diff --git a/networking/tunctl.c b/networking/tunctl.c
index 28571ae7f..c17302eac 100644
--- a/networking/tunctl.c
+++ b/networking/tunctl.c
@@ -10,7 +10,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config TUNCTL
-//config:       bool "tunctl (6.2 kb)"
+//config:       bool "tunctl (6.4 kb)"
 //config:       default y
 //config:       help
 //config:       tunctl creates or deletes tun devices.
diff --git a/networking/udhcp/Config.src b/networking/udhcp/Config.src
index 7ba7f48fc..4b9259eb8 100644
--- a/networking/udhcp/Config.src
+++ b/networking/udhcp/Config.src
@@ -10,6 +10,13 @@ config UDHCPD
         udhcpd is a DHCP server geared primarily toward embedded systems,
         while striving to be fully functional and RFC compliant.
 
+config FEATURE_UDHCPD_BOOTP
+        bool "Answer to BOOTP requests as well"
+        default y
+        depends on UDHCPD
+        help
+        Support old BOOTP protocol too.
+
 config FEATURE_UDHCPD_BASE_IP_ON_MAC
         bool "Select IP address based on client MAC"
         default n
@@ -43,7 +50,7 @@ config DHCPD_LEASES_FILE
         of the file. Normally it is safe to leave it untouched.
 
 config DUMPLEASES
-        bool "dumpleases (5.1 kb)"
+        bool "dumpleases (5.3 kb)"
         default y
         help
         dumpleases displays the leases written out by the udhcpd.
@@ -51,7 +58,7 @@ config DUMPLEASES
         by the absolute time that it expires in seconds from epoch.
 
 config DHCPRELAY
-        bool "dhcprelay (5.2 kb)"
+        bool "dhcprelay (5.5 kb)"
         default y
         help
         dhcprelay listens for DHCP requests on one or more interfaces
diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c
index ae818db05..ad580f38d 100644
--- a/networking/udhcp/common.c
+++ b/networking/udhcp/common.c
@@ -252,6 +252,14 @@ uint8_t* FAST_FUNC udhcp_scan_options(struct dhcp_packet *packet, struct dhcp_sc
         /* option bytes: [code][len][data1][data2]..[dataLEN] */
         while (1) {
                 if (scan_state->rem <= 0) {
+                        if (ENABLE_FEATURE_UDHCPD_BOOTP && scan_state->rem == 0) {
+                                /* DHCP requires END option to be present.
+                                 * We are here if packet fails this condition
+                                 * (options[] are zero-padded to the end).
+                                 * Assume BOOTP packet without further checks.
+                                 */
+                                break; /* return NULL */
+                        }
  complain:
                         bb_simple_error_msg("bad packet, malformed option field");
                         return NULL;
@@ -278,7 +286,7 @@ uint8_t* FAST_FUNC udhcp_scan_options(struct dhcp_packet *packet, struct dhcp_sc
                                 scan_state->rem = sizeof(packet->sname);
                                 continue;
                         }
-                        break;
+                        break; /* return NULL */
                 }
 
                 if (scan_state->rem <= OPT_LEN) /* [len] byte exists? */
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
index 49a0b593d..3ef371a7c 100644
--- a/networking/udhcp/common.h
+++ b/networking/udhcp/common.h
@@ -20,8 +20,11 @@ extern const uint8_t MAC_BCAST_ADDR[6] ALIGN2; /* six all-ones */
 
 /*** DHCP packet ***/
 
+#define RFC1048_MAGIC           0x63825363
+/* RFC 1048 still uses BOOTP's small buffer (4 byte cookie + 60 the rest) */
+#define RFC1048_OPTIONS_BUFSIZE 60
+
 /* DHCP protocol. See RFC 2131 */
-#define DHCP_MAGIC              0x63825363
 #define DHCP_OPTIONS_BUFSIZE    308
 #define BOOTREQUEST             1
 #define BOOTREPLY               2
@@ -57,8 +60,10 @@ struct dhcp_packet {
          * such as 'unix' or 'gateway'; this means 'boot the named program
          * configured for my machine'"
          */
-        /* BOOTP fields end here, BOOTP says optional uint8_t vend[64] follows */
-        uint32_t cookie;      /* DHCP magic bytes: 99,130,83,99 decimal */
+        /* BOOTP fields end here, BOOTP says optional uint8_t vend[64] follows. */
+        /* RFC 1048 defined this cookie value and options 0-12 and 255. */
+        /* DHCP extended it and required option 255 (END) to be always present. */
+        uint32_t cookie;      /* RFC 1048 magic bytes: 99,130,83,99 decimal */
         uint8_t options[DHCP_OPTIONS_BUFSIZE + CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS];
 };
 #define DHCP_PKT_SNAME_LEN      64
@@ -200,6 +205,9 @@ struct dhcp_scan_state {
 #define SNAME_FIELD             2
 
 /* DHCP_MESSAGE_TYPE values */
+#if ENABLE_FEATURE_UDHCPD_BOOTP
+#define MSGTYPE_BOOTP           0 /* there was no TYPE option in client's packet, assuming BOOTP */
+#endif
 #define DHCPDISCOVER            1 /* client -> server */
 #define DHCPOFFER               2 /* client <- server */
 #define DHCPREQUEST             3 /* client -> server */
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index c757fb37c..200a2fb8a 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -971,7 +971,7 @@ static NOINLINE int d4_recv_raw_packet(struct dhcp_packet *dhcp_pkt, int fd)
         }
  skip_udp_sum_check:
 
-        if (packet.data.cookie != htonl(DHCP_MAGIC)) {
+        if (packet.data.cookie != htonl(RFC1048_MAGIC)) {
                 log1s("packet with bad magic, ignoring");
                 return -2;
         }
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
index 66750e2e6..2904119e5 100644
--- a/networking/udhcp/dhcpd.c
+++ b/networking/udhcp/dhcpd.c
@@ -649,7 +649,8 @@ static void init_packet(struct dhcp_packet *packet, struct dhcp_packet *oldpacke
         packet->flags = oldpacket->flags;
         packet->gateway_nip = oldpacket->gateway_nip;
         packet->ciaddr = oldpacket->ciaddr;
-        udhcp_add_simple_option(packet, DHCP_SERVER_ID, server_data.server_nip);
+        IF_FEATURE_UDHCPD_BOOTP(if (type != MSGTYPE_BOOTP))
+                udhcp_add_simple_option(packet, DHCP_SERVER_ID, server_data.server_nip);
 }
 
 /* Fill options field, siaddr_nip, and sname and boot_file fields.
@@ -725,7 +726,12 @@ static uint32_t select_lease_time(struct dhcp_packet *packet)
 
 /* We got a DHCP DISCOVER. Send an OFFER. */
 /* NOINLINE: limit stack usage in caller */
-static NOINLINE void send_offer(struct dhcp_packet *oldpacket,
+#if !ENABLE_FEATURE_UDHCPD_BOOTP
+#define send_offer(is_dhcp_client, ...) \
+        send_offer(__VA_ARGS__)
+#endif
+static NOINLINE void send_offer(void *is_dhcp_client,
+                struct dhcp_packet *oldpacket,
                 uint32_t static_lease_nip,
                 struct dyn_lease *lease,
                 uint32_t requested_nip,
@@ -734,7 +740,12 @@ static NOINLINE void send_offer(struct dhcp_packet *oldpacket,
         struct dhcp_packet packet;
         uint32_t lease_time_sec;
 
+#if ENABLE_FEATURE_UDHCPD_BOOTP
+        init_packet(&packet, oldpacket, is_dhcp_client ? DHCPOFFER : MSGTYPE_BOOTP);
+#else
+        enum { is_dhcp_client = 1 };
         init_packet(&packet, oldpacket, DHCPOFFER);
+#endif
 
         /* If it is a static lease, use its IP */
         packet.yiaddr = static_lease_nip;
@@ -784,9 +795,16 @@ static NOINLINE void send_offer(struct dhcp_packet *oldpacket,
                 }
         }
 
-        lease_time_sec = select_lease_time(oldpacket);
-        udhcp_add_simple_option(&packet, DHCP_LEASE_TIME, htonl(lease_time_sec));
+        if (is_dhcp_client) {
+                lease_time_sec = select_lease_time(oldpacket);
+                udhcp_add_simple_option(&packet, DHCP_LEASE_TIME, htonl(lease_time_sec));
+        }
+/* TODO: pass "is_dhcp_client" to add_server_options(), avoid adding confusing options to BOOTP clients? */
         add_server_options(&packet);
+        if (!is_dhcp_client && udhcp_end_option(packet.options) >= RFC1048_OPTIONS_BUFSIZE) {
+                bb_simple_error_msg("BOOTP reply too large, not sending");
+                return;
+        }
 
         /* send_packet emits error message itself if it detects failure */
         send_packet_verbose(&packet, "sending OFFER to %s");
@@ -1050,8 +1068,12 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                         continue;
                 }
                 msg_type = udhcp_get_option(&packet, DHCP_MESSAGE_TYPE);
-                if (!msg_type || msg_type[0] < DHCP_MINTYPE || msg_type[0] > DHCP_MAXTYPE) {
-                        bb_info_msg("no or bad message type option%s", ", ignoring packet");
+                if (
+                        IF_FEATURE_UDHCPD_BOOTP( msg_type && )
+                        IF_NOT_FEATURE_UDHCPD_BOOTP( !msg_type || )
+                        (msg_type[0] < DHCP_MINTYPE || msg_type[0] > DHCP_MAXTYPE)
+                ) {
+                        bb_info_msg("bad message type option%s", ", ignoring packet");
                         continue;
                 }
 
@@ -1086,12 +1108,25 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                         move_from_unaligned32(requested_nip, requested_ip_opt);
                 }
 
+#if ENABLE_FEATURE_UDHCPD_BOOTP
+                /* Handle old BOOTP clients */
+                if (!msg_type) {
+                        log1("received %s", "BOOTP BOOTREQUEST");
+                        if (!static_lease_nip) {
+                                bb_info_msg("no static lease for BOOTP client%s", ", ignoring packet");
+                                continue;
+                        }
+                        send_offer(msg_type, &packet, static_lease_nip, lease, requested_nip, arpping_ms);
+                        continue;
+                }
+#endif
+
                 switch (msg_type[0]) {
 
                 case DHCPDISCOVER:
                         log1("received %s", "DISCOVER");
 
-                        send_offer(&packet, static_lease_nip, lease, requested_nip, arpping_ms);
+                        send_offer(msg_type, &packet, static_lease_nip, lease, requested_nip, arpping_ms);
                         break;
 
                 case DHCPREQUEST:
diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c
index 529978189..f9dc11d01 100644
--- a/networking/udhcp/packet.c
+++ b/networking/udhcp/packet.c
@@ -18,6 +18,8 @@ void FAST_FUNC udhcp_init_header(struct dhcp_packet *packet, char type)
         memset(packet, 0, sizeof(*packet));
         packet->op = BOOTREQUEST; /* if client to a server */
         switch (type) {
+        IF_FEATURE_UDHCPD_BOOTP(case MSGTYPE_BOOTP:)
+                /* reply to a BOOTP (not DHCP) client */
         case DHCPOFFER:
         case DHCPACK:
         case DHCPNAK:
@@ -25,10 +27,11 @@ void FAST_FUNC udhcp_init_header(struct dhcp_packet *packet, char type)
         }
         packet->htype = 1; /* ethernet */
         packet->hlen = 6;
-        packet->cookie = htonl(DHCP_MAGIC);
+        packet->cookie = htonl(RFC1048_MAGIC);
         if (DHCP_END != 0)
                 packet->options[0] = DHCP_END;
-        udhcp_add_simple_option(packet, DHCP_MESSAGE_TYPE, type);
+        IF_FEATURE_UDHCPD_BOOTP(if (type != MSGTYPE_BOOTP))
+                udhcp_add_simple_option(packet, DHCP_MESSAGE_TYPE, type);
 }
 #endif
 
@@ -90,7 +93,7 @@ int FAST_FUNC udhcp_recv_kernel_packet(struct dhcp_packet *packet, int fd)
         }
 
         if (bytes < offsetof(struct dhcp_packet, options)
-         || packet->cookie != htonl(DHCP_MAGIC)
+         || packet->cookie != htonl(RFC1048_MAGIC)
         ) {
                 bb_simple_info_msg("packet with bad magic, ignoring");
                 return -2;
diff --git a/networking/vconfig.c b/networking/vconfig.c
index 7e805be9c..77fbe3a40 100644
--- a/networking/vconfig.c
+++ b/networking/vconfig.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config VCONFIG
-//config:       bool "vconfig (2.3 kb)"
+//config:       bool "vconfig (2.6 kb)"
 //config:       default y
 //config:       help
 //config:       Creates, removes, and configures VLAN interfaces
diff --git a/networking/wget.c b/networking/wget.c
index 5470502aa..e0c66edba 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -9,7 +9,7 @@
  * Kuhn's copyrights are licensed GPLv2-or-later.  File as a whole remains GPLv2.
  */
 //config:config WGET
-//config:       bool "wget (38 kb)"
+//config:       bool "wget (41 kb)"
 //config:       default y
 //config:       help
 //config:       wget is a utility for non-interactive download of files from HTTP
diff --git a/networking/whois.c b/networking/whois.c
index caa71ac51..3a1dbd45d 100644
--- a/networking/whois.c
+++ b/networking/whois.c
@@ -10,7 +10,7 @@
  * Add proxy support
  */
 //config:config WHOIS
-//config:       bool "whois (6.3 kb)"
+//config:       bool "whois (6.5 kb)"
 //config:       default y
 //config:       help
 //config:       whois is a client for the whois directory service
diff --git a/networking/zcip.c b/networking/zcip.c
index 311dfbe4c..137d46e13 100644
--- a/networking/zcip.c
+++ b/networking/zcip.c
@@ -14,7 +14,7 @@
  * certainly be used.  Its naming is built over multicast DNS.
  */
 //config:config ZCIP
-//config:       bool "zcip (8.4 kb)"
+//config:       bool "zcip (8.7 kb)"
 //config:       default y
 //config:       select FEATURE_SYSLOG
 //config:       help