Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/networking/udhcp/dhcpd.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

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

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

@@ -23 +23 @@
 
 //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:     "\n    -a MSEC Timeout for ARP ping (default 2000)"
 //usage:    IF_FEATURE_UDHCP_PORT(
 //usage:     "\n    -P N    Use port N (default 67)"
@@ -60 +62 @@
      || dhcp_pkt->ciaddr == 0
     ) {
-        log1("Broadcasting packet to client");
+        log1("broadcasting packet to client");
         ciaddr = INADDR_BROADCAST;
         chaddr = MAC_BCAST_ADDR;
     } else {
-        log1("Unicasting packet to client ciaddr");
+        log1("unicasting packet to client ciaddr");
         ciaddr = dhcp_pkt->ciaddr;
         chaddr = dhcp_pkt->chaddr;
@@ -78 +80 @@
 static void send_packet_to_relay(struct dhcp_packet *dhcp_pkt)
 {
-    log1("Forwarding packet to relay");
+    log1("forwarding packet to relay");
 
     udhcp_send_kernel_packet(dhcp_pkt,
@@ -148 +150 @@
         uint32_t static_lease_nip,
         struct dyn_lease *lease,
-        uint8_t *requested_ip_opt)
+        uint8_t *requested_ip_opt,
+        unsigned arpping_ms)
 {
     struct dhcp_packet packet;
@@ -187 +190 @@
         else {
             /* Otherwise, find a free IP */
-            packet.yiaddr = find_free_or_expired_nip(oldpacket->chaddr);
+            packet.yiaddr = find_free_or_expired_nip(oldpacket->chaddr, arpping_ms);
         }
 
@@ -212 +215 @@
 
     addr.s_addr = packet.yiaddr;
-    bb_info_msg("Sending OFFER of %s", inet_ntoa(addr));
+    bb_error_msg("sending OFFER of %s", inet_ntoa(addr));
     /* send_packet emits error message itself if it detects failure */
     send_packet(&packet, /*force_bcast:*/ 0);
@@ -224 +227 @@
     init_packet(&packet, oldpacket, DHCPNAK);
 
-    log1("Sending NAK");
+    log1("sending %s", "NAK");
     send_packet(&packet, /*force_bcast:*/ 1);
 }
@@ -245 +248 @@
 
     addr.s_addr = yiaddr;
-    bb_info_msg("Sending ACK to %s", inet_ntoa(addr));
+    bb_error_msg("sending ACK to %s", inet_ntoa(addr));
     send_packet(&packet, /*force_bcast:*/ 0);
 
@@ -303 +306 @@
     unsigned opt;
     struct option_set *option;
+    char *str_I = str_I;
+    const char *str_a = "2000";
+    unsigned arpping_ms;
     IF_FEATURE_UDHCP_PORT(char *str_P;)
 
-#if ENABLE_FEATURE_UDHCP_PORT
-    SERVER_PORT = 67;
-    CLIENT_PORT = 68;
-#endif
+    setup_common_bufsiz();
+
+    IF_FEATURE_UDHCP_PORT(SERVER_PORT = 67;)
+    IF_FEATURE_UDHCP_PORT(CLIENT_PORT = 68;)
 
 #if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1
     opt_complementary = "vv";
 #endif
-    opt = getopt32(argv, "fSv"
-        IF_FEATURE_UDHCP_PORT("P:", &str_P)
+    opt = getopt32(argv, "fSI:va:"
+        IF_FEATURE_UDHCP_PORT("P:")
+        , &str_I
+        , &str_a
+        IF_FEATURE_UDHCP_PORT(, &str_P)
         IF_UDHCP_VERBOSE(, &dhcp_verbose)
         );
@@ -327 +336 @@
         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 & 32) { /* -P */
         SERVER_PORT = xatou16(str_P);
         CLIENT_PORT = SERVER_PORT + 1;
     }
 #endif
+    arpping_ms = xatou(str_a);
+
     /* Would rather not do read_config before daemonization -
      * otherwise NOMMU machines will parse config twice */
@@ -346 +362 @@
     /* if (!..) bb_perror_msg("can't create pidfile %s", pidfile); */
 
-    bb_info_msg("%s (v"BB_VER") started", applet_name);
+    bb_error_msg("started, v"BB_VER);
 
     option = udhcp_find_option(server_config.options, DHCP_LEASE_TIME);
@@ -368 +384 @@
     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)
     ) {
@@ -398 +414 @@
         max_sock = udhcp_sp_fd_set(&rfds, server_socket);
         if (server_config.auto_time) {
-            tv.tv_sec = timeout_end - monotonic_sec();
+            /* cast to signed is essential if tv_sec is wider than int */
+            tv.tv_sec = (int)(timeout_end - monotonic_sec());
             tv.tv_usec = 0;
         }
@@ -411 +428 @@
         }
         if (retval < 0 && errno != EINTR) {
-            log1("Error on select");
+            log1("error on select");
             continue;
         }
@@ -417 +434 @@
         switch (udhcp_sp_read(&rfds)) {
         case SIGUSR1:
-            bb_info_msg("Received SIGUSR1");
+            bb_error_msg("received %s", "SIGUSR1");
             write_leases();
             /* why not just reset the timeout, eh */
             goto continue_with_autotime;
         case SIGTERM:
-            bb_info_msg("Received SIGTERM");
+            bb_error_msg("received %s", "SIGTERM");
             write_leases();
             goto ret0;
@@ -435 +452 @@
             /* bytes can also be -2 ("bad packet data") */
             if (bytes == -1 && errno != EINTR) {
-                log1("Read error: %s, reopening socket", strerror(errno));
+                log1("read error: %s, reopening socket", strerror(errno));
                 close(server_socket);
                 server_socket = -1;
@@ -470 +487 @@
         static_lease_nip = get_static_nip_by_mac(server_config.static_leases, &packet.chaddr);
         if (static_lease_nip) {
-            bb_info_msg("Found static lease: %x", static_lease_nip);
+            bb_error_msg("found static lease: %x", static_lease_nip);
             memcpy(&fake_lease.lease_mac, &packet.chaddr, 6);
             fake_lease.lease_nip = static_lease_nip;
@@ -488 +505 @@
 
         case DHCPDISCOVER:
-            log1("Received DISCOVER");
-
-            send_offer(&packet, static_lease_nip, lease, requested_ip_opt);
+            log1("received %s", "DISCOVER");
+
+            send_offer(&packet, static_lease_nip, lease, requested_ip_opt, arpping_ms);
             break;
 
         case DHCPREQUEST:
-            log1("Received REQUEST");
+            log1("received %s", "REQUEST");
 /* RFC 2131:
 
@@ -619 +636 @@
              * ciaddr must be 0 (we do not check this)
              */
-            log1("Received DECLINE");
+            log1("received %s", "DECLINE");
             if (server_id_opt
              && requested_ip_opt
@@ -639 +656 @@
              * ciaddr must be filled in
              */
-            log1("Received RELEASE");
+            log1("received %s", "RELEASE");
             if (server_id_opt
              && lease  /* chaddr matches this lease */
@@ -649 +666 @@
 
         case DHCPINFORM:
-            log1("Received INFORM");
+            log1("received %s", "INFORM");
             send_inform(&packet);
             break;