enum dhcpv4_msg msg, const uint8_t *mac, struct in_addr reqaddr,
const char *hostname);
-// Magic option for hnet internal (4B enterprise ID, 1B data-len, 1B subopt-code, 1B subopt-len)
-static uint8_t hnet_internal_data[7] = {0x00, 0x00, 0x76, 0xfe, 2, 1, 0};
-
// Create socket and register events
int init_dhcpv4(void)
{
(addr.s_addr & mask.s_addr);
iface->dhcpv4_end.s_addr = htonl(end) |
(addr.s_addr & mask.s_addr);
- } else if (ntohl(mask.s_addr) <= 0xffffffc0) {
+ } else if (ntohl(mask.s_addr) <= 0xfffffff0) {
start = addr.s_addr & mask.s_addr;
end = addr.s_addr & mask.s_addr;
if (ntohl(mask.s_addr) <= 0xffffff00) {
iface->dhcpv4_start.s_addr = start | htonl(100);
iface->dhcpv4_end.s_addr = end | htonl(250);
- } else {
+ } else if (ntohl(mask.s_addr) <= 0xffffffc0) {
iface->dhcpv4_start.s_addr = start | htonl(10);
- iface->dhcpv4_end.s_addr = end | htonl(59);
+ iface->dhcpv4_end.s_addr = end | htonl(60);
+ } else if (ntohl(mask.s_addr) <= 0xffffffe0) {
+ iface->dhcpv4_start.s_addr = start | htonl(10);
+ iface->dhcpv4_end.s_addr = end | htonl(30);
+ } else {
+ iface->dhcpv4_start.s_addr = start | htonl(3);
+ iface->dhcpv4_end.s_addr = end | htonl(12);
}
}
} else if (opt->type == DHCPV4_OPT_SERVERID && opt->len == 4) {
if (memcmp(opt->data, &ifaddr.sin_addr, 4))
return;
- } else if (opt->type == DHCPV4_OPT_VENDOR_SPECIFIC_INFORMATION &&
- opt->len == sizeof(hnet_internal_data)) {
- if (!memcmp(opt->data, hnet_internal_data, sizeof(hnet_internal_data)))
- return; // Ignoring hnet internal routers
+ } else if (iface->filter_class && opt->type == DHCPV4_OPT_USER_CLASS) {
+ uint8_t *c = opt->data, *cend = &opt->data[opt->len];
+ for (; c < cend && &c[*c] < cend; c = &c[1 + *c]) {
+ size_t elen = strlen(iface->filter_class);
+ if (*c == elen && !memcmp(&c[1], iface->filter_class, elen))
+ return; // Ignore from homenet
+ }
}
}
dhcpv4_put(&reply, &cookie, DHCPV4_OPT_MTU, 2, &mtu);
}
- if (iface->search) {
- char b[256];
- if (dn_expand(iface->search, iface->search + iface->search_len,
- iface->search, b, sizeof(b)) > 0)
- dhcpv4_put(&reply, &cookie, DHCPV4_OPT_DOMAIN, strlen(b), b);
+ if (iface->search && iface->search_len <= 255) {
+ dhcpv4_put(&reply, &cookie, DHCPV4_OPT_SEARCH_DOMAIN,
+ iface->search_len, iface->search);
} else if (!res_init() && _res.dnsrch[0] && _res.dnsrch[0][0]) {
- dhcpv4_put(&reply, &cookie, DHCPV4_OPT_DOMAIN,
- strlen(_res.dnsrch[0]), _res.dnsrch[0]);
+ uint8_t search_buf[256];
+ int len = dn_comp(_res.dnsrch[0], search_buf,
+ sizeof(search_buf), NULL, NULL);
+ if (len > 0)
+ dhcpv4_put(&reply, &cookie, DHCPV4_OPT_SEARCH_DOMAIN,
+ len, search_buf);
}
dhcpv4_put(&reply, &cookie, DHCPV4_OPT_ROUTER, 4, &ifaddr.sin_addr);
a = NULL;
}
+ if (a)
+ update_state = true;
+
if (assigned && a)
lease = a;
} else if (msg == DHCPV4_MSG_RELEASE) {