max_option_length[] holds small ints, uint8_t is enough

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

diff --git a/networking/udhcp/dhcpc.h b/networking/udhcp/dhcpc.h
index d5c8a4ba5ef1d42978c4b7a8616a6d88555585fd..20f4e52b8dc82bcc099fdd8229029ca1d2596809 100644 (file)
--- a/networking/udhcp/dhcpc.h
+++ b/networking/udhcp/dhcpc.h
@@ -13,22 +13,24 @@
 #define RELEASED       7
 
 struct client_config_t {
-       char foreground;                /* Do not fork */
-       char quit_after_lease;          /* Quit after obtaining lease */
-       char release_on_quit;           /* perform release on quit */
-       char abort_if_no_lease;         /* Abort if no lease */
-       char background_if_no_lease;    /* Fork to background if no lease */
-       char *interface;                /* The name of the interface to use */
-       char *pidfile;                  /* Optionally store the process ID */
-       char *script;                   /* User script to run at dhcp events */
-       uint8_t *clientid;              /* Optional client id to use */
-       uint8_t *vendorclass;           /* Optional vendor class-id to use */
-       uint8_t *hostname;              /* Optional hostname to use */
-       uint8_t *fqdn;                  /* Optional fully qualified domain name to use */
-       int ifindex;                    /* Index number of the interface to use */
-       int retries;                    /* Max number of request packets */
-       int timeout;                    /* Number of seconds to try to get a lease */
-       uint8_t arp[6];                 /* Our arp address */
+       /* TODO: combine flag fields into single "unsigned opt" */
+       /* (can be set directly to the result of getopt32) */
+       char foreground;                /* Do not fork */
+       char quit_after_lease;          /* Quit after obtaining lease */
+       char release_on_quit;           /* Perform release on quit */
+       char abort_if_no_lease;         /* Abort if no lease */
+       char background_if_no_lease;    /* Fork to background if no lease */
+       const char *interface;          /* The name of the interface to use */
+       char *pidfile;                  /* Optionally store the process ID */
+       const char *script;             /* User script to run at dhcp events */
+       uint8_t *clientid;              /* Optional client id to use */
+       uint8_t *vendorclass;           /* Optional vendor class-id to use */
+       uint8_t *hostname;              /* Optional hostname to use */
+       uint8_t *fqdn;                  /* Optional fully qualified domain name to use */
+       int ifindex;                    /* Index number of the interface to use */
+       int retries;                    /* Max number of request packets */
+       int timeout;                    /* Number of seconds to try to get a lease */
+       uint8_t arp[6];                 /* Our arp address */
 };
 
 extern struct client_config_t client_config;
@@ -36,12 +38,12 @@ extern struct client_config_t client_config;
 
 /*** clientpacket.h ***/
 
-unsigned long random_xid(void);
-int send_discover(unsigned long xid, unsigned long requested);
-int send_selecting(unsigned long xid, unsigned long server, unsigned long requested);
-int send_renew(unsigned long xid, unsigned long server, unsigned long ciaddr);
-int send_renew(unsigned long xid, unsigned long server, unsigned long ciaddr);
-int send_release(unsigned long server, unsigned long ciaddr);
+uint32_t random_xid(void);
+int send_discover(uint32_t xid, uint32_t requested);
+int send_selecting(uint32_t xid, uint32_t server, uint32_t requested);
+int send_renew(uint32_t xid, uint32_t server, uint32_t ciaddr);
+int send_renew(uint32_t xid, uint32_t server, uint32_t ciaddr);
+int send_release(uint32_t server, uint32_t ciaddr);
 int get_raw_packet(struct dhcpMessage *payload, int fd);