diff options
| -rw-r--r-- | usr.sbin/ospf6d/interface.c | 4 | ||||
| -rw-r--r-- | usr.sbin/ospf6d/kroute.c | 4 | ||||
| -rw-r--r-- | usr.sbin/ospf6d/ospfe.c | 4 | ||||
| -rw-r--r-- | usr.sbin/ospf6d/rde.c | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/usr.sbin/ospf6d/interface.c b/usr.sbin/ospf6d/interface.c index c1b1f744f19..3f16a5efc47 100644 --- a/usr.sbin/ospf6d/interface.c +++ b/usr.sbin/ospf6d/interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: interface.c,v 1.19 2011/07/07 17:10:48 claudio Exp $ */ +/* $OpenBSD: interface.c,v 1.20 2012/09/17 13:49:27 bluhm Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -150,7 +150,7 @@ if_fsm(struct iface *iface, enum iface_event event) ospfe_imsg_compose_rde(IMSG_IFINFO, iface->self->peerid, 0, &iface->state, sizeof(iface->state)); } - + if (old_state & (IF_STA_MULTI | IF_STA_POINTTOPOINT) && (iface->state & (IF_STA_MULTI | IF_STA_POINTTOPOINT)) == 0) ospfe_demote_iface(iface, 0); diff --git a/usr.sbin/ospf6d/kroute.c b/usr.sbin/ospf6d/kroute.c index da76b5ab88c..9800ab2171e 100644 --- a/usr.sbin/ospf6d/kroute.c +++ b/usr.sbin/ospf6d/kroute.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kroute.c,v 1.36 2011/07/07 18:39:11 claudio Exp $ */ +/* $OpenBSD: kroute.c,v 1.37 2012/09/17 13:49:27 bluhm Exp $ */ /* * Copyright (c) 2004 Esben Norby <norby@openbsd.org> @@ -1075,7 +1075,7 @@ send_rtmsg(int fd, int action, struct kroute *kroute) bzero(&ifp, sizeof(ifp)); ifp.addr.sdl_len = sizeof(struct sockaddr_dl); ifp.addr.sdl_family = AF_LINK; - + ifp.addr.sdl_index = kroute->ifindex; /* adjust header */ hdr.rtm_flags |= RTF_CLONING; diff --git a/usr.sbin/ospf6d/ospfe.c b/usr.sbin/ospf6d/ospfe.c index 42c96d91cec..9f1074555b7 100644 --- a/usr.sbin/ospf6d/ospfe.c +++ b/usr.sbin/ospf6d/ospfe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ospfe.c,v 1.37 2011/07/07 17:10:48 claudio Exp $ */ +/* $OpenBSD: ospfe.c,v 1.38 2012/09/17 13:49:27 bluhm Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -289,7 +289,7 @@ ospfe_dispatch_main(int fd, short event, void *bula) if_update(iface, ifp->mtu, ifp->flags, ifp->media_type, ifp->linkstate, ifp->baudrate); - + if ((iface->flags & IFF_UP) && LINK_STATE_IS_UP(iface->linkstate)) { if_fsm(iface, IF_EVT_UP); diff --git a/usr.sbin/ospf6d/rde.c b/usr.sbin/ospf6d/rde.c index 14c69bd8177..118c06b813d 100644 --- a/usr.sbin/ospf6d/rde.c +++ b/usr.sbin/ospf6d/rde.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde.c,v 1.59 2011/11/06 10:29:05 guenther Exp $ */ +/* $OpenBSD: rde.c,v 1.60 2012/09/17 13:49:27 bluhm Exp $ */ /* * Copyright (c) 2004, 2005 Claudio Jeker <claudio@openbsd.org> @@ -1473,8 +1473,8 @@ orig_intra_lsa_rtr(struct area *area, struct vertex *old) LINK_STATE_IS_UP(iface->linkstate))) /* interface or link state down */ continue; - if ((iface->state & IF_STA_DOWN) && - !(iface->cflags & F_IFACE_PASSIVE)) + if ((iface->state & IF_STA_DOWN) && + !(iface->cflags & F_IFACE_PASSIVE)) /* passive interfaces stay in state DOWN */ continue; |