Incorporate new radix code from UCB. This fixes the orphaned mask bugs.

This submission was done by hand-applying FreeBSD local modifications on
top of the UCB code, rather than trying to patch the UCB code in on top
of the FreeBSD code due to the extensive changes.

Reviewed by:	pst	(been handling 30k routes for 4+ months)
Obtained from:	Sklower/Woody/Honing/Traina (8.4 UCB release)

1 files changed, 19 insertions, 11 deletions

diff --git a/sys/net/radix.h b/sys/net/radix.h
index 89df2ac..2384936 100644
--- a/sys/net/radix.h
+++ b/sys/net/radix.h
@@ -30,12 +30,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)radix.h	8.1 (Berkeley) 6/10/93
- * $Id: radix.h,v 1.6 1995/03/16 18:14:29 bde Exp $
+ *	@(#)radix.h	8.2 (Berkeley) 10/31/94
+ *	$Id$
  */
 
-#ifndef _NET_RADIX_H_
-#define	_NET_RADIX_H_
+#ifndef _RADIX_H_
+#define	_RADIX_H_
 
 /*
  * Radix search tree node layout.
@@ -52,7 +52,7 @@ struct radix_node {
 #define RNF_ACTIVE	4		/* This node is alive (for rtfree) */
 	union {
 		struct {			/* leaf only data: */
-			caddr_t	rn_Key;	/* object of search */
+			caddr_t	rn_Key;		/* object of search */
 			caddr_t	rn_Mask;	/* netmask, if present */
 			struct	radix_node *rn_Dupedkey;
 		} rn_leaf;
@@ -60,7 +60,7 @@ struct radix_node {
 			int	rn_Off;		/* where to start compare */
 			struct	radix_node *rn_L;/* progeny */
 			struct	radix_node *rn_R;/* progeny */
-		}rn_node;
+		} rn_node;
 	}		rn_u;
 #ifdef RN_DEBUG
 	int rn_info;
@@ -85,10 +85,16 @@ extern struct radix_mask {
 	char	rm_unused;		/* cf. rn_bmask */
 	u_char	rm_flags;		/* cf. rn_flags */
 	struct	radix_mask *rm_mklist;	/* more masks to try */
-	caddr_t	rm_mask;		/* the mask */
+	union	{
+		caddr_t	rmu_mask;		/* the mask */
+		struct	radix_node *rmu_leaf;	/* for normal routes */
+	}	rm_rmu;
 	int	rm_refs;		/* # of references to this struct */
 } *rn_mkfreelist;
 
+#define rm_mask rm_rmu.rmu_mask
+#define rm_leaf rm_rmu.rmu_leaf		/* extra field would make 32 bytes */
+
 #define MKGet(m) {\
 	if (rn_mkfreelist) {\
 		m = rn_mkfreelist; \
@@ -98,7 +104,7 @@ extern struct radix_mask {
 
 #define MKFree(m) { (m)->rm_mklist = rn_mkfreelist; rn_mkfreelist = (m);}
 
-typedef int walktree_f_t __P((struct radix_node *, /*struct walkarg*/ void *));
+typedef int walktree_f_t __P((struct radix_node *, void *));
 
 struct radix_node_head {
 	struct	radix_node *rnh_treetop;
@@ -116,6 +122,8 @@ struct radix_node_head {
 		__P((void *v, void *mask, struct radix_node_head *head));
 	struct	radix_node *(*rnh_matchaddr)	/* locate based on sockaddr */
 		__P((void *v, struct radix_node_head *head));
+	struct	radix_node *(*rnh_lookup)	/* locate based on sockaddr */
+		__P((void *v, void *mask, struct radix_node_head *head));
 	struct	radix_node *(*rnh_matchpkt)	/* locate based on packet hdr */
 		__P((void *v, struct radix_node_head *head));
 	int	(*rnh_walktree)			/* traverse tree */
@@ -130,6 +138,7 @@ struct radix_node_head {
 
 #ifndef KERNEL
 #define Bcmp(a, b, n) bcmp(((char *)(a)), ((char *)(b)), (n))
+#define Bcopy(a, b, n) bcopy(((char *)(a)), ((char *)(b)), (unsigned)(n))
 #define Bzero(p, n) bzero((char *)(p), (int)(n));
 #define R_Malloc(p, t, n) (p = (t) malloc((unsigned int)(n)))
 #define Free(p) free((char *)p);
@@ -139,6 +148,7 @@ struct radix_node_head {
 #define Bzero(p, n) bzero((caddr_t)(p), (unsigned)(n));
 #define R_Malloc(p, t, n) (p = (t) malloc((unsigned long)(n), M_RTABLE, M_DONTWAIT))
 #define Free(p) free((caddr_t)p, M_RTABLE);
+#endif /*KERNEL*/
 
 extern struct radix_node_head *mask_rnhead;
 
@@ -158,6 +168,4 @@ struct radix_node
 	 *rn_search __P((void *, struct radix_node *)),
 	 *rn_search_m __P((void *, struct radix_node *, void *));
 
-#endif /*KERNEL*/
-
-#endif /* !_NET_RADIX_H_ */
+#endif /* _RADIX_H_ */