X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fdhcpv4.c;h=1807c68b02ab9933dcdfc09a1498d155853444fe;hp=92a1397908c9b4e071b38759fa399f15436aa064;hb=ee243b09f3c81f824cc463c1c757e905f882350e;hpb=da9b89e3894c53ecb3c2dc37dff9ae1fb8e36460

diff --git a/src/dhcpv4.c b/src/dhcpv4.c
index 92a1397..1807c68 100644
--- a/src/dhcpv4.c
+++ b/src/dhcpv4.c
@@ -137,8 +137,8 @@ int setup_dhcpv4_interface(struct interface *iface, bool enable)
 
 			if (start && end && start < end &&
 					start > ntohl(addr.s_addr & ~mask.s_addr) &&
-					(start & ntohl(mask.s_addr)) == start &&
-					(end & ntohl(mask.s_addr)) == end) {
+					(start & ntohl(~mask.s_addr)) == start &&
+					(end & ntohl(~mask.s_addr)) == end) {
 				iface->dhcpv4_start.s_addr = htonl(start) |
 						(addr.s_addr & mask.s_addr);
 				iface->dhcpv4_end.s_addr = htonl(end) |
@@ -506,12 +506,12 @@ static void handle_dhcpv4(void *addr, void *data, size_t len,
 static bool dhcpv4_assign(struct interface *iface,
 		struct dhcpv4_assignment *assign, uint32_t raddr)
 {
-	const unsigned tries = 10;
+	const unsigned tries = 100;
 	uint32_t start = ntohl(iface->dhcpv4_start.s_addr);
 	uint32_t end = ntohl(iface->dhcpv4_end.s_addr);
 	uint32_t count = end - start + 1;
 
-	// Seed RNG with checksum of DUID
+	// Seed RNG with checksum of hwaddress
 	uint32_t seed = 0;
 	for (size_t i = 0; i < sizeof(assign->hwaddr); ++i)
 		seed += assign->hwaddr[i];
@@ -611,10 +611,9 @@ static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface,
 		if (assigned && a)
 			lease = a;
 	} else if (msg == DHCPV4_MSG_RELEASE) {
-		if (a) {
+		if (a && a->valid_until != LONG_MAX)
 			a->valid_until = 0;
-		}
-	} else if (msg == DHCPV4_MSG_DECLINE) {
+	} else if (msg == DHCPV4_MSG_DECLINE && a->valid_until != LONG_MAX) {
 		memset(a->hwaddr, 0, sizeof(a->hwaddr));
 		a->valid_until = now + 3600; // Block address for 1h
 	}