Proactively fix prefix counters. Currently only F_LOCAL prefixes exist but

as soon as F_ORIGINAL come the counters would no longer be correct and in the
end max-prefix would no longer work. Add additinal counters for F_ORIGINAL
prefixes and bump the correct conter depending on the prefix flags.
OK henning@

1 files changed, 6 insertions, 4 deletions

diff --git a/usr.sbin/bgpd/rde.h b/usr.sbin/bgpd/rde.h
index 9f550731f30..d07eb43dd19 100644
--- a/usr.sbin/bgpd/rde.h
+++ b/usr.sbin/bgpd/rde.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde.h,v 1.84 2006/01/20 16:06:12 claudio Exp $ */
+/*	$OpenBSD: rde.h,v 1.85 2006/01/20 16:40:17 claudio Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org> and
@@ -61,7 +61,8 @@ struct rde_peer {
 	struct uplist_prefix		 withdraws6;
 	struct capabilities		 capa_announced;
 	struct capabilities		 capa_received;
-	u_int32_t			 prefix_cnt;
+	u_int32_t			 prefix_cnt; /* # of prefixes */
+	u_int32_t			 adjrib_cnt; /* # of p. in Adj-RIB-In */
 	u_int32_t			 remote_bgpid;
 	u_int32_t			 up_pcnt;
 	u_int32_t			 up_acnt;
@@ -168,11 +169,12 @@ struct rde_aspath {
 	u_int32_t			 med;		/* multi exit disc */
 	u_int32_t			 lpref;		/* local pref */
 	u_int32_t			 weight;	/* low prio lpref */
+	u_int32_t			 prefix_cnt; /* # of prefixes */
+	u_int32_t			 active_cnt; /* # of active prefixes */
+	u_int32_t			 adjrib_cnt; /* # of p. in Adj-RIB-In */
 	u_int16_t			 rtlabelid;	/* route label id */
 	u_int16_t			 pftableid;	/* pf table id */
 	u_int16_t			 flags;		/* internally used */
-	u_int16_t			 prefix_cnt; /* # of prefixes */
-	u_int16_t			 active_cnt; /* # of active prefixes */
 	u_int8_t			 origin;
 	u_int8_t			 others_len;
 };