X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fdhcpv6-ia.c;h=b1931ef5f55ba225fe344826f08edc55defa6b55;hp=37b7cc89d7013f74d0089b6dbbd7aed3e4ba7743;hb=79d005edf35a363e2d254e37ca2edcd743c2b4f6;hpb=75e08e1fcf642763199429c42db1078366b4b522

diff --git a/src/dhcpv6-ia.c b/src/dhcpv6-ia.c
index 37b7cc8..b1931ef 100644
--- a/src/dhcpv6-ia.c
+++ b/src/dhcpv6-ia.c
@@ -101,6 +101,7 @@ int setup_dhcpv6_ia_interface(struct interface *iface, bool enable)
 			list_for_each_entry(c, &iface->ia_assignments, head) {
 				if (c->length != 128 || c->assigned > a->assigned) {
 					list_add_tail(&a->head, &c->head);
+					break;
 				} else if (c->assigned == a->assigned) {
 					// Already an assignment with that number
 					break;
@@ -211,7 +212,7 @@ void dhcpv6_write_statefile(void)
 			if (iface->dhcpv6 != RELAYD_SERVER && iface->dhcpv4 != RELAYD_SERVER)
 				continue;
 
-			if (iface->dhcpv6 == RELAYD_SERVER) {
+			if (iface->dhcpv6 == RELAYD_SERVER && iface->ia_assignments.next) {
 				struct dhcpv6_assignment *c;
 				list_for_each_entry(c, &iface->ia_assignments, head) {
 					if (c->clid_len == 0)
@@ -232,7 +233,7 @@ void dhcpv6_write_statefile(void)
 
 					struct in6_addr addr;
 					for (size_t i = 0; i < iface->ia_addr_len; ++i) {
-						if (iface->ia_addr[i].prefix > 64)
+						if (iface->ia_addr[i].prefix > 96)
 							continue;
 
 						addr = iface->ia_addr[i].addr;
@@ -243,7 +244,14 @@ void dhcpv6_write_statefile(void)
 						inet_ntop(AF_INET6, &addr, ipbuf, sizeof(ipbuf) - 1);
 
 						if (c->length == 128 && c->hostname && i == 0) {
-							fprintf(fp, "%s\t%s\n", ipbuf, c->hostname);
+							fputs(ipbuf, fp);
+
+							char b[256];
+					                if (dn_expand(iface->search, iface->search + iface->search_len,
+					                		iface->search, b, sizeof(b)) > 0)
+					                	fprintf(fp, "\t%s.%s", c->hostname, b);
+
+							fprintf(fp, "\t%s\n", c->hostname);
 							md5_hash(ipbuf, strlen(ipbuf), &md5);
 							md5_hash(c->hostname, strlen(c->hostname), &md5);
 						}
@@ -255,7 +263,7 @@ void dhcpv6_write_statefile(void)
 				}
 			}
 
-			if (iface->dhcpv4 == RELAYD_SERVER) {
+			if (iface->dhcpv4 == RELAYD_SERVER && iface->dhcpv4_assignments.next) {
 				struct dhcpv4_assignment *c;
 				list_for_each_entry(c, &iface->dhcpv4_assignments, head) {
 					char ipbuf[INET6_ADDRSTRLEN];
@@ -275,7 +283,14 @@ void dhcpv6_write_statefile(void)
 					inet_ntop(AF_INET, &addr, ipbuf, sizeof(ipbuf) - 1);
 
 					if (c->hostname[0]) {
-						fprintf(fp, "%s\t%s\n", ipbuf, c->hostname);
+						fputs(ipbuf, fp);
+
+						char b[256];
+				                if (dn_expand(iface->search, iface->search + iface->search_len,
+				                		iface->search, b, sizeof(b)) > 0)
+				                	fprintf(fp, "\t%s.%s", c->hostname, b);
+
+						fprintf(fp, "\t%s\n", c->hostname);
 						md5_hash(ipbuf, strlen(ipbuf), &md5);
 						md5_hash(c->hostname, strlen(c->hostname), &md5);
 					}
@@ -436,7 +451,6 @@ static void update(struct interface *iface)
 		if (addr[i].prefix > minprefix)
 			minprefix = addr[i].prefix;
 
-		addr[i].addr.s6_addr32[2] = 0;
 		addr[i].addr.s6_addr32[3] = 0;
 
 		if (addr[i].preferred < UINT32_MAX - now)
@@ -589,7 +603,7 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
 				uint32_t prefix_pref = iface->ia_addr[i].preferred - now;
 				uint32_t prefix_valid = iface->ia_addr[i].valid - now;
 
-				if (iface->ia_addr[i].prefix > 64 ||
+				if (iface->ia_addr[i].prefix > 96 ||
 						iface->ia_addr[i].preferred <= (uint32_t)now)
 					continue;
 
@@ -697,7 +711,7 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
 				bool found = false;
 				if (a) {
 					for (size_t i = 0; i < iface->ia_addr_len; ++i) {
-						if (iface->ia_addr[i].prefix > 64 ||
+						if (iface->ia_addr[i].prefix > 96 ||
 								iface->ia_addr[i].preferred <= (uint32_t)now)
 							continue;
 
@@ -705,13 +719,13 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
 						if (ia->type == htons(DHCPV6_OPT_IA_PD)) {
 							addr.s6_addr32[1] |= htonl(a->assigned);
 
-							if (IN6_ARE_ADDR_EQUAL(&p->addr, &addr) &&
+							if (!memcmp(&p->addr, &addr, sizeof(addr)) &&
 									p->prefix == a->length)
 								found = true;
 						} else {
 							addr.s6_addr32[3] = htonl(a->assigned);
 
-							if (IN6_ARE_ADDR_EQUAL(&n->addr, &addr))
+							if (!memcmp(&n->addr, &addr, sizeof(addr)))
 								found = true;
 						}
 					}