diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2009-09-30 14:39:08 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2009-09-30 14:39:08 +0000 |
| commit | 1ae4fd96cbce0e4906a8d367a79dad9aa6ebc73e (patch) | |
| tree | 8fe9a7e1d12f4182bfd0964d6a6366b5d5d0792e /usr.sbin | |
| parent | 661ea77a13d50cc4311f6765df79f1c3cc1adb9e (diff) | |
Oups, these changes should not have been commited. Revert.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/ospfd/interface.c | 8 | ||||
| -rw-r--r-- | usr.sbin/ospfd/neighbor.c | 7 |
2 files changed, 6 insertions, 9 deletions
diff --git a/usr.sbin/ospfd/interface.c b/usr.sbin/ospfd/interface.c index 784acdf9161..a5d53ab9b0a 100644 --- a/usr.sbin/ospfd/interface.c +++ b/usr.sbin/ospfd/interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: interface.c,v 1.65 2009/09/30 14:37:11 claudio Exp $ */ +/* $OpenBSD: interface.c,v 1.66 2009/09/30 14:39:07 claudio Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -139,9 +139,11 @@ if_fsm(struct iface *iface, enum iface_event event) if (iface->state != old_state) orig_rtr_lsa(iface->area); - if (old_state & IF_STA_MULTI && (iface->state & IF_STA_MULTI) == 0) + if (old_state & (IF_STA_MULTI | IF_STA_POINTTOPOINT) && + (iface->state & (IF_STA_MULTI | IF_STA_POINTTOPOINT)) == 0) ospfe_demote_iface(iface, 0); - if ((old_state & IF_STA_MULTI) == 0 && iface->state & IF_STA_MULTI) + if ((old_state & (IF_STA_MULTI | IF_STA_POINTTOPOINT)) == 0 && + iface->state & (IF_STA_MULTI | IF_STA_POINTTOPOINT)) ospfe_demote_iface(iface, 1); log_debug("if_fsm: event %s resulted in action %s and changing " diff --git a/usr.sbin/ospfd/neighbor.c b/usr.sbin/ospfd/neighbor.c index 7cd6796fb48..ed7f5492807 100644 --- a/usr.sbin/ospfd/neighbor.c +++ b/usr.sbin/ospfd/neighbor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: neighbor.c,v 1.38 2009/09/30 14:37:11 claudio Exp $ */ +/* $OpenBSD: neighbor.c,v 1.39 2009/09/30 14:39:07 claudio Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -211,11 +211,6 @@ nbr_fsm(struct nbr *nbr, enum nbr_event event) gettimeofday(&now, NULL); nbr->uptime = now.tv_sec; - - /* demote P2P links if the neighbor resets */ - if (nbr->iface->type == IF_TYPE_POINTOPOINT) - ospfe_demote_iface(nbr->iface, - !(old_state & NBR_STA_FULL)); } /* bidirectional communication lost */ |