diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:04:11 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:04:11 -0800 |
| commit | 4c5a5fb53bccceff331bae70f748bf9b4609fe0a (patch) | |
| tree | d6ae69d0d3f4a4d760a3254ec326bca4a8afacfe /dhcpcd.h | |
| parent | e95877ecfa1170d77b1ec1f66752725cdda01b64 (diff) | |
| download | external_dhcpcd-4c5a5fb53bccceff331bae70f748bf9b4609fe0a.zip external_dhcpcd-4c5a5fb53bccceff331bae70f748bf9b4609fe0a.tar.gz external_dhcpcd-4c5a5fb53bccceff331bae70f748bf9b4609fe0a.tar.bz2 | |
Code drop from //branches/cupcake/...@124589
Diffstat (limited to 'dhcpcd.h')
| -rw-r--r-- | dhcpcd.h | 25 |
1 files changed, 11 insertions, 14 deletions
@@ -41,18 +41,12 @@ #define DEFAULT_TIMEOUT 30 #define DEFAULT_LEASETIME 3600 /* 1 hour */ -#define CLASSID_MAX_LEN 48 +#define HOSTNAME_MAX_LEN 250 /* 255 - 3 (FQDN) - 2 (DNS enc) */ +#define VENDORCLASSID_MAX_LEN 48 #define CLIENTID_MAX_LEN 48 #define USERCLASS_MAX_LEN 255 #define VENDOR_MAX_LEN 255 -#ifdef THERE_IS_NO_FORK -extern char dhcpcd[PATH_MAX]; -extern char **dhcpcd_argv; -extern int dhcpcd_argc; -extern char *dhcpcd_skiproutes; -#endif - #define DHCPCD_ARP (1 << 0) #define DHCPCD_DOMAIN (1 << 2) #define DHCPCD_GATEWAY (1 << 3) @@ -68,11 +62,14 @@ extern char *dhcpcd_skiproutes; #define DHCPCD_FORKED (1 << 17) #define DHCPCD_HOSTNAME (1 << 18) #define DHCPCD_CLIENTID (1 << 19) +#define DHCPCD_LINK (1 << 20) +#define DHCPCD_BACKGROUND (1 << 21) struct options { char interface[IF_NAMESIZE]; int metric; - uint8_t reqmask[256 / 8]; + uint8_t requestmask[256 / 8]; + uint8_t requiremask[256 / 8]; uint8_t nomask[256 / 8]; uint32_t leasetime; time_t timeout; @@ -85,14 +82,14 @@ struct options { char script[PATH_MAX]; char pidfile[PATH_MAX]; -#ifndef MINIMAL - char hostname[MAXHOSTNAMELEN]; + char hostname[HOSTNAME_MAX_LEN + 1]; int fqdn; - uint8_t classid[CLASSID_MAX_LEN + 1]; + uint8_t vendorclassid[VENDORCLASSID_MAX_LEN + 1]; char clientid[CLIENTID_MAX_LEN + 1]; uint8_t userclass[USERCLASS_MAX_LEN + 1]; uint8_t vendor[VENDOR_MAX_LEN + 1]; -#endif -}; + size_t blacklist_len; + in_addr_t *blacklist; +}; #endif |