[Midnightbsd-cvs] src [6992] trunk/sys/netinet6/nd6_rtr.c: The Neighbor Discover Protocol allows a local router to advertise a

[laffer1 at midnightbsd.org]

Revision: 6992
          http://svnweb.midnightbsd.org/src/?rev=6992
Author:   laffer1
Date:     2015-04-07 21:28:07 -0400 (Tue, 07 Apr 2015)
Log Message:
-----------
The Neighbor Discover Protocol allows a local router to advertise a
suggested Current Hop Limit value of a link, which will replace
Current Hop Limit on an interface connected to the link on the MidnightBSD
system.

Modified Paths:
--------------
    trunk/sys/netinet6/nd6_rtr.c

Modified: trunk/sys/netinet6/nd6_rtr.c
===================================================================
--- trunk/sys/netinet6/nd6_rtr.c	2015-04-08 01:25:39 UTC (rev 6991)
+++ trunk/sys/netinet6/nd6_rtr.c	2015-04-08 01:28:07 UTC (rev 6992)
@@ -296,8 +296,16 @@
 	}
 	if (nd_ra->nd_ra_retransmit)
 		ndi->retrans = ntohl(nd_ra->nd_ra_retransmit);
-	if (nd_ra->nd_ra_curhoplimit)
-		ndi->chlim = nd_ra->nd_ra_curhoplimit;
+	if (nd_ra->nd_ra_curhoplimit) {
+		if (ndi->chlim < nd_ra->nd_ra_curhoplimit)
+			ndi->chlim = nd_ra->nd_ra_curhoplimit;
+		else if (ndi->chlim != nd_ra->nd_ra_curhoplimit) {
+			log(LOG_ERR, "RA with a lower CurHopLimit sent from "
+			    "%s on %s (current = %d, received = %d). "
+			    "Ignored.\n", ip6_sprintf(ip6bufs, &ip6->ip6_src),
+			    if_name(ifp), ndi->chlim, nd_ra->nd_ra_curhoplimit);
+		}
+	}
 	dr = defrtrlist_update(&dr0);
     }