{
DEBUG("entering %s listen mode",
new_mode ? (new_mode == 1 ? "kernel" : "raw") : "none");
+
+ listen_mode = new_mode;
if (sockfd >= 0) {
close(sockfd);
sockfd = -1;
}
- listen_mode = new_mode;
+ if (new_mode == LISTEN_KERNEL)
+ sockfd = udhcp_listen_socket(/*INADDR_ANY,*/ CLIENT_PORT, client_config.interface);
+ else if (new_mode != LISTEN_NONE)
+ sockfd = udhcp_raw_socket(client_config.ifindex);
+ /* else LISTEN_NONE: sockfd stay closed */
}
int udhcpc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int udhcpc_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int udhcpc_main(int argc UNUSED_PARAM, char **argv)
{
uint8_t *temp, *message;
char *str_c, *str_V, *str_h, *str_F, *str_r;
OPT_H = 1 << 3,
OPT_h = 1 << 4,
OPT_F = 1 << 5,
- OPT_i = 1 << 6,
- OPT_n = 1 << 7,
+ OPT_i = 1 << 6,
+ OPT_n = 1 << 7,
OPT_p = 1 << 8,
OPT_q = 1 << 9,
OPT_R = 1 << 10,
if (opt & OPT_o)
client_config.no_default_options = 1;
while (list_O) {
- int n = index_in_strings(dhcp_option_strings, list_O->data);
+ 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'", list_O->data);
+ bb_error_msg_and_die("unknown option '%s'", optstr);
n = dhcp_options[n].code;
client_config.opt_mask[n >> 3] |= 1 << (n & 7);
- list_O = list_O->link;
}
- if (read_interface(client_config.interface, &client_config.ifindex,
+ if (udhcp_read_interface(client_config.interface, &client_config.ifindex,
NULL, client_config.arp))
return 1;
#if !BB_MMU
/* on NOMMU reexec (i.e., background) early */
if (!(opt & OPT_f)) {
bb_daemonize_or_rexec(0 /* flags */, argv);
- logmode = 0;
+ logmode = LOGMODE_NONE;
}
#endif
if (opt & OPT_S) {
- openlog(applet_name, LOG_PID, LOG_LOCAL0);
+ openlog(applet_name, LOG_PID, LOG_DAEMON);
logmode |= LOGMODE_SYSLOG;
}
* "continue" statements in code below jump to the top of the loop.
*/
for (;;) {
- unsigned timestamp_before_wait;
+ /* silence "uninitialized!" warning */
+ unsigned timestamp_before_wait = timestamp_before_wait;
+
+ //bb_error_msg("sockfd:%d, listen_mode:%d", sockfd, listen_mode);
+
+ /* Was opening raw or udp socket here
+ * if (listen_mode != LISTEN_NONE && sockfd < 0),
+ * but on fast network renew responses return faster
+ * than we open sockets. Thus this code is moved
+ * to change_listen_mode(). Thus we open listen socket
+ * BEFORE we send renew request (see "case BOUND:"). */
- if (listen_mode != LISTEN_NONE && sockfd < 0) {
- if (listen_mode == LISTEN_KERNEL)
- sockfd = listen_socket(/*INADDR_ANY,*/ CLIENT_PORT, client_config.interface);
- else
- sockfd = raw_socket(client_config.ifindex);
- }
max_fd = udhcp_sp_fd_set(&rfds, sockfd);
tv.tv_sec = timeout - already_waited_sec;
* resend discover/renew/whatever
*/
if (retval == 0) {
- /* We will restart wait afresh in any case */
+ /* We will restart the wait in any case */
already_waited_sec = 0;
switch (state) {
packet_num++;
continue;
}
+ leasefail:
udhcp_run_script(NULL, "leasefail");
#if BB_MMU /* -b is not supported on NOMMU */
if (opt & OPT_b) { /* background if no lease */
if (state == RENEW_REQUESTED) /* unicast */
send_renew(xid, server_addr, requested_ip);
else /* broadcast */
- send_selecting(xid, server_addr, requested_ip);
+ send_select(xid, server_addr, requested_ip);
timeout = discover_timeout;
packet_num++;
if (state == RENEW_REQUESTED)
udhcp_run_script(NULL, "deconfig");
change_listen_mode(LISTEN_RAW);
+ /* "discover...select...discover..." loops
+ * were seen in the wild. Treat them similarly
+ * to "no response to discover" case */
+ if (state == REQUESTING) {
+ state = INIT_SELECTING;
+ goto leasefail;
+ }
state = INIT_SELECTING;
timeout = 0;
packet_num = 0;
* try to find DHCP server using broadcast */
if (timeout > 0) {
/* send a request packet */
- send_renew(xid, 0, requested_ip); /* broadcast */
+ send_renew(xid, 0 /*INADDR_ANY*/, requested_ip); /* broadcast */
timeout >>= 1;
continue;
}
}
/* select() didn't timeout, something did happen. */
- /* Is is a packet? */
+ /* Is it a packet? */
if (listen_mode != LISTEN_NONE && FD_ISSET(sockfd, &rfds)) {
int len;
/* A packet is ready, read it */
continue;
if (packet.xid != xid) {
- DEBUG("Ignoring XID %x (our xid is %x)",
+ DEBUG("Ignoring xid %x (our xid is %x)",
(unsigned)packet.xid, (unsigned)xid);
continue;
}
/* still selecting - this server looks bad */
}
/* it IS unaligned sometimes, don't "optimize" */
- server_addr = get_unaligned_u32p((uint32_t*)temp);
+ move_from_unaligned32(server_addr, temp);
xid = packet.xid;
requested_ip = packet.yiaddr;
bb_error_msg("no lease time with ACK, using 1 hour lease");
lease_seconds = 60 * 60;
} else {
- /* can be misaligned, thus memcpy */
- memcpy(&lease_seconds, temp, 4);
+ /* it IS unaligned sometimes, don't "optimize" */
+ move_from_unaligned32(lease_seconds, temp);
lease_seconds = ntohl(lease_seconds);
lease_seconds &= 0x0fffffff; /* paranoia: must not be prone to overflows */
if (lease_seconds < 10) /* and not too small */
}
#if ENABLE_FEATURE_UDHCPC_ARPING
if (opt & OPT_a) {
+/* RFC 2131 3.1 paragraph 5:
+ * "The client receives the DHCPACK message with configuration
+ * parameters. The client SHOULD perform a final check on the
+ * parameters (e.g., ARP for allocated network address), and notes
+ * the duration of the lease specified in the DHCPACK message. At this
+ * point, the client is configured. If the client detects that the
+ * address is already in use (e.g., through the use of ARP),
+ * the client MUST send a DHCPDECLINE message to the server and restarts
+ * the configuration process..." */
if (!arpping(packet.yiaddr,
(uint32_t) 0,
client_config.arp,
}
requested_ip = packet.yiaddr;
udhcp_run_script(&packet,
- ((state == RENEWING || state == REBINDING) ? "renew" : "bound"));
+ ((state == RENEWING || state == REBINDING) ? "renew" : "bound"));
state = BOUND;
change_listen_mode(LISTEN_NONE);
projects / oweals / busybox.git / blobdiff