X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=src%2Fdhcpv6.c;h=f128ed88fa52e82a064c9c4065a4dbc14dd4a4a7;hb=4323a13ae58f9be363847d58ae25733289d91205;hp=fe4cc0b48e8f5dd4ca56139ee1c7fdcc5e353f1f;hpb=9c409ef5ce654ed5dd3ce706317eaac718a22983;p=odhcp6c.git

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index fe4cc0b..f128ed8 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -145,7 +145,9 @@ int init_dhcpv6(const char *ifname, int request_pd)
 			htons(DHCPV6_OPT_SIP_SERVER_A),
 			htons(DHCPV6_OPT_AFTR_NAME),
 			htons(DHCPV6_OPT_PD_EXCLUDE),
+#ifdef EXT_PREFIX_CLASS
 			htons(DHCPV6_OPT_PREFIX_CLASS),
+#endif
 	};
 	odhcp6c_add_state(STATE_ORO, oro, sizeof(oro));
 
@@ -742,18 +744,21 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig,
 			if (ia_hdr->iaid != 1 || l_t2 < l_t1)
 				continue;
 
-			bool error = false;
+			int error = 0;
 			uint16_t stype, slen;
 			uint8_t *sdata;
 			// Test status and bail if error
 			dhcpv6_for_each_option(&ia_hdr[1], odata + olen,
 					stype, slen, sdata)
-				if (stype == DHCPV6_OPT_STATUS && slen >= 2 &&
-						(sdata[0] || sdata[1]))
-					error = true;
-
-			if (error)
-				continue;
+				if (stype == DHCPV6_OPT_STATUS && slen >= 2)
+					error = ((int)sdata[0]) << 8 | ((int)sdata[1]);
+
+			if (error) {
+				syslog(LOG_WARNING, "Server returned IAID status %i!", error);
+				if (error != 2)
+					raise(SIGUSR2);
+				break;
+			}
 
 			uint32_t n = dhcpv6_parse_ia(&ia_hdr[1], odata + olen);
 
@@ -819,6 +824,15 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig,
 		}
 	}
 
+	if (t1 == UINT32_MAX)
+		t1 = 300;
+
+	if (t2 == UINT32_MAX)
+		t2 = 600;
+
+	if (t3 == UINT32_MAX)
+		t3 = 3600;
+
 	return true;
 }
 
@@ -831,8 +845,8 @@ static uint32_t dhcpv6_parse_ia(void *opt, void *end)
 
 	// 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};
+		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];
@@ -850,11 +864,13 @@ static uint32_t dhcpv6_parse_ia(void *opt, void *end)
 			uint16_t stype, slen;
 			uint8_t *sdata;
 
+#ifdef EXT_PREFIX_CLASS
                         // 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));
+					stype, slen, sdata)
+				if (stype == DHCPV6_OPT_PREFIX_CLASS && slen == 2)
+					entry.class = sdata[0] << 8 | sdata[1];
+#endif
 
 			// Parse PD-exclude
 			bool ok = true;
@@ -912,18 +928,18 @@ static uint32_t dhcpv6_parse_ia(void *opt, void *end)
 			entry.length = 128;
 			entry.target = addr->addr;
 
+#ifdef EXT_PREFIX_CLASS
 			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));
-			
+					stype, slen, sdata)
+				if (stype == DHCPV6_OPT_PREFIX_CLASS && slen == 2)
+					entry.class = sdata[0] << 8 | sdata[1];
+#endif
+
 			odhcp6c_update_entry(STATE_IA_NA, &entry);
 		}
-
 		if (entry.valid > 0 && timeout > entry.valid)
 			timeout = entry.valid;
 	}