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

Timestamp:

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

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/networking/udhcp/dhcpc.c (modified) (23 diffs)

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

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /* dhcpc.c
  *
@@ -8 +9 @@
  */
 
-#include <sys/file.h>
-#include <unistd.h>
 #include <getopt.h>
-#include <stdlib.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <signal.h>
-#include <time.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <net/if.h>
-#include <errno.h>
-
+#include <syslog.h>
+
+/* Override ENABLE_FEATURE_PIDFILE - ifupdown needs our pidfile to always exist */
+#define WANT_PIDFILE 1
 #include "common.h"
 #include "dhcpd.h"
 #include "dhcpc.h"
 #include "options.h"
-#include "clientpacket.h"
-#include "clientsocket.h"
-#include "socket.h"
-#include "signalpipe.h"
-
-static int state;
-static unsigned long requested_ip; /* = 0 */
-static unsigned long server_addr;
-static unsigned long timeout;
+
+
+/* Something is definitely wrong here. IPv4 addresses
+ * in variables of type long?? BTW, we use inet_ntoa()
+ * in the code. Manpage says that struct in_addr has a member of type long (!)
+ * which holds IPv4 address, and the struct is passed by value (!!)
+ */
+static unsigned timeout;
+static uint32_t requested_ip; /* = 0 */
+static uint32_t server_addr;
 static int packet_num; /* = 0 */
-static int fd = -1;
+static int sockfd = -1;
 
 #define LISTEN_NONE 0
 #define LISTEN_KERNEL 1
 #define LISTEN_RAW 2
-static int listen_mode;
-
-struct client_config_t client_config = {
-    /* Default options. */
-    .abort_if_no_lease = 0,
-    .foreground = 0,
-    .quit_after_lease = 0,
-    .background_if_no_lease = 0,
-    .interface = "eth0",
-    .pidfile = NULL,
-    .script = DEFAULT_SCRIPT,
-    .clientid = NULL,
-    .vendorclass = NULL,
-    .hostname = NULL,
-    .fqdn = NULL,
-    .ifindex = 0,
-    .retries = 3,
-    .timeout = 3,
-    .arp = "\0\0\0\0\0\0",      /* appease gcc-3.0 */
-};
+static smallint listen_mode;
+
+static smallint state;
+
+struct client_config_t client_config;
+
 
 /* just a little helper */
 static void change_mode(int new_mode)
 {
-    DEBUG(LOG_INFO, "entering %s listen mode",
+    DEBUG("entering %s listen mode",
         new_mode ? (new_mode == 1 ? "kernel" : "raw") : "none");
-    if (fd >= 0) close(fd);
-    fd = -1;
+    if (sockfd >= 0) {
+        close(sockfd);
+        sockfd = -1;
+    }
     listen_mode = new_mode;
 }
@@ -76 +57 @@
 static void perform_renew(void)
 {
-    LOG(LOG_INFO, "Performing a DHCP renew");
+    bb_info_msg("Performing a DHCP renew");
     switch (state) {
     case BOUND:
@@ -106 +87 @@
 static void perform_release(void)
 {
-    char buffer[16];
+    char buffer[sizeof("255.255.255.255")];
     struct in_addr temp_addr;
 
@@ -112 +93 @@
     if (state == BOUND || state == RENEWING || state == REBINDING) {
         temp_addr.s_addr = server_addr;
-        sprintf(buffer, "%s", inet_ntoa(temp_addr));
+        strcpy(buffer, inet_ntoa(temp_addr));
         temp_addr.s_addr = requested_ip;
-        LOG(LOG_INFO, "Unicasting a release of %s to %s",
+        bb_info_msg("Unicasting a release of %s to %s",
                 inet_ntoa(temp_addr), buffer);
         send_release(server_addr, requested_ip); /* unicast */
         udhcp_run_script(NULL, "deconfig");
     }
-    LOG(LOG_INFO, "Entering released state");
+    bb_info_msg("Entering released state");
 
     change_mode(LISTEN_NONE);
     state = RELEASED;
-    timeout = 0x7fffffff;
+    timeout = INT_MAX;
 }
 
@@ -129 +110 @@
 static void client_background(void)
 {
-    udhcp_background(client_config.pidfile);
-    client_config.foreground = 1; /* Do not fork again. */
+#if !BB_MMU
+    bb_error_msg("cannot background in uclinux (yet)");
+/* ... mainly because udhcpc calls client_background()
+ * in _the _middle _of _udhcpc _run_, not at the start!
+ * If that will be properly disabled for NOMMU, client_background()
+ * will work on NOMMU too */
+#else
+    bb_daemonize(0);
+    logmode &= ~LOGMODE_STDIO;
+    /* rewrite pidfile, as our pid is different now */
+    write_pidfile(client_config.pidfile);
+#endif
+    /* Do not fork again. */
+    client_config.foreground = 1;
     client_config.background_if_no_lease = 0;
 }
 
 
-int udhcpc_main(int argc, char *argv[])
+static uint8_t* alloc_dhcp_option(int code, const char *str, int extra)
+{
+    uint8_t *storage;
+    int len = strlen(str);
+    if (len > 255) len = 255;
+    storage = xzalloc(len + extra + OPT_DATA);
+    storage[OPT_CODE] = code;
+    storage[OPT_LEN] = len + extra;
+    memcpy(storage + extra + OPT_DATA, str, len);
+    return storage;
+}
+
+
+int udhcpc_main(int argc, char **argv);
+int udhcpc_main(int argc, char **argv)
 {
     uint8_t *temp, *message;
-    unsigned long t1 = 0, t2 = 0, xid = 0;
-    unsigned long start = 0, lease;
+    char *str_c, *str_V, *str_h, *str_F, *str_r, *str_T, *str_t;
+    uint32_t xid = 0;
+    uint32_t lease = 0; /* can be given as 32-bit quantity */
+    unsigned t1 = 0, t2 = 0; /* what a wonderful names */
+    unsigned start = 0;
+    unsigned now;
+    unsigned opt;
+    int max_fd;
+    int retval;
+    int len;
+    struct timeval tv;
+    struct in_addr temp_addr;
+    struct dhcpMessage packet;
     fd_set rfds;
-    int retval;
-    struct timeval tv;
-    int c, len;
-    struct dhcpMessage packet;
-    struct in_addr temp_addr;
-    long now;
-    int max_fd;
-    int sig;
-    int no_clientid = 0;
-
-    static const struct option arg_options[] = {
-        {"clientid",    required_argument,  0, 'c'},
-        {"clientid-none", no_argument,      0, 'C'},
-        {"vendorclass", required_argument,  0, 'V'},
-        {"foreground",  no_argument,        0, 'f'},
-        {"background",  no_argument,        0, 'b'},
-        {"hostname",    required_argument,  0, 'H'},
-        {"hostname",    required_argument,  0, 'h'},
-        {"fqdn",    required_argument,  0, 'F'},
-        {"interface",   required_argument,  0, 'i'},
-        {"now",     no_argument,        0, 'n'},
-        {"pidfile", required_argument,  0, 'p'},
-        {"quit",    no_argument,        0, 'q'},
-        {"request", required_argument,  0, 'r'},
-        {"script",  required_argument,  0, 's'},
-        {"timeout", required_argument,  0, 'T'},
-        {"version", no_argument,        0, 'v'},
-        {"retries", required_argument,  0, 't'},
-        {0, 0, 0, 0}
+
+    enum {
+        OPT_c = 1 << 0,
+        OPT_C = 1 << 1,
+        OPT_V = 1 << 2,
+        OPT_f = 1 << 3,
+        OPT_b = 1 << 4,
+        OPT_H = 1 << 5,
+        OPT_h = 1 << 6,
+        OPT_F = 1 << 7,
+        OPT_i = 1 << 8,
+        OPT_n = 1 << 9,
+        OPT_p = 1 << 10,
+        OPT_q = 1 << 11,
+        OPT_R = 1 << 12,
+        OPT_r = 1 << 13,
+        OPT_s = 1 << 14,
+        OPT_T = 1 << 15,
+        OPT_t = 1 << 16,
+        OPT_v = 1 << 17,
+        OPT_S = 1 << 18,
     };
-
-    /* get options */
-    while (1) {
-        int option_index = 0;
-        c = getopt_long(argc, argv, "c:CV:fbH:h:F:i:np:qr:s:T:t:v", arg_options, &option_index);
-        if (c == -1) break;
-
-        switch (c) {
-        case 'c':
-            if (no_clientid) bb_show_usage();
-            len = strlen(optarg) > 255 ? 255 : strlen(optarg);
-            free(client_config.clientid);
-            client_config.clientid = xmalloc(len + 2);
-            client_config.clientid[OPT_CODE] = DHCP_CLIENT_ID;
-            client_config.clientid[OPT_LEN] = len;
-            client_config.clientid[OPT_DATA] = '\0';
-            strncpy((char*)client_config.clientid + OPT_DATA, optarg, len);
-            break;
-        case 'C':
-            if (client_config.clientid) bb_show_usage();
-            no_clientid = 1;
-            break;
-        case 'V':
-            len = strlen(optarg) > 255 ? 255 : strlen(optarg);
-            free(client_config.vendorclass);
-            client_config.vendorclass = xmalloc(len + 2);
-            client_config.vendorclass[OPT_CODE] = DHCP_VENDOR;
-            client_config.vendorclass[OPT_LEN] = len;
-            strncpy((char*)client_config.vendorclass + OPT_DATA, optarg, len);
-            break;
-        case 'f':
-            client_config.foreground = 1;
-            break;
-        case 'b':
-            client_config.background_if_no_lease = 1;
-            break;
-        case 'h':
-        case 'H':
-            len = strlen(optarg) > 255 ? 255 : strlen(optarg);
-            free(client_config.hostname);
-            client_config.hostname = xmalloc(len + 2);
-            client_config.hostname[OPT_CODE] = DHCP_HOST_NAME;
-            client_config.hostname[OPT_LEN] = len;
-            strncpy((char*)client_config.hostname + 2, optarg, len);
-            break;
-        case 'F':
-            len = strlen(optarg) > 255 ? 255 : strlen(optarg);
-            free(client_config.fqdn);
-            client_config.fqdn = xmalloc(len + 5);
-            client_config.fqdn[OPT_CODE] = DHCP_FQDN;
-            client_config.fqdn[OPT_LEN] = len + 3;
-            /* Flags: 0000NEOS
-            S: 1 => Client requests Server to update A RR in DNS as well as PTR
-            O: 1 => Server indicates to client that DNS has been updated regardless
-            E: 1 => Name data is DNS format, i.e. <4>host<6>domain<4>com<0> not "host.domain.com"
-            N: 1 => Client requests Server to not update DNS
-            */
-            client_config.fqdn[OPT_LEN + 1] = 0x1;
-            client_config.fqdn[OPT_LEN + 2] = 0;
-            client_config.fqdn[OPT_LEN + 3] = 0;
-            strncpy((char*)client_config.fqdn + 5, optarg, len);
-            break;
-        case 'i':
-            client_config.interface =  optarg;
-            break;
-        case 'n':
-            client_config.abort_if_no_lease = 1;
-            break;
-        case 'p':
-            client_config.pidfile = optarg;
-            break;
-        case 'q':
-            client_config.quit_after_lease = 1;
-            break;
-        case 'r':
-            requested_ip = inet_addr(optarg);
-            break;
-        case 's':
-            client_config.script = optarg;
-            break;
-        case 'T':
-            client_config.timeout = atoi(optarg);
-            break;
-        case 't':
-            client_config.retries = atoi(optarg);
-            break;
-        case 'v':
-            printf("version %s\n\n", BB_VER);
-            return 0;
-            break;
-        default:
-            bb_show_usage();
-        }
-    }
-
-    /* Start the log, sanitize fd's, and write a pid file */
-    udhcp_start_log_and_pid("udhcpc", client_config.pidfile);
+#if ENABLE_GETOPT_LONG
+    static const char udhcpc_longopts[] ALIGN1 =
+        "clientid\0"      Required_argument "c"
+        "clientid-none\0" No_argument       "C"
+        "vendorclass\0"   Required_argument "V"
+        "foreground\0"    No_argument       "f"
+        "background\0"    No_argument       "b"
+        "hostname\0"      Required_argument "H"
+        "hostname\0"      Required_argument "h"
+        "fqdn\0"          Required_argument "F"
+        "interface\0"     Required_argument "i"
+        "now\0"           No_argument       "n"
+        "pidfile\0"       Required_argument "p"
+        "quit\0"          No_argument       "q"
+        "release\0"       No_argument       "R"
+        "request\0"       Required_argument "r"
+        "script\0"        Required_argument "s"
+        "timeout\0"       Required_argument "T"
+        "version\0"       No_argument       "v"
+        "retries\0"       Required_argument "t"
+        "syslog\0"        No_argument       "S"
+        ;
+#endif
+    /* Default options. */
+    client_config.interface = "eth0";
+    client_config.script = DEFAULT_SCRIPT;
+    client_config.retries = 3;
+    client_config.timeout = 3;
+
+    /* Parse command line */
+    opt_complementary = "c--C:C--c" // mutually exclusive
+                        ":hH:Hh"; // -h and -H are the same
+#if ENABLE_GETOPT_LONG
+    applet_long_options = udhcpc_longopts;
+#endif
+    opt = getopt32(argv, "c:CV:fbH:h:F:i:np:qRr:s:T:t:vS",
+        &str_c, &str_V, &str_h, &str_h, &str_F,
+        &client_config.interface, &client_config.pidfile, &str_r,
+        &client_config.script, &str_T, &str_t
+        );
+
+    if (opt & OPT_c)
+        client_config.clientid = alloc_dhcp_option(DHCP_CLIENT_ID, str_c, 0);
+    //if (opt & OPT_C)
+    if (opt & OPT_V)
+        client_config.vendorclass = alloc_dhcp_option(DHCP_VENDOR, str_V, 0);
+    if (opt & OPT_f)
+        client_config.foreground = 1;
+    if (opt & OPT_b)
+        client_config.background_if_no_lease = 1;
+    if (opt & OPT_h)
+        client_config.hostname = alloc_dhcp_option(DHCP_HOST_NAME, str_h, 0);
+    if (opt & OPT_F) {
+        client_config.fqdn = alloc_dhcp_option(DHCP_FQDN, str_F, 3);
+        /* Flags: 0000NEOS
+        S: 1 => Client requests Server to update A RR in DNS as well as PTR
+        O: 1 => Server indicates to client that DNS has been updated regardless
+        E: 1 => Name data is DNS format, i.e. <4>host<6>domain<4>com<0> not "host.domain.com"
+        N: 1 => Client requests Server to not update DNS
+        */
+        client_config.fqdn[OPT_DATA + 0] = 0x1;
+        /* client_config.fqdn[OPT_DATA + 1] = 0; - redundant */
+        /* client_config.fqdn[OPT_DATA + 2] = 0; - redundant */
+    }
+    // if (opt & OPT_i) client_config.interface = ...
+    if (opt & OPT_n)
+        client_config.abort_if_no_lease = 1;
+    // if (opt & OPT_p) client_config.pidfile = ...
+    if (opt & OPT_q)
+        client_config.quit_after_lease = 1;
+    if (opt & OPT_R)
+        client_config.release_on_quit = 1;
+    if (opt & OPT_r)
+        requested_ip = inet_addr(str_r);
+    // if (opt & OPT_s) client_config.script = ...
+    if (opt & OPT_T)
+        client_config.timeout = xatoi_u(str_T);
+    if (opt & OPT_t)
+        client_config.retries = xatoi_u(str_t);
+    if (opt & OPT_v) {
+        printf("version %s\n", BB_VER);
+        return 0;
+    }
+
+    if (opt & OPT_S) {
+        openlog(applet_name, LOG_PID, LOG_LOCAL0);
+        logmode |= LOGMODE_SYSLOG;
+    }
 
     if (read_interface(client_config.interface, &client_config.ifindex,
-               NULL, client_config.arp) < 0)
+               NULL, client_config.arp))
         return 1;
 
+    /* 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(client_config.pidfile);
+    /* if (!..) bb_perror_msg("cannot create pidfile %s", pidfile); */
+
+    /* Goes to stdout and possibly syslog */
+    bb_info_msg("%s (v%s) started", applet_name, BB_VER);
+
     /* if not set, and not suppressed, setup the default client ID */
-    if (!client_config.clientid && !no_clientid) {
-        client_config.clientid = xmalloc(6 + 3);
-        client_config.clientid[OPT_CODE] = DHCP_CLIENT_ID;
-        client_config.clientid[OPT_LEN] = 7;
+    if (!client_config.clientid && !(opt & OPT_C)) {
+        client_config.clientid = alloc_dhcp_option(DHCP_CLIENT_ID, "", 7);
         client_config.clientid[OPT_DATA] = 1;
-        memcpy(client_config.clientid + 3, client_config.arp, 6);
-    }
-
-    if (!client_config.vendorclass) {
-        client_config.vendorclass = xmalloc(sizeof("udhcp "BB_VER) + 2);
-        client_config.vendorclass[OPT_CODE] = DHCP_VENDOR;
-        client_config.vendorclass[OPT_LEN] = sizeof("udhcp "BB_VER) - 1;
-        client_config.vendorclass[OPT_DATA] = 1;
-        memcpy(&client_config.vendorclass[OPT_DATA],
-            "udhcp "BB_VER, sizeof("udhcp "BB_VER) - 1);
-    }
-
+        memcpy(client_config.clientid + OPT_DATA+1, client_config.arp, 6);
+    }
+
+    if (!client_config.vendorclass)
+        client_config.vendorclass = alloc_dhcp_option(DHCP_VENDOR, "udhcp "BB_VER, 0);
 
     /* setup the signal pipe */
@@ -298 +302 @@
     udhcp_run_script(NULL, "deconfig");
     change_mode(LISTEN_RAW);
+    tv.tv_sec = 0;
+    goto jump_in;
 
     for (;;) {
-
-        tv.tv_sec = timeout - uptime();
+        tv.tv_sec = timeout - monotonic_sec();
+ jump_in:
         tv.tv_usec = 0;
 
-        if (listen_mode != LISTEN_NONE && fd < 0) {
+        if (listen_mode != LISTEN_NONE && sockfd < 0) {
             if (listen_mode == LISTEN_KERNEL)
-                fd = listen_socket(INADDR_ANY, CLIENT_PORT, client_config.interface);
+                sockfd = listen_socket(/*INADDR_ANY,*/ CLIENT_PORT, client_config.interface);
             else
-                fd = raw_socket(client_config.ifindex);
-            if (fd < 0) {
-                LOG(LOG_ERR, "FATAL: couldn't listen on socket, %m");
-                return 0;
-            }
+                sockfd = raw_socket(client_config.ifindex);
         }
-        max_fd = udhcp_sp_fd_set(&rfds, fd);
-
+        max_fd = udhcp_sp_fd_set(&rfds, sockfd);
+
+        retval = 0; /* If we already timed out, fall through, else... */
         if (tv.tv_sec > 0) {
-            DEBUG(LOG_INFO, "Waiting on select...");
+            DEBUG("Waiting on select...");
             retval = select(max_fd + 1, &rfds, NULL, NULL, &tv);
-        } else retval = 0; /* If we already timed out, fall through */
-
-        now = uptime();
-        if (retval == 0) {
+        }
+
+        now = monotonic_sec();
+        if (retval < 0) {
+            /* EINTR? signal was caught, don't panic */
+            if (errno != EINTR) {
+                /* Else: an error occured, panic! */
+                bb_perror_msg_and_die("select");
+            }
+        } else if (retval == 0) {
             /* timeout dropped to zero */
             switch (state) {
@@ -338 +347 @@
                     udhcp_run_script(NULL, "leasefail");
                     if (client_config.background_if_no_lease) {
-                        LOG(LOG_INFO, "No lease, forking to background.");
+                        bb_info_msg("No lease, forking to background");
                         client_background();
                     } else if (client_config.abort_if_no_lease) {
-                        LOG(LOG_INFO, "No lease, failing.");
-                        return 1;
+                        bb_info_msg("No lease, failing");
+                        retval = 1;
+                        goto ret;
                     }
                     /* wait to try again */
@@ -361 +371 @@
                 } else {
                     /* timed out, go back to init state */
-                    if (state == RENEW_REQUESTED) udhcp_run_script(NULL, "deconfig");
+                    if (state == RENEW_REQUESTED)
+                        udhcp_run_script(NULL, "deconfig");
                     state = INIT_SELECTING;
                     timeout = now;
@@ -372 +383 @@
                 state = RENEWING;
                 change_mode(LISTEN_KERNEL);
-                DEBUG(LOG_INFO, "Entering renew state");
+                DEBUG("Entering renew state");
                 /* fall right through */
             case RENEWING:
@@ -380 +391 @@
                     state = REBINDING;
                     timeout = now + (t2 - t1);
-                    DEBUG(LOG_INFO, "Entering rebinding state");
+                    DEBUG("Entering rebinding state");
                 } else {
                     /* send a request packet */
                     send_renew(xid, server_addr, requested_ip); /* unicast */
-
                     t1 = (t2 - t1) / 2 + t1;
-                    timeout = t1 + start;
+                    timeout = start + t1;
                 }
                 break;
@@ -394 +404 @@
                     /* timed out, enter init state */
                     state = INIT_SELECTING;
-                    LOG(LOG_INFO, "Lease lost, entering init state");
+                    bb_info_msg("Lease lost, entering init state");
                     udhcp_run_script(NULL, "deconfig");
                     timeout = now;
@@ -402 +412 @@
                     /* send a request packet */
                     send_renew(xid, 0, requested_ip); /* broadcast */
-
                     t2 = (lease - t2) / 2 + t2;
-                    timeout = t2 + start;
+                    timeout = start + t2;
                 }
                 break;
             case RELEASED:
                 /* yah, I know, *you* say it would never happen */
-                timeout = 0x7fffffff;
-                break;
-            }
-        } else if (retval > 0 && listen_mode != LISTEN_NONE && FD_ISSET(fd, &rfds)) {
+                timeout = INT_MAX;
+                break;
+            }
+        } else if (listen_mode != LISTEN_NONE && FD_ISSET(sockfd, &rfds)) {
             /* a packet is ready, read it */
 
             if (listen_mode == LISTEN_KERNEL)
-                len = udhcp_get_packet(&packet, fd);
-            else len = get_raw_packet(&packet, fd);
+                len = udhcp_get_packet(&packet, sockfd);
+            else len = get_raw_packet(&packet, sockfd);
 
             if (len == -1 && errno != EINTR) {
-                DEBUG(LOG_INFO, "error on read, %m, reopening socket");
+                DEBUG("error on read, %s, reopening socket", strerror(errno));
                 change_mode(listen_mode); /* just close and reopen */
             }
@@ -426 +435 @@
 
             if (packet.xid != xid) {
-                DEBUG(LOG_INFO, "Ignoring XID %lx (our xid is %lx)",
-                    (unsigned long) packet.xid, xid);
+                DEBUG("Ignoring XID %x (our xid is %x)",
+                    (unsigned)packet.xid, (unsigned)xid);
                 continue;
             }
@@ -433 +442 @@
             /* Ignore packets that aren't for us */
             if (memcmp(packet.chaddr, client_config.arp, 6)) {
-                DEBUG(LOG_INFO, "packet does not have our chaddr -- ignoring");
+                DEBUG("Packet does not have our chaddr - ignoring");
                 continue;
             }
 
-            if ((message = get_option(&packet, DHCP_MESSAGE_TYPE)) == NULL) {
-                DEBUG(LOG_ERR, "couldnt get option from packet -- ignoring");
+            message = get_option(&packet, DHCP_MESSAGE_TYPE);
+            if (message == NULL) {
+                bb_error_msg("cannot get option from packet - ignoring");
                 continue;
             }
@@ -446 +456 @@
                 /* Must be a DHCPOFFER to one of our xid's */
                 if (*message == DHCPOFFER) {
-                    if ((temp = get_option(&packet, DHCP_SERVER_ID))) {
+                    temp = get_option(&packet, DHCP_SERVER_ID);
+                    if (temp) {
+                        /* can be misaligned, thus memcpy */
                         memcpy(&server_addr, temp, 4);
                         xid = packet.xid;
@@ -456 +468 @@
                         packet_num = 0;
                     } else {
-                        DEBUG(LOG_ERR, "No server ID in message");
+                        bb_error_msg("no server ID in message");
                     }
                 }
@@ -465 +477 @@
             case REBINDING:
                 if (*message == DHCPACK) {
-                    if (!(temp = get_option(&packet, DHCP_LEASE_TIME))) {
-                        LOG(LOG_ERR, "No lease time with ACK, using 1 hour lease");
+                    temp = get_option(&packet, DHCP_LEASE_TIME);
+                    if (!temp) {
+                        bb_error_msg("no lease time with ACK, using 1 hour lease");
                         lease = 60 * 60;
                     } else {
+                        /* can be misaligned, thus memcpy */
                         memcpy(&lease, temp, 4);
                         lease = ntohl(lease);
@@ -477 +491 @@
 
                     /* little fixed point for n * .875 */
-                    t2 = (lease * 0x7) >> 3;
+                    t2 = (lease * 7) >> 3;
                     temp_addr.s_addr = packet.yiaddr;
-                    LOG(LOG_INFO, "Lease of %s obtained, lease time %ld",
-                        inet_ntoa(temp_addr), lease);
+                    bb_info_msg("Lease of %s obtained, lease time %u",
+                        inet_ntoa(temp_addr), (unsigned)lease);
                     start = now;
-                    timeout = t1 + start;
+                    timeout = start + t1;
                     requested_ip = packet.yiaddr;
                     udhcp_run_script(&packet,
@@ -489 +503 @@
                     state = BOUND;
                     change_mode(LISTEN_NONE);
-                    if (client_config.quit_after_lease)
-                        return 0;
+                    if (client_config.quit_after_lease) {
+                        if (client_config.release_on_quit)
+                            perform_release();
+                        goto ret0;
+                    }
                     if (!client_config.foreground)
                         client_background();
@@ -496 +513 @@
                 } else if (*message == DHCPNAK) {
                     /* return to init state */
-                    LOG(LOG_INFO, "Received DHCP NAK");
+                    bb_info_msg("Received DHCP NAK");
                     udhcp_run_script(&packet, "nak");
                     if (state != REQUESTING)
@@ -510 +527 @@
             /* case BOUND, RELEASED: - ignore all packets */
             }
-        } else if (retval > 0 && (sig = udhcp_sp_read(&rfds))) {
-            switch (sig) {
+        } else {
+            int signo = udhcp_sp_read(&rfds);
+            switch (signo) {
             case SIGUSR1:
                 perform_renew();
@@ -519 +537 @@
                 break;
             case SIGTERM:
-                LOG(LOG_INFO, "Received SIGTERM");
-                return 0;
-            }
-        } else if (retval == -1 && errno == EINTR) {
-            /* a signal was caught */
-        } else {
-            /* An error occured */
-            DEBUG(LOG_ERR, "Error on select");
+                bb_info_msg("Received SIGTERM");
+                if (client_config.release_on_quit)
+                    perform_release();
+                goto ret0;
+            }
         }
-
-    }
-    return 0;
+    } /* for (;;) */
+ ret0:
+    retval = 0;
+ ret:
+    /*if (client_config.pidfile) - remove_pidfile has it's own check */
+        remove_pidfile(client_config.pidfile);
+    return retval;
 }