arp: fix -H/-t handling.

[oweals/busybox.git] / networking / udhcp / dhcpd.c

diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
index ac77b511d4e80a9d2eb0d2b8143cb295b5c0dd0f..9ad95954dd0ec5c0b6a56d7d86049949ce4de1d2 100644 (file)
--- a/networking/udhcp/dhcpd.c
+++ b/networking/udhcp/dhcpd.c
@@ -20,6 +20,17 @@
  * along with this program; if not, write to the Free Software
  * 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"
 #include "dhcpc.h"
@@ -303,9 +314,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
 #endif
        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 */
                bb_daemonize_or_rexec(0, argv);
@@ -368,6 +377,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
        /* Setup the signal pipe */
        udhcp_sp_setup();
 
+ continue_with_autotime:
        timeout_end = monotonic_sec() + server_config.auto_time;
        while (1) { /* loop until universe collapses */
                fd_set rfds;
@@ -397,8 +407,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                }
                if (retval == 0) {
                        write_leases();
-                       timeout_end = monotonic_sec() + server_config.auto_time;
-                       continue;
+                       goto continue_with_autotime;
                }
                if (retval < 0 && errno != EINTR) {
                        log1("Error on select");
@@ -410,10 +419,10 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                        bb_info_msg("Received SIGUSR1");
                        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 */
                        break;
@@ -448,9 +457,9 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                /* Get 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) {
+                       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;
@@ -584,11 +593,15 @@ o DHCPREQUEST generated during REBINDING state:
                                send_ACK(&packet, lease->lease_nip);
                                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;
 
                case DHCPDECLINE: