summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2014-02-05 16:41:51 +0100
committerSteven Barth <steven@midlink.org>2014-02-05 16:41:51 +0100
commitb618ad5373ae619e3d01a49f2c672a8cc1dc59a6 (patch)
tree9cc63aac435c10799fcde7e459fb19f33b593087
parenteaa9fbea30a5c6de93b89b0acdb2ac856d4c9bcf (diff)
Fix homenet filter
-rw-r--r--src/dhcpv6.c9
-rw-r--r--src/dhcpv6.h1
2 files changed, 10 insertions, 0 deletions
diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index 9b802c4..bf48d78 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -22,6 +22,8 @@
#include "odhcpd.h"
#include "dhcpv6.h"
+static const char *excluded_class = "HOMENET";
+
static void relay_client_request(struct sockaddr_in6 *source,
const void *data, size_t len, struct interface *iface);
@@ -275,6 +277,13 @@ static void handle_client_request(void *addr, void *data, size_t len,
if (olen != ntohs(dest.serverid_length) ||
memcmp(odata, &dest.duid_type, olen))
return; // Not for us
+ } else if (otype == DHCPV6_OPT_USER_CLASS) {
+ uint8_t *c = odata, *cend = &odata[olen];
+ for (; &c[2] <= cend && &c[2 + (c[0] << 8) + c[1]] <= cend; c = &c[2 + (c[0] << 8) + c[1]]) {
+ size_t elen = strlen(excluded_class);
+ if (((((size_t)c[0]) << 8) | c[1]) == elen && !memcmp(&c[2], excluded_class, elen))
+ return; // Ignore from homenet
+ }
}
}
diff --git a/src/dhcpv6.h b/src/dhcpv6.h
index 7b3b484..9b38283 100644
--- a/src/dhcpv6.h
+++ b/src/dhcpv6.h
@@ -44,6 +44,7 @@
#define DHCPV6_OPT_STATUS 13
#define DHCPV6_OPT_RELAY_MSG 9
#define DHCPV6_OPT_AUTH 11
+#define DHCPV6_OPT_USER_CLASS 15
#define DHCPV6_OPT_INTERFACE_ID 18
#define DHCPV6_OPT_RECONF_MSG 19
#define DHCPV6_OPT_RECONF_ACCEPT 20