Page MenuHomeFreeBSD
Files F154233424

D54722.id169750.diff
No OneTemporary
Actions

D54722.id169750.diff
View Options

diff --git a/sys/netinet6/nd6.h b/sys/netinet6/nd6.h
--- a/sys/netinet6/nd6.h
+++ b/sys/netinet6/nd6.h
@@ -62,22 +62,6 @@
#define ND6_IS_LLINFO_PROBREACH(n) ((n)->ln_state > ND6_LLINFO_INCOMPLETE)
#define ND6_LLINFO_PERMANENT(n) (((n)->la_expire == 0) && ((n)->ln_state > ND6_LLINFO_INCOMPLETE))
-struct nd_ifinfo {
- u_int32_t linkmtu; /* LinkMTU */
- u_int32_t maxmtu; /* Upper bound of LinkMTU */
- u_int32_t basereachable; /* BaseReachableTime */
- u_int32_t reachable; /* Reachable Time */
- u_int32_t retrans; /* Retrans Timer */
- u_int32_t flags; /* Flags */
- int recalctm; /* BaseReacable re-calculation timer */
- u_int8_t chlim; /* CurHopLimit */
- u_int8_t initialized; /* Flag to see the entry is initialized */
- /* the following 3 members are for privacy extension for addrconf */
- u_int8_t randomseed0[8]; /* upper 64 bits of MD5 digest */
- u_int8_t randomseed1[8]; /* lower 64 bits (usually the EUI64 IFID) */
- u_int8_t randomid[8]; /* current random ID */
-};
-
#define ND6_IFF_PERFORMNUD 0x1
#define ND6_IFF_ACCEPT_RTADV 0x2
#define ND6_IFF_PREFER_SOURCE 0x4 /* Not used in FreeBSD. */
@@ -139,9 +123,29 @@
/* struct sockaddr_in6 advrtr[] */
};
-struct in6_ndireq {
+struct in6_ndireq {
char ifname[IFNAMSIZ];
- struct nd_ifinfo ndi;
+ struct nd_ifinfo {
+ uint32_t linkmtu; /* LinkMTU */
+ uint32_t maxmtu; /* Upper bound of LinkMTU */
+ uint32_t basereachable; /* BaseReachableTime */
+ uint32_t reachable; /* Reachable Time */
+ uint32_t retrans; /* Retrans Timer */
+ uint32_t flags; /* Flags */
+ int recalctm; /* BaseReacable re-calculation timer */
+ uint8_t chlim; /* CurHopLimit */
+ /*
+ * The below members are not used. They came from KAME and
+ * are hanging around to preserve ABI compatibility of the
+ * SIOCGIFINFO_IN6 ioctl.
+ * The original comment documented the random* members as a
+ * privacy extension for addrconf.
+ */
+ uint8_t initialized; /* compat: always 1 */
+ uint8_t randomseed0[8]; /* upper 64 bits of MD5 digest */
+ uint8_t randomseed1[8]; /* lower 64 bits (the EUI64 IFID?) */
+ uint8_t randomid[8]; /* current random ID */
+ } ndi;
};
struct in6_ndifreq {

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 28, 7:41 AM (3 h, 9 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32259026
Default Alt Text
D54722.id169750.diff (2 KB)

Event Timeline