Mercurial > hg > dhcpcd
changeset 2189:143b9d6bbddb draft
Remove dead options
| author | Roy Marples <roy@marples.name> |
|---|---|
| date | Tue, 03 Dec 2013 23:38:00 +0000 |
| parents | 20c4c537a339 |
| children | 2aca38b8b8bd |
| files | dhcp-common.c dhcp-common.h |
| diffstat | 2 files changed, 13 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- a/dhcp-common.c Tue Dec 03 23:33:13 2013 +0000 +++ b/dhcp-common.c Tue Dec 03 23:38:00 2013 +0000 @@ -393,22 +393,6 @@ return 2; } - /* DHCPv6 status code */ - if (type & SCODE && dl >= (int)sizeof(u16)) { - if (s) { - memcpy(&u16, data, sizeof(u16)); - u16 = ntohs(u16); - l = snprintf(s, len, "%d ", u16); - len -= l; - } else - l = 7; - data += sizeof(u16); - dl -= sizeof(u16); - if (dl) - l += print_option(s, len, STRING, dl, data, ifname); - return l; - } - if (!s) { if (type & UINT8) l = 3;
--- a/dhcp-common.h Tue Dec 03 23:33:13 2013 +0000 +++ b/dhcp-common.h Tue Dec 03 23:38:00 2013 +0000 @@ -47,21 +47,19 @@ #define SINT32 (1 << 5) #define ADDRIPV4 (1 << 6) #define STRING (1 << 7) -#define PAIR (1 << 8) -#define ARRAY (1 << 9) -#define RFC3361 (1 << 10) -#define RFC3397 (1 << 11) -#define RFC3442 (1 << 12) -#define RFC5969 (1 << 13) -#define ADDRIPV6 (1 << 14) -#define BINHEX (1 << 15) -#define SCODE (1 << 16) -#define FLAG (1 << 17) -#define NOREQ (1 << 18) -#define EMBED (1 << 19) -#define ENCAP (1 << 20) -#define INDEX (1 << 21) -#define OPTION (1 << 22) +#define ARRAY (1 << 8) +#define RFC3361 (1 << 9) +#define RFC3397 (1 << 10) +#define RFC3442 (1 << 11) +#define RFC5969 (1 << 12) +#define ADDRIPV6 (1 << 13) +#define BINHEX (1 << 14) +#define FLAG (1 << 15) +#define NOREQ (1 << 16) +#define EMBED (1 << 17) +#define ENCAP (1 << 18) +#define INDEX (1 << 19) +#define OPTION (1 << 20) struct dhcp_opt { uint16_t option;