Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/networking/udhcp/dhcpd.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/networking/udhcp/dhcpd.c (modified) (15 diffs)

branches/3.2/mindi-busybox/networking/udhcp/dhcpd.c

@@ -21 +21 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
+//usage:#define udhcpd_trivial_usage
+//usage:       "[-fS]" IF_FEATURE_UDHCP_PORT(" [-P N]") " [CONFFILE]"
+//usage:#define udhcpd_full_usage "\n\n"
+//usage:       "DHCP server\n"
+//usage:     "\n    -f  Run in foreground"
+//usage:     "\n    -S  Log to syslog too"
+//usage:    IF_FEATURE_UDHCP_PORT(
+//usage:     "\n    -P N    Use port N (default 67)"
+//usage:    )
+
 #include <syslog.h>
 #include "common.h"
@@ -134 +145 @@
 /* We got a DHCP DISCOVER. Send an OFFER. */
 /* NOINLINE: limit stack usage in caller */
-static NOINLINE void send_offer(struct dhcp_packet *oldpacket, uint32_t static_lease_nip, struct dyn_lease *lease)
+static NOINLINE void send_offer(struct dhcp_packet *oldpacket,
+        uint32_t static_lease_nip,
+        struct dyn_lease *lease,
+        uint8_t *requested_ip_opt)
 {
     struct dhcp_packet packet;
@@ -148 +162 @@
         /* We have no static lease for client's chaddr */
         uint32_t req_nip;
-        uint8_t *req_ip_opt;
         const char *p_host_name;
 
@@ -159 +172 @@
         }
         /* Or: if client has requested an IP */
-        else if ((req_ip_opt = udhcp_get_option(oldpacket, DHCP_REQUESTED_IP)) != NULL
+        else if (requested_ip_opt != NULL
          /* (read IP) */
-         && (move_from_unaligned32(req_nip, req_ip_opt), 1)
+         && (move_from_unaligned32(req_nip, requested_ip_opt), 1)
          /* and the IP is in the lease range */
          && ntohl(req_nip) >= server_config.start_ip
@@ -284 +297 @@
 int udhcpd_main(int argc UNUSED_PARAM, char **argv)
 {
-    fd_set rfds;
     int server_socket = -1, retval, max_sock;
-    struct dhcp_packet packet;
     uint8_t *state;
-    uint32_t static_lease_nip;
     unsigned timeout_end;
     unsigned num_ips;
     unsigned opt;
     struct option_set *option;
-    struct dyn_lease *lease, fake_lease;
     IF_FEATURE_UDHCP_PORT(char *str_P;)
 
@@ -306 +315 @@
     opt = getopt32(argv, "fSv"
         IF_FEATURE_UDHCP_PORT("P:", &str_P)
-#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1
-        , &dhcp_verbose
-#endif
+        IF_UDHCP_VERBOSE(, &dhcp_verbose)
         );
     if (!(opt & 1)) { /* no -f */
@@ -371 +378 @@
     udhcp_sp_setup();
 
+ continue_with_autotime:
     timeout_end = monotonic_sec() + server_config.auto_time;
     while (1) { /* loop until universe collapses */
+        fd_set rfds;
+        struct dhcp_packet packet;
         int bytes;
         struct timeval tv;
         uint8_t *server_id_opt;
-        uint8_t *requested_opt;
+        uint8_t *requested_ip_opt;
         uint32_t requested_nip = requested_nip; /* for compiler */
+        uint32_t static_lease_nip;
+        struct dyn_lease *lease, fake_lease;
 
         if (server_socket < 0) {
@@ -396 +408 @@
         if (retval == 0) {
             write_leases();
-            timeout_end = monotonic_sec() + server_config.auto_time;
-            continue;
+            goto continue_with_autotime;
         }
         if (retval < 0 && errno != EINTR) {
@@ -409 +420 @@
             write_leases();
             /* why not just reset the timeout, eh */
-            timeout_end = monotonic_sec() + server_config.auto_time;
-            continue;
+            goto continue_with_autotime;
         case SIGTERM:
             bb_info_msg("Received SIGTERM");
+            write_leases();
             goto ret0;
         case 0: /* no signal: read a packet */
@@ -442 +453 @@
             bb_error_msg("no or bad message type option, ignoring packet");
             continue;
+        }
+
+        /* Get SERVER_ID if present */
+        server_id_opt = udhcp_get_option(&packet, DHCP_SERVER_ID);
+        if (server_id_opt) {
+            uint32_t server_id_network_order;
+            move_from_unaligned32(server_id_network_order, server_id_opt);
+            if (server_id_network_order != server_config.server_nip) {
+                /* client talks to somebody else */
+                log1("server ID doesn't match, ignoring");
+                continue;
+            }
         }
 
@@ -456 +479 @@
         }
 
-        /* Get REQUESTED_IP and SERVER_ID if present */
-        server_id_opt = udhcp_get_option(&packet, DHCP_SERVER_ID);
-        if (server_id_opt) {
-            uint32_t server_id_net;
-            move_from_unaligned32(server_id_net, server_id_opt);
-            if (server_id_net != server_config.server_nip) {
-                /* client talks to somebody else */
-                log1("server ID doesn't match, ignoring");
-                continue;
-            }
-        }
-        requested_opt = udhcp_get_option(&packet, DHCP_REQUESTED_IP);
-        if (requested_opt) {
-            move_from_unaligned32(requested_nip, requested_opt);
+        /* Get REQUESTED_IP if present */
+        requested_ip_opt = udhcp_get_option(&packet, DHCP_REQUESTED_IP);
+        if (requested_ip_opt) {
+            move_from_unaligned32(requested_nip, requested_ip_opt);
         }
 
@@ -477 +490 @@
             log1("Received DISCOVER");
 
-            send_offer(&packet, static_lease_nip, lease);
+            send_offer(&packet, static_lease_nip, lease, requested_ip_opt);
             break;
 
@@ -568 +581 @@
    administrative authority to do so.
 */
-            if (!requested_opt) {
+            if (!requested_ip_opt) {
                 requested_nip = packet.ciaddr;
                 if (requested_nip == 0) {
@@ -581 +594 @@
                 break;
             }
-            if (server_id_opt) {
-                /* client was talking specifically to us.
-                 * "No, we don't have this IP for you". */
+            /* No lease for this MAC, or lease IP != requested IP */
+
+            if (server_id_opt    /* client is in SELECTING state */
+             || requested_ip_opt /* client is in INIT-REBOOT state */
+            ) {
+                /* "No, we don't have this IP for you" */
                 send_NAK(&packet);
-            }
+            } /* else: client is in RENEWING or REBINDING, do not answer */
+
             break;
 
@@ -604 +621 @@
             log1("Received DECLINE");
             if (server_id_opt
-             && requested_opt
+             && requested_ip_opt
              && lease  /* chaddr matches this lease */
              && requested_nip == lease->lease_nip