X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fdhcpv6-ia.c;h=b1931ef5f55ba225fe344826f08edc55defa6b55;hp=89d3a1582053af82f85fa17ce62681629e483409;hb=4b6fb015e3124ad1fbb266f70b5aea5c4d6cbc87;hpb=8b19de666e02f24280728938dd985ecb3673b83e;ds=sidebyside

diff --git a/src/dhcpv6-ia.c b/src/dhcpv6-ia.c
index 89d3a15..b1931ef 100644
--- a/src/dhcpv6-ia.c
+++ b/src/dhcpv6-ia.c
@@ -15,7 +15,7 @@
 #include "odhcpd.h"
 #include "dhcpv6.h"
 #include "dhcpv4.h"
-#include "md5.h"
+#include "libubox/md5.h"
 
 #include <time.h>
 #include <errno.h>
@@ -32,13 +32,12 @@
 static void update(struct interface *iface);
 static void reconf_timer(struct uloop_timeout *event);
 static struct uloop_timeout reconf_event = {.cb = reconf_timer};
-static int socket_fd = -1;
 static uint32_t serial = 0;
+static uint8_t statemd5[16];
 
 
-int dhcpv6_ia_init(int dhcpv6_socket)
+int dhcpv6_ia_init(void)
 {
-	socket_fd = dhcpv6_socket;
 	uloop_timeout_set(&reconf_event, 2000);
 	return 0;
 }
@@ -51,6 +50,8 @@ int setup_dhcpv6_ia_interface(struct interface *iface, bool enable)
 		while (!list_empty(&iface->ia_assignments)) {
 			c = list_first_entry(&iface->ia_assignments, struct dhcpv6_assignment, head);
 			list_del(&c->head);
+			free(c->hostname);
+			free(c->classes);
 			free(c);
 		}
 	}
@@ -61,6 +62,11 @@ int setup_dhcpv6_ia_interface(struct interface *iface, bool enable)
 
 		if (list_empty(&iface->ia_assignments)) {
 			struct dhcpv6_assignment *border = calloc(1, sizeof(*border));
+			if (!border) {
+				syslog(LOG_ERR, "Calloc failed for border on interface %s", iface->ifname);
+				return -1;
+			}
+			
 			border->length = 64;
 			list_add(&border->head, &iface->ia_assignments);
 		}
@@ -72,9 +78,20 @@ int setup_dhcpv6_ia_interface(struct interface *iface, bool enable)
 		list_for_each_entry(lease, &leases, head) {
 			// Construct entry
 			struct dhcpv6_assignment *a = calloc(1, sizeof(*a) + lease->duid_len);
+			if (!a) {
+				syslog(LOG_ERR, "Calloc failed for static lease assignment on interface %s",
+					iface->ifname);
+				return -1;
+			}
+
 			a->clid_len = lease->duid_len;
 			a->length = 128;
-			a->assigned = lease->hostid;
+			if (lease->hostid) {
+				a->assigned = lease->hostid;
+			} else {
+				uint32_t i4a = ntohl(lease->ipaddr.s_addr) & 0xff;
+				a->assigned = ((i4a / 100) << 8) | (((i4a % 100) / 10) << 4) | (i4a % 10);
+			}
 			odhcpd_urandom(a->key, sizeof(a->key));
 			memcpy(a->clid_data, lease->duid, a->clid_len);
 			memcpy(a->mac, lease->mac.ether_addr_octet, sizeof(a->mac));
@@ -84,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;
@@ -96,6 +114,8 @@ int setup_dhcpv6_ia_interface(struct interface *iface, bool enable)
 					a->hostname = strdup(lease->hostname);
 				}
 			} else {
+				free(a->classes);
+				free(a->hostname);
 				free(a);
 			}
 		}
@@ -163,12 +183,15 @@ static int send_reconf(struct interface *iface, struct dhcpv6_assignment *assign
 	md5_hash(reconf_msg.auth.key, 16, &md5);
 	md5_end(reconf_msg.auth.key, &md5);
 
-	return odhcpd_send(socket_fd, &assign->peer, &iov, 1, iface);
+	return odhcpd_send(iface->dhcpv6_event.uloop.fd, &assign->peer, &iov, 1, iface);
 }
 
 
 void dhcpv6_write_statefile(void)
 {
+	md5_ctx_t md5;
+	md5_begin(&md5);
+
 	if (config.dhcp_statefile) {
 		time_t now = odhcpd_time(), wall_time = time(NULL);
 		int fd = open(config.dhcp_statefile, O_CREAT | O_WRONLY | O_CLOEXEC, 0644);
@@ -189,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)
@@ -210,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;
@@ -220,8 +243,18 @@ void dhcpv6_write_statefile(void)
 							addr.s6_addr32[1] |= htonl(c->assigned);
 						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);
+						if (c->length == 128 && c->hostname && i == 0) {
+							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);
+						}
 
 						l += snprintf(leasebuf + l, sizeof(leasebuf) - l, "%s/%hhu ", ipbuf, c->length);
 					}
@@ -230,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];
@@ -249,8 +282,18 @@ void dhcpv6_write_statefile(void)
 					struct in_addr addr = {htonl(c->addr)};
 					inet_ntop(AF_INET, &addr, ipbuf, sizeof(ipbuf) - 1);
 
-					if (c->hostname[0])
-						fprintf(fp, "%s\t%s\n", ipbuf, c->hostname);
+					if (c->hostname[0]) {
+						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);
+					}
 
 					l += snprintf(leasebuf + l, sizeof(leasebuf) - l, "%s/32 ", ipbuf);
 					leasebuf[l - 1] = '\n';
@@ -262,7 +305,11 @@ void dhcpv6_write_statefile(void)
 		fclose(fp);
 	}
 
-	if (config.dhcp_cb) {
+	uint8_t newmd5[16];
+	md5_end(newmd5, &md5);
+
+	if (config.dhcp_cb && memcmp(newmd5, statemd5, sizeof(newmd5))) {
+		memcpy(statemd5, newmd5, sizeof(statemd5));
 		char *argv[2] = {config.dhcp_cb, NULL};
 		if (!vfork()) {
 			execv(argv[0], argv);
@@ -333,7 +380,21 @@ static bool assign_pd(struct interface *iface, struct dhcpv6_assignment *assign)
 
 static bool assign_na(struct interface *iface, struct dhcpv6_assignment *assign)
 {
-	if (iface->ia_addr_len < 1)
+	bool match = false;
+	for (size_t i = 0; i < iface->ia_addr_len; ++i) {
+		if (!iface->ia_addr[i].has_class) {
+			match = true;
+			continue;
+		} else if (assign->classes_cnt) {
+			for (size_t j = 0; j < assign->classes_cnt; ++j)
+				if (assign->classes[j] == iface->ia_addr[i].class)
+					match = true;
+		} else if (assign->all_class) {
+			match = true;
+		}
+	}
+
+	if (!match)
 		return false;
 
 	// Seed RNG with checksum of DUID
@@ -390,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)
@@ -408,7 +468,8 @@ static void update(struct interface *iface)
 		if (addr[i].addr.s6_addr32[0] != iface->ia_addr[i].addr.s6_addr32[0] ||
 				addr[i].addr.s6_addr32[1] != iface->ia_addr[i].addr.s6_addr32[1] ||
 				(addr[i].preferred > 0) != (iface->ia_addr[i].preferred > 0) ||
-				(addr[i].valid > now + 7200) != (iface->ia_addr[i].valid > now + 7200))
+				(addr[i].valid > (uint32_t)now + 7200) !=
+						(iface->ia_addr[i].valid > (uint32_t)now + 7200))
 			change = true;
 
 	if (change) {
@@ -475,6 +536,7 @@ static void reconf_timer(struct uloop_timeout *event)
 				if ((a->length < 128 && a->clid_len > 0) ||
 						(a->length == 128 && a->clid_len == 0)) {
 					list_del(&a->head);
+					free(a->classes);
 					free(a->hostname);
 					free(a);
 				}
@@ -521,31 +583,45 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
 		if (a) {
 			uint32_t pref = 3600;
 			uint32_t valid = 3600;
-			bool have_non_ula = false;
-			for (size_t i = 0; i < iface->ia_addr_len; ++i)
-				if ((iface->ia_addr[i].addr.s6_addr[0] & 0xfe) != 0xfc)
-					have_non_ula = true;
 
 			for (size_t i = 0; i < iface->ia_addr_len; ++i) {
+				bool match = true;
+				if (iface->ia_addr[i].has_class) {
+					match = false;
+					if (a->classes_cnt) {
+						for (size_t j = 0; j < a->classes_cnt; ++j)
+							if (a->classes[j] == iface->ia_addr[i].class)
+								match = true;
+					} else if (a->all_class) {
+						match = true;
+					}
+				}
+
+				if (!match)
+					continue;
+
 				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;
 
-				// ULA-deprecation compatibility workaround
-				if ((iface->ia_addr[i].addr.s6_addr[0] & 0xfe) == 0xfc &&
-						a->length == 128 && have_non_ula &&
-						iface->deprecate_ula_if_public_avail)
-					continue;
-
 				if (prefix_pref > 86400)
 					prefix_pref = 86400;
 
 				if (prefix_valid > 86400)
 					prefix_valid = 86400;
 
+#ifdef DHCPV6_OPT_PREFIX_CLASS
+				struct {
+					uint16_t code;
+					uint16_t length;
+					uint16_t class;
+				} pclass = {htons(DHCPV6_OPT_PREFIX_CLASS),
+					htons(2), htons(iface->ia_addr[i].class)};
+#endif
+
 				if (a->length < 128) {
 					struct dhcpv6_ia_prefix p = {
 						.type = htons(DHCPV6_OPT_IA_PREFIX),
@@ -556,12 +632,23 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
 						.addr = iface->ia_addr[i].addr
 					};
 					p.addr.s6_addr32[1] |= htonl(a->assigned);
+					size_t entrlen = sizeof(p) - 4;
+
+#ifdef DHCPV6_OPT_PREFIX_CLASS
+					if (iface->ia_addr[i].has_class) {
+						entrlen += sizeof(pclass);
+						p.len = htons(entrlen);
+					}
+#endif
 
-					if (datalen + sizeof(p) > buflen || a->assigned == 0)
+					if (datalen + entrlen + 4 > buflen || a->assigned == 0)
 						continue;
 
 					memcpy(buf + datalen, &p, sizeof(p));
-					datalen += sizeof(p);
+#ifdef DHCPV6_OPT_PREFIX_CLASS
+					memcpy(buf + datalen + sizeof(p), &pclass, sizeof(pclass));
+#endif
+					datalen += entrlen + 4;
 				} else {
 					struct dhcpv6_ia_addr n = {
 						.type = htons(DHCPV6_OPT_IA_ADDR),
@@ -571,12 +658,23 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
 						.valid = htonl(prefix_valid)
 					};
 					n.addr.s6_addr32[3] = htonl(a->assigned);
+					size_t entrlen = sizeof(n) - 4;
 
-					if (datalen + sizeof(n) > buflen || a->assigned == 0)
+#ifdef DHCPV6_OPT_PREFIX_CLASS
+					if (iface->ia_addr[i].has_class) {
+						entrlen += sizeof(pclass);
+						n.len = htons(entrlen);
+					}
+#endif
+
+					if (datalen + entrlen + 4 > buflen || a->assigned == 0)
 						continue;
 
 					memcpy(buf + datalen, &n, sizeof(n));
-					datalen += sizeof(n);
+#ifdef DHCPV6_OPT_PREFIX_CLASS
+					memcpy(buf + datalen + sizeof(n), &pclass, sizeof(pclass));
+#endif
+					datalen += entrlen + 4;
 				}
 
 				// Calculate T1 / T2 based on non-deprecated addresses
@@ -613,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;
 
@@ -621,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;
 						}
 					}
@@ -689,6 +787,7 @@ size_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
 	uint8_t *clid_data = NULL, clid_len = 0, mac[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 	char hostname[256];
 	size_t hostname_len = 0;
+	bool class_oro = false;
 	dhcpv6_for_each_option(start, end, otype, olen, odata) {
 		if (otype == DHCPV6_OPT_CLIENTID) {
 			clid_data = odata;
@@ -705,6 +804,14 @@ size_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
 
 			if (dn_expand(&fqdn_buf[1], &fqdn_buf[olen], &fqdn_buf[1], hostname, sizeof(hostname)) > 0)
 				hostname_len = strcspn(hostname, ".");
+		} else if (otype == DHCPV6_OPT_ORO) {
+#ifdef DHCPV6_OPT_PREFIX_CLASS
+			for (size_t i = 0; i + 1 < olen; i += 2) {
+				if (odata[i] == (DHCPV6_OPT_PREFIX_CLASS >> 8) &&
+						odata[i + 1] == (DHCPV6_OPT_PREFIX_CLASS & 0xff))
+					class_oro = true;
+			}
+#endif
 		} else if (otype == DHCPV6_OPT_RECONF_ACCEPT) {
 			accept_reconf = true;
 		}
@@ -728,25 +835,65 @@ size_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
 		uint8_t reqlen = (is_pd) ? 62 : 128;
 		uint32_t reqhint = 0;
 
+		const uint8_t classes_max = 32;
+		uint8_t classes_cnt = 0;
+		uint16_t classes[classes_max];
+
 		// Parse request hint for IA-PD
 		if (is_pd) {
 			uint8_t *sdata;
 			uint16_t stype, slen;
 			dhcpv6_for_each_option(&ia[1], odata + olen, stype, slen, sdata) {
-				if (stype == DHCPV6_OPT_IA_PREFIX && slen >= sizeof(struct dhcpv6_ia_prefix) - 4) {
-					struct dhcpv6_ia_prefix *p = (struct dhcpv6_ia_prefix*)&sdata[-4];
-					if (p->prefix) {
-						reqlen = p->prefix;
-						reqhint = ntohl(p->addr.s6_addr32[1]);
-						if (reqlen > 32 && reqlen <= 64)
-							reqhint &= (1U << (64 - reqlen)) - 1;
-					}
-					break;
+				if (stype != DHCPV6_OPT_IA_PREFIX || slen < sizeof(struct dhcpv6_ia_prefix) - 4)
+					continue;
+
+				struct dhcpv6_ia_prefix *p = (struct dhcpv6_ia_prefix*)&sdata[-4];
+				if (p->prefix) {
+					reqlen = p->prefix;
+					reqhint = ntohl(p->addr.s6_addr32[1]);
+					if (reqlen > 32 && reqlen <= 64)
+						reqhint &= (1U << (64 - reqlen)) - 1;
 				}
+
+#ifdef DHCPV6_OPT_PREFIX_CLASS
+				uint8_t *xdata;
+				uint16_t xtype, xlen;
+				dhcpv6_for_each_option(&p[1], sdata + slen, xtype, xlen, xdata) {
+					if (xtype != DHCPV6_OPT_PREFIX_CLASS || xlen != 2)
+						continue;
+
+					if (classes_cnt >= classes_max)
+						continue;
+
+					classes[classes_cnt++] = (uint16_t)xdata[0] << 8 | (uint16_t)xdata[1];
+				}
+#endif
 			}
 
 			if (reqlen > 64)
 				reqlen = 64;
+		} else if (is_na) {
+			uint8_t *sdata;
+			uint16_t stype, slen;
+			dhcpv6_for_each_option(&ia[1], odata + olen, stype, slen, sdata) {
+				if (stype != DHCPV6_OPT_IA_ADDR || slen < sizeof(struct dhcpv6_ia_addr) - 4)
+					continue;
+
+#ifdef DHCPV6_OPT_PREFIX_CLASS
+				uint8_t *xdata;
+				uint16_t xtype, xlen;
+				struct dhcpv6_ia_addr *p = (struct dhcpv6_ia_addr*)&sdata[-4];
+				dhcpv6_for_each_option(&p[1], sdata + slen, xtype, xlen, xdata) {
+					if (xtype != DHCPV6_OPT_PREFIX_CLASS || xlen != 2)
+						continue;
+
+					if (classes_cnt >= classes_max)
+						continue;
+
+					classes[classes_cnt++] = (uint16_t)xdata[0] << 8 | (uint16_t)xdata[1];
+				}
+#endif
+			}
 		}
 
 		// Find assignment
@@ -767,6 +914,11 @@ size_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
 				a->peer = *addr;
 				a->reconf_cnt = 0;
 				a->reconf_sent = 0;
+				a->all_class = class_oro;
+				a->classes_cnt = classes_cnt;
+				a->classes = realloc(a->classes, classes_cnt * sizeof(uint16_t));
+				if (a->classes)
+					memcpy(a->classes, classes, classes_cnt * sizeof(uint16_t));
 				break;
 			}
 		}
@@ -778,21 +930,31 @@ size_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
 
 			if (!a && !iface->no_dynamic_dhcp) { // Create new binding
 				a = calloc(1, sizeof(*a) + clid_len);
-				a->clid_len = clid_len;
-				a->iaid = ia->iaid;
-				a->length = reqlen;
-				a->peer = *addr;
-				a->assigned = reqhint;
-				if (first)
-					memcpy(a->key, first->key, sizeof(a->key));
-				else
-					odhcpd_urandom(a->key, sizeof(a->key));
-				memcpy(a->clid_data, clid_data, clid_len);
+				if (a) {
+					a->clid_len = clid_len;
+					a->iaid = ia->iaid;
+					a->length = reqlen;
+					a->peer = *addr;
+					a->assigned = reqhint;
+					a->all_class = class_oro;
+					a->classes_cnt = classes_cnt;
+					if (classes_cnt) {
+						a->classes = malloc(classes_cnt * sizeof(uint16_t));
+						if (a->classes)
+							memcpy(a->classes, classes, classes_cnt * sizeof(uint16_t));
+					}
+
+					if (first)
+						memcpy(a->key, first->key, sizeof(a->key));
+					else
+						odhcpd_urandom(a->key, sizeof(a->key));
+					memcpy(a->clid_data, clid_data, clid_len);
 
-				if (is_pd)
-					while (!(assigned = assign_pd(iface, a)) && ++a->length <= 64);
-				else
-					assigned = assign_na(iface, a);
+					if (is_pd)
+						while (!(assigned = assign_pd(iface, a)) && ++a->length <= 64);
+					else
+						assigned = assign_na(iface, a);
+				}
 			}
 
 			if (!assigned || iface->ia_addr_len == 0) { // Set error status
@@ -833,13 +995,16 @@ size_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
 			} else if (assigned && hdr->msg_type == DHCPV6_MSG_REQUEST) {
 				if (hostname_len > 0) {
 					a->hostname = realloc(a->hostname, hostname_len + 1);
-					memcpy(a->hostname, hostname, hostname_len);
-					a->hostname[hostname_len] = 0;
+					if (a->hostname) {
+						memcpy(a->hostname, hostname, hostname_len);
+						a->hostname[hostname_len] = 0;
+					}
 				}
 				a->accept_reconf = accept_reconf;
 				apply_lease(iface, a, true);
 				update_state = true;
 			} else if (!assigned && a) { // Cleanup failed assignment
+				free(a->classes);
 				free(a->hostname);
 				free(a);
 			}