Page MenuHomeFreeBSD
Files F146941170

D55141.id.diff
No OneTemporary
Actions

D55141.id.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
@@ -155,11 +155,13 @@
/* ND6 queue flags */
#define ND6_QUEUE_FLAG_NEWGUA 0x01 /* new global unicast address event */
#define ND6_QUEUE_FLAG_LLADDR 0x02 /* link-layer address change event */
+#define ND6_QUEUE_FLAG_ANYCAST 0x04 /* delay NA for anycast or proxy address */
/* protocol constants */
#define MAX_RTR_SOLICITATION_DELAY 1 /* 1sec */
#define RTR_SOLICITATION_INTERVAL 4 /* 4sec */
#define MAX_RTR_SOLICITATIONS 3
+#define MAX_ANYCAST_DELAY_TIME 1 /* 1sec */
#define ND6_INFINITE_LIFETIME 0xffffffff
@@ -374,6 +376,7 @@
void nd6_queue_init(struct in6_ifextra *);
void nd6_grand_start(struct ifaddr *, uint32_t);
void nd6_queue_stop(struct ifaddr *);
+void nd6_delayed_na_start(struct ifaddr *, struct in6_addr *, u_int, uint32_t);
/* nd6_rtr.c */
void nd6_rs_input(struct mbuf *, int, int);
diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c
--- a/sys/netinet6/nd6_nbr.c
+++ b/sys/netinet6/nd6_nbr.c
@@ -124,6 +124,7 @@
struct nd_queue {
TAILQ_ENTRY(nd_queue) ndq_list;
struct ifaddr *ndq_ifa;
+ struct in6_addr ndq_daddr;
uint32_t ndq_flags;
uint32_t ndq_refcnt;
struct callout ndq_callout;
@@ -356,8 +357,17 @@
rflag |= ND_NA_FLAG_SOLICITED;
}
- nd6_na_output_fib(ifp, &saddr6, &taddr6, rflag, tlladdr,
- proxy ? (struct sockaddr *)&proxydl : NULL, M_GETFIB(m));
+ /*
+ * RFC 4861, anycast or proxy NA sent in response to a NS SHOULD
+ * be delayed by a random time between 0 and MAX_ANYCAST_DELAY_TIME
+ * to reduce the probability of network congestion.
+ */
+ if (anycast == 0 && proxy == 0)
+ nd6_na_output_fib(ifp, &saddr6, &taddr6, rflag, tlladdr,
+ proxy ? (struct sockaddr *)&proxydl : NULL, M_GETFIB(m));
+ else
+ nd6_delayed_na_start(ifa, &saddr6, arc4random() %
+ (MAX_ANYCAST_DELAY_TIME * hz), ND6_QUEUE_FLAG_ANYCAST);
freeit:
if (ifa != NULL)
ifa_free(ifa);
@@ -649,10 +659,6 @@
*
* Based on RFC 2461
* Based on RFC 2462 (duplicate address detection)
- *
- * the following items are not implemented yet:
- * - proxy advertisement delay rule (RFC2461 7.2.8, last paragraph, SHOULD)
- * - anycast advertisement delay rule (RFC2461 7.2.7, SHOULD)
*/
void
nd6_na_input(struct mbuf *m, int off, int icmp6len)
@@ -967,10 +973,6 @@
*
* Based on RFC 2461
*
- * the following items are not implemented yet:
- * - proxy advertisement delay rule (RFC2461 7.2.8, last paragraph, SHOULD)
- * - anycast advertisement delay rule (RFC2461 7.2.7, SHOULD)
- *
* tlladdr:
* - 0x01 if include target link-layer address
* - 0x02 if target address is CARP MASTER
@@ -1695,7 +1697,6 @@
struct ifaddr *ifa = ndq->ndq_ifa;
struct ifnet *ifp = ifa->ifa_ifp;
struct in6_ifextra *ext = ifp->if_inet6;
- struct in6_addr taddr6 = IN6ADDR_ANY_INIT;
struct epoch_tracker et;
int delay, tlladdr;
u_long flags;
@@ -1711,12 +1712,10 @@
flags &= ~ND_NA_FLAG_ROUTER;
/*
- * RFC 9131 Section 6.1.2: if new global address added,
- * use the all-routers multicast address.
- * If the address is preferred, then the Override flag SHOULD NOT be set.
+ * RFC 9131 Section 6.1.2: If the address is preferred,
+ * then the Override flag SHOULD NOT be set.
*/
if ((ndq->ndq_flags & ND6_QUEUE_FLAG_NEWGUA) != 0) {
- taddr6 = in6addr_linklocal_allrouters;
/*
* XXX: If the address is in the Optimistic state,
* then the Override flag MUST NOT be set.
@@ -1727,31 +1726,32 @@
}
/*
* RFC 4891 Section 7.2.6: if link-layer address changed,
- * use the all-nodes multicast address.
* The Override flag MAY be set to either zero or one.
*/
- if ((ndq->ndq_flags & ND6_QUEUE_FLAG_LLADDR) != 0) {
- taddr6 = in6addr_linklocal_allnodes;
+ if ((ndq->ndq_flags & ND6_QUEUE_FLAG_LLADDR) != 0)
flags |= ND_NA_FLAG_OVERRIDE;
- }
+ /* anycast advertisement delay rule (RFC 4891 7.2.7, SHOULD) */
+ if ((ndq->ndq_flags & ND6_QUEUE_FLAG_ANYCAST) != 0)
+ flags |= ND_NA_FLAG_SOLICITED;
/* Wait at least a RetransTimer before removing from queue */
delay = ext->nd_retrans * hz / 1000;
callout_reset(&ndq->ndq_callout, delay, nd6_queue_rel, ndq);
IF_ADDR_WUNLOCK(ifp);
- if (in6_setscope(&taddr6, ifp, NULL) != 0)
+ if (in6_setscope(&ndq->ndq_daddr, ifp, NULL) != 0)
goto bad;
- nd6_na_output_fib(ifp, &taddr6, IFA_IN6(ifa), flags, tlladdr, NULL, ifp->if_fib);
-
+ nd6_na_output_fib(ifp, &ndq->ndq_daddr, IFA_IN6(ifa), flags, tlladdr,
+ NULL, ifp->if_fib);
bad:
NET_EPOCH_EXIT(et);
CURVNET_RESTORE();
}
static void
-nd6_queue_add(struct ifaddr *ifa, int delay, uint32_t flags)
+nd6_queue_add(struct ifaddr *ifa, struct in6_addr *daddr,
+ int delay, uint32_t flags)
{
struct nd_queue *ndq;
struct ifnet *ifp = ifa->ifa_ifp;
@@ -1777,6 +1777,7 @@
ndq->ndq_ifa = ifa;
ifa_ref(ndq->ndq_ifa);
+ memcpy(&ndq->ndq_daddr, daddr, sizeof(struct in6_addr));
ndq->ndq_flags = flags;
refcount_init(&ndq->ndq_refcnt, 1);
@@ -1794,6 +1795,7 @@
{
struct nd_queue *ndq;
struct in6_ifextra *ext = ifa->ifa_ifp->if_inet6;
+ struct in6_addr daddr = IN6ADDR_ANY_INIT;
int delay, count = 0;
NET_EPOCH_ASSERT();
@@ -1823,8 +1825,22 @@
return;
}
+ /*
+ * RFC 9131 Section 6.1.2: if new global address added,
+ * use the all-routers multicast address.
+ */
+ if ((flags & ND6_QUEUE_FLAG_NEWGUA) != 0)
+ daddr = in6addr_linklocal_allrouters;
+
+ /*
+ * RFC 4891 Section 7.2.6: if link-layer address changed,
+ * use the all-nodes multicast address.
+ */
+ if ((flags & ND6_QUEUE_FLAG_LLADDR) != 0)
+ daddr = in6addr_linklocal_allnodes;
+
delay = ext->nd_retrans * hz / 1000;
- nd6_queue_add(ifa, count * delay, flags);
+ nd6_queue_add(ifa, &daddr, count * delay, flags);
}
/*
@@ -1842,3 +1858,16 @@
callout_drain(&ndq->ndq_callout);
}
+
+/*
+ * Send delayed NA for specified address.
+ * Called by nd6_ns_input for anycast or proxy NA
+ */
+void
+nd6_delayed_na_start(struct ifaddr *ifa, struct in6_addr *daddr,
+ u_int delay, uint32_t flags)
+{
+
+ NET_EPOCH_ASSERT();
+ nd6_queue_add(ifa, daddr, delay, flags);
+}

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 7, 11:27 PM (7 h, 26 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29385853
Default Alt Text
D55141.id.diff (5 KB)

Event Timeline