Merge branch 'busybox'

14 files changed, 263 insertions, 129 deletions

diff --git a/networking/Config.src b/networking/Config.src
index 492c60da4..2ce5287de 100644
--- a/networking/Config.src
+++ b/networking/Config.src
@@ -1,6 +1,6 @@
 #
 # For a description of the syntax of this configuration file,
-# see scripts/kbuild/config-language.txt.
+# see docs/Kconfig-language.txt.
 #
 
 menu "Networking Utilities"
diff --git a/networking/nc_bloaty.c b/networking/nc_bloaty.c
index 64098648a..42c84de45 100644
--- a/networking/nc_bloaty.c
+++ b/networking/nc_bloaty.c
@@ -791,7 +791,7 @@ int nc_main(int argc UNUSED_PARAM, char **argv)
                 "np:s:uvw:+"/* -w N */ IF_NC_SERVER("lk")
                 IF_NC_EXTRA("i:o:z")
                         "\0"
-                        "?2:vv:ll", /* max 2 params; -v and -l are counters */
+                        "?2:vv"IF_NC_SERVER(":ll"), /* max 2 params; -v and -l are counters */
                 &str_p, &str_s, &o_wait
                 IF_NC_EXTRA(, &str_i, &str_o)
                         , &o_verbose IF_NC_SERVER(, &cnt_l)
diff --git a/networking/nslookup.c b/networking/nslookup.c
index fd241a5ca..3a614b0c6 100644
--- a/networking/nslookup.c
+++ b/networking/nslookup.c
@@ -712,11 +712,11 @@ static void add_query(int type, const char *dname)
 static char *make_ptr(const char *addrstr)
 {
         unsigned char addr[16];
-        int i;
 
 #if ENABLE_FEATURE_IPV6
         if (inet_pton(AF_INET6, addrstr, addr)) {
                 if (memcmp(addr, v4_mapped, 12) != 0) {
+                        int i;
                         char resbuf[80];
                         char *ptr = resbuf;
                         for (i = 0; i < 16; i++) {
diff --git a/networking/ntpd.c b/networking/ntpd.c
index 6cd497090..7b800369e 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -93,10 +93,10 @@
 
 #include "libbb.h"
 #include <math.h>
-#include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
+#include <netinet/ip.h> /* For IPTOS_DSCP_AF21 definition */
 #include <sys/timex.h>
-#ifndef IPTOS_LOWDELAY
-# define IPTOS_LOWDELAY 0x10
+#ifndef IPTOS_DSCP_AF21
+# define IPTOS_DSCP_AF21 0x48
 #endif
 
 
@@ -149,6 +149,7 @@
  */
 
 #define INITIAL_SAMPLES    4    /* how many samples do we want for init */
+#define MIN_FREQHOLD      10    /* adjust offset, but not freq in this many first adjustments */
 #define BAD_DELAY_GROWTH   4    /* drop packet if its delay grew by more than this */
 
 #define RETRY_INTERVAL    32    /* on send/recv error, retry in N secs (need to be power of 2) */
@@ -910,7 +911,7 @@ send_query_to_peer(peer_t *p)
 #if ENABLE_FEATURE_IPV6
                 if (family == AF_INET)
 #endif
-                        setsockopt_int(fd, IPPROTO_IP, IP_TOS, IPTOS_LOWDELAY);
+                        setsockopt_int(fd, IPPROTO_IP, IP_TOS, IPTOS_DSCP_AF21);
                 free(local_lsa);
         }
 
@@ -1753,7 +1754,7 @@ update_local_clock(peer_t *p)
 //15:19:39.114 update from:<IP> offset:+0.327022 delay:0.158384 jitter:0.108538 clock drift:-1.393ppm tc:4
 //15:20:12.715 update from:<IP> offset:+0.275596 delay:0.158297 jitter:0.097292 clock drift:-1.393ppm tc:4
 //15:20:45.111 update from:<IP> offset:+0.225715 delay:0.158271 jitter:0.087841 clock drift:-1.393ppm tc:4
-// If allwed to continue, it would start increasing tmx.freq now.
+// If allowed to continue, it would start increasing tmx.freq now.
 // Instead, it was ^Ced, and started anew:
 //15:21:15.043 no valid datapoints, no peer selected
 //15:21:17.408 update from:<IP> offset:+0.175910 delay:0.158314 jitter:0.076683 clock drift:-1.393ppm tc:4
@@ -1776,9 +1777,9 @@ update_local_clock(peer_t *p)
 //15:31:53.473 update from:<IP> offset:+0.000007 delay:0.158142 jitter:0.010922 clock drift:+9.343ppm tc:6
 //15:32:58.902 update from:<IP> offset:-0.000728 delay:0.158222 jitter:0.009454 clock drift:+9.298ppm tc:6
                         /*
-                         * This expression would choose 15 in the above example.
+                         * This expression would choose MIN_FREQHOLD + 7 in the above example.
                          */
-                        G.FREQHOLD_cnt = 8 + ((unsigned)(abs(tmx.offset)) >> 16);
+                        G.FREQHOLD_cnt = MIN_FREQHOLD + ((unsigned)(abs(tmx.offset)) >> 16);
                 }
                 G.FREQHOLD_cnt--;
                 tmx.status |= STA_FREQHOLD;
@@ -2320,7 +2321,7 @@ static NOINLINE void ntp_init(char **argv)
                                 xfunc_die();
                 }
                 socket_want_pktinfo(G_listen_fd);
-                setsockopt_int(G_listen_fd, IPPROTO_IP, IP_TOS, IPTOS_LOWDELAY);
+                setsockopt_int(G_listen_fd, IPPROTO_IP, IP_TOS, IPTOS_DSCP_AF21);
         }
 #endif
         /* I hesitate to set -20 prio. -15 should be high enough for timekeeping */
diff --git a/networking/tls.c b/networking/tls.c
index ec5a56d57..fce1d0ea6 100644
--- a/networking/tls.c
+++ b/networking/tls.c
@@ -1088,6 +1088,8 @@ static void find_key_in_der_cert(tls_state_t *tls, uint8_t *der, int len)
  * We need Certificate.tbsCertificate.subjectPublicKeyInfo.publicKey
  */
         uint8_t *end = der + len;
+        uint8_t tag_class, pc, tag_number;
+        int version_present;
 
         /* enter "Certificate" item: [der, end) will be only Cert */
         der = enter_der_item(der, &end);
@@ -1095,8 +1097,24 @@ static void find_key_in_der_cert(tls_state_t *tls, uint8_t *der, int len)
         /* enter "tbsCertificate" item: [der, end) will be only tbsCert */
         der = enter_der_item(der, &end);
 
+        /*
+         * Skip version field only if it is present. For a v1 certificate, the
+         * version field won't be present since v1 is the default value for the
+         * version field and fields with default values should be omitted (see
+         * RFC 5280 sections 4.1 and 4.1.2.1). If the version field is present
+         * it will have a tag class of 2 (context-specific), bit 6 as 1
+         * (constructed), and a tag number of 0 (see ITU-T X.690 sections 8.1.2
+         * and 8.14).
+         */
+        tag_class = der[0] >> 6; /* bits 8-7 */
+        pc = (der[0] & 32) >> 5; /* bit 6 */
+        tag_number = der[0] & 31; /* bits 5-1 */
+        version_present = tag_class == 2 && pc == 1 && tag_number == 0;
+        if (version_present) {
+                der = skip_der_item(der, end); /* version */
+        }
+
         /* skip up to subjectPublicKeyInfo */
-        der = skip_der_item(der, end); /* version */
         der = skip_der_item(der, end); /* serialNumber */
         der = skip_der_item(der, end); /* signatureAlgo */
         der = skip_der_item(der, end); /* issuer */
diff --git a/networking/udhcp/Config.src b/networking/udhcp/Config.src
index 50bff2e8c..e5958804b 100644
--- a/networking/udhcp/Config.src
+++ b/networking/udhcp/Config.src
@@ -1,6 +1,6 @@
 #
 # For a description of the syntax of this configuration file,
-# see scripts/kbuild/config-language.txt.
+# see docs/Kconfig-language.txt.
 #
 
 config UDHCPD
diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c
index fbf9c6878..e5fd74f91 100644
--- a/networking/udhcp/common.c
+++ b/networking/udhcp/common.c
@@ -65,6 +65,7 @@ const struct dhcp_optflag dhcp_optflags[] = {
 #endif
         { OPTION_STRING                           , 0xd1 }, /* DHCP_PXE_CONF_FILE */
         { OPTION_STRING                           , 0xd2 }, /* DHCP_PXE_PATH_PREFIX */
+        { OPTION_U32                              , 0xd3 }, /* DHCP_REBOOT_TIME   */
         { OPTION_6RD                              , 0xd4 }, /* DHCP_6RD           */
         { OPTION_STATIC_ROUTES | OPTION_LIST      , 0xf9 }, /* DHCP_MS_STATIC_ROUTES */
         { OPTION_STRING                           , 0xfc }, /* DHCP_WPAD          */
@@ -92,50 +93,51 @@ const struct dhcp_optflag dhcp_optflags[] = {
  */
 /* Must match dhcp_optflags[] order */
 const char dhcp_option_strings[] ALIGN1 =
-        "subnet" "\0"      /* DHCP_SUBNET         */
-        "timezone" "\0"    /* DHCP_TIME_OFFSET    */
-        "router" "\0"      /* DHCP_ROUTER         */
-//      "timesrv" "\0"     /* DHCP_TIME_SERVER    */
-//      "namesrv" "\0"     /* DHCP_NAME_SERVER    */
-        "dns" "\0"         /* DHCP_DNS_SERVER     */
-//      "logsrv" "\0"      /* DHCP_LOG_SERVER     */
-//      "cookiesrv" "\0"   /* DHCP_COOKIE_SERVER  */
-        "lprsrv" "\0"      /* DHCP_LPR_SERVER     */
-        "hostname" "\0"    /* DHCP_HOST_NAME      */
-        "bootsize" "\0"    /* DHCP_BOOT_SIZE      */
-        "domain" "\0"      /* DHCP_DOMAIN_NAME    */
-        "swapsrv" "\0"     /* DHCP_SWAP_SERVER    */
-        "rootpath" "\0"    /* DHCP_ROOT_PATH      */
-        "ipttl" "\0"       /* DHCP_IP_TTL         */
-        "mtu" "\0"         /* DHCP_MTU            */
-        "broadcast" "\0"   /* DHCP_BROADCAST      */
-        "routes" "\0"      /* DHCP_ROUTES         */
-        "nisdomain" "\0"   /* DHCP_NIS_DOMAIN     */
-        "nissrv" "\0"      /* DHCP_NIS_SERVER     */
-        "ntpsrv" "\0"      /* DHCP_NTP_SERVER     */
-        "wins" "\0"        /* DHCP_WINS_SERVER    */
-        "lease" "\0"       /* DHCP_LEASE_TIME     */
-        "serverid" "\0"    /* DHCP_SERVER_ID      */
-        "message" "\0"     /* DHCP_ERR_MESSAGE    */
-        "tftp" "\0"        /* DHCP_TFTP_SERVER_NAME */
-        "bootfile" "\0"    /* DHCP_BOOT_FILE      */
-//      "userclass" "\0"   /* DHCP_USER_CLASS     */
+        "subnet" "\0"           /* DHCP_SUBNET          */
+        "timezone" "\0"         /* DHCP_TIME_OFFSET     */
+        "router" "\0"           /* DHCP_ROUTER          */
+//      "timesrv" "\0"          /* DHCP_TIME_SERVER     */
+//      "namesrv" "\0"          /* DHCP_NAME_SERVER     */
+        "dns" "\0"              /* DHCP_DNS_SERVER      */
+//      "logsrv" "\0"           /* DHCP_LOG_SERVER      */
+//      "cookiesrv" "\0"        /* DHCP_COOKIE_SERVER   */
+        "lprsrv" "\0"           /* DHCP_LPR_SERVER      */
+        "hostname" "\0"         /* DHCP_HOST_NAME       */
+        "bootsize" "\0"         /* DHCP_BOOT_SIZE       */
+        "domain" "\0"           /* DHCP_DOMAIN_NAME     */
+        "swapsrv" "\0"          /* DHCP_SWAP_SERVER     */
+        "rootpath" "\0"         /* DHCP_ROOT_PATH       */
+        "ipttl" "\0"            /* DHCP_IP_TTL          */
+        "mtu" "\0"              /* DHCP_MTU             */
+        "broadcast" "\0"        /* DHCP_BROADCAST       */
+        "routes" "\0"           /* DHCP_ROUTES          */
+        "nisdomain" "\0"        /* DHCP_NIS_DOMAIN      */
+        "nissrv" "\0"           /* DHCP_NIS_SERVER      */
+        "ntpsrv" "\0"           /* DHCP_NTP_SERVER      */
+        "wins" "\0"             /* DHCP_WINS_SERVER     */
+        "lease" "\0"            /* DHCP_LEASE_TIME      */
+        "serverid" "\0"         /* DHCP_SERVER_ID       */
+        "message" "\0"          /* DHCP_ERR_MESSAGE     */
+        "tftp" "\0"             /* DHCP_TFTP_SERVER_NAME*/
+        "bootfile" "\0"         /* DHCP_BOOT_FILE       */
+//      "userclass" "\0"        /* DHCP_USER_CLASS      */
 #if ENABLE_FEATURE_UDHCP_RFC3397
-        "search" "\0"      /* DHCP_DOMAIN_SEARCH  */
+        "search" "\0"           /* DHCP_DOMAIN_SEARCH   */
 // doesn't work in udhcpd.conf since OPTION_SIP_SERVERS
 // is not handled yet by "string->option" conversion code:
-        "sipsrv" "\0"      /* DHCP_SIP_SERVERS    */
+        "sipsrv" "\0"           /* DHCP_SIP_SERVERS     */
 #endif
-        "staticroutes" "\0"/* DHCP_STATIC_ROUTES  */
+        "staticroutes" "\0"     /* DHCP_STATIC_ROUTES   */
 #if ENABLE_FEATURE_UDHCP_8021Q
-        "vlanid" "\0"      /* DHCP_VLAN_ID        */
-        "vlanpriority" "\0"/* DHCP_VLAN_PRIORITY  */
+        "vlanid" "\0"           /* DHCP_VLAN_ID         */
+        "vlanpriority" "\0"     /* DHCP_VLAN_PRIORITY   */
 #endif
-        "pxeconffile" "\0" /* DHCP_PXE_CONF_FILE  */
-        "pxepathprefix" "\0" /* DHCP_PXE_PATH_PREFIX  */
-        "ip6rd" "\0"       /* DHCP_6RD            */
-        "msstaticroutes""\0"/* DHCP_MS_STATIC_ROUTES */
-        "wpad" "\0"        /* DHCP_WPAD           */
+        "pxeconffile" "\0"      /* DHCP_PXE_CONF_FILE   */
+        "pxepathprefix" "\0"    /* DHCP_PXE_PATH_PREFIX */
+        "reboottime" "\0"       /* DHCP_REBOOT_TIME     */
+        "ip6rd" "\0"            /* DHCP_6RD             */
+        "msstaticroutes" "\0"   /* DHCP_MS_STATIC_ROUTES*/
+        "wpad" "\0"             /* DHCP_WPAD            */
         ;
 #endif
 
@@ -379,12 +381,18 @@ int FAST_FUNC udhcp_str2nip(const char *str, void *arg)
  * and to parse udhcpd.conf's "opt OPTNAME OPTVAL" directives.
  */
 /* helper: add an option to the opt_list */
+#if !ENABLE_UDHCPC6
+#define attach_option(opt_list, optflag, buffer, length, dhcpv6) \
+        attach_option(opt_list, optflag, buffer, length)
+#endif
 static NOINLINE void attach_option(
                 struct option_set **opt_list,
                 const struct dhcp_optflag *optflag,
                 char *buffer,
-                int length)
+                int length,
+                bool dhcpv6)
 {
+        IF_NOT_UDHCPC6(bool dhcpv6 = 0;)
         struct option_set *existing;
         char *allocated = NULL;
 
@@ -410,10 +418,21 @@ static NOINLINE void attach_option(
                 /* make a new option */
                 log2("attaching option %02x to list", optflag->code);
                 new = xmalloc(sizeof(*new));
-                new->data = xmalloc(length + OPT_DATA);
-                new->data[OPT_CODE] = optflag->code;
-                new->data[OPT_LEN] = length;
-                memcpy(new->data + OPT_DATA, (allocated ? allocated : buffer), length);
+                if (!dhcpv6) {
+                        new->data = xmalloc(length + OPT_DATA);
+                        new->data[OPT_CODE] = optflag->code;
+                        new->data[OPT_LEN] = length;
+                        memcpy(new->data + OPT_DATA, (allocated ? allocated : buffer),
+                                        length);
+                } else {
+                        new->data = xmalloc(length + D6_OPT_DATA);
+                        new->data[D6_OPT_CODE] = optflag->code >> 8;
+                        new->data[D6_OPT_CODE + 1] = optflag->code & 0xff;
+                        new->data[D6_OPT_LEN] = length >> 8;
+                        new->data[D6_OPT_LEN + 1] = length & 0xff;
+                        memcpy(new->data + D6_OPT_DATA, (allocated ? allocated : buffer),
+                                        length);
+                }
 
                 curr = opt_list;
                 while (*curr && (*curr)->data[OPT_CODE] < optflag->code)
@@ -450,7 +469,9 @@ static NOINLINE void attach_option(
         free(allocated);
 }
 
-int FAST_FUNC udhcp_str2optset(const char *const_str, void *arg, const struct dhcp_optflag *optflags, const char *option_strings)
+int FAST_FUNC udhcp_str2optset(const char *const_str, void *arg,
+                const struct dhcp_optflag *optflags, const char *option_strings,
+                bool dhcpv6)
 {
         struct option_set **opt_list = arg;
         char *opt;
@@ -489,9 +510,10 @@ int FAST_FUNC udhcp_str2optset(const char *const_str, void *arg, const struct dh
                 int length;
                 char *val;
 
-                if (optflag->flags == OPTION_BIN)
-                        val = trim(strtok(NULL, "")); /* do not split "'q w e'" */
-                else
+                if (optflag->flags == OPTION_BIN) {
+                        val = strtok(NULL, ""); /* do not split "'q w e'" */
+                        trim(val);
+                } else
                         val = strtok(NULL, ", \t");
                 if (!val)
                         break;
@@ -601,7 +623,7 @@ case_OPTION_STRING:
                 }
 
                 if (retval)
-                        attach_option(opt_list, optflag, opt, length);
+                        attach_option(opt_list, optflag, opt, length, dhcpv6);
         } while (retval && (optflag->flags & OPTION_LIST));
 
         return retval;
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
index 13059f106..7ad603d33 100644
--- a/networking/udhcp/common.h
+++ b/networking/udhcp/common.h
@@ -122,9 +122,9 @@ enum {
 //#define DHCP_LOG_SERVER       0x07 /* port 704 UDP log (not syslog)
 //#define DHCP_COOKIE_SERVER    0x08 /* "quote of the day" server */
 //#define DHCP_LPR_SERVER       0x09
-#define DHCP_HOST_NAME          0x0c /* either client informs server or server gives name to client */
+#define DHCP_HOST_NAME          0x0c /* 12: either client informs server or server gives name to client */
 //#define DHCP_BOOT_SIZE        0x0d
-//#define DHCP_DOMAIN_NAME      0x0f /* server gives domain suffix */
+//#define DHCP_DOMAIN_NAME      0x0f /* 15: server gives domain suffix */
 //#define DHCP_SWAP_SERVER      0x10
 //#define DHCP_ROOT_PATH        0x11
 //#define DHCP_IP_TTL           0x17
@@ -135,35 +135,40 @@ enum {
 //#define DHCP_NIS_SERVER       0x29
 //#define DHCP_NTP_SERVER       0x2a
 //#define DHCP_WINS_SERVER      0x2c
-#define DHCP_REQUESTED_IP       0x32 /* sent by client if specific IP is wanted */
-#define DHCP_LEASE_TIME         0x33
-#define DHCP_OPTION_OVERLOAD    0x34
-#define DHCP_MESSAGE_TYPE       0x35
-#define DHCP_SERVER_ID          0x36 /* by default server's IP */
-#define DHCP_PARAM_REQ          0x37 /* list of options client wants */
-//#define DHCP_ERR_MESSAGE      0x38 /* error message when sending NAK etc */
-#define DHCP_MAX_SIZE           0x39
-#define DHCP_VENDOR             0x3c /* client's vendor (a string) */
-#define DHCP_CLIENT_ID          0x3d /* by default client's MAC addr, but may be arbitrarily long */
-//#define DHCP_TFTP_SERVER_NAME 0x42 /* same as 'sname' field */
-//#define DHCP_BOOT_FILE        0x43 /* same as 'file' field */
-//#define DHCP_USER_CLASS       0x4d /* RFC 3004. set of LASCII strings. "I am a printer" etc */
-#define DHCP_FQDN               0x51 /* client asks to update DNS to map its FQDN to its new IP */
-//#define DHCP_DOMAIN_SEARCH    0x77 /* RFC 3397. set of ASCIZ string, DNS-style compressed */
-//#define DHCP_SIP_SERVERS      0x78 /* RFC 3361. flag byte, then: 0: domain names, 1: IP addrs */
-//#define DHCP_STATIC_ROUTES    0x79 /* RFC 3442. (mask,ip,router) tuples */
-//#define DHCP_VLAN_ID          0x84 /* 802.1P VLAN ID */
-//#define DHCP_VLAN_PRIORITY    0x85 /* 802.1Q VLAN priority */
-//#define DHCP_PXE_CONF_FILE    0xd1 /* RFC 5071 Configuration File */
-//#define DHCP_PXE_PATH_PREFIX  0xd2 /* RFC 5071 Configuration File */
-//#define DHCP_MS_STATIC_ROUTES 0xf9 /* Microsoft's pre-RFC 3442 code for 0x79? */
-//#define DHCP_WPAD             0xfc /* MSIE's Web Proxy Autodiscovery Protocol */
-#define DHCP_END                0xff
+#define DHCP_REQUESTED_IP       0x32 /* 50: sent by client if specific IP is wanted */
+#define DHCP_LEASE_TIME         0x33 /* 51: */
+#define DHCP_OPTION_OVERLOAD    0x34 /* 52: */
+#define DHCP_MESSAGE_TYPE       0x35 /* 53: */
+#define DHCP_SERVER_ID          0x36 /* 54: server's IP */
+#define DHCP_PARAM_REQ          0x37 /* 55: list of options client wants */
+//#define DHCP_ERR_MESSAGE      0x38 /* 56: error message when sending NAK etc */
+#define DHCP_MAX_SIZE           0x39 /* 57: */
+#define DHCP_VENDOR             0x3c /* 60: client's vendor (a string) */
+#define DHCP_CLIENT_ID          0x3d /* 61: by default client's MAC addr, but may be arbitrarily long */
+//#define DHCP_TFTP_SERVER_NAME 0x42 /* 66: same as 'sname' field */
+//#define DHCP_BOOT_FILE        0x43 /* 67: same as 'file' field */
+//#define DHCP_USER_CLASS       0x4d /* 77: RFC 3004. set of LASCII strings. "I am a printer" etc */
+#define DHCP_FQDN               0x51 /* 81: client asks to update DNS to map its FQDN to its new IP */
+//#define DHCP_DOMAIN_SEARCH    0x77 /* 119: RFC 3397. set of ASCIZ string, DNS-style compressed */
+//#define DHCP_SIP_SERVERS      0x78 /* 120: RFC 3361. flag byte, then: 0: domain names, 1: IP addrs */
+//#define DHCP_STATIC_ROUTES    0x79 /* 121: RFC 3442. (mask,ip,router) tuples */
+//#define DHCP_VLAN_ID          0x84 /* 132: 802.1P VLAN ID */
+//#define DHCP_VLAN_PRIORITY    0x85 /* 133: 802.1Q VLAN priority */
+//#define DHCP_PXE_CONF_FILE    0xd1 /* 209: RFC 5071 Configuration File */
+//#define DHCP_PXE_PATH_PREFIX  0xd2 /* 210: RFC 5071 Configuration File */
+//#define DHCP_REBOOT_TIME      0xd3 /* 211: RFC 5071 Reboot time */
+//#define DHCP_MS_STATIC_ROUTES 0xf9 /* 249: Microsoft's pre-RFC 3442 code for 0x79? */
+//#define DHCP_WPAD             0xfc /* 252: MSIE's Web Proxy Autodiscovery Protocol */
+#define DHCP_END                0xff /* 255: */
 
 /* Offsets in option byte sequence */
 #define OPT_CODE                0
 #define OPT_LEN                 1
 #define OPT_DATA                2
+/* Offsets in option byte sequence for DHCPv6 */
+#define D6_OPT_CODE             0
+#define D6_OPT_LEN              2
+#define D6_OPT_DATA             4
 /* Bits in "overload" option */
 #define OPTION_FIELD            0
 #define FILE_FIELD              1
@@ -290,10 +295,15 @@ void udhcp_dump_packet(struct dhcp_packet *packet) FAST_FUNC;
 /* 2nd param is "uint32_t*" */
 int FAST_FUNC udhcp_str2nip(const char *str, void *arg);
 /* 2nd param is "struct option_set**" */
+#if !ENABLE_UDHCPC6
+#define udhcp_str2optset(str, arg, optflags, option_strings, dhcpv6) \
+        udhcp_str2optset(str, arg, optflags, option_strings)
+#endif
 int FAST_FUNC udhcp_str2optset(const char *str,
                 void *arg,
                 const struct dhcp_optflag *optflags,
-                const char *option_strings);
+                const char *option_strings,
+                bool dhcpv6);
 
 #if ENABLE_UDHCPC || ENABLE_UDHCPD
 void udhcp_init_header(struct dhcp_packet *packet, char type) FAST_FUNC;
@@ -308,9 +318,7 @@ int udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt,
 
 int udhcp_send_kernel_packet(struct dhcp_packet *dhcp_pkt,
                 uint32_t source_nip, int source_port,
-                uint32_t dest_nip, int dest_port,
-                int send_flags
-) FAST_FUNC;
+                uint32_t dest_nip, int dest_port) FAST_FUNC;
 
 void udhcp_sp_setup(void) FAST_FUNC;
 void udhcp_sp_fd_set(struct pollfd *pfds, int extra_fd) FAST_FUNC;
diff --git a/networking/udhcp/d6_common.h b/networking/udhcp/d6_common.h
index e9c0397ae..d0506e2bb 100644
--- a/networking/udhcp/d6_common.h
+++ b/networking/udhcp/d6_common.h
@@ -128,6 +128,9 @@ struct d6_option {
 #define D6_OPT_TZ_POSIX      41
 #define D6_OPT_TZ_NAME       42
 
+#define D6_OPT_BOOT_URL      59
+#define D6_OPT_BOOT_PARAM    60
+
 /*** Other shared functions ***/
 
 struct client6_data_t {
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index 85d9da724..ed2255ef3 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -38,6 +38,14 @@
 //config:       help
 //config:       You can request POSIX timezone with "-O tz" and timezone name
 //config:       with "-O timezone".
+//config:
+//config:config FEATURE_UDHCPC6_RFC5970
+//config:       bool "Support RFC 5970 (Network Boot)"
+//config:       default y
+//config:       depends on UDHCPC6
+//config:       help
+//config:       You can request bootfile-url with "-O bootfile_url" and
+//config:       bootfile-params with "-O bootfile_params".
 
 //applet:IF_UDHCPC6(APPLET(udhcpc6, BB_DIR_USR_BIN, BB_SUID_DROP))
 
@@ -71,6 +79,12 @@ static const struct dhcp_optflag d6_optflags[] = {
         { OPTION_STRING,                                D6_OPT_TZ_POSIX },
         { OPTION_STRING,                                D6_OPT_TZ_NAME },
 #endif
+#if ENABLE_FEATURE_UDHCPC6_RFC5970
+        { OPTION_STRING,                                D6_OPT_BOOT_URL },
+        { OPTION_STRING,                                D6_OPT_BOOT_PARAM },
+#endif
+        { OPTION_STRING,                                0xd1 }, /* DHCP_PXE_CONF_FILE */
+        { OPTION_STRING,                                0xd2 }, /* DHCP_PXE_PATH_PREFIX */
         { 0, 0 }
 };
 /* Must match d6_optflags[] order */
@@ -86,6 +100,12 @@ static const char d6_option_strings[] ALIGN1 =
         "tz" "\0"       /* D6_OPT_TZ_POSIX */
         "timezone" "\0" /* D6_OPT_TZ_NAME */
 #endif
+#if ENABLE_FEATURE_UDHCPC6_RFC5970
+        "bootfile_url" "\0" /* D6_OPT_BOOT_URL */
+        "bootfile_param" "\0" /* D6_OPT_BOOT_PARAM */
+#endif
+        "pxeconffile" "\0" /* DHCP_PXE_CONF_FILE  */
+        "pxepathprefix" "\0" /* DHCP_PXE_PATH_PREFIX  */
         "\0";
 
 #if ENABLE_LONG_OPTS
@@ -195,8 +215,37 @@ static char** new_env(void)
         return &client6_data.env_ptr[client6_data.env_idx++];
 }
 
+static char *string_option_to_env(const uint8_t *option,
+                const uint8_t *option_end)
+{
+        const char *ptr, *name = NULL;
+        unsigned val_len;
+        int i;
+
+        ptr = d6_option_strings;
+        i = 0;
+        while (*ptr) {
+                if (d6_optflags[i].code == option[1]) {
+                        name = ptr;
+                        goto found;
+                }
+                ptr += strlen(ptr) + 1;
+                i++;
+        }
+        bb_error_msg("can't find option name for 0x%x, skipping", option[1]);
+        return NULL;
+
+ found:
+        val_len = (option[2] << 8) | option[3];
+        if (val_len + &option[D6_OPT_DATA] > option_end) {
+                bb_error_msg("option data exceeds option length");
+                return NULL;
+        }
+        return xasprintf("%s=%.*s", name, val_len, (char*)option + 4);
+}
+
 /* put all the parameters into the environment */
-static void option_to_env(uint8_t *option, uint8_t *option_end)
+static void option_to_env(const uint8_t *option, const uint8_t *option_end)
 {
 #if ENABLE_FEATURE_UDHCPC6_RFC3646
         int addrs, option_offset;
@@ -239,6 +288,10 @@ static void option_to_env(uint8_t *option, uint8_t *option_end)
  * |                        valid-lifetime                         |
  * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  */
+                        /* Make sure payload contains an address */
+                        if (option[3] < 24)
+                                break;
+
                         sprint_nip6(ipv6str, option + 4);
                         *new_env() = xasprintf("ipv6=%s", ipv6str);
 
@@ -354,13 +407,23 @@ static void option_to_env(uint8_t *option, uint8_t *option_end)
                         *new_env() = xasprintf("tz_name=%.*s", (int)option[3], (char*)option + 4);
                         break;
 #endif
+                case D6_OPT_BOOT_URL:
+                case D6_OPT_BOOT_PARAM:
+                case 0xd1: /* DHCP_PXE_CONF_FILE */
+                case 0xd2: /* DHCP_PXE_PATH_PREFIX */
+                        {
+                        char *tmp = string_option_to_env(option, option_end);
+                        if (tmp)
+                                *new_env() = tmp;
+                        break;
+                        }
                 }
                 len_m4 -= 4 + option[3];
                 option += 4 + option[3];
         }
 }
 
-static char **fill_envp(struct d6_packet *packet)
+static char **fill_envp(const uint8_t *option, const uint8_t *option_end)
 {
         char **envp, **curr;
 
@@ -369,8 +432,8 @@ static char **fill_envp(struct d6_packet *packet)
 
         *new_env() = xasprintf("interface=%s", client_config.interface);
 
-        if (packet)
-                option_to_env(packet->d6_options, packet->d6_options + sizeof(packet->d6_options));
+        if (option)
+                option_to_env(option, option_end);
 
         envp = curr = client6_data.env_ptr;
         while (*curr)
@@ -380,12 +443,13 @@ static char **fill_envp(struct d6_packet *packet)
 }
 
 /* Call a script with a par file and env vars */
-static void d6_run_script(struct d6_packet *packet, const char *name)
+static void d6_run_script(const uint8_t *option, const uint8_t *option_end,
+                const char *name)
 {
         char **envp, **curr;
         char *argv[3];
 
-        envp = fill_envp(packet);
+        envp = fill_envp(option, option_end);
 
         /* call script */
         log1("executing %s %s", client_config.script, name);
@@ -401,6 +465,11 @@ static void d6_run_script(struct d6_packet *packet, const char *name)
         free(envp);
 }
 
+/* Call a script with a par file and no env var */
+static void d6_run_script_no_option(const char *name)
+{
+        d6_run_script(NULL, NULL, name);
+}
 
 /*** Sending/receiving packets ***/
 
@@ -426,8 +495,10 @@ static uint8_t *init_d6_packet(struct d6_packet *packet, char type, uint32_t xid
 
 static uint8_t *add_d6_client_options(uint8_t *ptr)
 {
+        struct option_set *curr;
         uint8_t *start = ptr;
         unsigned option;
+        uint16_t len;
 
         ptr += 4;
         for (option = 1; option < 256; option++) {
@@ -450,7 +521,12 @@ static uint8_t *add_d6_client_options(uint8_t *ptr)
         ptr = mempcpy(ptr, &opt_fqdn_req, sizeof(opt_fqdn_req));
 #endif
         /* Add -x options if any */
-        //...
+        curr = client_config.options;
+        while (curr) {
+                len = (curr->data[D6_OPT_LEN] << 8) | curr->data[D6_OPT_LEN + 1];
+                ptr = mempcpy(ptr, curr->data, D6_OPT_DATA + len);
+                curr = curr->next;
+        }
 
         return ptr;
 }
@@ -727,15 +803,13 @@ static NOINLINE int send_d6_renew(uint32_t xid, struct in6_addr *server_ipv6, st
         opt_ptr = add_d6_client_options(opt_ptr);
 
         bb_error_msg("sending %s", "renew");
-        if (server_ipv6) {
+        if (server_ipv6)
                 return d6_send_kernel_packet(
                         &packet, (opt_ptr - (uint8_t*) &packet),
                         our_cur_ipv6, CLIENT_PORT6,
                         server_ipv6, SERVER_PORT6,
                         client_config.ifindex
-                        /* TODO? send_flags: MSG_DONTROUTE (see IPv4 code for reason why) */
                 );
-        }
         return d6_mcast_from_client_config_ifindex(&packet, opt_ptr);
 }
 
@@ -969,7 +1043,7 @@ static void perform_renew(void)
                 state = RENEW_REQUESTED;
                 break;
         case RENEW_REQUESTED: /* impatient are we? fine, square 1 */
-                d6_run_script(NULL, "deconfig");
+                d6_run_script_no_option("deconfig");
         case REQUESTING:
         case RELEASED:
                 change_listen_mode(LISTEN_RAW);
@@ -998,7 +1072,7 @@ static void perform_d6_release(struct in6_addr *server_ipv6, struct in6_addr *ou
  * Users requested to be notified in all cases, even if not in one
  * of the states above.
  */
-        d6_run_script(NULL, "deconfig");
+        d6_run_script_no_option("deconfig");
         change_listen_mode(LISTEN_NONE);
         state = RELEASED;
 }
@@ -1157,7 +1231,10 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
         }
         while (list_x) {
                 char *optstr = xstrdup(llist_pop(&list_x));
-                udhcp_str2optset(optstr, &client_config.options, d6_optflags, d6_option_strings);
+                udhcp_str2optset(optstr, &client_config.options,
+                                d6_optflags, d6_option_strings,
+                                /*dhcpv6:*/ 1
+                );
                 free(optstr);
         }
 
@@ -1204,7 +1281,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
         udhcp_sp_setup();
 
         state = INIT_SELECTING;
-        d6_run_script(NULL, "deconfig");
+        d6_run_script_no_option("deconfig");
         change_listen_mode(LISTEN_RAW);
         packet_num = 0;
         timeout = 0;
@@ -1285,7 +1362,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                                         continue;
                                 }
  leasefail:
-                                d6_run_script(NULL, "leasefail");
+                                d6_run_script_no_option("leasefail");
 #if BB_MMU /* -b is not supported on NOMMU */
                                 if (opt & OPT_b) { /* background if no lease */
                                         bb_error_msg("no lease, forking to background");
@@ -1359,7 +1436,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                                 }
                                 /* Timed out, enter init state */
                                 bb_error_msg("lease lost, entering init state");
-                                d6_run_script(NULL, "deconfig");
+                                d6_run_script_no_option("deconfig");
                                 state = INIT_SELECTING;
                                 client_config.first_secs = 0; /* make secs field count from 0 */
                                 /*timeout = 0; - already is */
@@ -1466,9 +1543,10 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                                 if (option && (option->data[0] | option->data[1]) != 0) {
                                         /* return to init state */
                                         bb_error_msg("received DHCP NAK (%u)", option->data[4]);
-                                        d6_run_script(&packet, "nak");
+                                        d6_run_script(packet.d6_options,
+                                                        packet_end, "nak");
                                         if (state != REQUESTING)
-                                                d6_run_script(NULL, "deconfig");
+                                                d6_run_script_no_option("deconfig");
                                         change_listen_mode(LISTEN_RAW);
                                         sleep(3); /* avoid excessive network traffic */
                                         state = INIT_SELECTING;
@@ -1665,7 +1743,8 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                                 if (timeout < 0x10)
                                         timeout = 0x10;
                                 /* enter bound state */
-                                d6_run_script(&packet, state == REQUESTING ? "bound" : "renew");
+                                d6_run_script(packet.d6_options, packet_end,
+                                        (state == REQUESTING ? "bound" : "renew"));
 
                                 state = BOUND;
                                 change_listen_mode(LISTEN_NONE);
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index bd9e8fdc2..c2805a009 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -693,16 +693,10 @@ static int raw_bcast_from_client_config_ifindex(struct dhcp_packet *packet, uint
 
 static int bcast_or_ucast(struct dhcp_packet *packet, uint32_t ciaddr, uint32_t server)
 {
-        if (server) {
-                /* Without MSG_DONTROUTE, the packet was seen routed over
-                 * _other interface_ if server ID is bogus (example: 1.1.1.1).
-                 */
+        if (server)
                 return udhcp_send_kernel_packet(packet,
                         ciaddr, CLIENT_PORT,
-                        server, SERVER_PORT,
-                        /*send_flags: "to hosts only on directly connected networks" */ MSG_DONTROUTE
-                );
-        }
+                        server, SERVER_PORT);
         return raw_bcast_from_client_config_ifindex(packet, ciaddr);
 }
 
@@ -1337,7 +1331,10 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
         }
         while (list_x) {
                 char *optstr = xstrdup(llist_pop(&list_x));
-                udhcp_str2optset(optstr, &client_config.options, dhcp_optflags, dhcp_option_strings);
+                udhcp_str2optset(optstr, &client_config.options,
+                                dhcp_optflags, dhcp_option_strings,
+                                /*dhcpv6:*/ 0
+                );
                 free(optstr);
         }
 
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
index 19f94a2d7..a8cd3f03b 100644
--- a/networking/udhcp/dhcpd.c
+++ b/networking/udhcp/dhcpd.c
@@ -362,7 +362,10 @@ static int FAST_FUNC read_staticlease(const char *const_line, void *arg)
 }
 
 static int FAST_FUNC read_optset(const char *line, void *arg) {
-        return udhcp_str2optset(line, arg, dhcp_optflags, dhcp_option_strings);
+        return udhcp_str2optset(line, arg,
+                        dhcp_optflags, dhcp_option_strings,
+                        /*dhcpv6:*/ 0
+        );
 }
 
 struct config_keyword {
@@ -588,9 +591,7 @@ static void send_packet_to_relay(struct dhcp_packet *dhcp_pkt)
 
         udhcp_send_kernel_packet(dhcp_pkt,
                         server_config.server_nip, SERVER_PORT,
-                        dhcp_pkt->gateway_nip, SERVER_PORT,
-                        /*send_flags:*/ 0
-        );
+                        dhcp_pkt->gateway_nip, SERVER_PORT);
 }
 
 static void send_packet(struct dhcp_packet *dhcp_pkt, int force_broadcast)
diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c
index fc2bb5416..ff16904f7 100644
--- a/networking/udhcp/packet.c
+++ b/networking/udhcp/packet.c
@@ -189,8 +189,7 @@ int FAST_FUNC udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt,
 /* Let the kernel do all the work for packet generation */
 int FAST_FUNC udhcp_send_kernel_packet(struct dhcp_packet *dhcp_pkt,
                 uint32_t source_nip, int source_port,
-                uint32_t dest_nip, int dest_port,
-                int send_flags)
+                uint32_t dest_nip, int dest_port)
 {
         struct sockaddr_in sa;
         unsigned padding;
@@ -227,8 +226,8 @@ int FAST_FUNC udhcp_send_kernel_packet(struct dhcp_packet *dhcp_pkt,
         padding = DHCP_OPTIONS_BUFSIZE - 1 - udhcp_end_option(dhcp_pkt->options);
         if (padding > DHCP_SIZE - 300)
                 padding = DHCP_SIZE - 300;
-        result = send(fd, dhcp_pkt, DHCP_SIZE - padding, send_flags);
-        msg = "send";
+        result = safe_write(fd, dhcp_pkt, DHCP_SIZE - padding);
+        msg = "write";
  ret_close:
         close(fd);
         if (result < 0) {
diff --git a/networking/wget.c b/networking/wget.c
index 85eae061b..bd2f4edcf 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -137,6 +137,7 @@
 //usage:       "Retrieve files via HTTP or FTP\n"
 //usage:        IF_FEATURE_WGET_LONG_OPTIONS(
 //usage:     "\n        --spider        Only check URL existence: $? is 0 if exists"
+///////:     "\n        --no-check-certificate  Don't validate the server's certificate"
 //usage:        )
 //usage:     "\n        -c              Continue retrieval of aborted transfer"
 //usage:     "\n        -q              Quiet"
@@ -271,6 +272,7 @@ enum {
         WGET_OPT_HEADER     = (1 << 10) * ENABLE_FEATURE_WGET_LONG_OPTIONS,
         WGET_OPT_POST_DATA  = (1 << 11) * ENABLE_FEATURE_WGET_LONG_OPTIONS,
         WGET_OPT_SPIDER     = (1 << 12) * ENABLE_FEATURE_WGET_LONG_OPTIONS,
+        WGET_OPT_NO_CHECK_CERT = (1 << 13) * ENABLE_FEATURE_WGET_LONG_OPTIONS,
 };
 
 enum {
@@ -721,6 +723,9 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
         int pid;
         char *servername, *p;
 
+        if (!(option_mask32 & WGET_OPT_NO_CHECK_CERT))
+                bb_error_msg("note: TLS certificate validation not implemented");
+
         servername = xstrdup(host);
         p = strrchr(servername, ':');
         if (p) *p = '\0';
@@ -1362,6 +1367,7 @@ However, in real world it was observed that some web servers
                                                 /* server.user remains untouched */
                                                 free(server.allocated);
                                                 server.allocated = NULL;
+                                                server.protocol = target.protocol;
                                                 server.host = target.host;
                                                 /* strip_ipv6_scope_id(target.host); - no! */
                                                 /* we assume remote never gives us IPv6 addr with scope id */
@@ -1434,10 +1440,9 @@ IF_DESKTOP(	"tries\0"            Required_argument "t")
                 "header\0"           Required_argument "\xff"
                 "post-data\0"        Required_argument "\xfe"
                 "spider\0"           No_argument       "\xfd"
+                "no-check-certificate\0" No_argument   "\xfc"
                 /* Ignored (we always use PASV): */
 IF_DESKTOP(     "passive-ftp\0"      No_argument       "\xf0")
-                /* Ignored (we don't do ssl) */
-IF_DESKTOP(     "no-check-certificate\0" No_argument   "\xf0")
                 /* Ignored (we don't support caching) */
 IF_DESKTOP(     "no-cache\0"         No_argument       "\xf0")
 IF_DESKTOP(     "no-verbose\0"       No_argument       "\xf0")
@@ -1497,6 +1502,7 @@ IF_DESKTOP(	"no-parent\0"        No_argument       "\xf0")
         if (option_mask32 & WGET_OPT_HEADER) bb_error_msg("--header");
         if (option_mask32 & WGET_OPT_POST_DATA) bb_error_msg("--post-data");
         if (option_mask32 & WGET_OPT_SPIDER) bb_error_msg("--spider");
+        if (option_mask32 & WGET_OPT_NO_CHECK_CERT) bb_error_msg("--no-check-certificate");
         exit(0);
 #endif
         argv += optind;