Merge branch 'busybox' into merge

17 files changed, 339 insertions, 153 deletions

diff --git a/networking/inetd.c b/networking/inetd.c
index 01e659f13..3bf157b70 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -227,7 +227,8 @@
 
 #if ENABLE_FEATURE_INETD_RPC
 # if defined(__UCLIBC__) && ! defined(__UCLIBC_HAS_RPC__)
-#  error "You need to build uClibc with UCLIBC_HAS_RPC for NFS support"
+#  warning "You probably need to build uClibc with UCLIBC_HAS_RPC for NFS support"
+   /* not #error, since user may be using e.g. libtirpc instead */
 # endif
 # include <rpc/rpc.h>
 # include <rpc/pmap_clnt.h>
@@ -1513,8 +1514,11 @@ int inetd_main(int argc UNUSED_PARAM, char **argv)
         } /* for (;;) */
 }
 
-#if !BB_MMU
+#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_ECHO \
+ || ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD
+# if !BB_MMU
 static const char *const cat_args[] = { "cat", NULL };
+# endif
 #endif
 
 /*
@@ -1525,14 +1529,14 @@ static const char *const cat_args[] = { "cat", NULL };
 /* ARGSUSED */
 static void FAST_FUNC echo_stream(int s, servtab_t *sep UNUSED_PARAM)
 {
-#if BB_MMU
+# if BB_MMU
         while (1) {
                 ssize_t sz = safe_read(s, line, LINE_SIZE);
                 if (sz <= 0)
                         break;
                 xwrite(s, line, sz);
         }
-#else
+# else
         /* We are after vfork here! */
         /* move network socket to stdin/stdout */
         xmove_fd(s, STDIN_FILENO);
@@ -1542,7 +1546,7 @@ static void FAST_FUNC echo_stream(int s, servtab_t *sep UNUSED_PARAM)
         xopen(bb_dev_null, O_WRONLY);
         BB_EXECVP("cat", (char**)cat_args);
         /* on failure we return to main, which does exit(EXIT_FAILURE) */
-#endif
+# endif
 }
 static void FAST_FUNC echo_dg(int s, servtab_t *sep)
 {
@@ -1566,10 +1570,10 @@ static void FAST_FUNC echo_dg(int s, servtab_t *sep)
 /* ARGSUSED */
 static void FAST_FUNC discard_stream(int s, servtab_t *sep UNUSED_PARAM)
 {
-#if BB_MMU
+# if BB_MMU
         while (safe_read(s, line, LINE_SIZE) > 0)
                 continue;
-#else
+# else
         /* We are after vfork here! */
         /* move network socket to stdin */
         xmove_fd(s, STDIN_FILENO);
@@ -1580,7 +1584,7 @@ static void FAST_FUNC discard_stream(int s, servtab_t *sep UNUSED_PARAM)
         xdup2(STDOUT_FILENO, STDERR_FILENO);
         BB_EXECVP("cat", (char**)cat_args);
         /* on failure we return to main, which does exit(EXIT_FAILURE) */
-#endif
+# endif
 }
 /* ARGSUSED */
 static void FAST_FUNC discard_dg(int s, servtab_t *sep UNUSED_PARAM)
diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c
index cc3443a92..6a41b8331 100644
--- a/networking/libiproute/iproute.c
+++ b/networking/libiproute/iproute.c
@@ -28,7 +28,7 @@ struct filter_t {
         int flushe;
         struct rtnl_handle *rth;
         //int protocol, protocolmask; - write-only fields?!
-        //int scope, scopemask; - unused
+        int scope, scopemask;
         //int type; - read-only
         //int typemask; - unused
         //int tos, tosmask; - unused
@@ -120,6 +120,8 @@ static int FAST_FUNC print_route(const struct sockaddr_nl *who UNUSED_PARAM,
                         return 0;
                 }
         }
+        if ((G_filter.scope ^ r->rtm_scope) & G_filter.scopemask)
+                return 0;
         if (G_filter.rdst.family
          && (r->rtm_family != G_filter.rdst.family || G_filter.rdst.bitlen > r->rtm_dst_len)
         ) {
@@ -270,7 +272,11 @@ static int FAST_FUNC print_route(const struct sockaddr_nl *who UNUSED_PARAM,
                 printf("table %s ", rtnl_rttable_n2a(tid));
 #endif
 
-        /* Todo: parse & show "proto kernel", "scope link" here */
+        /* Todo: parse & show "proto kernel" here */
+        if (!(r->rtm_flags & RTM_F_CLONED)) {
+                if ((r->rtm_scope != RT_SCOPE_UNIVERSE) && G_filter.scopemask != -1)
+                        printf("scope %s ", rtnl_rtscope_n2a(r->rtm_scope));
+        }
 
         if (tb[RTA_PREFSRC] && /*G_filter.rprefsrc.bitlen - always 0*/ 0 != host_len) {
                 /* Do not use format_host(). It is our local addr
@@ -761,10 +767,11 @@ static int iproute_list_or_flush(char **argv, int flush)
         char *id = NULL;
         char *od = NULL;
         static const char keywords[] ALIGN1 =
+                /* If you add stuff here, update iproute_full_usage */
                 /* "ip route list/flush" parameters: */
                 "protocol\0" "dev\0"   "oif\0"   "iif\0"
                 "via\0"      "table\0" "cache\0"
-                "from\0"     "to\0"
+                "from\0"     "to\0"    "scope\0"
                 /* and possible further keywords */
                 "all\0"
                 "root\0"
@@ -775,7 +782,7 @@ static int iproute_list_or_flush(char **argv, int flush)
         enum {
                 KW_proto, KW_dev,   KW_oif,  KW_iif,
                 KW_via,   KW_table, KW_cache,
-                KW_from,  KW_to,
+                KW_from,  KW_to,    KW_scope,
                 /* */
                 KW_all,
                 KW_root,
@@ -834,6 +841,17 @@ static int iproute_list_or_flush(char **argv, int flush)
                         /* The command 'ip route flush cache' is used by OpenSWAN.
                          * Assuming it's a synonym for 'ip route flush table cache' */
                         G_filter.tb = -1;
+                } else if (arg == KW_scope) {
+                        uint32_t scope;
+                        NEXT_ARG();
+                        G_filter.scopemask = -1;
+                        if (rtnl_rtscope_a2n(&scope, *argv)) {
+                                if (strcmp(*argv, "all") != 0)
+                                        invarg_1_to_2(*argv, "scope");
+                                scope = RT_SCOPE_NOWHERE;
+                                G_filter.scopemask = 0;
+                        }
+                        G_filter.scope = scope;
                 } else if (arg == KW_from) {
                         NEXT_ARG();
                         parm = index_in_substrings(keywords, *argv);
diff --git a/networking/libiproute/iprule.c b/networking/libiproute/iprule.c
index 8f3f86286..1bb5e759e 100644
--- a/networking/libiproute/iprule.c
+++ b/networking/libiproute/iprule.c
@@ -17,25 +17,32 @@
 #include <netinet/ip.h>
 #include <arpa/inet.h>
 
+/* from <linux/fib_rules.h>: */
+#define FRA_SUPPRESS_IFGROUP   13
+#define FRA_SUPPRESS_PREFIXLEN 14
+
 #include "ip_common.h"  /* #include "libbb.h" is inside */
 #include "rt_names.h"
 #include "utils.h"
 
-/*
-static void usage(void) __attribute__((noreturn));
-
-static void usage(void)
-{
-        fprintf(stderr, "Usage: ip rule [ list | add | del ] SELECTOR ACTION\n");
-        fprintf(stderr, "SELECTOR := [ from PREFIX ] [ to PREFIX ] [ tos TOS ] [ fwmark FWMARK ]\n");
-        fprintf(stderr, "            [ dev STRING ] [ pref NUMBER ]\n");
-        fprintf(stderr, "ACTION := [ table TABLE_ID ] [ nat ADDRESS ]\n");
-        fprintf(stderr, "          [ prohibit | reject | unreachable ]\n");
-        fprintf(stderr, "          [ realms [SRCREALM/]DSTREALM ]\n");
-        fprintf(stderr, "TABLE_ID := [ local | main | default | NUMBER ]\n");
-        exit(-1);
-}
-*/
+/* If you add stuff here, update iprule_full_usage */
+static const char keywords[] ALIGN1 =
+        "from\0""to\0""preference\0""order\0""priority\0"
+        "tos\0""fwmark\0""realms\0""table\0""lookup\0"
+        "suppress_prefixlength\0""suppress_ifgroup\0"
+        "dev\0""iif\0""nat\0""map-to\0""type\0""help\0"
+        ;
+#define keyword_preference            (keywords           + sizeof("from") + sizeof("to"))
+#define keyword_fwmark                (keyword_preference + sizeof("preference") + sizeof("order") + sizeof("priority") + sizeof("tos"))
+#define keyword_realms                (keyword_fwmark     + sizeof("fwmark"))
+#define keyword_suppress_prefixlength (keyword_realms     + sizeof("realms") + sizeof("table") + sizeof("lookup"))
+#define keyword_suppress_ifgroup      (keyword_suppress_prefixlength + sizeof("suppress_prefixlength"))
+enum {
+        ARG_from = 1, ARG_to, ARG_preference, ARG_order, ARG_priority,
+        ARG_tos, ARG_fwmark, ARG_realms, ARG_table, ARG_lookup,
+        ARG_suppress_prefixlength, ARG_suppress_ifgroup,
+        ARG_dev, ARG_iif, ARG_nat, ARG_map_to, ARG_type, ARG_help,
+};
 
 static int FAST_FUNC print_rule(const struct sockaddr_nl *who UNUSED_PARAM,
                                         struct nlmsghdr *n, void *arg UNUSED_PARAM)
@@ -119,6 +126,17 @@ static int FAST_FUNC print_rule(const struct sockaddr_nl *who UNUSED_PARAM,
         else if (r->rtm_table)
                 printf("lookup %s ", rtnl_rttable_n2a(r->rtm_table));
 
+        if (tb[FRA_SUPPRESS_PREFIXLEN]) {
+                int pl = *(uint32_t*)RTA_DATA(tb[FRA_SUPPRESS_PREFIXLEN]);
+                if (pl != -1)
+                        printf("%s %d ", keyword_suppress_prefixlength, pl);
+        }
+        if (tb[FRA_SUPPRESS_IFGROUP]) {
+                int grp = *(uint32_t*)RTA_DATA(tb[FRA_SUPPRESS_IFGROUP]);
+                if (grp != -1)
+                        printf("%s %d ", keyword_suppress_ifgroup, grp);
+        }
+
         if (tb[RTA_FLOW]) {
                 uint32_t to = *(uint32_t*)RTA_DATA(tb[RTA_FLOW]);
                 uint32_t from = to>>16;
@@ -174,15 +192,6 @@ static int iprule_list(char **argv)
 /* Return value becomes exitcode. It's okay to not return at all */
 static int iprule_modify(int cmd, char **argv)
 {
-        static const char keywords[] ALIGN1 =
-                "from\0""to\0""preference\0""order\0""priority\0"
-                "tos\0""fwmark\0""realms\0""table\0""lookup\0""dev\0"
-                "iif\0""nat\0""map-to\0""type\0""help\0";
-        enum {
-                ARG_from = 1, ARG_to, ARG_preference, ARG_order, ARG_priority,
-                ARG_tos, ARG_fwmark, ARG_realms, ARG_table, ARG_lookup, ARG_dev,
-                ARG_iif, ARG_nat, ARG_map_to, ARG_type, ARG_help
-        };
         bool table_ok = 0;
         struct rtnl_handle rth;
         struct {
@@ -232,7 +241,7 @@ static int iprule_modify(int cmd, char **argv)
                 ) {
                         uint32_t pref;
                         NEXT_ARG();
-                        pref = get_u32(*argv, "preference");
+                        pref = get_u32(*argv, keyword_preference);
                         addattr32(&req.n, sizeof(req), RTA_PRIORITY, pref);
                 } else if (key == ARG_tos) {
                         uint32_t tos;
@@ -243,13 +252,13 @@ static int iprule_modify(int cmd, char **argv)
                 } else if (key == ARG_fwmark) {
                         uint32_t fwmark;
                         NEXT_ARG();
-                        fwmark = get_u32(*argv, "fwmark");
+                        fwmark = get_u32(*argv, keyword_fwmark);
                         addattr32(&req.n, sizeof(req), RTA_PROTOINFO, fwmark);
                 } else if (key == ARG_realms) {
                         uint32_t realm;
                         NEXT_ARG();
                         if (get_rt_realms(&realm, *argv))
-                                invarg_1_to_2(*argv, "realms");
+                                invarg_1_to_2(*argv, keyword_realms);
                         addattr32(&req.n, sizeof(req), RTA_FLOW, realm);
                 } else if (key == ARG_table ||
                            key == ARG_lookup
@@ -265,6 +274,16 @@ static int iprule_modify(int cmd, char **argv)
                                 addattr32(&req.n, sizeof(req), RTA_TABLE, tid);
                         }
                         table_ok = 1;
+                } else if (key == ARG_suppress_prefixlength) {
+                        int prefix_length;
+                        NEXT_ARG();
+                        prefix_length = get_u32(*argv, keyword_suppress_prefixlength);
+                        addattr32(&req.n, sizeof(req), FRA_SUPPRESS_PREFIXLEN, prefix_length);
+                } else if (key == ARG_suppress_ifgroup) {
+                        int grp;
+                        NEXT_ARG();
+                        grp = get_u32(*argv, keyword_suppress_ifgroup);
+                        addattr32(&req.n, sizeof(req), FRA_SUPPRESS_IFGROUP, grp);
                 } else if (key == ARG_dev ||
                            key == ARG_iif
                 ) {
diff --git a/networking/tls.c b/networking/tls.c
index db518bf90..fd3cb0dba 100644
--- a/networking/tls.c
+++ b/networking/tls.c
@@ -1199,11 +1199,11 @@ static void send_client_hello_and_alloc_hsd(tls_state_t *tls, const char *sni)
         };
         struct client_hello *record;
         int len;
-        int sni_len = sni ? strnlen(sni, 127) : 0;
+        int sni_len = sni ? strnlen(sni, 127 - 9) : 0;
 
         len = sizeof(*record);
         if (sni_len)
-                len += 11 + strlen(sni);
+                len += 11 + sni_len;
         record = tls_get_outbuf(tls, len);
         memset(record, 0, len);
 
diff --git a/networking/tls_aes.c b/networking/tls_aes.c
index 6992f1c90..c137442e9 100644
--- a/networking/tls_aes.c
+++ b/networking/tls_aes.c
@@ -40,10 +40,6 @@
  */
 #include "tls.h"
 
-/* TODO: grep for this and move to libbb */
-#define get_unaligned_be32(buf) ({ uint32_t v; move_from_unaligned32(v, buf); SWAP_BE32(v); })
-
-
 // The lookup-tables are marked const so they can be placed in read-only storage instead of RAM
 // The numbers below can be computed dynamically trading ROM for RAM -
 // This can be useful in (embedded) bootloader applications, where ROM is often limited.
diff --git a/networking/tls_pstm.c b/networking/tls_pstm.c
index bd5bae0b7..e12e6c9d4 100644
--- a/networking/tls_pstm.c
+++ b/networking/tls_pstm.c
@@ -2127,7 +2127,7 @@ int32 pstm_invmod(psPool_t *pool, pstm_int *a, pstm_int *b, pstm_int *c)
 {
         pstm_int        x, y, u, v, B, D;
         int32           res;
-        uint16          neg, sanity;
+        int             neg, sanity; //bbox: was uint16
 
         /* 2. [modified] b must be odd   */
         if (pstm_iseven (b) == 1) {
diff --git a/networking/tls_pstm_montgomery_reduce.c b/networking/tls_pstm_montgomery_reduce.c
index dc2fe0a48..3391755e1 100644
--- a/networking/tls_pstm_montgomery_reduce.c
+++ b/networking/tls_pstm_montgomery_reduce.c
@@ -345,7 +345,7 @@ int32 pstm_montgomery_reduce(psPool_t *pool, pstm_int *a, pstm_int *m,
 {
         pstm_digit      *c, *_c, *tmpm, mu;
         int32           oldused, x, y;
-        int16           pa;
+        int             pa; //bbox: was int16
 
         pa = m->used;
         if (pa > a->alloc) {
diff --git a/networking/tls_pstm_mul_comba.c b/networking/tls_pstm_mul_comba.c
index 47cbb9618..6ba152bc1 100644
--- a/networking/tls_pstm_mul_comba.c
+++ b/networking/tls_pstm_mul_comba.c
@@ -85,7 +85,8 @@ asm(                                                      \
          "addl  %%eax,%0     \n\t"                            \
          "adcl  %%edx,%1     \n\t"                            \
          "adcl  $0,%2        \n\t"                            \
-         :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i), "m"(j)  :"%eax","%edx","%cc");
+         :"=rm"(c0), "=rm"(c1), "=rm"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i), "m"(j)  :"%eax","%edx","%cc");
+        //bbox: ^^^ replaced "=r" with "=rm": %ebx is not available on shared build
 
 /******************************************************************************/
 #elif defined(PSTM_X86_64)
@@ -228,7 +229,7 @@ asm(                               \
 static int32 pstm_mul_comba_gen(psPool_t *pool, pstm_int *A, pstm_int *B,
                         pstm_int *C, pstm_digit *paD, uint32 paDlen)
 {
-        int16           paDfail, pa;
+        int             paDfail, pa; //bbox: was int16
         int32       ix, iy, iz, tx, ty;
         pstm_digit      c0, c1, c2, *tmpx, *tmpy, *dst;
 
diff --git a/networking/tls_pstm_sqr_comba.c b/networking/tls_pstm_sqr_comba.c
index 36cb9ea97..d5c74d2f0 100644
--- a/networking/tls_pstm_sqr_comba.c
+++ b/networking/tls_pstm_sqr_comba.c
@@ -78,7 +78,8 @@ asm(                                            \
          "addl  %%eax,%0     \n\t"                            \
          "adcl  %%edx,%1     \n\t"                            \
          "adcl  $0,%2        \n\t"                            \
-         :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i) :"%eax","%edx","%cc");
+         :"=rm"(c0), "=rm"(c1), "=rm"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i) :"%eax","%edx","%cc");
+        //bbox: ^^^ replaced "=r" with "=rm": %ebx is not available on shared build
 
 #define SQRADD2(i, j)                                     \
 asm(                                            \
@@ -90,7 +91,8 @@ asm(                                            \
          "addl  %%eax,%0     \n\t"                            \
          "adcl  %%edx,%1     \n\t"                            \
          "adcl  $0,%2        \n\t"                            \
-         :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i), "m"(j)  :"%eax","%edx","%cc");
+         :"=rm"(c0), "=rm"(c1), "=rm"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i), "m"(j)  :"%eax","%edx","%cc");
+        //bbox: ^^^ replaced "=r" with "=rm": %ebx is not available on shared build
 
 #define SQRADDSC(i, j)                                    \
 asm(                                                     \
@@ -445,7 +447,7 @@ asm(                               \
 static int32 pstm_sqr_comba_gen(psPool_t *pool, pstm_int *A, pstm_int *B,
                         pstm_digit *paD, uint32 paDlen)
 {
-        int16           paDfail, pa;
+        int             paDfail, pa; //bbox: was int16
         int32       ix, iz;
         pstm_digit  c0, c1, c2, *dst;
 #ifdef PSTM_ISO
diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c
index 420695a20..d3eea5def 100644
--- a/networking/udhcp/common.c
+++ b/networking/udhcp/common.c
@@ -14,6 +14,7 @@ const uint8_t MAC_BCAST_ADDR[6] ALIGN2 = {
         0xff, 0xff, 0xff, 0xff, 0xff, 0xff
 };
 
+#if ENABLE_UDHCPC || ENABLE_UDHCPD
 /* Supported options are easily added here.
  * See RFC2132 for more options.
  * OPTION_REQ: these options are requested by udhcpc (unless -o).
@@ -136,6 +137,7 @@ const char dhcp_option_strings[] ALIGN1 =
         "msstaticroutes""\0"/* DHCP_MS_STATIC_ROUTES */
         "wpad" "\0"        /* DHCP_WPAD           */
         ;
+#endif
 
 /* Lengths of the option types in binary form.
  * Used by:
@@ -190,21 +192,26 @@ static void log_option(const char *pfx, const uint8_t *opt)
 # define log_option(pfx, opt) ((void)0)
 #endif
 
-unsigned FAST_FUNC udhcp_option_idx(const char *name)
+unsigned FAST_FUNC udhcp_option_idx(const char *name, const char *option_strings)
 {
-        int n = index_in_strings(dhcp_option_strings, name);
+        int n = index_in_strings(option_strings, name);
         if (n >= 0)
                 return n;
 
         {
-                char buf[sizeof(dhcp_option_strings)];
-                char *d = buf;
-                const char *s = dhcp_option_strings;
-                while (s < dhcp_option_strings + sizeof(dhcp_option_strings) - 2) {
+                char *buf, *d;
+                const char *s;
+
+                s = option_strings;
+                while (*s)
+                        s += strlen(s) + 1;
+
+                d = buf = xzalloc(s - option_strings);
+                s = option_strings;
+                while (!(*s == '\0' && s[1] == '\0')) {
                         *d++ = (*s == '\0' ? ' ' : *s);
                         s++;
                 }
-                *d = '\0';
                 bb_error_msg_and_die("unknown option '%s', known options: %s", name, buf);
         }
 }
@@ -315,6 +322,7 @@ void FAST_FUNC udhcp_add_binary_option(struct dhcp_packet *packet, uint8_t *addo
         optionptr[end + len] = DHCP_END;
 }
 
+#if ENABLE_UDHCPC || ENABLE_UDHCPD
 /* Add an one to four byte option to a packet */
 void FAST_FUNC udhcp_add_simple_option(struct dhcp_packet *packet, uint8_t code, uint32_t data)
 {
@@ -338,6 +346,7 @@ void FAST_FUNC udhcp_add_simple_option(struct dhcp_packet *packet, uint8_t code,
 
         bb_error_msg("can't add option 0x%02x", code);
 }
+#endif
 
 /* Find option 'code' in opt_list */
 struct option_set* FAST_FUNC udhcp_find_option(struct option_set *opt_list, uint8_t code)
@@ -451,7 +460,7 @@ static NOINLINE void attach_option(
         free(allocated);
 }
 
-int FAST_FUNC udhcp_str2optset(const char *const_str, void *arg)
+int FAST_FUNC udhcp_str2optset(const char *const_str, void *arg, const struct dhcp_optflag *optflags, const char *option_strings)
 {
         struct option_set **opt_list = arg;
         char *opt, *val;
@@ -478,7 +487,7 @@ int FAST_FUNC udhcp_str2optset(const char *const_str, void *arg)
                 bin_optflag.code = optcode;
                 optflag = &bin_optflag;
         } else {
-                optflag = &dhcp_optflags[udhcp_option_idx(opt)];
+                optflag = &optflags[udhcp_option_idx(opt, option_strings)];
         }
 
         retval = 0;
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
index ee12cf91b..a9c23a186 100644
--- a/networking/udhcp/common.h
+++ b/networking/udhcp/common.h
@@ -93,8 +93,10 @@ enum {
         OPTION_BIN,
         OPTION_STATIC_ROUTES,
         OPTION_6RD,
-#if ENABLE_FEATURE_UDHCP_RFC3397
+#if ENABLE_FEATURE_UDHCP_RFC3397 || ENABLE_FEATURE_UDHCPC6_RFC3646 || ENABLE_FEATURE_UDHCPC6_RFC4704
         OPTION_DNS_STRING,  /* RFC1035 compressed domain name list */
+#endif
+#if ENABLE_FEATURE_UDHCP_RFC3397
         OPTION_SIP_SERVERS,
 #endif
 
@@ -189,17 +191,21 @@ struct option_set {
         struct option_set *next;
 };
 
+#if ENABLE_UDHCPC || ENABLE_UDHCPD
 extern const struct dhcp_optflag dhcp_optflags[];
 extern const char dhcp_option_strings[] ALIGN1;
+#endif
 extern const uint8_t dhcp_option_lengths[] ALIGN1;
 
-unsigned FAST_FUNC udhcp_option_idx(const char *name);
+unsigned FAST_FUNC udhcp_option_idx(const char *name, const char *option_strings);
 
 uint8_t *udhcp_get_option(struct dhcp_packet *packet, int code) FAST_FUNC;
 int udhcp_end_option(uint8_t *optionptr) FAST_FUNC;
 void udhcp_add_binary_option(struct dhcp_packet *packet, uint8_t *addopt) FAST_FUNC;
+#if ENABLE_UDHCPC || ENABLE_UDHCPD
 void udhcp_add_simple_option(struct dhcp_packet *packet, uint8_t code, uint32_t data) FAST_FUNC;
-#if ENABLE_FEATURE_UDHCP_RFC3397
+#endif
+#if ENABLE_FEATURE_UDHCP_RFC3397 || ENABLE_FEATURE_UDHCPC6_RFC3646 || ENABLE_FEATURE_UDHCPC6_RFC4704
 char *dname_dec(const uint8_t *cstr, int clen, const char *pre) FAST_FUNC;
 uint8_t *dname_enc(const uint8_t *cstr, int clen, const char *src, int *retlen) FAST_FUNC;
 #endif
@@ -284,9 +290,14 @@ 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**" */
-int FAST_FUNC udhcp_str2optset(const char *str, void *arg);
+int FAST_FUNC udhcp_str2optset(const char *str,
+                void *arg,
+                const struct dhcp_optflag *optflags,
+                const char *option_strings);
 
+#if ENABLE_UDHCPC || ENABLE_UDHCPD
 void udhcp_init_header(struct dhcp_packet *packet, char type) FAST_FUNC;
+#endif
 
 int udhcp_recv_kernel_packet(struct dhcp_packet *packet, int fd) FAST_FUNC;
 
diff --git a/networking/udhcp/d6_common.h b/networking/udhcp/d6_common.h
index fcec8c15a..310550371 100644
--- a/networking/udhcp/d6_common.h
+++ b/networking/udhcp/d6_common.h
@@ -87,8 +87,47 @@ struct d6_option {
 #define D6_OPT_IA_PD         25
 #define D6_OPT_IAPREFIX      26
 
+/* RFC 4704 "The DHCPv6 Client FQDN Option"
+ * uint16       option-code     OPTION_CLIENT_FQDN (39)
+ * uint16       option-len      1 + length of domain name
+ * uint8        flags
+ * char[]       domain-name     partial or fully qualified domain name
+ *
+ * Flags format is |MBZ|N|O|S|
+ * The "S" bit indicates whether the server SHOULD or SHOULD NOT perform
+ * the AAAA RR (FQDN-to-address) DNS updates.  A client sets the bit to
+ * 0 to indicate that the server SHOULD NOT perform the updates and 1 to
+ * indicate that the server SHOULD perform the updates.  The state of
+ * the bit in the reply from the server indicates the action to be taken
+ * by the server; if it is 1, the server has taken responsibility for
+ * AAAA RR updates for the FQDN.
+ * The "O" bit indicates whether the server has overridden the client's
+ * preference for the "S" bit.  A client MUST set this bit to 0.  A
+ * server MUST set this bit to 1 if the "S" bit in its reply to the
+ * client does not match the "S" bit received from the client.
+ * The "N" bit indicates whether the server SHOULD NOT perform any DNS
+ * updates.  A client sets this bit to 0 to request that the server
+ * SHOULD perform updates (the PTR RR and possibly the AAAA RR based on
+ * the "S" bit) or to 1 to request that the server SHOULD NOT perform
+ * any DNS updates.  A server sets the "N" bit to indicate whether the
+ * server SHALL (0) or SHALL NOT (1) perform DNS updates.  If the "N"
+ * bit is 1, the "S" bit MUST be 0.
+ *
+ * If a client knows only part of its name, it MAY send a name that is not
+ * fully qualified, indicating that it knows part of the name but does not
+ * necessarily know the zone in which the name is to be embedded.
+ * To send a fully qualified domain name, the Domain Name field is set
+ * to the DNS-encoded domain name including the terminating zero-length
+ * label.  To send a partial name, the Domain Name field is set to the
+ * DNS-encoded domain name without the terminating zero-length label.
+ * A client MAY also leave the Domain Name field empty if it desires the
+ * server to provide a name.
+ */
 #define D6_OPT_CLIENT_FQDN   39
 
+#define D6_OPT_TZ_POSIX      41
+#define D6_OPT_TZ_NAME       42
+
 /*** Other shared functions ***/
 
 struct client6_data_t {
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index 18a104c61..f6d3fb98b 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -2,26 +2,49 @@
 /*
  * DHCPv6 client.
  *
- * 2011-11.
- * WARNING: THIS CODE IS INCOMPLETE. IT IS NOWHERE NEAR
- * TO BE READY FOR PRODUCTION USE.
+ * WARNING: THIS CODE IS INCOMPLETE.
  *
- * Copyright (C) 2011 Denys Vlasenko.
+ * Copyright (C) 2011-2017 Denys Vlasenko.
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
 //config:config UDHCPC6
-//config:       bool "udhcpc6 (DHCPv6 client, NOT READY)"
+//config:       bool "udhcpc6 (DHCPv6 client, EXPERIMENTAL)"
 //config:       default n  # not yet ready
 //config:       depends on FEATURE_IPV6
 //config:       help
 //config:         udhcpc6 is a DHCPv6 client
+//config:
+//config:config FEATURE_UDHCPC6_RFC3646
+//config:       bool "Support RFC 3646 (DNS server and search list)"
+//config:       default y
+//config:       depends on UDHCPC6
+//config:       help
+//config:         List of DNS servers and domain search list can be requested with
+//config:         "-O dns" and "-O search". If server gives these values,
+//config:         they will be set in environment variables "dns" and "search".
+//config:
+//config:config FEATURE_UDHCPC6_RFC4704
+//config:       bool "Support RFC 4704 (Client FQDN)"
+//config:       default y
+//config:       depends on UDHCPC6
+//config:       help
+//config:         You can request FQDN to be given by server using "-O fqdn".
+//config:
+//config:config FEATURE_UDHCPC6_RFC4833
+//config:       bool "Support RFC 4833 (Timezones)"
+//config:       default y
+//config:       depends on UDHCPC6
+//config:       help
+//config:         You can request POSIX timezone with "-O tz" and timezone name
+//config:         with "-O timezone".
 
 //applet:IF_UDHCPC6(APPLET(udhcpc6, BB_DIR_USR_BIN, BB_SUID_DROP))
 
 //kbuild:lib-$(CONFIG_UDHCPC6) += d6_dhcpc.o d6_packet.o d6_socket.o common.o socket.o signalpipe.o
-
+//kbuild:lib-$(CONFIG_FEATURE_UDHCPC6_RFC3646) += domain_codec.o
+//kbuild:lib-$(CONFIG_FEATURE_UDHCPC6_RFC4704) += domain_codec.o
 
 #include <syslog.h>
 /* Override ENABLE_FEATURE_PIDFILE - ifupdown needs our pidfile to always exist */
@@ -37,6 +60,34 @@
 
 /* "struct client_config_t client_config" is in bb_common_bufsiz1 */
 
+static const struct dhcp_optflag d6_optflags[] = {
+#if ENABLE_FEATURE_UDHCPC6_RFC3646
+        { OPTION_6RD | OPTION_LIST        | OPTION_REQ, D6_OPT_DNS_SERVERS },
+        { OPTION_DNS_STRING | OPTION_LIST | OPTION_REQ, D6_OPT_DOMAIN_LIST },
+#endif
+#if ENABLE_FEATURE_UDHCPC6_RFC4704
+        { OPTION_DNS_STRING,                            D6_OPT_CLIENT_FQDN },
+#endif
+#if ENABLE_FEATURE_UDHCPC6_RFC4833
+        { OPTION_STRING,                                D6_OPT_TZ_POSIX },
+        { OPTION_STRING,                                D6_OPT_TZ_NAME },
+#endif
+        { 0, 0 }
+};
+/* Must match d6_optflags[] order */
+static const char d6_option_strings[] ALIGN1 =
+#if ENABLE_FEATURE_UDHCPC6_RFC3646
+        "dns" "\0"      /* D6_OPT_DNS_SERVERS */
+        "search" "\0"   /* D6_OPT_DOMAIN_LIST */
+#endif
+#if ENABLE_FEATURE_UDHCPC6_RFC4704
+        "fqdn" "\0"     /* D6_OPT_CLIENT_FQDN */
+#endif
+#if ENABLE_FEATURE_UDHCPC6_RFC4833
+        "tz" "\0"       /* D6_OPT_TZ_POSIX */
+        "timezone" "\0" /* D6_OPT_TZ_NAME */
+#endif
+        "\0";
 
 #if ENABLE_LONG_OPTS
 static const char udhcpc6_longopts[] ALIGN1 =
@@ -88,19 +139,17 @@ enum {
         IF_FEATURE_UDHCP_PORT(   OPT_P = 1 << OPTBIT_P,)
 };
 
-static const char opt_req[] = {
-        (D6_OPT_ORO >> 8), (D6_OPT_ORO & 0xff),
-        0, 6,
-        (D6_OPT_DNS_SERVERS >> 8), (D6_OPT_DNS_SERVERS & 0xff),
-        (D6_OPT_DOMAIN_LIST >> 8), (D6_OPT_DOMAIN_LIST & 0xff),
-        (D6_OPT_CLIENT_FQDN >> 8), (D6_OPT_CLIENT_FQDN & 0xff)
-};
-
+#if ENABLE_FEATURE_UDHCPC6_RFC4704
 static const char opt_fqdn_req[] = {
         (D6_OPT_CLIENT_FQDN >> 8), (D6_OPT_CLIENT_FQDN & 0xff),
-        0, 2,
-        0, 0
+        0, 2, /* optlen */
+        0, /* flags: */
+        /* S=0: server SHOULD NOT perform AAAA RR updates */
+        /* O=0: client MUST set this bit to 0 */
+        /* N=0: server SHOULD perform updates (PTR RR only in our case, since S=0) */
+        0 /* empty DNS-encoded name */
 };
+#endif
 
 /*** Utility functions ***/
 
@@ -136,12 +185,6 @@ static void *d6_copy_option(uint8_t *option, uint8_t *option_end, unsigned code)
         return xmemdup(opt, opt[3] + 4);
 }
 
-static void *d6_store_blob(void *dst, const void *src, unsigned len)
-{
-        memcpy(dst, src, len);
-        return dst + len;
-}
-
 
 /*** Script execution code ***/
 
@@ -154,10 +197,12 @@ static char** new_env(void)
 /* put all the parameters into the environment */
 static void option_to_env(uint8_t *option, uint8_t *option_end)
 {
-        char *dlist, *ptr;
+#if ENABLE_FEATURE_UDHCPC6_RFC3646
+        int addrs, option_offset;
+#endif
         /* "length minus 4" */
         int len_m4 = option_end - option - 4;
-        int olen, ooff;
+
         while (len_m4 >= 0) {
                 uint32_t v32;
                 char ipv6str[sizeof("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")];
@@ -165,6 +210,10 @@ static void option_to_env(uint8_t *option, uint8_t *option_end)
                 if (option[0] != 0 || option[2] != 0)
                         break;
 
+                /* Check if option-length exceeds size of option */
+                if (option[3] > len_m4)
+                        break;
+
                 switch (option[1]) {
                 //case D6_OPT_CLIENTID:
                 //case D6_OPT_SERVERID:
@@ -174,7 +223,7 @@ static void option_to_env(uint8_t *option, uint8_t *option_end)
                         break;
                 //case D6_OPT_IA_TA:
                 case D6_OPT_IAADDR:
-/*   0                   1                   2                   3
+/*  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_IAADDR        |          option-len           |
@@ -235,51 +284,76 @@ static void option_to_env(uint8_t *option, uint8_t *option_end)
                         sprint_nip6(ipv6str, option + 4 + 4 + 1);
                         *new_env() = xasprintf("ipv6prefix=%s/%u", ipv6str, (unsigned)(option[4 + 4]));
                         break;
-                case D6_OPT_DNS_SERVERS:
-                        olen = ((option[2] << 8) | option[3]) / 16;
-                        dlist = ptr = malloc (4 + olen * 40 - 1);
-
-                        memcpy (ptr, "dns=", 4);
-                        ptr += 4;
-                        ooff = 0;
-
-                        while (olen--) {
-                                sprint_nip6(ptr, option + 4 + ooff);
-                                ptr += 39;
-                                ooff += 16;
-                                if (olen)
-                                        *ptr++ = ' ';
-                        }
+#if ENABLE_FEATURE_UDHCPC6_RFC3646
+                case D6_OPT_DNS_SERVERS: {
+                        char *dlist;
 
-                        *new_env() = dlist;
+                        /* Make sure payload-size is a multiple of 16 */
+                        if ((option[3] & 0x0f) != 0)
+                                break;
+
+                        /* Get the number of addresses on the option */
+                        addrs = option[3] >> 4;
+
+                        /* Setup environment variable */
+                        *new_env() = dlist = xmalloc(4 + addrs * 40 - 1);
+                        dlist = stpcpy(dlist, "dns=");
+                        option_offset = 0;
+
+                        while (addrs--) {
+                                sprint_nip6(dlist, option + 4 + option_offset);
+                                dlist += 39;
+                                option_offset += 16;
+                                if (addrs)
+                                        *dlist++ = ' ';
+                        }
 
                         break;
-                case D6_OPT_DOMAIN_LIST:
+                }
+                case D6_OPT_DOMAIN_LIST: {
+                        char *dlist;
+
                         dlist = dname_dec(option + 4, (option[2] << 8) | option[3], "search=");
                         if (!dlist)
                                 break;
                         *new_env() = dlist;
                         break;
-                case D6_OPT_CLIENT_FQDN:
-                        // Work around broken ISC DHCPD6
+                }
+#endif
+#if ENABLE_FEATURE_UDHCPC6_RFC4704
+                case D6_OPT_CLIENT_FQDN: {
+                        char *dlist;
+
+                        if (option[3] == 0)
+                                break;
+                        /* Work around broken ISC DHCPD6.
+                         * ISC DHCPD6 does not implement RFC 4704 correctly: It says the first
+                         * byte of option-payload should contain flags where the bits 7-3 are
+                         * reserved for future use and MUST be zero. Instead ISC DHCPD6 just
+                         * writes the entire FQDN as string to option-payload. We assume a
+                         * broken server here if any of the reserved bits are set.
+                         */
                         if (option[4] & 0xf8) {
-                                olen = ((option[2] << 8) | option[3]);
-                                dlist = xmalloc(olen);
-//fixme:
-//- explain
-//- add len error check
-//- merge two allocs into one
-                                memcpy(dlist, option + 4, olen);
-                                *new_env() = xasprintf("fqdn=%s", dlist);
-                                free(dlist);
+                                *new_env() = xasprintf("fqdn=%.*s", (int)option[3], (char*)option + 4);
                                 break;
                         }
-                        dlist = dname_dec(option + 5, ((option[2] << 8) | option[3]) - 1, "fqdn=");
+                        dlist = dname_dec(option + 5, (/*(option[2] << 8) |*/ option[3]) - 1, "fqdn=");
                         if (!dlist)
                                 break;
                         *new_env() = dlist;
                         break;
                 }
+#endif
+#if ENABLE_FEATURE_UDHCPC6_RFC4833
+                /* RFC 4833 Timezones */
+                case D6_OPT_TZ_POSIX:
+                        *new_env() = xasprintf("tz=%.*s", (int)option[3], (char*)option + 4);
+                        break;
+                case D6_OPT_TZ_NAME:
+                        *new_env() = xasprintf("tz_name=%.*s", (int)option[3], (char*)option + 4);
+                        break;
+#endif
+                }
                 len_m4 -= 4 + option[3];
                 option += 4 + option[3];
         }
@@ -346,22 +420,38 @@ static uint8_t *init_d6_packet(struct d6_packet *packet, char type, uint32_t xid
         packet->d6_msg_type = type;
 
         clientid = (void*)client_config.clientid;
-        return d6_store_blob(packet->d6_options, clientid, clientid->len + 2+2);
+        return mempcpy(packet->d6_options, clientid, clientid->len + 2+2);
 }
 
 static uint8_t *add_d6_client_options(uint8_t *ptr)
 {
-        return ptr;
-        //uint8_t c;
-        //int i, end, len;
+        uint8_t *start = ptr;
+        unsigned option;
+
+        ptr += 4;
+        for (option = 1; option < 256; option++) {
+                if (client_config.opt_mask[option >> 3] & (1 << (option & 7))) {
+                        ptr[0] = (option >> 8);
+                        ptr[1] = option;
+                        ptr += 2;
+                }
+        }
 
-        /* Add a "param req" option with the list of options we'd like to have
-         * from stubborn DHCP servers. Pull the data from the struct in common.c.
-         * No bounds checking because it goes towards the head of the packet. */
-        //...
+        if ((ptr - start - 4) != 0) {
+                start[0] = (D6_OPT_ORO >> 8);
+                start[1] = D6_OPT_ORO;
+                start[2] = ((ptr - start - 4) >> 8);
+                start[3] = (ptr - start - 4);
+        } else
+                ptr = start;
 
+#if ENABLE_FEATURE_UDHCPC6_RFC4704
+        ptr = mempcpy(ptr, &opt_fqdn_req, sizeof(opt_fqdn_req));
+#endif
         /* Add -x options if any */
         //...
+
+        return ptr;
 }
 
 static int d6_mcast_from_client_config_ifindex(struct d6_packet *packet, uint8_t *end)
@@ -483,11 +573,7 @@ static NOINLINE int send_d6_discover(uint32_t xid, struct in6_addr *requested_ip
                 iaaddr->len = 16+4+4;
                 memcpy(iaaddr->data, requested_ipv6, 16);
         }
-        opt_ptr = d6_store_blob(opt_ptr, client6_data.ia_na, len);
-
-        /* Request additional options */
-        opt_ptr = d6_store_blob(opt_ptr, &opt_req, sizeof(opt_req));
-        opt_ptr = d6_store_blob(opt_ptr, &opt_fqdn_req, sizeof(opt_fqdn_req));
+        opt_ptr = mempcpy(opt_ptr, client6_data.ia_na, len);
 
         /* Add options:
          * "param req" option according to -O, options specified with -x
@@ -538,13 +624,9 @@ static NOINLINE int send_d6_select(uint32_t xid)
         opt_ptr = init_d6_packet(&packet, D6_MSG_REQUEST, xid);
 
         /* server id */
-        opt_ptr = d6_store_blob(opt_ptr, client6_data.server_id, client6_data.server_id->len + 2+2);
+        opt_ptr = mempcpy(opt_ptr, client6_data.server_id, client6_data.server_id->len + 2+2);
         /* IA NA (contains requested IP) */
-        opt_ptr = d6_store_blob(opt_ptr, client6_data.ia_na, client6_data.ia_na->len + 2+2);
-
-        /* Request additional options */
-        opt_ptr = d6_store_blob(opt_ptr, &opt_req, sizeof(opt_req));
-        opt_ptr = d6_store_blob(opt_ptr, &opt_fqdn_req, sizeof(opt_fqdn_req));
+        opt_ptr = mempcpy(opt_ptr, client6_data.ia_na, client6_data.ia_na->len + 2+2);
 
         /* Add options:
          * "param req" option according to -O, options specified with -x
@@ -611,9 +693,9 @@ static NOINLINE int send_d6_renew(uint32_t xid, struct in6_addr *server_ipv6, st
         opt_ptr = init_d6_packet(&packet, DHCPREQUEST, xid);
 
         /* server id */
-        opt_ptr = d6_store_blob(opt_ptr, client6_data.server_id, client6_data.server_id->len + 2+2);
+        opt_ptr = mempcpy(opt_ptr, client6_data.server_id, client6_data.server_id->len + 2+2);
         /* IA NA (contains requested IP) */
-        opt_ptr = d6_store_blob(opt_ptr, client6_data.ia_na, client6_data.ia_na->len + 2+2);
+        opt_ptr = mempcpy(opt_ptr, client6_data.ia_na, client6_data.ia_na->len + 2+2);
 
         /* Add options:
          * "param req" option according to -O, options specified with -x
@@ -640,9 +722,9 @@ static int send_d6_release(struct in6_addr *server_ipv6, struct in6_addr *our_cu
         /* Fill in: msg type, client id */
         opt_ptr = init_d6_packet(&packet, D6_MSG_RELEASE, random_xid());
         /* server id */
-        opt_ptr = d6_store_blob(opt_ptr, client6_data.server_id, client6_data.server_id->len + 2+2);
+        opt_ptr = mempcpy(opt_ptr, client6_data.server_id, client6_data.server_id->len + 2+2);
         /* IA NA (contains our current IP) */
-        opt_ptr = d6_store_blob(opt_ptr, client6_data.ia_na, client6_data.ia_na->len + 2+2);
+        opt_ptr = mempcpy(opt_ptr, client6_data.ia_na, client6_data.ia_na->len + 2+2);
 
         bb_error_msg("sending %s", "release");
         return d6_send_kernel_packet(
@@ -1051,20 +1133,18 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                 char *optstr = llist_pop(&list_O);
                 unsigned n = bb_strtou(optstr, NULL, 0);
                 if (errno || n > 254) {
-                        n = udhcp_option_idx(optstr);
-                        n = dhcp_optflags[n].code;
+                        n = udhcp_option_idx(optstr, d6_option_strings);
+                        n = d6_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) {
+                for (i = 0; (n = d6_optflags[i].code) != 0; i++) {
+                        if (d6_optflags[i].flags & OPTION_REQ) {
                                 client_config.opt_mask[n >> 3] |= 1 << (n & 7);
                         }
                 }
-                */
         }
         while (list_x) {
                 char *optstr = llist_pop(&list_x);
@@ -1073,7 +1153,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                         *colon = ' ';
                 /* now it looks similar to udhcpd's config file line:
                  * "optname optval", using the common routine: */
-                udhcp_str2optset(optstr, &client_config.options);
+                udhcp_str2optset(optstr, &client_config.options, d6_optflags, d6_option_strings);
                 if (colon)
                         *colon = ':'; /* restore it for NOMMU reexec */
         }
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 6aa6731fb..1a66c610e 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -1346,7 +1346,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                 char *optstr = llist_pop(&list_O);
                 unsigned n = bb_strtou(optstr, NULL, 0);
                 if (errno || n > 254) {
-                        n = udhcp_option_idx(optstr);
+                        n = udhcp_option_idx(optstr, dhcp_option_strings);
                         n = dhcp_optflags[n].code;
                 }
                 client_config.opt_mask[n >> 3] |= 1 << (n & 7);
@@ -1366,7 +1366,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                         *colon = ' ';
                 /* now it looks similar to udhcpd's config file line:
                  * "optname optval", using the common routine: */
-                udhcp_str2optset(optstr, &client_config.options);
+                udhcp_str2optset(optstr, &client_config.options, dhcp_optflags, dhcp_option_strings);
                 if (colon)
                         *colon = ':'; /* restore it for NOMMU reexec */
         }
diff --git a/networking/udhcp/dhcpc.h b/networking/udhcp/dhcpc.h
index 9f423a5b2..7fdbc9a6c 100644
--- a/networking/udhcp/dhcpc.h
+++ b/networking/udhcp/dhcpc.h
@@ -12,6 +12,7 @@ struct client_config_t {
         IF_FEATURE_UDHCP_PORT(uint16_t port;)
         int ifindex;                    /* Index number of the interface to use */
         uint8_t opt_mask[256 / 8];      /* Bitmask of options to send (-O option) */
+// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ TODO: DHCPv6 has 16-bit option numbers
         const char *interface;          /* The name of the interface to use */
         char *pidfile;                  /* Optionally store the process ID */
         const char *script;             /* User script to run at dhcp events */
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
index 5eff026bc..3a5fc2db7 100644
--- a/networking/udhcp/dhcpd.c
+++ b/networking/udhcp/dhcpd.c
@@ -361,6 +361,10 @@ static int FAST_FUNC read_staticlease(const char *const_line, void *arg)
         return 1;
 }
 
+static int FAST_FUNC read_optset(const char *line, void *arg) {
+        return udhcp_str2optset(line, arg, dhcp_optflags, dhcp_option_strings);
+}
+
 struct config_keyword {
         const char *keyword;
         int (*handler)(const char *line, void *var) FAST_FUNC;
@@ -387,8 +391,8 @@ static const struct config_keyword keywords[] = {
         {"pidfile"      , read_str        , OFS(pidfile      ), "/var/run/udhcpd.pid"},
         {"siaddr"       , udhcp_str2nip   , OFS(siaddr_nip   ), "0.0.0.0"},
         /* keywords with no defaults must be last! */
-        {"option"       , udhcp_str2optset, OFS(options      ), ""},
-        {"opt"          , udhcp_str2optset, OFS(options      ), ""},
+        {"option"       , read_optset     , OFS(options      ), ""},
+        {"opt"          , read_optset     , OFS(options      ), ""},
         {"notify_file"  , read_str        , OFS(notify_file  ), NULL},
         {"sname"        , read_str        , OFS(sname        ), NULL},
         {"boot_file"    , read_str        , OFS(boot_file    ), NULL},
diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c
index 0a31f2643..9e1b46d2f 100644
--- a/networking/udhcp/packet.c
+++ b/networking/udhcp/packet.c
@@ -12,6 +12,7 @@
 #include <netinet/if_ether.h>
 #include <netpacket/packet.h>
 
+#if ENABLE_UDHCPC || ENABLE_UDHCPD
 void FAST_FUNC udhcp_init_header(struct dhcp_packet *packet, char type)
 {
         memset(packet, 0, sizeof(*packet));
@@ -29,6 +30,7 @@ void FAST_FUNC udhcp_init_header(struct dhcp_packet *packet, char type)
                 packet->options[0] = DHCP_END;
         udhcp_add_simple_option(packet, DHCP_MESSAGE_TYPE, type);
 }
+#endif
 
 #if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 2
 void FAST_FUNC udhcp_dump_packet(struct dhcp_packet *packet)