X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fdhcpv4.c;h=d978da8c7fa003416e951efdb65b68c2390e684c;hp=2093ecd037b173df7b286f9e08983dae945a8266;hb=aa5659eb06a386ddf2bc80ad078891820f12c410;hpb=98b41e5b07b28b438fb0be45ba294a932f4c849b

diff --git a/src/dhcpv4.c b/src/dhcpv4.c
index 2093ecd..d978da8 100644
--- a/src/dhcpv4.c
+++ b/src/dhcpv4.c
@@ -334,7 +334,16 @@ static void handle_dhcpv4(void *addr, void *data, size_t len,
 	} else if (reqmsg == DHCPV4_MSG_REQUEST && reqaddr.s_addr &&
 			reqaddr.s_addr != htonl(lease->addr)) {
 		msg = DHCPV4_MSG_NAK;
-		lease = NULL;
+		/*
+		 * DHCP client requested an IP which we can't offer to him. Probably the
+		 * client changed the network. The reply type is set to DHCPV4_MSG_NAK,
+		 * because the client should not use that IP.
+		 *
+		 * For modern devices we build an answer that includes a valid IP, like
+		 * a DHCPV4_MSG_ACK. The client will use that IP and doesn't need to
+		 * perform additional DHCP round trips.
+		 *
+		 */
 	}
 
 	if (reqmsg == DHCPV4_MSG_DECLINE || reqmsg == DHCPV4_MSG_RELEASE)
@@ -384,8 +393,11 @@ static void handle_dhcpv4(void *addr, void *data, size_t len,
 					len, search_buf);
 	}
 
-	dhcpv4_put(&reply, &cookie, DHCPV4_OPT_ROUTER, 4, &ifaddr.sin_addr);
-
+	if (iface->dhcpv4_router_cnt == 0)
+		dhcpv4_put(&reply, &cookie, DHCPV4_OPT_ROUTER, 4, &ifaddr.sin_addr);
+	else
+		dhcpv4_put(&reply, &cookie, DHCPV4_OPT_ROUTER,
+				4 * iface->dhcpv4_router_cnt, iface->dhcpv4_router);
 
 
 	if (iface->dhcpv4_dns_cnt == 0)