summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudio Jeker <claudio@cvs.openbsd.org>2003-12-25 23:41:24 +0000
committerClaudio Jeker <claudio@cvs.openbsd.org>2003-12-25 23:41:24 +0000
commit84a256c9180fb5c9d744493bbdc33b664c93ded2 (patch)
tree0a4c21ffe4ccc05913575cd37d8dd2c73f8b38da
parentf04218fe5a82a954c5622650dbecf584f0f794f6 (diff)
Turn the nexthop verification on. At least in the RDE.
ok henning@
-rw-r--r--usr.sbin/bgpd/rde.c10
-rw-r--r--usr.sbin/bgpd/rde_rib.c5
2 files changed, 4 insertions, 11 deletions
diff --git a/usr.sbin/bgpd/rde.c b/usr.sbin/bgpd/rde.c
index 0d3e0718853..cbecc69fe20 100644
--- a/usr.sbin/bgpd/rde.c
+++ b/usr.sbin/bgpd/rde.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rde.c,v 1.30 2003/12/25 23:22:13 claudio Exp $ */
+/* $OpenBSD: rde.c,v 1.31 2003/12/25 23:41:23 claudio Exp $ */
/*
* Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
@@ -241,6 +241,7 @@ rde_dispatch_imsg(struct imsgbuf *ibuf, int idx)
case IMSG_NEXTHOP_UPDATE:
if (idx != PFD_PIPE_MAIN)
fatal("nexthop response not from parent", 0);
+ nexthop_update(imsg.data);
break;
case IMSG_MRT_REQ:
if (idx != PFD_PIPE_MAIN)
@@ -264,13 +265,6 @@ rde_dispatch_imsg(struct imsgbuf *ibuf, int idx)
}
/*
- * rde_request_dispatch() -- handle all messages comming form the parent.
- * This are reconfiguration request and inquiries.
- * XXX most is done in rde_dispatch_imsg so probably drop this function.
- */
-
-
-/*
* rde_update_dispatch() -- handle routing updates comming from the session
* engine.
*/
diff --git a/usr.sbin/bgpd/rde_rib.c b/usr.sbin/bgpd/rde_rib.c
index 556393d197f..eb93ec810e1 100644
--- a/usr.sbin/bgpd/rde_rib.c
+++ b/usr.sbin/bgpd/rde_rib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rde_rib.c,v 1.7 2003/12/25 23:22:13 claudio Exp $ */
+/* $OpenBSD: rde_rib.c,v 1.8 2003/12/25 23:41:23 claudio Exp $ */
/*
* Copyright (c) 2003 Claudio Jeker <claudio@openbsd.org>
@@ -948,8 +948,7 @@ nexthop_add(struct rde_aspath *asp)
nh = nexthop_get(asp->flags.nexthop.s_addr);
if (nh == NULL) {
nh = nexthop_alloc();
- //nh->state = NEXTHOP_LOOKUP;
- nh->state = NEXTHOP_REACH;
+ nh->state = NEXTHOP_LOOKUP;
nh->exit_nexthop = asp->flags.nexthop;
LIST_INSERT_HEAD(NEXTHOP_HASH(asp->flags.nexthop.s_addr), nh,
nexthop_l);