Start 1.33.0 development cycle

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

diff --git a/networking/udhcp/dhcpc.h b/networking/udhcp/dhcpc.h
index dfab2368c314bcb8ada2eac9cdf885518ddf2766..b407a6cdbf7f01d3b82d3ac3d8b16f2d37a3781c 100644 (file)
--- a/networking/udhcp/dhcpc.h
+++ b/networking/udhcp/dhcpc.h
@@ -1,50 +1,46 @@
 /* vi: set sw=4 ts=4: */
-/* dhcpc.h */
+/*
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
 #ifndef UDHCP_DHCPC_H
 #define UDHCP_DHCPC_H 1
 
 PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 
-struct client_config_t {
+struct client_data_t {
        uint8_t client_mac[6];          /* Our mac address */
-       char no_default_options;        /* Do not include default options in request */
        IF_FEATURE_UDHCP_PORT(uint16_t port;)
        int ifindex;                    /* Index number of the interface to use */
-       int verbose;
        uint8_t opt_mask[256 / 8];      /* Bitmask of options to send (-O option) */
+// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ TODO: DHCPv6 has 16-bit option numbers
        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 */
+       struct option_set *options;     /* list of DHCP options to send to server */
        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 */
+
+       unsigned first_secs;
+       unsigned last_secs;
+
+       int sockfd;
+       smallint listen_mode;
+       smallint state;
 } FIX_ALIASING;
 
 /* server_config sits in 1st half of bb_common_bufsiz1 */
-#define client_config (*(struct client_config_t*)(&bb_common_bufsiz1[COMMON_BUFSIZE / 2]))
+#define client_data (*(struct client_data_t*)(&bb_common_bufsiz1[COMMON_BUFSIZE / 2]))
 
 #if ENABLE_FEATURE_UDHCP_PORT
-#define CLIENT_PORT (client_config.port)
+#define CLIENT_PORT  (client_data.port)
+#define CLIENT_PORT6 (client_data.port)
 #else
-#define CLIENT_PORT 68
+#define CLIENT_PORT  68
+#define CLIENT_PORT6 546
 #endif
 
-
-/*** clientpacket.h ***/
-
-uint32_t random_xid(void) FAST_FUNC;
-int send_discover(uint32_t xid, uint32_t requested) FAST_FUNC;
-int send_select(uint32_t xid, uint32_t server, uint32_t requested) FAST_FUNC;
-#if ENABLE_FEATURE_UDHCPC_ARPING
-int send_decline(uint32_t xid, uint32_t server, uint32_t requested) FAST_FUNC;
-#endif
-int send_renew(uint32_t xid, uint32_t server, uint32_t ciaddr) FAST_FUNC;
-int send_renew(uint32_t xid, uint32_t server, uint32_t ciaddr) FAST_FUNC;
-int send_release(uint32_t server, uint32_t ciaddr) FAST_FUNC;
-
-int udhcp_recv_raw_packet(struct dhcp_packet *dhcp_pkt, int fd) FAST_FUNC;
-
 POP_SAVED_FUNCTION_VISIBILITY
 
 #endif