Author: markj
Date: Fri Feb 12 21:15:57 2016
New Revision: 295583
URL: https://svnweb.freebsd.org/changeset/base/295583
Log:
Rename the flags field of struct nd_defrouter to "raflags".
This field contains the flags inherited from the corresponding router
advertisement message and is not for storing private state.
MFC after: 1 week
Modified:
head/sys/netinet6/nd6.c
head/sys/netinet6/nd6.h
head/sys/netinet6/nd6_rtr.c
Modified: head/sys/netinet6/nd6.c
==============================================================================
--- head/sys/netinet6/nd6.c Fri Feb 12 21:15:31 2016 (r295582)
+++ head/sys/netinet6/nd6.c Fri Feb 12 21:15:57 2016 (r295583)
@@ -2550,7 +2550,7 @@ nd6_sysctl_drlist(SYSCTL_HANDLER_ARGS)
error = sa6_recoverscope(&d.rtaddr);
if (error != 0)
return (error);
- d.flags = dr->flags;
+ d.flags = dr->raflags;
d.rtlifetime = dr->rtlifetime;
d.expire = dr->expire + (time_second - time_uptime);
d.if_index = dr->ifp->if_index;
Modified: head/sys/netinet6/nd6.h
==============================================================================
--- head/sys/netinet6/nd6.h Fri Feb 12 21:15:31 2016 (r295582)
+++ head/sys/netinet6/nd6.h Fri Feb 12 21:15:57 2016 (r295583)
@@ -232,13 +232,13 @@ struct in6_ndifreq {
((MAX_RANDOM_FACTOR - MIN_RANDOM_FACTOR) * (x >> 10)))) /1000)
TAILQ_HEAD(nd_drhead, nd_defrouter);
-struct nd_defrouter {
+struct nd_defrouter {
TAILQ_ENTRY(nd_defrouter) dr_entry;
- struct in6_addr rtaddr;
- u_char flags; /* flags on RA message */
+ struct in6_addr rtaddr;
+ u_char raflags; /* flags on RA message */
u_short rtlifetime;
u_long expire;
- struct ifnet *ifp;
+ struct ifnet *ifp;
int installed; /* is installed into kernel routing table */
};
Modified: head/sys/netinet6/nd6_rtr.c
==============================================================================
--- head/sys/netinet6/nd6_rtr.c Fri Feb 12 21:15:31 2016 (r295582)
+++ head/sys/netinet6/nd6_rtr.c Fri Feb 12 21:15:57 2016 (r295583)
@@ -272,7 +272,7 @@ nd6_ra_input(struct mbuf *m, int off, in
bzero(&dr0, sizeof(dr0));
dr0.rtaddr = saddr6;
- dr0.flags = nd_ra->nd_ra_flags_reserved;
+ dr0.raflags = nd_ra->nd_ra_flags_reserved;
/*
* Effectively-disable routes from RA messages when
* ND6_IFF_NO_RADR enabled on the receiving interface or
@@ -710,7 +710,7 @@ defrouter_select(void)
static int
rtpref(struct nd_defrouter *dr)
{
- switch (dr->flags & ND_RA_FLAG_RTPREF_MASK) {
+ switch (dr->raflags & ND_RA_FLAG_RTPREF_MASK) {
case ND_RA_FLAG_RTPREF_HIGH:
return (RTPREF_HIGH);
case ND_RA_FLAG_RTPREF_MEDIUM:
@@ -724,7 +724,7 @@ rtpref(struct nd_defrouter *dr)
* serious bug of kernel internal. We thus always bark here.
* Or, can we even panic?
*/
- log(LOG_ERR, "rtpref: impossible RA flag %x\n", dr->flags);
+ log(LOG_ERR, "rtpref: impossible RA flag %x\n", dr->raflags);
return (RTPREF_INVALID);
}
/* NOTREACHED */
@@ -746,7 +746,7 @@ defrtrlist_update(struct nd_defrouter *n
oldpref = rtpref(dr);
/* override */
- dr->flags = new->flags; /* xxx flag check */
+ dr->raflags = new->raflags; /* XXX flag check */
dr->rtlifetime = new->rtlifetime;
dr->expire = new->expire;
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
