udhcpc: periodically reread our ifindex and mac
[oweals/busybox.git] / networking / udhcp / dhcpc.c
index d51d8b82f669c5d749c982d631530ff6d0d8e80e..f0c8ace2ddb890c404106c6c70212066517fbf05 100644 (file)
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * udhcp DHCP client
+ * udhcp client
  *
  * Russ Dill <Russ.Dill@asu.edu> July 2001
  *
@@ -24,7 +24,6 @@
 #include "common.h"
 #include "dhcpd.h"
 #include "dhcpc.h"
-#include "options.h"
 
 #include <asm/types.h>
 #if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined(_NEWLIB_VERSION)
 #endif
 #include <linux/filter.h>
 
+/* struct client_config_t client_config is in bb_common_bufsiz1 */
 
-static int sockfd = -1;
 
-#define LISTEN_NONE   0
-#define LISTEN_KERNEL 1
-#define LISTEN_RAW    2
-static smallint listen_mode;
+/*** Script execution code ***/
 
-/* initial state: (re)start DHCP negotiation */
-#define INIT_SELECTING  0
-/* discover was sent, DHCPOFFER reply received */
-#define REQUESTING      1
-/* select/renew was sent, DHCPACK reply received */
-#define BOUND           2
-/* half of lease passed, want to renew it by sending unicast renew requests */
-#define RENEWING        3
-/* renew requests were not answered, lease is almost over, send broadcast renew */
-#define REBINDING       4
-/* manually requested renew (SIGUSR1) */
-#define RENEW_REQUESTED 5
-/* release, possibly manually requested (SIGUSR2) */
-#define RELEASED        6
-static smallint state;
+/* get a rough idea of how long an option will be (rounding up...) */
+static const uint8_t len_of_option_as_string[] = {
+       [OPTION_IP              ] = sizeof("255.255.255.255 "),
+       [OPTION_IP_PAIR         ] = sizeof("255.255.255.255 ") * 2,
+       [OPTION_STATIC_ROUTES   ] = sizeof("255.255.255.255/32 255.255.255.255 "),
+       [OPTION_STRING          ] = 1,
+#if ENABLE_FEATURE_UDHCP_RFC3397
+       [OPTION_DNS_STRING      ] = 1, /* unused */
+       /* Hmmm, this severely overestimates size if SIP_SERVERS option
+        * is in domain name form: N-byte option in binary form
+        * mallocs ~16*N bytes. But it is freed almost at once.
+        */
+       [OPTION_SIP_SERVERS     ] = sizeof("255.255.255.255 "),
+#endif
+//     [OPTION_BOOLEAN         ] = sizeof("yes "),
+       [OPTION_U8              ] = sizeof("255 "),
+       [OPTION_U16             ] = sizeof("65535 "),
+//     [OPTION_S16             ] = sizeof("-32768 "),
+       [OPTION_U32             ] = sizeof("4294967295 "),
+       [OPTION_S32             ] = sizeof("-2147483684 "),
+};
+
+/* note: ip is a pointer to an IP in network order, possibly misaliged */
+static int sprint_nip(char *dest, const char *pre, const uint8_t *ip)
+{
+       return sprintf(dest, "%s%u.%u.%u.%u", pre, ip[0], ip[1], ip[2], ip[3]);
+}
 
-/* struct client_config_t client_config is in bb_common_bufsiz1 */
+/* really simple implementation, just count the bits */
+static int mton(uint32_t mask)
+{
+       int i = 0;
+       mask = ntohl(mask); /* 111110000-like bit pattern */
+       while (mask) {
+               i++;
+               mask <<= 1;
+       }
+       return i;
+}
+
+/* Create "opt_name=opt_value" string */
+static NOINLINE char *xmalloc_optname_optval(uint8_t *option, const struct dhcp_optflag *optflag, const char *opt_name)
+{
+       unsigned upper_length;
+       int len, type, optlen;
+       char *dest, *ret;
+
+       /* option points to OPT_DATA, need to go back and get OPT_LEN */
+       len = option[OPT_LEN - OPT_DATA];
+
+       type = optflag->flags & OPTION_TYPE_MASK;
+       optlen = dhcp_option_lengths[type];
+       upper_length = len_of_option_as_string[type] * ((unsigned)len / (unsigned)optlen);
+
+       dest = ret = xmalloc(upper_length + strlen(opt_name) + 2);
+       dest += sprintf(ret, "%s=", opt_name);
+
+       while (len >= optlen) {
+               unsigned ip_ofs = 0;
+
+               switch (type) {
+               case OPTION_IP_PAIR:
+                       dest += sprint_nip(dest, "", option);
+                       *dest++ = '/';
+                       ip_ofs = 4;
+                       /* fall through */
+               case OPTION_IP:
+                       dest += sprint_nip(dest, "", option + ip_ofs);
+                       break;
+//             case OPTION_BOOLEAN:
+//                     dest += sprintf(dest, *option ? "yes" : "no");
+//                     break;
+               case OPTION_U8:
+                       dest += sprintf(dest, "%u", *option);
+                       break;
+//             case OPTION_S16:
+               case OPTION_U16: {
+                       uint16_t val_u16;
+                       move_from_unaligned16(val_u16, option);
+                       dest += sprintf(dest, "%u", ntohs(val_u16));
+                       break;
+               }
+               case OPTION_S32:
+               case OPTION_U32: {
+                       uint32_t val_u32;
+                       move_from_unaligned32(val_u32, option);
+                       dest += sprintf(dest, type == OPTION_U32 ? "%lu" : "%ld", (unsigned long) ntohl(val_u32));
+                       break;
+               }
+               case OPTION_STRING:
+                       memcpy(dest, option, len);
+                       dest[len] = '\0';
+                       return ret;      /* Short circuit this case */
+               case OPTION_STATIC_ROUTES: {
+                       /* Option binary format:
+                        * mask [one byte, 0..32]
+                        * ip [big endian, 0..4 bytes depending on mask]
+                        * router [big endian, 4 bytes]
+                        * may be repeated
+                        *
+                        * We convert it to a string "IP/MASK ROUTER IP2/MASK2 ROUTER2"
+                        */
+                       const char *pfx = "";
+
+                       while (len >= 1 + 4) { /* mask + 0-byte ip + router */
+                               uint32_t nip;
+                               uint8_t *p;
+                               unsigned mask;
+                               int bytes;
+
+                               mask = *option++;
+                               if (mask > 32)
+                                       break;
+                               len--;
+
+                               nip = 0;
+                               p = (void*) &nip;
+                               bytes = (mask + 7) / 8; /* 0 -> 0, 1..8 -> 1, 9..16 -> 2 etc */
+                               while (--bytes >= 0) {
+                                       *p++ = *option++;
+                                       len--;
+                               }
+                               if (len < 4)
+                                       break;
+
+                               /* print ip/mask */
+                               dest += sprint_nip(dest, pfx, (void*) &nip);
+                               pfx = " ";
+                               dest += sprintf(dest, "/%u ", mask);
+                               /* print router */
+                               dest += sprint_nip(dest, "", option);
+                               option += 4;
+                               len -= 4;
+                       }
+
+                       return ret;
+               }
+#if ENABLE_FEATURE_UDHCP_RFC3397
+               case OPTION_DNS_STRING:
+                       /* unpack option into dest; use ret for prefix (i.e., "optname=") */
+                       dest = dname_dec(option, len, ret);
+                       if (dest) {
+                               free(ret);
+                               return dest;
+                       }
+                       /* error. return "optname=" string */
+                       return ret;
+               case OPTION_SIP_SERVERS:
+                       /* Option binary format:
+                        * type: byte
+                        * type=0: domain names, dns-compressed
+                        * type=1: IP addrs
+                        */
+                       option++;
+                       len--;
+                       if (option[-1] == 0) {
+                               dest = dname_dec(option, len, ret);
+                               if (dest) {
+                                       free(ret);
+                                       return dest;
+                               }
+                       } else
+                       if (option[-1] == 1) {
+                               const char *pfx = "";
+                               while (1) {
+                                       len -= 4;
+                                       if (len < 0)
+                                               break;
+                                       dest += sprint_nip(dest, pfx, option);
+                                       pfx = " ";
+                                       option += 4;
+                               }
+                       }
+                       return ret;
+#endif
+               } /* switch */
+               option += optlen;
+               len -= optlen;
+// TODO: it can be a list only if (optflag->flags & OPTION_LIST).
+// Should we bail out/warn if we see multi-ip option which is
+// not allowed to be such (for example, DHCP_BROADCAST)? -
+               if (len <= 0 /* || !(optflag->flags & OPTION_LIST) */)
+                       break;
+               *dest++ = ' ';
+               *dest = '\0';
+       }
+       return ret;
+}
 
+/* put all the parameters into the environment */
+static char **fill_envp(struct dhcp_packet *packet)
+{
+       int envc;
+       int i;
+       char **envp, **curr;
+       const char *opt_name;
+       uint8_t *temp;
+       uint8_t overload = 0;
+
+       /* We need 6 elements for:
+        * "interface=IFACE"
+        * "ip=N.N.N.N" from packet->yiaddr
+        * "siaddr=IP" from packet->siaddr_nip (unless 0)
+        * "boot_file=FILE" from packet->file (unless overloaded)
+        * "sname=SERVER_HOSTNAME" from packet->sname (unless overloaded)
+        * terminating NULL
+        */
+       envc = 6;
+       /* +1 element for each option, +2 for subnet option: */
+       if (packet) {
+               for (i = 0; dhcp_optflags[i].code; i++) {
+                       if (udhcp_get_option(packet, dhcp_optflags[i].code)) {
+                               if (dhcp_optflags[i].code == DHCP_SUBNET)
+                                       envc++; /* for mton */
+                               envc++;
+                       }
+               }
+               temp = udhcp_get_option(packet, DHCP_OPTION_OVERLOAD);
+               if (temp)
+                       overload = *temp;
+       }
+       curr = envp = xzalloc(sizeof(char *) * envc);
+
+       *curr = xasprintf("interface=%s", client_config.interface);
+       putenv(*curr++);
+
+       if (!packet)
+               return envp;
+
+       *curr = xmalloc(sizeof("ip=255.255.255.255"));
+       sprint_nip(*curr, "ip=", (uint8_t *) &packet->yiaddr);
+       putenv(*curr++);
+
+       opt_name = dhcp_option_strings;
+       i = 0;
+       while (*opt_name) {
+               temp = udhcp_get_option(packet, dhcp_optflags[i].code);
+               if (!temp)
+                       goto next;
+               *curr = xmalloc_optname_optval(temp, &dhcp_optflags[i], opt_name);
+               putenv(*curr++);
+               if (dhcp_optflags[i].code == DHCP_SUBNET) {
+                       /* Subnet option: make things like "$ip/$mask" possible */
+                       uint32_t subnet;
+                       move_from_unaligned32(subnet, temp);
+                       *curr = xasprintf("mask=%d", mton(subnet));
+                       putenv(*curr++);
+               }
+ next:
+               opt_name += strlen(opt_name) + 1;
+               i++;
+       }
+       if (packet->siaddr_nip) {
+               *curr = xmalloc(sizeof("siaddr=255.255.255.255"));
+               sprint_nip(*curr, "siaddr=", (uint8_t *) &packet->siaddr_nip);
+               putenv(*curr++);
+       }
+       if (!(overload & FILE_FIELD) && packet->file[0]) {
+               /* watch out for invalid packets */
+               *curr = xasprintf("boot_file=%."DHCP_PKT_FILE_LEN_STR"s", packet->file);
+               putenv(*curr++);
+       }
+       if (!(overload & SNAME_FIELD) && packet->sname[0]) {
+               /* watch out for invalid packets */
+               *curr = xasprintf("sname=%."DHCP_PKT_SNAME_LEN_STR"s", packet->sname);
+               putenv(*curr++);
+       }
+       return envp;
+}
 
-/* Create a random xid */
-static uint32_t random_xid(void)
+/* Call a script with a par file and env vars */
+static void udhcp_run_script(struct dhcp_packet *packet, const char *name)
 {
-       static smallint initialized;
+       char **envp, **curr;
+       char *argv[3];
 
-       if (!initialized) {
-               srand(monotonic_us());
-               initialized = 1;
+       if (client_config.script == NULL)
+               return;
+
+       envp = fill_envp(packet);
+
+       /* call script */
+       log1("Executing %s %s", client_config.script, name);
+       argv[0] = (char*) client_config.script;
+       argv[1] = (char*) name;
+       argv[2] = NULL;
+       spawn_and_wait(argv);
+
+       for (curr = envp; *curr; curr++) {
+               log2(" %s", *curr);
+               bb_unsetenv_and_free(*curr);
        }
+       free(envp);
+}
+
+
+/*** Sending/receiving packets ***/
+
+static ALWAYS_INLINE uint32_t random_xid(void)
+{
        return rand();
 }
 
 /* Initialize the packet with the proper defaults */
 static void init_packet(struct dhcp_packet *packet, char type)
 {
+       /* Fill in: op, htype, hlen, cookie fields; message type option: */
        udhcp_init_header(packet, type);
+
+       packet->xid = random_xid();
+
        memcpy(packet->chaddr, client_config.client_mac, 6);
        if (client_config.clientid)
-               add_option_string(packet->options, client_config.clientid);
-       if (client_config.hostname)
-               add_option_string(packet->options, client_config.hostname);
-       if (client_config.fqdn)
-               add_option_string(packet->options, client_config.fqdn);
-       if (type != DHCPDECLINE
-        && type != DHCPRELEASE
-        && client_config.vendorclass
-       ) {
-               add_option_string(packet->options, client_config.vendorclass);
-       }
+               udhcp_add_binary_option(packet, client_config.clientid);
 }
 
-/* Add a parameter request list for stubborn DHCP servers. Pull the data
- * from the struct in options.c. Don't do bounds checking here because it
- * goes towards the head of the packet. */
-static void add_param_req_option(struct dhcp_packet *packet)
+static void add_client_options(struct dhcp_packet *packet)
 {
        uint8_t c;
-       int end = end_option(packet->options);
-       int i, len = 0;
+       int i, end, len;
 
-       for (i = 0; (c = dhcp_options[i].code) != 0; i++) {
-               if ((   (dhcp_options[i].flags & OPTION_REQ)
+       udhcp_add_simple_option(packet, DHCP_MAX_SIZE, htons(IP_UDP_DHCP_SIZE));
+       if (client_config.hostname)
+               udhcp_add_binary_option(packet, client_config.hostname);
+       if (client_config.fqdn)
+               udhcp_add_binary_option(packet, client_config.fqdn);
+       if (client_config.vendorclass)
+               udhcp_add_binary_option(packet, client_config.vendorclass);
+
+       /* 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. */
+       end = udhcp_end_option(packet->options);
+       len = 0;
+       for (i = 0; (c = dhcp_optflags[i].code) != 0; i++) {
+               if ((   (dhcp_optflags[i].flags & OPTION_REQ)
                     && !client_config.no_default_options
                    )
                 || (client_config.opt_mask[c >> 3] & (1 << (c & 7)))
@@ -118,6 +389,19 @@ static void add_param_req_option(struct dhcp_packet *packet)
                packet->options[end + OPT_LEN] = len;
                packet->options[end + OPT_DATA + len] = DHCP_END;
        }
+
+       /* Add -x options if any */
+       {
+               struct option_set *curr = client_config.options;
+               while (curr) {
+                       udhcp_add_binary_option(packet, curr->data);
+                       curr = curr->next;
+               }
+//             if (client_config.sname)
+//                     strncpy((char*)packet->sname, client_config.sname, sizeof(packet->sname) - 1);
+//             if (client_config.boot_file)
+//                     strncpy((char*)packet->file, client_config.boot_file, sizeof(packet->file) - 1);
+       }
 }
 
 /* RFC 2131
@@ -151,14 +435,21 @@ static int send_discover(uint32_t xid, uint32_t requested)
 {
        struct dhcp_packet packet;
 
+       /* Fill in: op, htype, hlen, cookie, chaddr fields,
+        * random xid field (we override it below),
+        * client-id option (unless -C), message type option:
+        */
        init_packet(&packet, DHCPDISCOVER);
+
        packet.xid = xid;
        if (requested)
-               add_simple_option(packet.options, DHCP_REQUESTED_IP, requested);
-       /* Explicitly saying that we want RFC-compliant packets helps
-        * some buggy DHCP servers to NOT send bigger packets */
-       add_simple_option(packet.options, DHCP_MAX_SIZE, htons(576));
-       add_param_req_option(&packet);
+               udhcp_add_simple_option(&packet, DHCP_REQUESTED_IP, requested);
+
+       /* Add options: maxsize,
+        * optionally: hostname, fqdn, vendorclass,
+        * "param req" option according to -O, options specified with -x
+        */
+       add_client_options(&packet);
 
        bb_info_msg("Sending discover...");
        return raw_bcast_from_client_config_ifindex(&packet);
@@ -173,11 +464,34 @@ static int send_select(uint32_t xid, uint32_t server, uint32_t requested)
        struct dhcp_packet packet;
        struct in_addr addr;
 
+/*
+ * RFC 2131 4.3.2 DHCPREQUEST message
+ * ...
+ * If the DHCPREQUEST message contains a 'server identifier'
+ * option, the message is in response to a DHCPOFFER message.
+ * Otherwise, the message is a request to verify or extend an
+ * existing lease. If the client uses a 'client identifier'
+ * in a DHCPREQUEST message, it MUST use that same 'client identifier'
+ * in all subsequent messages. If the client included a list
+ * of requested parameters in a DHCPDISCOVER message, it MUST
+ * include that list in all subsequent messages.
+ */
+       /* Fill in: op, htype, hlen, cookie, chaddr fields,
+        * random xid field (we override it below),
+        * client-id option (unless -C), message type option:
+        */
        init_packet(&packet, DHCPREQUEST);
+
        packet.xid = xid;
-       add_simple_option(packet.options, DHCP_REQUESTED_IP, requested);
-       add_simple_option(packet.options, DHCP_SERVER_ID, server);
-       add_param_req_option(&packet);
+       udhcp_add_simple_option(&packet, DHCP_REQUESTED_IP, requested);
+
+       udhcp_add_simple_option(&packet, DHCP_SERVER_ID, server);
+
+       /* Add options: maxsize,
+        * optionally: hostname, fqdn, vendorclass,
+        * "param req" option according to -O, and options specified with -x
+        */
+       add_client_options(&packet);
 
        addr.s_addr = requested;
        bb_info_msg("Sending select for %s...", inet_ntoa(addr));
@@ -189,10 +503,34 @@ static int send_renew(uint32_t xid, uint32_t server, uint32_t ciaddr)
 {
        struct dhcp_packet packet;
 
+/*
+ * RFC 2131 4.3.2 DHCPREQUEST message
+ * ...
+ * DHCPREQUEST generated during RENEWING state:
+ *
+ * 'server identifier' MUST NOT be filled in, 'requested IP address'
+ * option MUST NOT be filled in, 'ciaddr' MUST be filled in with
+ * client's IP address. In this situation, the client is completely
+ * configured, and is trying to extend its lease. This message will
+ * be unicast, so no relay agents will be involved in its
+ * transmission.  Because 'giaddr' is therefore not filled in, the
+ * DHCP server will trust the value in 'ciaddr', and use it when
+ * replying to the client.
+ */
+       /* Fill in: op, htype, hlen, cookie, chaddr fields,
+        * random xid field (we override it below),
+        * client-id option (unless -C), message type option:
+        */
        init_packet(&packet, DHCPREQUEST);
+
        packet.xid = xid;
        packet.ciaddr = ciaddr;
-       add_param_req_option(&packet);
+
+       /* Add options: maxsize,
+        * optionally: hostname, fqdn, vendorclass,
+        * "param req" option according to -O, and options specified with -x
+        */
+       add_client_options(&packet);
 
        bb_info_msg("Sending renew...");
        if (server)
@@ -208,10 +546,21 @@ static int send_decline(uint32_t xid, uint32_t server, uint32_t requested)
 {
        struct dhcp_packet packet;
 
+       /* Fill in: op, htype, hlen, cookie, chaddr, random xid fields,
+        * client-id option (unless -C), message type option:
+        */
        init_packet(&packet, DHCPDECLINE);
+
+       /* RFC 2131 says DHCPDECLINE's xid is randomly selected by client,
+        * but in case the server is buggy and wants DHCPDECLINE's xid
+        * to match the xid which started entire handshake,
+        * we use the same xid we used in initial DHCPDISCOVER:
+        */
        packet.xid = xid;
-       add_simple_option(packet.options, DHCP_REQUESTED_IP, requested);
-       add_simple_option(packet.options, DHCP_SERVER_ID, server);
+       /* DHCPDECLINE uses "requested ip", not ciaddr, to store offered IP */
+       udhcp_add_simple_option(&packet, DHCP_REQUESTED_IP, requested);
+
+       udhcp_add_simple_option(&packet, DHCP_SERVER_ID, server);
 
        bb_info_msg("Sending decline...");
        return raw_bcast_from_client_config_ifindex(&packet);
@@ -223,11 +572,15 @@ static int send_release(uint32_t server, uint32_t ciaddr)
 {
        struct dhcp_packet packet;
 
+       /* Fill in: op, htype, hlen, cookie, chaddr, random xid fields,
+        * client-id option (unless -C), message type option:
+        */
        init_packet(&packet, DHCPRELEASE);
-       packet.xid = random_xid();
+
+       /* DHCPRELEASE uses ciaddr, not "requested ip", to store IP being released */
        packet.ciaddr = ciaddr;
 
-       add_simple_option(packet.options, DHCP_SERVER_ID, server);
+       udhcp_add_simple_option(&packet, DHCP_SERVER_ID, server);
 
        bb_info_msg("Sending release...");
        return udhcp_send_kernel_packet(&packet, ciaddr, CLIENT_PORT, server, SERVER_PORT);
@@ -303,6 +656,32 @@ static NOINLINE int udhcp_recv_raw_packet(struct dhcp_packet *dhcp_pkt, int fd)
        return bytes - (sizeof(packet.ip) + sizeof(packet.udp));
 }
 
+
+/*** Main ***/
+
+static int sockfd = -1;
+
+#define LISTEN_NONE   0
+#define LISTEN_KERNEL 1
+#define LISTEN_RAW    2
+static smallint listen_mode;
+
+/* initial state: (re)start DHCP negotiation */
+#define INIT_SELECTING  0
+/* discover was sent, DHCPOFFER reply received */
+#define REQUESTING      1
+/* select/renew was sent, DHCPACK reply received */
+#define BOUND           2
+/* half of lease passed, want to renew it by sending unicast renew requests */
+#define RENEWING        3
+/* renew requests were not answered, lease is almost over, send broadcast renew */
+#define REBINDING       4
+/* manually requested renew (SIGUSR1) */
+#define RENEW_REQUESTED 5
+/* release, possibly manually requested (SIGUSR2) */
+#define RELEASED        6
+static smallint state;
+
 static int udhcp_raw_socket(int ifindex)
 {
        int fd;
@@ -374,7 +753,6 @@ static int udhcp_raw_socket(int ifindex)
        return fd;
 }
 
-/* just a little helper */
 static void change_listen_mode(int new_mode)
 {
        log1("Entering listen mode: %s",
@@ -395,7 +773,6 @@ static void change_listen_mode(int new_mode)
        /* else LISTEN_NONE: sockfd stays closed */
 }
 
-/* perform a renew */
 static void perform_renew(void)
 {
        bb_info_msg("Performing a DHCP renew");
@@ -418,7 +795,6 @@ static void perform_renew(void)
        }
 }
 
-/* perform a release */
 static void perform_release(uint32_t requested_ip, uint32_t server_addr)
 {
        char buffer[sizeof("255.255.255.255")];
@@ -440,16 +816,6 @@ static void perform_release(uint32_t requested_ip, uint32_t server_addr)
        state = RELEASED;
 }
 
-#if BB_MMU
-static void client_background(void)
-{
-       bb_daemonize(0);
-       logmode &= ~LOGMODE_STDIO;
-       /* rewrite pidfile, as our pid is different now */
-       write_pidfile(client_config.pidfile);
-}
-#endif
-
 static uint8_t* alloc_dhcp_option(int code, const char *str, int extra)
 {
        uint8_t *storage;
@@ -461,13 +827,108 @@ static uint8_t* alloc_dhcp_option(int code, const char *str, int extra)
        return storage;
 }
 
+#if BB_MMU
+static void client_background(void)
+{
+       bb_daemonize(0);
+       logmode &= ~LOGMODE_STDIO;
+       /* rewrite pidfile, as our pid is different now */
+       write_pidfile(client_config.pidfile);
+}
+#endif
+
+//usage:#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1
+//usage:# define IF_UDHCP_VERBOSE(...) __VA_ARGS__
+//usage:#else
+//usage:# define IF_UDHCP_VERBOSE(...)
+//usage:#endif
+//usage:#define udhcpc_trivial_usage
+//usage:       "[-fbnq"IF_UDHCP_VERBOSE("v")"oCR] [-i IFACE] [-r IP] [-s PROG] [-p PIDFILE]\n"
+//usage:       "       [-H HOSTNAME] [-V VENDOR] [-x OPT:VAL]... [-O OPT]..." IF_FEATURE_UDHCP_PORT(" [-P N]")
+//usage:#define udhcpc_full_usage "\n"
+//usage:       IF_LONG_OPTS(
+//usage:     "\n       -i,--interface IFACE    Interface to use (default eth0)"
+//usage:     "\n       -p,--pidfile FILE       Create pidfile"
+//usage:     "\n       -s,--script PROG        Run PROG at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")"
+//usage:     "\n       -t,--retries N          Send up to N discover packets"
+//usage:     "\n       -T,--timeout N          Pause between packets (default 3 seconds)"
+//usage:     "\n       -A,--tryagain N         Wait N seconds after failure (default 20)"
+//usage:     "\n       -f,--foreground         Run in foreground"
+//usage:       USE_FOR_MMU(
+//usage:     "\n       -b,--background         Background if lease is not obtained"
+//usage:       )
+//usage:     "\n       -n,--now                Exit if lease is not obtained"
+//usage:     "\n       -q,--quit               Exit after obtaining lease"
+//usage:     "\n       -R,--release            Release IP on exit"
+//usage:     "\n       -S,--syslog             Log to syslog too"
+//usage:       IF_FEATURE_UDHCP_PORT(
+//usage:     "\n       -P,--client-port N      Use port N (default 68)"
+//usage:       )
+//usage:       IF_FEATURE_UDHCPC_ARPING(
+//usage:     "\n       -a,--arping             Use arping to validate offered address"
+//usage:       )
+//usage:     "\n       -O,--request-option OPT Request option OPT from server (cumulative)"
+//usage:     "\n       -o,--no-default-options Don't request any options (unless -O is given)"
+//usage:     "\n       -r,--request IP         Request this IP address"
+//usage:     "\n       -x OPT:VAL              Include option OPT in sent packets (cumulative)"
+//usage:     "\n                               Examples of string, numeric, and hex byte opts:"
+//usage:     "\n                               -x hostname:bbox - option 12"
+//usage:     "\n                               -x lease:3600 - option 51 (lease time)"
+//usage:     "\n                               -x 0x3d:0100BEEFC0FFEE - option 61 (client id)"
+//usage:     "\n       -F,--fqdn NAME          Ask server to update DNS mapping for NAME"
+//usage:     "\n       -H,-h,--hostname NAME   Send NAME as client hostname (default none)"
+//usage:     "\n       -V,--vendorclass VENDOR Vendor identifier (default 'udhcp VERSION')"
+//usage:     "\n       -C,--clientid-none      Don't send MAC as client identifier"
+//usage:       IF_UDHCP_VERBOSE(
+//usage:     "\n       -v                      Verbose"
+//usage:       )
+//usage:       )
+//usage:       IF_NOT_LONG_OPTS(
+//usage:     "\n       -i IFACE        Interface to use (default eth0)"
+//usage:     "\n       -p FILE         Create pidfile"
+//usage:     "\n       -s PROG         Run PROG at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")"
+//usage:     "\n       -t N            Send up to N discover packets"
+//usage:     "\n       -T N            Pause between packets (default 3 seconds)"
+//usage:     "\n       -A N            Wait N seconds (default 20) after failure"
+//usage:     "\n       -f              Run in foreground"
+//usage:       USE_FOR_MMU(
+//usage:     "\n       -b              Background if lease is not obtained"
+//usage:       )
+//usage:     "\n       -n              Exit if lease is not obtained"
+//usage:     "\n       -q              Exit after obtaining lease"
+//usage:     "\n       -R              Release IP on exit"
+//usage:     "\n       -S              Log to syslog too"
+//usage:       IF_FEATURE_UDHCP_PORT(
+//usage:     "\n       -P N            Use port N (default 68)"
+//usage:       )
+//usage:       IF_FEATURE_UDHCPC_ARPING(
+//usage:     "\n       -a              Use arping to validate offered address"
+//usage:       )
+//usage:     "\n       -O OPT          Request option OPT from server (cumulative)"
+//usage:     "\n       -o              Don't request any options (unless -O is given)"
+//usage:     "\n       -r IP           Request this IP address"
+//usage:     "\n       -x OPT:VAL      Include option OPT in sent packets (cumulative)"
+//usage:     "\n                       Examples of string, numeric, and hex byte opts:"
+//usage:     "\n                       -x hostname:bbox - option 12"
+//usage:     "\n                       -x lease:3600 - option 51 (lease time)"
+//usage:     "\n                       -x 0x3d:0100BEEFC0FFEE - option 61 (client id)"
+//usage:     "\n       -F NAME         Ask server to update DNS mapping for NAME"
+//usage:     "\n       -H,-h NAME      Send NAME as client hostname (default none)"
+//usage:     "\n       -V VENDOR       Vendor identifier (default 'udhcp VERSION')"
+//usage:     "\n       -C              Don't send MAC as client identifier"
+//usage:       IF_UDHCP_VERBOSE(
+//usage:     "\n       -v              Verbose"
+//usage:       )
+//usage:       )
+
 int udhcpc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int udhcpc_main(int argc UNUSED_PARAM, char **argv)
 {
        uint8_t *temp, *message;
-       const char *str_c, *str_V, *str_h, *str_F, *str_r;
+       const char *str_V, *str_h, *str_F, *str_r;
        IF_FEATURE_UDHCP_PORT(char *str_P;)
        llist_t *list_O = NULL;
+       llist_t *list_x = NULL;
        int tryagain_timeout = 20;
        int discover_timeout = 3;
        int discover_retries = 3;
@@ -487,7 +948,6 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
 
 #if ENABLE_LONG_OPTS
        static const char udhcpc_longopts[] ALIGN1 =
-               "clientid\0"       Required_argument "c"
                "clientid-none\0"  No_argument       "C"
                "vendorclass\0"    Required_argument "V"
                "hostname\0"       Required_argument "H"
@@ -513,25 +973,25 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                ;
 #endif
        enum {
-               OPT_c = 1 << 0,
-               OPT_C = 1 << 1,
-               OPT_V = 1 << 2,
-               OPT_H = 1 << 3,
-               OPT_h = 1 << 4,
-               OPT_F = 1 << 5,
-               OPT_i = 1 << 6,
-               OPT_n = 1 << 7,
-               OPT_p = 1 << 8,
-               OPT_q = 1 << 9,
-               OPT_R = 1 << 10,
-               OPT_r = 1 << 11,
-               OPT_s = 1 << 12,
-               OPT_T = 1 << 13,
-               OPT_t = 1 << 14,
-               OPT_S = 1 << 15,
-               OPT_A = 1 << 16,
-               OPT_O = 1 << 17,
-               OPT_o = 1 << 18,
+               OPT_C = 1 << 0,
+               OPT_V = 1 << 1,
+               OPT_H = 1 << 2,
+               OPT_h = 1 << 3,
+               OPT_F = 1 << 4,
+               OPT_i = 1 << 5,
+               OPT_n = 1 << 6,
+               OPT_p = 1 << 7,
+               OPT_q = 1 << 8,
+               OPT_R = 1 << 9,
+               OPT_r = 1 << 10,
+               OPT_s = 1 << 11,
+               OPT_T = 1 << 12,
+               OPT_t = 1 << 13,
+               OPT_S = 1 << 14,
+               OPT_A = 1 << 15,
+               OPT_O = 1 << 16,
+               OPT_o = 1 << 17,
+               OPT_x = 1 << 18,
                OPT_f = 1 << 19,
 /* The rest has variable bit positions, need to be clever */
                OPTBIT_f = 19,
@@ -547,27 +1007,28 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
        IF_FEATURE_UDHCP_PORT(SERVER_PORT = 67;)
        IF_FEATURE_UDHCP_PORT(CLIENT_PORT = 68;)
        client_config.interface = "eth0";
-       client_config.script = DEFAULT_SCRIPT;
+       client_config.script = CONFIG_UDHCPC_DEFAULT_SCRIPT;
        str_V = "udhcp "BB_VER;
 
        /* Parse command line */
-       /* Cc: mutually exclusive; O: list; -T,-t,-A take numeric param */
-       opt_complementary = "c--C:C--c:O::T+:t+:A+"
+       /* O,x: list; -T,-t,-A take numeric param */
+       opt_complementary = "O::x::T+:t+:A+"
 #if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1
                ":vv"
 #endif
                ;
        IF_LONG_OPTS(applet_long_options = udhcpc_longopts;)
-       opt = getopt32(argv, "c:CV:H:h:F:i:np:qRr:s:T:t:SA:O:of"
+       opt = getopt32(argv, "CV:H:h:F:i:np:qRr:s:T:t:SA:O:ox:f"
                USE_FOR_MMU("b")
                IF_FEATURE_UDHCPC_ARPING("a")
                IF_FEATURE_UDHCP_PORT("P:")
                "v"
-               , &str_c, &str_V, &str_h, &str_h, &str_F
+               , &str_V, &str_h, &str_h, &str_F
                , &client_config.interface, &client_config.pidfile, &str_r /* i,p */
                , &client_config.script /* s */
                , &discover_timeout, &discover_retries, &tryagain_timeout /* T,t,A */
                , &list_O
+               , &list_x
                IF_FEATURE_UDHCP_PORT(, &str_P)
 #if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1
                , &dhcp_verbose
@@ -602,12 +1063,19 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                client_config.no_default_options = 1;
        while (list_O) {
                char *optstr = llist_pop(&list_O);
-               int n = index_in_strings(dhcp_option_strings, optstr);
-               if (n < 0)
-                       bb_error_msg_and_die("unknown option '%s'", optstr);
-               n = dhcp_options[n].code;
+               unsigned n = udhcp_option_idx(optstr);
+               n = dhcp_optflags[n].code;
                client_config.opt_mask[n >> 3] |= 1 << (n & 7);
        }
+       while (list_x) {
+               char *optstr = llist_pop(&list_x);
+               char *colon = strchr(optstr, ':');
+               if (colon)
+                       *colon = ' ';
+               /* now it looks similar to udhcpd's config file line:
+                * "optname optval", using the common routine: */
+               udhcp_str2optset(optstr, &client_config.options);
+       }
 
        if (udhcp_read_interface(client_config.interface,
                        &client_config.ifindex,
@@ -617,10 +1085,8 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                return 1;
        }
 
-       if (opt & OPT_c) {
-               client_config.clientid = alloc_dhcp_option(DHCP_CLIENT_ID, str_c, 0);
-       } else if (!(opt & OPT_C)) {
-               /* not set and not suppressed, set the default client ID */
+       if (!(opt & OPT_C) && !udhcp_find_option(client_config.options, DHCP_CLIENT_ID)) {
+               /* not suppressed and not set, set the default client ID */
                client_config.clientid = alloc_dhcp_option(DHCP_CLIENT_ID, "", 7);
                client_config.clientid[OPT_DATA] = 1; /* type: ethernet */
                memcpy(client_config.clientid + OPT_DATA+1, client_config.client_mac, 6);
@@ -643,15 +1109,14 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
        bb_sanitize_stdio();
        /* Equivalent of doing a fflush after every \n */
        setlinebuf(stdout);
-
        /* Create pidfile */
        write_pidfile(client_config.pidfile);
-
        /* Goes to stdout (unless NOMMU) and possibly syslog */
        bb_info_msg("%s (v"BB_VER") started", applet_name);
-
        /* Set up the signal pipe */
        udhcp_sp_setup();
+       /* We want random_xid to be random... */
+       srand(monotonic_us());
 
        state = INIT_SELECTING;
        udhcp_run_script(NULL, "deconfig");
@@ -681,7 +1146,8 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
 
                tv.tv_sec = timeout - already_waited_sec;
                tv.tv_usec = 0;
-               retval = 0; /* If we already timed out, fall through, else... */
+               retval = 0;
+               /* If we already timed out, fall through with retval = 0, else... */
                if ((int)tv.tv_sec > 0) {
                        timestamp_before_wait = (unsigned)monotonic_sec();
                        log1("Waiting on select...");
@@ -701,6 +1167,16 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                 * resend discover/renew/whatever
                 */
                if (retval == 0) {
+                       /* When running on a bridge, the ifindex may have changed
+                        * (e.g. if member interfaces were added/removed
+                        * or if the status of the bridge changed).
+                        * Refresh ifindex and client_mac:
+                        */
+                       udhcp_read_interface(client_config.interface,
+                               &client_config.ifindex,
+                               NULL,
+                               client_config.client_mac);
+
                        /* We will restart the wait in any case */
                        already_waited_sec = 0;
 
@@ -860,14 +1336,14 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
 
                /* Ignore packets that aren't for us */
                if (packet.hlen != 6
-                || memcmp(packet.chaddr, client_config.client_mac, 6)
+                || memcmp(packet.chaddr, client_config.client_mac, 6) != 0
                ) {
 //FIXME: need to also check that last 10 bytes are zero
                        log1("chaddr does not match, ignoring packet"); // log2?
                        continue;
                }
 
-               message = get_option(&packet, DHCP_MESSAGE_TYPE);
+               message = udhcp_get_option(&packet, DHCP_MESSAGE_TYPE);
                if (message == NULL) {
                        bb_error_msg("no message type option, ignoring packet");
                        continue;
@@ -878,7 +1354,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                        /* Must be a DHCPOFFER to one of our xid's */
                        if (*message == DHCPOFFER) {
                /* TODO: why we don't just fetch server's IP from IP header? */
-                               temp = get_option(&packet, DHCP_SERVER_ID);
+                               temp = udhcp_get_option(&packet, DHCP_SERVER_ID);
                                if (!temp) {
                                        bb_error_msg("no server ID in message");
                                        continue;
@@ -886,7 +1362,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                }
                                /* it IS unaligned sometimes, don't "optimize" */
                                move_from_unaligned32(server_addr, temp);
-                               xid = packet.xid;
+                               /*xid = packet.xid; - already is */
                                requested_ip = packet.yiaddr;
 
                                /* enter requesting state */
@@ -901,7 +1377,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                case RENEW_REQUESTED:
                case REBINDING:
                        if (*message == DHCPACK) {
-                               temp = get_option(&packet, DHCP_LEASE_TIME);
+                               temp = udhcp_get_option(&packet, DHCP_LEASE_TIME);
                                if (!temp) {
                                        bb_error_msg("no lease time with ACK, using 1 hour lease");
                                        lease_seconds = 60 * 60;