summaryrefslogtreecommitdiff
path: root/usr.sbin/bgpd/rde_decide.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/bgpd/rde_decide.c')
-rw-r--r--usr.sbin/bgpd/rde_decide.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/usr.sbin/bgpd/rde_decide.c b/usr.sbin/bgpd/rde_decide.c
index d7443dcb8ab..b580bb46b76 100644
--- a/usr.sbin/bgpd/rde_decide.c
+++ b/usr.sbin/bgpd/rde_decide.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rde_decide.c,v 1.53 2009/05/17 12:25:15 claudio Exp $ */
+/* $OpenBSD: rde_decide.c,v 1.54 2009/05/21 15:47:03 claudio Exp $ */
/*
* Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org>
@@ -217,14 +217,7 @@ prefix_evaluate(struct prefix *p, struct rib_entry *re)
{
struct prefix *xp;
- /* XXX we need to skip the adj-rib-in somehow */
- /* XXX hack for now, no idea why we end up here. */
- if (!re) {
- log_debug("*BOOM*");
- return;
- }
-
- if (rde_noevaluate()) {
+ if (re->rib->noevaluate || rde_noevaluate()) {
/* decision process is turned off */
if (p != NULL)
LIST_INSERT_HEAD(&re->prefix_h, p, rib_l);