X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fdhcpv4.c;h=62ddab866ea5cc608f1596e7a99130db0f77818a;hp=7a68f66e62a0bed2b4aade7d009d6d86117173b0;hb=da2657472b642a266c8a80763a51868e2af6b050;hpb=78c5e4b032c420852abc2a9e1e6f429a4d803c21

diff --git a/src/dhcpv4.c b/src/dhcpv4.c
index 7a68f66..62ddab8 100644
--- a/src/dhcpv4.c
+++ b/src/dhcpv4.c
@@ -38,7 +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);
 
-
 // Create socket and register events
 int init_dhcpv4(void)
 {
@@ -49,6 +48,7 @@ int init_dhcpv4(void)
 int setup_dhcpv4_interface(struct interface *iface, bool enable)
 {
 	if (iface->dhcpv4_event.uloop.fd > 0) {
+		uloop_fd_delete(&iface->dhcpv4_event.uloop);
 		close(iface->dhcpv4_event.uloop.fd);
 		iface->dhcpv4_event.uloop.fd = -1;
 	}
@@ -58,6 +58,11 @@ int setup_dhcpv4_interface(struct interface *iface, bool enable)
 			INIT_LIST_HEAD(&iface->dhcpv4_assignments);
 
 		int sock = socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC, IPPROTO_UDP);
+		if (sock < 0) {
+			syslog(LOG_ERR, "Failed to create DHCPv4 server socket: %s",
+					strerror(errno));
+			return -1;
+		}
 
 		// Basic IPv6 configuration
 		int val = 1;
@@ -65,7 +70,7 @@ int setup_dhcpv4_interface(struct interface *iface, bool enable)
 		setsockopt(sock, SOL_SOCKET, SO_BROADCAST, &val, sizeof(val));
 		setsockopt(sock, IPPROTO_IP, IP_PKTINFO, &val, sizeof(val));
 
-		val = IPTOS_CLASS_CS6;
+		val = IPTOS_PREC_INTERNETCONTROL;
 		setsockopt(sock, IPPROTO_IP, IP_TOS, &val, sizeof(val));
 
 		val = IP_PMTUDISC_DONT;
@@ -114,16 +119,22 @@ 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 {
+				} else if (ntohl(mask.s_addr) <= 0xffffffc0) {
+					iface->dhcpv4_start.s_addr = start | htonl(10);
+					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(59);
+					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);
 				}
 			}
 
@@ -136,7 +147,11 @@ int setup_dhcpv4_interface(struct interface *iface, bool enable)
 			// Construct entry
 			size_t hostlen = strlen(lease->hostname) + 1;
 			struct dhcpv4_assignment *a = calloc(1, sizeof(*a) + hostlen);
-
+			if (!a) {
+				syslog(LOG_ERR, "Calloc failed for static lease on interface %s",
+					iface->ifname);
+				return -1;
+			}
 			a->addr = ntohl(lease->ipaddr.s_addr);
 			memcpy(a->hwaddr, lease->mac.ether_addr_octet, sizeof(a->hwaddr));
 			memcpy(a->hostname, lease->hostname, hostlen);
@@ -284,6 +299,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 (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
+			}
 		}
 	}
 
@@ -340,14 +362,16 @@ static void handle_dhcpv4(void *addr, void *data, size_t len,
 		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);
@@ -463,6 +487,10 @@ static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface,
 
 		if (!a && !iface->no_dynamic_dhcp) { // Create new binding
 			a = calloc(1, sizeof(*a) + hostlen);
+			if (!a) {
+				syslog(LOG_ERR, "Failed to calloc binding on interface %s", iface->ifname);
+				return NULL;
+			}
 			memcpy(a->hwaddr, mac, sizeof(a->hwaddr));
 			memcpy(a->hostname, hostname, hostlen);
 
@@ -471,6 +499,10 @@ static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface,
 
 		if (assigned && !a->hostname[0] && hostname) {
 			a = realloc(a, sizeof(*a) + hostlen);
+			if (!a) {
+				syslog(LOG_ERR, "Failed to realloc binding on interface %s", iface->ifname);
+				return NULL;
+			}
 			memcpy(a->hostname, hostname, hostlen);
 
 			// Fixup list
@@ -487,6 +519,9 @@ static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface,
 			a = NULL;
 		}
 
+		if (a)
+			update_state = true;
+
 		if (assigned && a)
 			lease = a;
 	} else if (msg == DHCPV4_MSG_RELEASE) {