diff options
| author |   stsp <stsp@openbsd.org> | 2015-09-27 17:31:50 +0000 |
|---|---|---|
| committer | stsp <stsp@openbsd.org> | 2015-09-27 17:31:50 +0000 |
| commit | 18ffdd9451bdbfe12cfc5ad3ca892e204f4b4047 (patch) | |
| tree | 9315b67d57330fdf752cf0432a8f4fdc76c2a975 /usr.sbin/ospfd/ospfe.c | |
| parent | As done for bgpd recently, rename if_mediatype to if_type in ldpd. (diff) | |
| download | wireguard-openbsd-18ffdd9451bdbfe12cfc5ad3ca892e204f4b4047.tar.xz wireguard-openbsd-18ffdd9451bdbfe12cfc5ad3ca892e204f4b4047.zip | |
As done for bgpd recently, rename if_mediatype to if_type in ospfd/ospf6d.
And some ifmedia64 fixes.
"move forward" deraadt@
Diffstat (limited to 'usr.sbin/ospfd/ospfe.c')
| -rw-r--r-- | usr.sbin/ospfd/ospfe.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/ospfd/ospfe.c b/usr.sbin/ospfd/ospfe.c index d04d0975f83..b3c7ac26c9d 100644 --- a/usr.sbin/ospfd/ospfe.c +++ b/usr.sbin/ospfd/ospfe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ospfe.c,v 1.90 2015/02/10 05:24:48 claudio Exp $ */ +/* $OpenBSD: ospfe.c,v 1.91 2015/09/27 17:31:50 stsp Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -879,7 +879,7 @@ orig_rtr_lsa(struct area *area) */ if (!(iface->flags & IFF_UP) || (!LINK_STATE_IS_UP(iface->linkstate) && - !(iface->media_type == IFT_CARP && + !(iface->if_type == IFT_CARP && iface->linkstate == LINK_STATE_DOWN))) continue; log_debug("orig_rtr_lsa: stub net, " @@ -895,7 +895,7 @@ orig_rtr_lsa(struct area *area) * backup carp interfaces are anounced with high metric * for faster failover. */ - if (iface->media_type == IFT_CARP && + if (iface->if_type == IFT_CARP && iface->linkstate == LINK_STATE_DOWN) rtr_link.metric = MAX_METRIC; else |