Merge branch 'busybox' into mergemerge

1 files changed, 128 insertions, 65 deletions

diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index 79cef1999..19c961d5c 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -148,10 +148,11 @@ enum {
         OPT_o = 1 << 12,
         OPT_x = 1 << 13,
         OPT_f = 1 << 14,
-        OPT_l = 1 << 15,
-        OPT_d = 1 << 16,
+        OPT_m = 1 << 15,
+        OPT_l = 1 << 16,
+        OPT_d = 1 << 17,
 /* The rest has variable bit positions, need to be clever */
-        OPTBIT_d = 16,
+        OPTBIT_d = 17,
         USE_FOR_MMU(             OPTBIT_b,)
         ///IF_FEATURE_UDHCPC_ARPING(OPTBIT_a,)
         IF_FEATURE_UDHCP_PORT(   OPTBIT_P,)
@@ -268,6 +269,23 @@ static void option_to_env(const uint8_t *option, const uint8_t *option_end)
                 //case D6_OPT_SERVERID:
                 case D6_OPT_IA_NA:
                 case D6_OPT_IA_PD:
+/*  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_IA_PD          |         option-length         |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * |                         IAID (4 octets)                       |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * |                              T1                               |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * |                              T2                               |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * .                                                               .
+ * .                          IA_PD-options                        .
+ * .                                                               .
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+                        /* recurse to handle "IA_PD-options" field */
                         option_to_env(option + 16, option + 4 + option[3]);
                         break;
                 //case D6_OPT_IA_TA:
@@ -604,6 +622,31 @@ static NOINLINE int send_d6_info_request(void)
         return d6_mcast_from_client_data_ifindex(&packet, opt_ptr);
 }
 
+/*
+ * RFC 3315 10. Identity Association
+ *
+ * An "identity-association" (IA) is a construct through which a server
+ * and a client can identify, group, and manage a set of related IPv6
+ * addresses.  Each IA consists of an IAID and associated configuration
+ * information.
+ *
+ * A client must associate at least one distinct IA with each of its
+ * network interfaces for which it is to request the assignment of IPv6
+ * addresses from a DHCP server.  The client uses the IAs assigned to an
+ * interface to obtain configuration information from a server for that
+ * interface.  Each IA must be associated with exactly one interface.
+ *
+ * The IAID uniquely identifies the IA and must be chosen to be unique
+ * among the IAIDs on the client.  The IAID is chosen by the client.
+ * For any given use of an IA by the client, the IAID for that IA MUST
+ * be consistent across restarts of the DHCP client...
+ */
+/* Generate IAID. We base it on our MAC address' last 4 bytes */
+static void generate_iaid(uint8_t *iaid)
+{
+        memcpy(iaid, &client_data.client_mac[2], 4);
+}
+
 /* Multicast a DHCPv6 Solicit packet to the network, with an optionally requested IP.
  *
  * RFC 3315 17.1.1. Creation of Solicit Messages
@@ -703,7 +746,7 @@ static NOINLINE int send_d6_discover(struct in6_addr *requested_ipv6)
                 client6_data.ia_na = xzalloc(len);
                 client6_data.ia_na->code = D6_OPT_IA_NA;
                 client6_data.ia_na->len = len - 4;
-                *(bb__aliased_uint32_t*)client6_data.ia_na->data = rand(); /* IAID */
+                generate_iaid(client6_data.ia_na->data); /* IAID */
                 if (requested_ipv6) {
                         struct d6_option *iaaddr = (void*)(client6_data.ia_na->data + 4+4+4);
                         iaaddr->code = D6_OPT_IAADDR;
@@ -721,7 +764,7 @@ static NOINLINE int send_d6_discover(struct in6_addr *requested_ipv6)
                 client6_data.ia_pd = xzalloc(len);
                 client6_data.ia_pd->code = D6_OPT_IA_PD;
                 client6_data.ia_pd->len = len - 4;
-                *(bb__aliased_uint32_t*)client6_data.ia_pd->data = rand(); /* IAID */
+                generate_iaid(client6_data.ia_pd->data); /* IAID */
                 opt_ptr = mempcpy(opt_ptr, client6_data.ia_pd, len);
         }
 
@@ -1131,12 +1174,11 @@ static void client_background(void)
 //usage:#endif
 //usage:#define udhcpc6_trivial_usage
 //usage:       "[-fbq"IF_UDHCP_VERBOSE("v")"R] [-t N] [-T SEC] [-A SEC|-n] [-i IFACE] [-s PROG]\n"
-//usage:       "        [-p PIDFILE]"IF_FEATURE_UDHCP_PORT(" [-P PORT]")" [-ldo] [-r IPv6] [-x OPT:VAL]... [-O OPT]..."
+//usage:       "        [-p PIDFILE]"IF_FEATURE_UDHCP_PORT(" [-P PORT]")" [-mldo] [-r IPv6] [-x OPT:VAL]... [-O OPT]..."
 //usage:#define udhcpc6_full_usage "\n"
 //usage:     "\n        -i IFACE        Interface to use (default "CONFIG_UDHCPC_DEFAULT_INTERFACE")"
 //usage:     "\n        -p FILE         Create pidfile"
 //usage:     "\n        -s PROG         Run PROG at DHCP events (default "CONFIG_UDHCPC6_DEFAULT_SCRIPT")"
-//usage:     "\n        -B              Request broadcast replies"
 //usage:     "\n        -t N            Send up to N discover packets"
 //usage:     "\n        -T SEC          Pause between packets (default 3)"
 //usage:     "\n        -A SEC          Wait if lease is not obtained (default 20)"
@@ -1154,6 +1196,7 @@ static void client_background(void)
 ////usage:      IF_FEATURE_UDHCPC_ARPING(
 ////usage:     "\n      -a              Use arping to validate offered address"
 ////usage:      )
+//usage:     "\n        -m              Send multicast renew requests rather than unicast ones"
 //usage:     "\n        -l              Send 'information request' instead of 'solicit'"
 //usage:     "\n                        (used for servers which do not assign IPv6 addresses)"
 //usage:     "\n        -r IPv6         Request this address ('no' to not request any IP)"
@@ -1211,7 +1254,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
         /* Parse command line */
         opt = getopt32long(argv, "^"
                 /* O,x: list; -T,-t,-A take numeric param */
-                "i:np:qRr:s:T:+t:+SA:+O:*ox:*fld"
+                "i:np:qRr:s:T:+t:+SA:+O:*ox:*fmld"
                 USE_FOR_MMU("b")
                 ///IF_FEATURE_UDHCPC_ARPING("a")
                 IF_FEATURE_UDHCP_PORT("P:")
@@ -1464,7 +1507,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                                         if (opt & OPT_l)
                                                 send_d6_info_request();
                                         else
-                                                send_d6_renew(&srv6_buf, requested_ipv6);
+                                                send_d6_renew(OPT_m ? NULL : &srv6_buf, requested_ipv6);
                                         timeout = discover_timeout;
                                         packet_num++;
                                         continue;
@@ -1606,62 +1649,6 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                 case RENEW_REQUESTED:
                 case REBINDING:
                         if (packet.d6_msg_type == D6_MSG_REPLY) {
-                                unsigned start;
-                                uint32_t lease_seconds;
-                                struct d6_option *option;
-                                unsigned address_timeout;
-                                unsigned prefix_timeout;
- type_is_ok:
-                                change_listen_mode(LISTEN_NONE);
-
-                                address_timeout = 0;
-                                prefix_timeout = 0;
-                                option = d6_find_option(packet.d6_options, packet_end, D6_OPT_STATUS_CODE);
-                                if (option && (option->data[0] | option->data[1]) != 0) {
-///FIXME:
-//    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//    |       OPTION_STATUS_CODE      |         option-len            |
-//    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//    |          status-code          |                               |
-//    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+                               |
-//    .                        status-message                         .
-//    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-// so why do we think it's NAK if data[0] is zero but data[1] is not? That's wrong...
-// we should also check that option->len is ok (i.e. not 0), right?
-                                        /* return to init state */
-                                        bb_info_msg("received DHCP NAK (%u)", option->data[4]);
-                                        d6_run_script(packet.d6_options,
-                                                        packet_end, "nak");
-                                        if (client_data.state != REQUESTING)
-                                                d6_run_script_no_option("deconfig");
-                                        sleep(3); /* avoid excessive network traffic */
-                                        client_data.state = INIT_SELECTING;
-                                        client_data.first_secs = 0; /* make secs field count from 0 */
-                                        requested_ipv6 = NULL;
-                                        timeout = 0;
-                                        packet_num = 0;
-                                        continue;
-                                }
-                                option = d6_copy_option(packet.d6_options, packet_end, D6_OPT_SERVERID);
-                                if (!option) {
-                                        bb_simple_info_msg("no server ID, ignoring packet");
-                                        continue;
-                                        /* still selecting - this server looks bad */
-                                }
-//Note: we do not bother comparing server IDs in Advertise and Reply msgs.
-//server_id variable is used solely for creation of proper server_id option
-//in outgoing packets. (why DHCPv6 even introduced it is a mystery).
-                                free(client6_data.server_id);
-                                client6_data.server_id = option;
-                                if (packet.d6_msg_type == D6_MSG_ADVERTISE) {
-                                        /* enter requesting state */
-                                        change_listen_mode(LISTEN_RAW);
-                                        client_data.state = REQUESTING;
-                                        timeout = 0;
-                                        packet_num = 0;
-                                        continue;
-                                }
-                                /* It's a D6_MSG_REPLY */
 /*
  * RFC 3315 18.1.8. Receipt of Reply Messages
  *
@@ -1747,6 +1734,67 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
  * .                                                               .
  * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  */
+                                unsigned start;
+                                uint32_t lease_seconds;
+                                struct d6_option *option;
+                                unsigned address_timeout;
+                                unsigned prefix_timeout;
+ type_is_ok:
+                                change_listen_mode(LISTEN_NONE);
+
+                                address_timeout = 0;
+                                prefix_timeout = 0;
+                                option = d6_find_option(packet.d6_options, packet_end, D6_OPT_STATUS_CODE);
+                                if (option) {
+//    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+//    |       OPTION_STATUS_CODE      |         option-len            |
+//    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+//    |          status-code          |                               |
+//    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+                               |
+//    .                        status-message                         .
+//    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+                                        unsigned len, status;
+                                        len = ((unsigned)option->len_hi << 8) + option->len;
+                                        if (len < 2) {
+                                                bb_simple_error_msg("invalid OPTION_STATUS_CODE, ignoring packet");
+                                                continue;
+                                        }
+                                        status = ((unsigned)option->data[0] << 8) + option->data[1];
+                                        if (status != 0) {
+//TODO: handle status == 5 (UseMulticast)?
+                                                /* return to init state */
+                                                bb_info_msg("received DHCP NAK: %u '%.*s'", status, len - 2, option->data + 2);
+                                                d6_run_script(packet.d6_options, packet_end, "nak");
+                                                if (client_data.state != REQUESTING)
+                                                        d6_run_script_no_option("deconfig");
+                                                sleep(3); /* avoid excessive network traffic */
+                                                client_data.state = INIT_SELECTING;
+                                                client_data.first_secs = 0; /* make secs field count from 0 */
+                                                requested_ipv6 = NULL;
+                                                timeout = 0;
+                                                packet_num = 0;
+                                                continue;
+                                        }
+                                }
+                                option = d6_copy_option(packet.d6_options, packet_end, D6_OPT_SERVERID);
+                                if (!option) {
+                                        bb_simple_info_msg("no server ID, ignoring packet");
+                                        continue;
+                                        /* still selecting - this server looks bad */
+                                }
+//Note: we do not bother comparing server IDs in Advertise and Reply msgs.
+//server_id variable is used solely for creation of proper server_id option
+//in outgoing packets. (why DHCPv6 even introduced it is a mystery).
+                                free(client6_data.server_id);
+                                client6_data.server_id = option;
+                                if (packet.d6_msg_type == D6_MSG_ADVERTISE) {
+                                        /* enter requesting state */
+                                        change_listen_mode(LISTEN_RAW);
+                                        client_data.state = REQUESTING;
+                                        timeout = 0;
+                                        packet_num = 0;
+                                        continue;
+                                }
                                 if (option_mask32 & OPT_r) {
                                         struct d6_option *iaaddr;
 
@@ -1790,6 +1838,21 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
 
                                         free(client6_data.ia_pd);
                                         client6_data.ia_pd = d6_copy_option(packet.d6_options, packet_end, D6_OPT_IA_PD);
+//  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_IA_PD          |         option-length         |
+// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+// |                         IAID (4 octets)                       |
+// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+// |                              T1                               |
+// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+// |                              T2                               |
+// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+// .                                                               .
+// .                          IA_PD-options                        .
+// .                                                               .
+// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
                                         if (!client6_data.ia_pd) {
                                                 bb_info_msg("no %s option%s", "IA_PD", ", ignoring packet");
                                                 continue;