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) |
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
}