X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fdhcpv4.c;h=9746aa2f3f9c6a8e88bc32683eed50d6821b5dcf;hp=1fac8a1ccf53748775b479211f046e9dcb880f6a;hb=3462b32b6e0e864acbe79e5c91b2c6a50742013f;hpb=d8d6d784258b64d23e7f1cc0a2ee02e88377707d

diff --git a/src/dhcpv4.c b/src/dhcpv4.c
index 1fac8a1..9746aa2 100644
--- a/src/dhcpv4.c
+++ b/src/dhcpv4.c
@@ -34,7 +34,7 @@
 
 
 static void handle_dhcpv4(void *addr, void *data, size_t len,
-		struct interface *iface);
+		struct interface *iface, void *dest_addr);
 static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface,
 		enum dhcpv4_msg msg, const uint8_t *mac, struct in_addr reqaddr,
 		const char *hostname);
@@ -225,7 +225,7 @@ static void dhcpv4_put(struct dhcpv4_message *msg, uint8_t **cookie,
 
 // Simple DHCPv6-server for information requests
 static void handle_dhcpv4(void *addr, void *data, size_t len,
-		struct interface *iface)
+		struct interface *iface, _unused void *dest_addr)
 {
 	if (!iface->dhcpv4)
 		return;
@@ -331,6 +331,10 @@ static void handle_dhcpv4(void *addr, void *data, size_t len,
 			return;
 	} else if (reqmsg == DHCPV4_MSG_DISCOVER) {
 		msg = DHCPV4_MSG_OFFER;
+	} else if (reqmsg == DHCPV4_MSG_REQUEST && reqaddr.s_addr &&
+			reqaddr.s_addr != htonl(lease->addr)) {
+		msg = DHCPV4_MSG_NAK;
+		lease = NULL;
 	}
 
 	if (reqmsg == DHCPV4_MSG_DECLINE || reqmsg == DHCPV4_MSG_RELEASE)
@@ -401,7 +405,7 @@ static void handle_dhcpv4(void *addr, void *data, size_t len,
 		dest.sin_addr = req->ciaddr;
 		dest.sin_port = htons(DHCPV4_CLIENT_PORT);
 	} else if ((ntohs(req->flags) & DHCPV4_FLAG_BROADCAST) ||
-			req->hlen != reply.hlen) {
+			req->hlen != reply.hlen || !reply.yiaddr.s_addr) {
 		dest.sin_addr.s_addr = INADDR_BROADCAST;
 		dest.sin_port = htons(DHCPV4_CLIENT_PORT);
 	} else {