diff options
| author | Thomas Markwalder <tmark@isc.org> | 2016-01-28 16:30:01 -0500 |
|---|---|---|
| committer | Thomas Markwalder <tmark@isc.org> | 2016-01-28 16:30:01 -0500 |
| commit | 62a9eb918c7a12bc97fc72960d9c57f35e08d72c (patch) | |
| tree | bbc108746102269b1eaa379e28afc1f18569d572 /includes | |
| parent | cab61f43770ff1785362adab09f885bc50a9ec5f (diff) | |
| download | isc-dhcp-62a9eb918c7a12bc97fc72960d9c57f35e08d72c.tar.gz | |
[master] Add support for relayed client-linklayer-address option (RFC 6939)
Merges in rt40334.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/dhcp6.h | 3 | ||||
| -rw-r--r-- | includes/dhcpd.h | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/includes/dhcp6.h b/includes/dhcp6.h index 94ddc592..03fedfa8 100644 --- a/includes/dhcp6.h +++ b/includes/dhcp6.h @@ -3,7 +3,7 @@ DHCPv6 Protocol structures... */ /* - * Copyright (c) 2013 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2013,2016 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2006-2009 by Internet Systems Consortium, Inc. ("ISC") * * Permission to use, copy, modify, and distribute this software for any @@ -76,6 +76,7 @@ #define D6O_CLT_TIME 46 /* RFC5007 */ #define D6O_LQ_RELAY_DATA 47 /* RFC5007 */ #define D6O_LQ_CLIENT_LINK 48 /* RFC5007 */ +#define D6O_CLIENT_LINKLAYER_ADDR 79 /* RFC6939 */ /* * Status Codes, from RFC 3315 section 24.4, and RFC 3633, 5007. diff --git a/includes/dhcpd.h b/includes/dhcpd.h index 4270edca..cef87858 100644 --- a/includes/dhcpd.h +++ b/includes/dhcpd.h @@ -3429,6 +3429,7 @@ int find_hosts_by_option(struct host_decl **, struct packet *, struct option_state *, const char *, int); int find_host_for_network (struct subnet **, struct host_decl **, struct iaddr *, struct shared_network *); + void new_address_range (struct parse *, struct iaddr, struct iaddr, struct subnet *, struct pool *, struct lease **); @@ -3750,6 +3751,11 @@ void mark_phosts_unavailable(void); void mark_interfaces_unavailable(void); void report_jumbo_ranges(); +#if defined(DHCPv6) +int find_hosts6(struct host_decl** host, struct packet* packet, + const struct data_string* client_id, char* file, int line); +#endif + #if defined (BINARY_LEASES) /* leasechain.c */ int lc_not_empty(struct leasechain *lc); |