From: Roy Marples <roy@marples.name>
Date: Wed, 31 Oct 2012 12:34:27 +0000 (+0000)
Subject: If we receive a RA with a lifetime of 0, just expire it right away
X-Git-Tag: v5.99.3~47
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7c3772a86882b9cfc6436c66d2b99b365ab29007;p=thirdparty%2Fdhcpcd.git

If we receive a RA with a lifetime of 0, just expire it right away
and continue.
---

diff --git a/ipv6rs.c b/ipv6rs.c
index a2c036bc..aaa5c717 100644
--- a/ipv6rs.c
+++ b/ipv6rs.c
@@ -453,6 +453,17 @@ ipv6rs_handledata(_unused void *arg)
 			break;
 	}
 
+	nd_ra = (struct nd_router_advert *)icp;
+	/* If the lifetime of the router is zero, just expire it
+	 * if we already have it and move on. */
+	if (nd_ra->nd_ra_router_lifetime == 0) {
+		if (rap) {
+			rap->lifetime = 0;
+			ipv6rs_expire(ifp);
+		}
+		return;
+	}
+
 	/* We don't want to spam the log with the fact we got an RA every
 	 * 30 seconds or so, so only spam the log if it's different. */
 	if (options & DHCPCD_DEBUG || rap == NULL ||
@@ -490,7 +501,6 @@ ipv6rs_handledata(_unused void *arg)
 	}
 
 	get_monotonic(&rap->received);
-	nd_ra = (struct nd_router_advert *)icp;
 	rap->flags = nd_ra->nd_ra_flags_reserved;
 	rap->lifetime = ntohs(nd_ra->nd_ra_router_lifetime);
 	if (nd_ra->nd_ra_reachable) {