summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2015-04-20 19:07:45 +0200
committerSteven Barth <steven@midlink.org>2015-04-20 19:07:45 +0200
commitc6e1e5f0f977d5e921fa5a6e34a3299019e4fc8a (patch)
treee177d92b19bf800d662e7edf06083346e68f9b84
parent33858d341fa7eff6e7245a2486fc42aee64c81ff (diff)
downloadodhcpd-c6e1e5f0f977d5e921fa5a6e34a3299019e4fc8a.tar.gz
remove leftover fallout from prefix class support
-rw-r--r--src/dhcpv6-ia.c2
-rw-r--r--src/dhcpv6.h8
2 files changed, 0 insertions, 10 deletions
diff --git a/src/dhcpv6-ia.c b/src/dhcpv6-ia.c
index 7e8e535..132efdb 100644
--- a/src/dhcpv6-ia.c
+++ b/src/dhcpv6-ia.c
@@ -60,7 +60,6 @@ void free_dhcpv6_assignment(struct dhcpv6_assignment *c)
free(c->managed);
free(c->hostname);
- free(c->classes);
free(c);
}
@@ -133,7 +132,6 @@ int setup_dhcpv6_ia_interface(struct interface *iface, bool enable)
a->hostname = strdup(lease->hostname);
}
} else {
- free(a->classes);
free(a->hostname);
free(a);
}
diff --git a/src/dhcpv6.h b/src/dhcpv6.h
index 44ce1d7..09aa6f1 100644
--- a/src/dhcpv6.h
+++ b/src/dhcpv6.h
@@ -59,11 +59,6 @@
#define DHCPV6_OPT_SOL_MAX_RT 82
#define DHCPV6_OPT_INF_MAX_RT 83
-#ifdef EXT_PREFIX_CLASS
-/* draft-bhandari-dhc-class-based-prefix, not yet standardized */
-#define DHCPV6_OPT_PREFIX_CLASS EXT_PREFIX_CLASS
-#endif
-
#define DHCPV6_DUID_VENDOR 2
#define DHCPV6_STATUS_OK 0
@@ -146,9 +141,6 @@ struct dhcpv6_assignment {
struct sockaddr_in6 peer;
time_t valid_until;
time_t reconf_sent;
- bool all_class;
- uint8_t classes_cnt;
- uint16_t *classes;
int reconf_cnt;
char *hostname;
uint8_t key[16];