arp: fix -H/-t handling.

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

diff --git a/networking/udhcp/dhcpd.h b/networking/udhcp/dhcpd.h
index 149300b87bfd6b386d1fd2bd3b5e433e7cc57f26..a77724f200d1ea139582fd4f912e5d016ce81800 100644 (file)
--- a/networking/udhcp/dhcpd.h
+++ b/networking/udhcp/dhcpd.h
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 #ifndef UDHCP_DHCPD_H
 #define UDHCP_DHCPD_H 1
@@ -61,9 +61,11 @@ struct server_config_t {
 /* client_config sits in 2nd half of bb_common_bufsiz1 */
 
 #if ENABLE_FEATURE_UDHCP_PORT
-#define SERVER_PORT (server_config.port)
+#define SERVER_PORT  (server_config.port)
+#define SERVER_PORT6 (server_config.port)
 #else
-#define SERVER_PORT 67
+#define SERVER_PORT  67
+#define SERVER_PORT6 547
 #endif
 
 
@@ -71,11 +73,11 @@ typedef uint32_t leasetime_t;
 typedef int32_t signed_leasetime_t;
 
 struct dyn_lease {
-       /* "nip": IP in network order */
        /* Unix time when lease expires. Kept in memory in host order.
         * When written to file, converted to network order
         * and adjusted (current time subtracted) */
        leasetime_t expires;
+       /* "nip": IP in network order */
        uint32_t lease_nip;
        /* We use lease_mac[6], since e.g. ARP probing uses
         * only 6 first bytes anyway. We check received dhcp packets