Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/networking/udhcp/dhcpd.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/networking/udhcp/dhcpd.c (modified) (11 diffs)

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

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /* dhcpd.c
  *
@@ -10 +11 @@
  */
 
-#include <fcntl.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/wait.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <unistd.h>
-#include <signal.h>
-#include <errno.h>
-#include <sys/ioctl.h>
-#include <time.h>
-
+#include <syslog.h>
+#include "common.h"
 #include "dhcpd.h"
-#include "arpping.h"
-#include "socket.h"
 #include "options.h"
-#include "files.h"
-#include "serverpacket.h"
-#include "common.h"
-#include "signalpipe.h"
-#include "static_leases.h"
 
 
@@ -40 +22 @@
 
 
-int udhcpd_main(int argc, char *argv[])
+int udhcpd_main(int argc, char **argv);
+int udhcpd_main(int argc, char **argv)
 {
     fd_set rfds;
@@ -48 +31 @@
     uint8_t *state, *server_id, *requested;
     uint32_t server_id_align, requested_align, static_lease_ip;
-    unsigned long timeout_end, num_ips;
+    unsigned timeout_end;
+    unsigned num_ips;
+    unsigned opt;
     struct option_set *option;
     struct dhcpOfferedAddr *lease, static_lease;
 
-    read_config(argc < 2 ? DHCPD_CONF_FILE : argv[1]);
-
-    /* Start the log, sanitize fd's, and write a pid file */
-    udhcp_start_log_and_pid("udhcpd", server_config.pidfile);
-
-    if ((option = find_option(server_config.options, DHCP_LEASE_TIME))) {
+    opt = getopt32(argv, "fS");
+    argv += optind;
+
+    if (!(opt & 1)) { /* no -f */
+        bb_daemonize_or_rexec(0, argv);
+        logmode &= ~LOGMODE_STDIO;
+    }
+
+    if (opt & 2) { /* -S */
+        openlog(applet_name, LOG_PID, LOG_LOCAL0);
+        logmode |= LOGMODE_SYSLOG;
+    }
+
+    /* Would rather not do read_config before daemonization -
+     * otherwise NOMMU machines will parse config twice */
+    read_config(argv[0] ? argv[0] : DHCPD_CONF_FILE);
+
+    /* Make sure fd 0,1,2 are open */
+    bb_sanitize_stdio();
+    /* Equivalent of doing a fflush after every \n */
+    setlinebuf(stdout);
+
+    /* Create pidfile */
+    write_pidfile(server_config.pidfile);
+    /* if (!..) bb_perror_msg("cannot create pidfile %s", pidfile); */
+
+    bb_info_msg("%s (v%s) started", applet_name, BB_VER);
+
+    option = find_option(server_config.options, DHCP_LEASE_TIME);
+    server_config.lease = LEASE_TIME;
+    if (option) {
         memcpy(&server_config.lease, option->data + 2, 4);
         server_config.lease = ntohl(server_config.lease);
     }
-    else server_config.lease = LEASE_TIME;
 
     /* Sanity check */
-    num_ips = ntohl(server_config.end) - ntohl(server_config.start) + 1;
+    num_ips = server_config.end_ip - server_config.start_ip + 1;
     if (server_config.max_leases > num_ips) {
-        LOG(LOG_ERR, "max_leases value (%lu) not sane, "
-            "setting to %lu instead",
-            server_config.max_leases, num_ips);
+        bb_error_msg("max_leases=%u is too big, setting to %u",
+            (unsigned)server_config.max_leases, num_ips);
         server_config.max_leases = num_ips;
     }
 
-    leases = xzalloc(server_config.max_leases * sizeof(struct dhcpOfferedAddr));
+    leases = xzalloc(server_config.max_leases * sizeof(*leases));
     read_leases(server_config.lease_file);
 
     if (read_interface(server_config.interface, &server_config.ifindex,
-               &server_config.server, server_config.arp) < 0)
-        return 1;
-
-    if (!ENABLE_FEATURE_UDHCP_DEBUG)
-        udhcp_background(server_config.pidfile); /* hold lock during fork. */
+               &server_config.server, server_config.arp)) {
+        retval = 1;
+        goto ret;
+    }
 
     /* Setup the signal pipe */
     udhcp_sp_setup();
 
-    timeout_end = time(0) + server_config.auto_time;
-    while(1) { /* loop until universe collapses */
-
-        if (server_socket < 0)
-            if ((server_socket = listen_socket(INADDR_ANY, SERVER_PORT, server_config.interface)) < 0) {
-                LOG(LOG_ERR, "FATAL: couldn't create server socket, %m");
-                return 2;
-            }
+    timeout_end = monotonic_sec() + server_config.auto_time;
+    while (1) { /* loop until universe collapses */
+
+        if (server_socket < 0) {
+            server_socket = listen_socket(/*INADDR_ANY,*/ SERVER_PORT,
+                    server_config.interface);
+        }
 
         max_sock = udhcp_sp_fd_set(&rfds, server_socket);
         if (server_config.auto_time) {
-            tv.tv_sec = timeout_end - time(0);
+            tv.tv_sec = timeout_end - monotonic_sec();
             tv.tv_usec = 0;
         }
+        retval = 0;
         if (!server_config.auto_time || tv.tv_sec > 0) {
             retval = select(max_sock + 1, &rfds, NULL, NULL,
                     server_config.auto_time ? &tv : NULL);
-        } else retval = 0; /* If we already timed out, fall through */
-
+        }
         if (retval == 0) {
             write_leases();
-            timeout_end = time(0) + server_config.auto_time;
-            continue;
-        } else if (retval < 0 && errno != EINTR) {
-            DEBUG(LOG_INFO, "error on select");
+            timeout_end = monotonic_sec() + server_config.auto_time;
+            continue;
+        }
+        if (retval < 0 && errno != EINTR) {
+            DEBUG("error on select");
             continue;
         }
@@ -115 +122 @@
         switch (udhcp_sp_read(&rfds)) {
         case SIGUSR1:
-            LOG(LOG_INFO, "Received a SIGUSR1");
+            bb_info_msg("Received a SIGUSR1");
             write_leases();
             /* why not just reset the timeout, eh */
-            timeout_end = time(0) + server_config.auto_time;
+            timeout_end = monotonic_sec() + server_config.auto_time;
             continue;
         case SIGTERM:
-            LOG(LOG_INFO, "Received a SIGTERM");
-            return 0;
+            bb_info_msg("Received a SIGTERM");
+            goto ret0;
         case 0: break;      /* no signal */
         default: continue;  /* signal or error (probably EINTR) */
         }
 
-        if ((bytes = udhcp_get_packet(&packet, server_socket)) < 0) { /* this waits for a packet - idle */
+        bytes = udhcp_get_packet(&packet, server_socket); /* this waits for a packet - idle */
+        if (bytes < 0) {
             if (bytes == -1 && errno != EINTR) {
-                DEBUG(LOG_INFO, "error on read, %m, reopening socket");
+                DEBUG("error on read, %s, reopening socket", strerror(errno));
                 close(server_socket);
                 server_socket = -1;
@@ -136 +144 @@
         }
 
-        if ((state = get_option(&packet, DHCP_MESSAGE_TYPE)) == NULL) {
-            DEBUG(LOG_ERR, "couldn't get option from packet, ignoring");
+        state = get_option(&packet, DHCP_MESSAGE_TYPE);
+        if (state == NULL) {
+            bb_error_msg("cannot get option from packet, ignoring");
             continue;
         }
@@ -144 +153 @@
         static_lease_ip = getIpByMac(server_config.static_leases, &packet.chaddr);
 
-        if(static_lease_ip)
-        {
-            printf("Found static lease: %x\n", static_lease_ip);
+        if (static_lease_ip) {
+            bb_info_msg("Found static lease: %x", static_lease_ip);
 
             memcpy(&static_lease.chaddr, &packet.chaddr, 16);
@@ -153 +161 @@
 
             lease = &static_lease;
-
-        }
-        else
-        {
-        lease = find_lease_by_chaddr(packet.chaddr);
+        } else {
+            lease = find_lease_by_chaddr(packet.chaddr);
         }
 
         switch (state[0]) {
         case DHCPDISCOVER:
-            DEBUG(LOG_INFO,"received DISCOVER");
+            DEBUG("Received DISCOVER");
 
             if (sendOffer(&packet) < 0) {
-                LOG(LOG_ERR, "send OFFER failed");
+                bb_error_msg("send OFFER failed");
             }
             break;
         case DHCPREQUEST:
-            DEBUG(LOG_INFO, "received REQUEST");
+            DEBUG("received REQUEST");
 
             requested = get_option(&packet, DHCP_REQUESTED_IP);
@@ -180 +185 @@
                 if (server_id) {
                     /* SELECTING State */
-                    DEBUG(LOG_INFO, "server_id = %08x", ntohl(server_id_align));
-                    if (server_id_align == server_config.server && requested &&
-                        requested_align == lease->yiaddr) {
+                    DEBUG("server_id = %08x", ntohl(server_id_align));
+                    if (server_id_align == server_config.server && requested
+                     && requested_align == lease->yiaddr
+                    ) {
                         sendACK(&packet, lease->yiaddr);
                     }
+                } else if (requested) {
+                    /* INIT-REBOOT State */
+                    if (lease->yiaddr == requested_align)
+                        sendACK(&packet, lease->yiaddr);
+                    else
+                        sendNAK(&packet);
+                } else if (lease->yiaddr == packet.ciaddr) {
+                    /* RENEWING or REBINDING State */
+                    sendACK(&packet, lease->yiaddr);
                 } else {
-                    if (requested) {
-                        /* INIT-REBOOT State */
-                        if (lease->yiaddr == requested_align)
-                            sendACK(&packet, lease->yiaddr);
-                        else sendNAK(&packet);
-                    } else {
-                        /* RENEWING or REBINDING State */
-                        if (lease->yiaddr == packet.ciaddr)
-                            sendACK(&packet, lease->yiaddr);
-                        else {
-                            /* don't know what to do!!!! */
-                            sendNAK(&packet);
-                        }
-                    }
+                    /* don't know what to do!!!! */
+                    sendNAK(&packet);
                 }
 
@@ -208 +211 @@
             } else if (requested) {
                 /* INIT-REBOOT State */
-                if ((lease = find_lease_by_yiaddr(requested_align))) {
+                lease = find_lease_by_yiaddr(requested_align);
+                if (lease) {
                     if (lease_expired(lease)) {
                         /* probably best if we drop this lease */
                         memset(lease->chaddr, 0, 16);
                     /* make some contention for this address */
-                    } else sendNAK(&packet);
-                } else if (requested_align < server_config.start ||
-                       requested_align > server_config.end) {
-                    sendNAK(&packet);
-                } /* else remain silent */
+                    } else
+                        sendNAK(&packet);
+                } else {
+                    uint32_t r = ntohl(requested_align);
+                    if (r < server_config.start_ip
+                         || r > server_config.end_ip
+                    ) {
+                        sendNAK(&packet);
+                    }
+                    /* else remain silent */
+                }
 
             } else {
-                 /* RENEWING or REBINDING State */
+                /* RENEWING or REBINDING State */
             }
             break;
         case DHCPDECLINE:
-            DEBUG(LOG_INFO,"received DECLINE");
+            DEBUG("Received DECLINE");
             if (lease) {
                 memset(lease->chaddr, 0, 16);
@@ -231 +241 @@
             break;
         case DHCPRELEASE:
-            DEBUG(LOG_INFO,"received RELEASE");
-            if (lease) lease->expires = time(0);
+            DEBUG("Received RELEASE");
+            if (lease)
+                lease->expires = time(0);
             break;
         case DHCPINFORM:
-            DEBUG(LOG_INFO,"received INFORM");
+            DEBUG("Received INFORM");
             send_inform(&packet);
             break;
         default:
-            LOG(LOG_WARNING, "unsupported DHCP message (%02x) -- ignoring", state[0]);
-        }
-    }
-
-    return 0;
+            bb_info_msg("Unsupported DHCP message (%02x) - ignoring", state[0]);
+        }
+    }
+ ret0:
+    retval = 0;
+ ret:
+    /*if (server_config.pidfile) - server_config.pidfile is never NULL */
+        remove_pidfile(server_config.pidfile);
+    return retval;
 }
-