Various cleanups I made while going through Erik Hovland's patch submissions,

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

diff --git a/networking/udhcp/dhcpd.h b/networking/udhcp/dhcpd.h
index c47f6aa3f015ceaa0e475aa4ca90801bcfce17f9..37ebbe326cb95d18514b9d836bc3bf3cf7d357a7 100644 (file)
--- a/networking/udhcp/dhcpd.h
+++ b/networking/udhcp/dhcpd.h
@@ -7,7 +7,6 @@
 
 #include "libbb_udhcp.h"
 #include "leases.h"
-#include "version.h"
 
 /************************************/
 /* Defaults _you_ may want to tweak */
@@ -63,6 +62,7 @@
 #define DHCP_T2                        0x3b
 #define DHCP_VENDOR            0x3c
 #define DHCP_CLIENT_ID         0x3d
+#define DHCP_FQDN              0x51
 
 #define DHCP_END               0xFF
 
@@ -107,23 +107,23 @@ struct static_lease {
 
 struct server_config_t {
        uint32_t server;                /* Our IP, in network order */
-       uint32_t start;         /* Start address of leases, network order */
+       uint32_t start;                 /* Start address of leases, network order */
        uint32_t end;                   /* End of leases, network order */
        struct option_set *options;     /* List of DHCP options loaded from the config file */
        char *interface;                /* The name of the interface to use */
        int ifindex;                    /* Index number of the interface to use */
-       uint8_t arp[6];         /* Our arp address */
+       uint8_t arp[6];                 /* Our arp address */
        unsigned long lease;            /* lease time in seconds (host order) */
-       unsigned long max_leases;       /* maximum number of leases (including reserved address) */
-       char remaining;                 /* should the lease file be interpreted as lease time remaining, or
-                                        * as the time the lease expires */
-       unsigned long auto_time;        /* how long should udhcpd wait before writing a config file.
+       unsigned long max_leases;       /* maximum number of leases (including reserved address) */
+       char remaining;                 /* should the lease file be interpreted as lease time remaining, or
+                                        * as the time the lease expires */
+       unsigned long auto_time;        /* how long should udhcpd wait before writing a config file.
                                         * if this is zero, it will only write one on SIGUSR1 */
-       unsigned long decline_time;     /* how long an address is reserved if a client returns a
-                                        * decline message */
-       unsigned long conflict_time;    /* how long an arp conflict offender is leased for */
-       unsigned long offer_time;       /* how long an offered address is reserved */
-       unsigned long min_lease;        /* minimum lease a client can request*/
+       unsigned long decline_time;     /* how long an address is reserved if a client returns a
+                                        * decline message */
+       unsigned long conflict_time;    /* how long an arp conflict offender is leased for */
+       unsigned long offer_time;       /* how long an offered address is reserved */
+       unsigned long min_lease;        /* minimum lease a client can request*/
        char *lease_file;
        char *pidfile;
        char *notify_file;              /* What to run whenever leases are written */