X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fdhcpv4.c;h=81e537d3ddbb8f4b7bc6e770e213c228ced1819f;hp=3fca8865be46cea11ecc6e541b2501fcbb7da1c6;hb=3d9f4067d56660a2c75ab2ce9b801ae1a4ff4cde;hpb=0b45fce0859e4726e27f408016ef2f7d210c847f

diff --git a/src/dhcpv4.c b/src/dhcpv4.c
index 3fca886..81e537d 100644
--- a/src/dhcpv4.c
+++ b/src/dhcpv4.c
@@ -153,8 +153,7 @@ int setup_dhcpv4_interface(struct interface *iface, bool enable)
 				return -1;
 			}
 
-			if (lease->dhcpv4_leasetime >= 60)
-				a->leasetime = lease->dhcpv4_leasetime;
+			a->leasetime = lease->dhcpv4_leasetime;
 
 			a->addr = ntohl(lease->ipaddr.s_addr);
 			memcpy(a->hwaddr, lease->mac.ether_addr_octet, sizeof(a->hwaddr));
@@ -194,10 +193,6 @@ int setup_dhcpv4_interface(struct interface *iface, bool enable)
 				free_dhcpv4_assignment(a);
 		}
 
-
-		if (iface->dhcpv4_leasetime < 60)
-			iface->dhcpv4_leasetime = 43200;
-
 		iface->dhcpv4_event.uloop.fd = sock;
 		iface->dhcpv4_event.handle_dgram = handle_dhcpv4;
 		odhcpd_register(&iface->dhcpv4_event);
@@ -540,7 +535,7 @@ static bool dhcpv4_assign(struct interface *iface,
 	if (start <= raddr && raddr <= end && dhcpv4_test(iface, raddr)) {
 		assign->addr = raddr;
 		list_add(&assign->head, &iface->dhcpv4_assignments);
-		syslog(LOG_DEBUG, "assigning the IP the client asked for: %u.%u.%u.%u",
+		syslog(LOG_INFO, "assigning the IP the client asked for: %u.%u.%u.%u",
 				(assign->addr & 0xff000000) >> 24,
 				(assign->addr & 0x00ff0000) >> 16,
 				(assign->addr & 0x0000ff00) >> 8,
@@ -563,7 +558,7 @@ static bool dhcpv4_assign(struct interface *iface,
 	if (list_empty(&iface->dhcpv4_assignments)) {
 		assign->addr = try;
 		list_add(&assign->head, &iface->dhcpv4_assignments);
-		syslog(LOG_DEBUG, "assigning mapped IP (empty list): %u.%u.%u.%u",
+		syslog(LOG_INFO, "assigning mapped IP (empty list): %u.%u.%u.%u",
 				(assign->addr & 0xff000000) >> 24,
 				(assign->addr & 0x00ff0000) >> 16,
 				(assign->addr & 0x0000ff00) >> 8,
@@ -586,7 +581,7 @@ static bool dhcpv4_assign(struct interface *iface,
 		try = (((try - start) + 1) % count) + start;
 	}
 
-	syslog(LOG_DEBUG, "can't assign any IP address -> address space is full");
+	syslog(LOG_WARNING, "can't assign any IP address -> address space is full");
 	return false;
 }
 
@@ -627,7 +622,7 @@ static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface,
 			assigned = dhcpv4_assign(iface, a, raddr);
 		}
 
-		if (a->leasetime >= 60)
+		if (a->leasetime)
 			my_leasetime = a->leasetime;
 		else
 			my_leasetime = iface->dhcpv4_leasetime;