diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2017-08-02 08:38:29 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2017-08-02 08:38:29 +0000 |
| commit | 2e5d1a26e6b3fccbf4641b5df3ec97b4ed56eea6 (patch) | |
| tree | 7ece14df052493b168a57d447872f704cd7f8b70 | |
| parent | cbc5e3352be50bf158bffde4b9bb174ff61a2850 (diff) | |
Fix rtable regression tests.
| -rw-r--r-- | sys/net/route.h | 6 | ||||
| -rw-r--r-- | sys/net/rtable.h | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/net/route.h b/sys/net/route.h index e704eafcd60..1ca0a22c45f 100644 --- a/sys/net/route.h +++ b/sys/net/route.h @@ -1,4 +1,4 @@ -/* $OpenBSD: route.h,v 1.166 2017/07/30 18:18:08 florian Exp $ */ +/* $OpenBSD: route.h,v 1.167 2017/08/02 08:38:28 mpi Exp $ */ /* $NetBSD: route.h,v 1.9 1996/02/13 22:00:49 christos Exp $ */ /* @@ -93,7 +93,7 @@ struct rt_metrics { */ struct rtentry { -#ifndef _KERNEL +#if !defined(_KERNEL) && !defined(ART) struct radix_node rt_nodes[2]; /* tree glue, and other values */ #else struct sockaddr *rt_dest; /* destination */ @@ -115,7 +115,7 @@ struct rtentry { unsigned int rt_ifidx; /* the answer: interface to use */ unsigned int rt_flags; /* up/down?, host/net */ int rt_refcnt; /* # held references */ -#ifdef _KERNEL +#if defined(_KERNEL) || defined(ART) int rt_plen; /* prefix length */ #endif uint16_t rt_labelid; /* route label ID */ diff --git a/sys/net/rtable.h b/sys/net/rtable.h index dac6fd2f190..6df75dd040a 100644 --- a/sys/net/rtable.h +++ b/sys/net/rtable.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rtable.h,v 1.19 2017/07/30 18:16:14 florian Exp $ */ +/* $OpenBSD: rtable.h,v 1.20 2017/08/02 08:38:28 mpi Exp $ */ /* * Copyright (c) 2014-2016 Martin Pieuchot @@ -19,7 +19,7 @@ #ifndef _NET_RTABLE_H_ #define _NET_RTABLE_H_ -#ifndef _KERNEL +#if !defined(_KERNEL) && !defined(ART) /* * Traditional BSD routing table implementation based on a radix tree. @@ -31,7 +31,7 @@ #define rt_plen(rt) (rtable_satoplen(rt_key(rt)->sa_family, rt_mask(rt))) #define RT_ROOT(rt) ((rt)->rt_nodes[0].rn_flags & RNF_ROOT) -#else /* _KERNEL */ +#else /* defined(_KERNEL) || defined(ART) */ /* * Newer routing table implementation based on ART (Allotment Routing @@ -43,7 +43,7 @@ #define rt_plen(rt) ((rt)->rt_plen) #define RT_ROOT(rt) (0) -#endif /* _KERNEL */ +#endif /* defined(_KERNEL) || defined(ART) */ int rtable_satoplen(sa_family_t, struct sockaddr *); |