Add default DHCPv4 range for prefixes down to /28

[project/odhcpd.git] / src / dhcpv4.c

diff --git a/src/dhcpv4.c b/src/dhcpv4.c
index 49b75f4..ad14e34 100644 (file)
--- a/src/dhcpv4.c
+++ b/src/dhcpv4.c
@@ -38,9 +38,6 @@ static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface,
                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)
 {
@@ -122,16 +119,19 @@ int setup_dhcpv4_interface(struct interface *iface, bool enable)
                                                (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 if (ntohl(mask.s_addr) <= 0xffffffc0) {
+                                       iface->dhcpv4_start.s_addr = start | htonl(10);
+                                       iface->dhcpv4_end.s_addr = end | htonl(60);
                                } else {
                                        iface->dhcpv4_start.s_addr = start | htonl(10);
-                                       iface->dhcpv4_end.s_addr = end | htonl(59);
+                                       iface->dhcpv4_end.s_addr = end | htonl(30);
                                }
                        }
 
@@ -296,10 +296,13 @@ static void handle_dhcpv4(void *addr, void *data, size_t len,
                } 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
+                       }
                }
        }