aboutsummaryrefslogtreecommitdiff
path: root/networking/udhcp/files.c
diff options
context:
space:
mode:
Diffstat (limited to 'networking/udhcp/files.c')
-rw-r--r--networking/udhcp/files.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/networking/udhcp/files.c b/networking/udhcp/files.c
index af7730890..671ea94c9 100644
--- a/networking/udhcp/files.c
+++ b/networking/udhcp/files.c
@@ -360,7 +360,7 @@ void FAST_FUNC write_leases(void)
360 for (i = 0; i < server_config.max_leases; i++) { 360 for (i = 0; i < server_config.max_leases; i++) {
361 leasetime_t tmp_time; 361 leasetime_t tmp_time;
362 362
363 if (leases[i].yiaddr == 0) 363 if (leases[i].lease_nip == 0)
364 continue; 364 continue;
365 365
366 /* Screw with the time in the struct, for easier writing */ 366 /* Screw with the time in the struct, for easier writing */
@@ -413,14 +413,14 @@ void FAST_FUNC read_leases(const char *file)
413 IF_UDHCP_DEBUG(i = 0;) 413 IF_UDHCP_DEBUG(i = 0;)
414 while (full_read(fd, &lease, sizeof(lease)) == sizeof(lease)) { 414 while (full_read(fd, &lease, sizeof(lease)) == sizeof(lease)) {
415 /* ADDME: what if it matches some static lease? */ 415 /* ADDME: what if it matches some static lease? */
416 uint32_t y = ntohl(lease.yiaddr); 416 uint32_t y = ntohl(lease.lease_nip);
417 if (y >= server_config.start_ip && y <= server_config.end_ip) { 417 if (y >= server_config.start_ip && y <= server_config.end_ip) {
418 signed_leasetime_t expires = ntohl(lease.expires) - (signed_leasetime_t)time_passed; 418 signed_leasetime_t expires = ntohl(lease.expires) - (signed_leasetime_t)time_passed;
419 if (expires <= 0) 419 if (expires <= 0)
420 continue; 420 continue;
421 /* NB: add_lease takes "relative time", IOW, 421 /* NB: add_lease takes "relative time", IOW,
422 * lease duration, not lease deadline. */ 422 * lease duration, not lease deadline. */
423 if (!(add_lease(lease.chaddr, lease.yiaddr, expires, lease.hostname))) { 423 if (!(add_lease(lease.lease_mac16, lease.lease_nip, expires, lease.hostname))) {
424 bb_error_msg("too many leases while loading %s", file); 424 bb_error_msg("too many leases while loading %s", file);
425 break; 425 break;
426 } 426 }