diff options
| author | Jeremie Courreges-Anglas <jca@cvs.openbsd.org> | 2017-01-23 00:12:37 +0000 |
|---|---|---|
| committer | Jeremie Courreges-Anglas <jca@cvs.openbsd.org> | 2017-01-23 00:12:37 +0000 |
| commit | 82b921e067a71335ba1a9be47d569a16b57cb8ed (patch) | |
| tree | c57b08767f841c2ec5223243344f08c4511850ef | |
| parent | 8b86f2c718ebd0b50e182e9810f830ae6cd5912d (diff) | |
Remove incomplete "forced nexthop" support.
Discussed with claudio@
| -rw-r--r-- | usr.sbin/ospfd/ospfd.h | 3 | ||||
| -rw-r--r-- | usr.sbin/ospfd/rde.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/usr.sbin/ospfd/ospfd.h b/usr.sbin/ospfd/ospfd.h index d0abe6c6fbe..442c7032278 100644 --- a/usr.sbin/ospfd/ospfd.h +++ b/usr.sbin/ospfd/ospfd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ospfd.h,v 1.95 2016/09/02 14:02:48 benno Exp $ */ +/* $OpenBSD: ospfd.h,v 1.96 2017/01/23 00:12:36 jca Exp $ */ /* * Copyright (c) 2004 Esben Norby <norby@openbsd.org> @@ -59,7 +59,6 @@ #define F_REJECT 0x0040 #define F_BLACKHOLE 0x0080 #define F_REDISTRIBUTED 0x0100 -#define F_FORCED_NEXTHOP 0x0200 static const char * const log_procnames[] = { "parent", diff --git a/usr.sbin/ospfd/rde.c b/usr.sbin/ospfd/rde.c index 5ad326c0e4a..b024fcb4b6c 100644 --- a/usr.sbin/ospfd/rde.c +++ b/usr.sbin/ospfd/rde.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde.c,v 1.106 2016/12/27 09:15:16 jca Exp $ */ +/* $OpenBSD: rde.c,v 1.107 2017/01/23 00:12:36 jca Exp $ */ /* * Copyright (c) 2004, 2005 Claudio Jeker <claudio@openbsd.org> @@ -1342,9 +1342,7 @@ orig_asext_lsa(struct kroute *kr, u_int32_t ls_id, u_int16_t age) * neighbors on the particular segment, we skip that check. */ iface = rde_asext_lookup(kr->nexthop.s_addr, -1); - if (kr->flags & F_FORCED_NEXTHOP) - lsa->data.asext.fw_addr = kr->nexthop.s_addr; - else if (kr->flags & F_CONNECTED) + if (kr->flags & F_CONNECTED) lsa->data.asext.fw_addr = 0; else if (iface && (iface->type == IF_TYPE_BROADCAST || iface->type == IF_TYPE_NBMA)) |