X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fdhcpv6.c;h=01d14942f73567337dabe9fdb0da8e07c7ce87c3;hb=5217b2bb6c26f70f6fe570a340045a372020d06b;hp=ed6b8f868a67accdad22418e34cfc369204f5347;hpb=6677edeab2d7472b97a34461872c2c8985d6a57c;p=odhcp6c.git

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index ed6b8f8..01d1494 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -142,8 +142,10 @@ int init_dhcpv6(const char *ifname, int request_pd)
 			htons(DHCPV6_OPT_DNS_SERVERS),
 			htons(DHCPV6_OPT_DNS_DOMAIN),
 			htons(DHCPV6_OPT_NTP_SERVER),
+			htons(DHCPV6_OPT_SIP_SERVER_A),
 			htons(DHCPV6_OPT_AFTR_NAME),
 			htons(DHCPV6_OPT_PD_EXCLUDE),
+			htons(DHCPV6_OPT_PREFIX_CLASS),
 	};
 	odhcp6c_add_state(STATE_ORO, oro, sizeof(oro));
 
@@ -800,11 +802,11 @@ static uint32_t dhcpv6_parse_ia(void *opt, void *end)
 	uint16_t otype, olen;
 	uint8_t *odata;
 
-	struct odhcp6c_entry entry = {IN6ADDR_ANY_INIT,
-			0, 0, IN6ADDR_ANY_INIT, 0, 0};
-
 	// Update address IA
 	dhcpv6_for_each_option(opt, end, otype, olen, odata) {
+          struct odhcp6c_entry entry = {IN6ADDR_ANY_INIT,
+                                        0, 0, IN6ADDR_ANY_INIT, 0, 0, 0};
+
 		if (otype == DHCPV6_OPT_IA_PREFIX) {
 			struct dhcpv6_ia_prefix *prefix = (void*)&odata[-4];
 			if (olen + 4U < sizeof(*prefix))
@@ -818,11 +820,17 @@ static uint32_t dhcpv6_parse_ia(void *opt, void *end)
 
 			entry.length = prefix->prefix;
 			entry.target = prefix->addr;
+			uint16_t stype, slen;
+			uint8_t *sdata;
+
+                        // Find prefix class, if any
+			dhcpv6_for_each_option(&prefix[1], odata + olen,
+                                               stype, slen, sdata)
+                          if (stype == DHCPV6_OPT_PREFIX_CLASS && slen == 2) 
+                            entry.prefix_class = ntohs(*((uint16_t*)sdata));
 
 			// Parse PD-exclude
 			bool ok = true;
-			uint16_t stype, slen;
-			uint8_t *sdata;
 			dhcpv6_for_each_option(odata + sizeof(*prefix) - 4U,
 					odata + olen, stype, slen, sdata) {
 				if (stype != DHCPV6_OPT_PD_EXCLUDE || slen < 2)
@@ -877,6 +885,15 @@ static uint32_t dhcpv6_parse_ia(void *opt, void *end)
 			entry.length = 128;
 			entry.target = addr->addr;
 
+			uint16_t stype, slen;
+			uint8_t *sdata;
+			
+			// Find prefix class, if any
+			dhcpv6_for_each_option(&addr[1], odata + olen,
+					       stype, slen, sdata)
+			  if (stype == DHCPV6_OPT_PREFIX_CLASS && slen == 2) 
+                            entry.prefix_class = ntohs(*((uint16_t*)sdata));
+			
 			odhcp6c_update_entry(STATE_IA_NA, &entry);
 		}