aboutsummaryrefslogtreecommitdiff
path: root/sys/netinet6
diff options
context:
space:
mode:
authorAlexander V. Chernikov <melifaro@FreeBSD.org>2020-04-26 18:42:38 +0000
committerAlexander V. Chernikov <melifaro@FreeBSD.org>2020-04-26 18:42:38 +0000
commit55f57ca9ac9b886c1de7c2cfe81ee9b53acc2c4e (patch)
treee673370309bcb9deea6e1c327d1d00928d281131 /sys/netinet6
parent49c9f84f54a193b42ed9a1dbfafd609181bf9fa4 (diff)
downloadsrc-55f57ca9ac9b886c1de7c2cfe81ee9b53acc2c4e.tar.gz
src-55f57ca9ac9b886c1de7c2cfe81ee9b53acc2c4e.zip
Convert debugnet to the new routing KPI.
Introduce new fib[46]_lookup_debugnet() functions serving as a special interface for the crash-time operations. Underlying implementation will try to return lookup result if datastructures are not corrupted, avoding locking. Convert debugnet to use fib4_lookup_debugnet() and switch it to use nexthops instead of rtentries. Reviewed by: cem Differential Revision: https://reviews.freebsd.org/D24555
Notes
Notes: svn path=/head/; revision=360349
Diffstat (limited to 'sys/netinet6')
-rw-r--r--sys/netinet6/in6_fib.c41
-rw-r--r--sys/netinet6/in6_fib.h2
2 files changed, 43 insertions, 0 deletions
diff --git a/sys/netinet6/in6_fib.c b/sys/netinet6/in6_fib.c
index a141510f142d..35f5da142db0 100644
--- a/sys/netinet6/in6_fib.c
+++ b/sys/netinet6/in6_fib.c
@@ -397,5 +397,46 @@ fib6_check_urpf(uint32_t fibnum, const struct in6_addr *dst6,
return (0);
}
+struct nhop_object *
+fib6_lookup_debugnet(uint32_t fibnum, const struct in6_addr *dst6,
+ uint32_t scopeid, uint32_t flags)
+{
+ struct rib_head *rh;
+ struct radix_node *rn;
+ struct rtentry *rt;
+ struct nhop_object *nh;
+ struct sockaddr_in6 sin6;
+
+ KASSERT((fibnum < rt_numfibs), ("fib6_lookup: bad fibnum"));
+ rh = rt_tables_get_rnh(fibnum, AF_INET6);
+ if (rh == NULL)
+ return (NULL);
+
+ /* TODO: radix changes */
+ //addr = *dst6;
+ /* Prepare lookup key */
+ memset(&sin6, 0, sizeof(sin6));
+ sin6.sin6_len = sizeof(struct sockaddr_in6);
+ sin6.sin6_addr = *dst6;
+
+ /* Assume scopeid is valid and embed it directly */
+ if (IN6_IS_SCOPE_LINKLOCAL(dst6))
+ sin6.sin6_addr.s6_addr16[1] = htons(scopeid & 0xffff);
+
+ rn = rh->rnh_matchaddr((void *)&sin6, &rh->head);
+ if (rn != NULL && ((rn->rn_flags & RNF_ROOT) == 0)) {
+ rt = RNTORT(rn);
+ nh = rt->rt_nhop;
+ /* Ensure route & ifp is UP */
+ if (RT_LINK_IS_UP(nh->nh_ifp)) {
+ if (flags & NHR_REF)
+ nhop_ref_object(nh);
+ return (nh);
+ }
+ }
+
+ return (NULL);
+}
+
#endif
diff --git a/sys/netinet6/in6_fib.h b/sys/netinet6/in6_fib.h
index bf8d367309cc..907d2d731949 100644
--- a/sys/netinet6/in6_fib.h
+++ b/sys/netinet6/in6_fib.h
@@ -64,5 +64,7 @@ struct nhop_object *fib6_lookup(uint32_t fibnum,
uint32_t flowid);
int fib6_check_urpf(uint32_t fibnum, const struct in6_addr *dst6,
uint32_t scopeid, uint32_t flags, const struct ifnet *src_if);
+struct nhop_object *fib6_lookup_debugnet(uint32_t fibnum,
+ const struct in6_addr *dst6, uint32_t scopeid, uint32_t flags);
#endif