udhcp: add PXELINUX config file option (code 209) definition

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

diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
index 747472d0cd9b1747e1f6935a3a09bcc9ea5ac975..a1a7f6b57c7be8984c86b054b41ccda1f174b929 100644 (file)
--- a/networking/udhcp/dhcpd.c
+++ b/networking/udhcp/dhcpd.c
@@ -22,11 +22,12 @@
  */
 
 //usage:#define udhcpd_trivial_usage
-//usage:       "[-fS]" IF_FEATURE_UDHCP_PORT(" [-P N]") " [CONFFILE]"
+//usage:       "[-fS] [-I ADDR]" 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:     "\n       -I ADDR Local address"
 //usage:       IF_FEATURE_UDHCP_PORT(
 //usage:     "\n       -P N    Use port N (default 67)"
 //usage:       )
@@ -302,6 +303,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
        unsigned num_ips;
        unsigned opt;
        struct option_set *option;
+       char *str_I = str_I;
        IF_FEATURE_UDHCP_PORT(char *str_P;)
 
 #if ENABLE_FEATURE_UDHCP_PORT
@@ -312,11 +314,11 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
 #if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1
        opt_complementary = "vv";
 #endif
-       opt = getopt32(argv, "fSv"
-               IF_FEATURE_UDHCP_PORT("P:", &str_P)
-#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1
-               , &dhcp_verbose
-#endif
+       opt = getopt32(argv, "fSI:v"
+               IF_FEATURE_UDHCP_PORT("P:")
+               , &str_I
+               IF_FEATURE_UDHCP_PORT(, &str_P)
+               IF_UDHCP_VERBOSE(, &dhcp_verbose)
                );
        if (!(opt & 1)) { /* no -f */
                bb_daemonize_or_rexec(0, argv);
@@ -328,8 +330,13 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                openlog(applet_name, LOG_PID, LOG_DAEMON);
                logmode |= LOGMODE_SYSLOG;
        }
+       if (opt & 4) { /* -I */
+               len_and_sockaddr *lsa = xhost_and_af2sockaddr(str_I, 0, AF_INET);
+               server_config.server_nip = lsa->u.sin.sin_addr.s_addr;
+               free(lsa);
+       }
 #if ENABLE_FEATURE_UDHCP_PORT
-       if (opt & 8) { /* -P */
+       if (opt & 16) { /* -P */
                SERVER_PORT = xatou16(str_P);
                CLIENT_PORT = SERVER_PORT + 1;
        }
@@ -369,7 +376,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
 
        if (udhcp_read_interface(server_config.interface,
                        &server_config.ifindex,
-                       &server_config.server_nip,
+                       (server_config.server_nip == 0 ? &server_config.server_nip : NULL),
                        server_config.server_mac)
        ) {
                retval = 1;
@@ -379,6 +386,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;
@@ -408,8 +416,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");
@@ -421,10 +428,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;