X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fdhcpv4.c;h=bfe70cbf3e840876808e99d674b02ed19f3f2979;hp=9e862ca33ba6e7e080f5103cab212dfbc7f24fb0;hb=5dfb716333ad12b86312ef5d8c824ea1ed3df26b;hpb=47fe122d19c0485ec398b19d223bbaa2f45b32d3

diff --git a/src/dhcpv4.c b/src/dhcpv4.c
index 9e862ca..bfe70cb 100644
--- a/src/dhcpv4.c
+++ b/src/dhcpv4.c
@@ -44,7 +44,7 @@ static void dhcpv4_fr_stop(struct dhcpv4_assignment *a);
 static void handle_dhcpv4(void *addr, void *data, size_t len,
 		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,
+		enum dhcpv4_msg msg, const uint8_t *mac, const uint32_t reqaddr,
 		uint32_t *leasetime, const char *hostname, const size_t hostname_len,
 		const bool accept_fr_nonce, bool *incl_fr_opt, uint32_t *fr_serverid);
 
@@ -58,13 +58,13 @@ struct odhcpd_ref_ip {
 };
 
 /* Create socket and register events */
-int init_dhcpv4(void)
+int dhcpv4_init(void)
 {
 	uloop_timeout_set(&valid_until_timeout, 1000);
 	return 0;
 }
 
-int setup_dhcpv4_interface(struct interface *iface, bool enable)
+int dhcpv4_setup_interface(struct interface *iface, bool enable)
 {
 	if (iface->dhcpv4_event.uloop.fd > 0) {
 		uloop_fd_delete(&iface->dhcpv4_event.uloop);
@@ -354,7 +354,7 @@ void dhcpv4_addr_update(struct interface *iface)
 	struct dhcpv4_assignment *c;
 	uint32_t mask = iface->dhcpv4_mask.s_addr;
 
-	memset(&ip, sizeof(ip), 0);
+	memset(&ip, 0, sizeof(ip));
 	ip.addr.in = iface->dhcpv4_local;
 	ip.prefix = odhcpd_netmask2bitlen(false, &iface->dhcpv4_mask);
 	ip.broadcast = iface->dhcpv4_bcast;
@@ -602,7 +602,7 @@ static void handle_dhcpv4(void *addr, void *data, size_t len,
 	uint8_t reqmsg = DHCPV4_MSG_REQUEST;
 	uint8_t msg = DHCPV4_MSG_ACK;
 
-	struct in_addr reqaddr = {INADDR_ANY};
+	uint32_t reqaddr = INADDR_ANY;
 	uint32_t leasetime = 0;
 	size_t hostname_len = 0;
 	char hostname[256];
@@ -666,7 +666,7 @@ static void handle_dhcpv4(void *addr, void *data, size_t len,
 	} else if (reqmsg == DHCPV4_MSG_DISCOVER)
 		msg = DHCPV4_MSG_OFFER;
 	else if (reqmsg == DHCPV4_MSG_REQUEST &&
-			((reqaddr.s_addr && reqaddr.s_addr != lease->addr) ||
+			((reqaddr && reqaddr != lease->addr) ||
 			 (req->ciaddr.s_addr && req->ciaddr.s_addr != lease->addr))) {
 		msg = DHCPV4_MSG_NAK;
 		/*
@@ -852,17 +852,6 @@ static void handle_dhcpv4(void *addr, void *data, size_t len,
 			(struct sockaddr*)&dest, sizeof(dest));
 }
 
-static bool dhcpv4_test(struct interface *iface, uint32_t try)
-{
-	struct dhcpv4_assignment *c;
-	list_for_each_entry(c, &iface->dhcpv4_assignments, head) {
-		if (c->addr == try)
-			return false;
-	}
-
-	return true;
-}
-
 static bool dhcpv4_assign(struct interface *iface,
 		struct dhcpv4_assignment *assign, uint32_t raddr)
 {
@@ -871,7 +860,8 @@ static bool dhcpv4_assign(struct interface *iface,
 	uint32_t count = end - start + 1;
 
 	// try to assign the IP the client asked for
-	if (start <= ntohl(raddr) && ntohl(raddr) <= end && dhcpv4_test(iface, raddr)) {
+	if (start <= ntohl(raddr) && ntohl(raddr) <= end &&
+			!find_assignment_by_addr(iface, raddr)) {
 		assign->addr = raddr;
 		syslog(LOG_INFO, "assigning the IP the client asked for: %u.%u.%u.%u",
 				((uint8_t *)&assign->addr)[0],
@@ -904,7 +894,7 @@ static bool dhcpv4_assign(struct interface *iface,
 	}
 
 	for (uint32_t i = 0; i < count; ++i) {
-		if (dhcpv4_test(iface, htonl(try))) {
+		if (!find_assignment_by_addr(iface, htonl(try))) {
 			/* test was successful: IP address is not assigned, assign it */
 			assign->addr = htonl(try);
 			syslog(LOG_DEBUG, "assigning mapped IP: %u.%u.%u.%u (try %u of %u)",
@@ -924,22 +914,14 @@ static bool dhcpv4_assign(struct interface *iface,
 
 
 static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface,
-		enum dhcpv4_msg msg, const uint8_t *mac, struct in_addr reqaddr,
+		enum dhcpv4_msg msg, const uint8_t *mac, const uint32_t reqaddr,
 		uint32_t *leasetime, const char *hostname, const size_t hostname_len,
 		const bool accept_fr_nonce, bool *incl_fr_opt, uint32_t *fr_serverid)
 {
+	struct dhcpv4_assignment *a = find_assignment_by_hwaddr(iface, mac);
 	struct dhcpv4_assignment *lease = NULL;
 	time_t now = odhcpd_time();
 
-	struct dhcpv4_assignment *c, *a = NULL;
-	list_for_each_entry(c, &iface->dhcpv4_assignments, head) {
-		if (!memcmp(c->hwaddr, mac, 6)) {
-			a = c;
-			if (c->addr == reqaddr.s_addr)
-				break;
-		}
-	}
-
 	if (a && (a->flags & OAF_BOUND) && a->fr_ip) {
 		*fr_serverid = a->fr_ip->addr.addr.in.s_addr;
 		dhcpv4_fr_stop(a);
@@ -961,7 +943,7 @@ static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface,
 				/* Don't consider new assignment as infinite */
 				a->valid_until = now;
 
-				assigned = dhcpv4_assign(iface, a, reqaddr.s_addr);
+				assigned = dhcpv4_assign(iface, a, reqaddr);
 				if (assigned) {
 					a->iface = iface;
 					list_add(&a->head, &iface->dhcpv4_assignments);
@@ -971,7 +953,7 @@ static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface,
 				(iface->dhcpv4_start_ip.s_addr & iface->dhcpv4_mask.s_addr)) {
 			list_del(&a->head);
 
-			assigned = dhcpv4_assign(iface, a, reqaddr.s_addr);
+			assigned = dhcpv4_assign(iface, a, reqaddr);
 			if (assigned)
 				list_add(&a->head, &iface->dhcpv4_assignments);
 		}