diff options
| author | Peter Hessler <phessler@cvs.openbsd.org> | 2016-09-19 10:03:41 +0000 |
|---|---|---|
| committer | Peter Hessler <phessler@cvs.openbsd.org> | 2016-09-19 10:03:41 +0000 |
| commit | bd71a3dc8881b693bad8330f91142b53a263cba4 (patch) | |
| tree | 4f1f218dd7aaa8050d6e25734c1efb609ab05099 /sys/net/bfd.c | |
| parent | b34badf3fe036312f8a05316172ad91cf3a44a6c (diff) | |
do a better job of setting "last state"
Diffstat (limited to 'sys/net/bfd.c')
| -rw-r--r-- | sys/net/bfd.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/sys/net/bfd.c b/sys/net/bfd.c index 5d55c5f4690..89891a44075 100644 --- a/sys/net/bfd.c +++ b/sys/net/bfd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bfd.c,v 1.31 2016/09/19 09:03:41 phessler Exp $ */ +/* $OpenBSD: bfd.c,v 1.32 2016/09/19 10:03:40 phessler Exp $ */ /* * Copyright (c) 2016 Peter Hessler <phessler@openbsd.org> @@ -814,26 +814,35 @@ bfd_set_state(struct bfd_config *bfd, int state) return; } - bfd->bc_state = bfd->bc_neighbor->bn_lstate = state; - if (bfd->bc_state > BFD_STATE_ADMINDOWN) + bfd->bc_neighbor->bn_lstate = state; + if (state > BFD_STATE_ADMINDOWN) bfd->bc_neighbor->bn_ldiag = 0; if (!rtisvalid(rt)) bfd->bc_neighbor->bn_lstate = BFD_STATE_ADMINDOWN; switch (state) { - case BFD_STATE_ADMINDOWN: /* FALLTHROUGH */ + case BFD_STATE_ADMINDOWN: + bfd->bc_laststate = bfd->bc_state; + /* FALLTHROUGH */ case BFD_STATE_DOWN: - if (bfd->bc_laststate == BFD_STATE_UP) + if (bfd->bc_laststate == BFD_STATE_UP) { + bfd->bc_laststate = bfd->bc_state; bfd_set_uptime(bfd); + } break; case BFD_STATE_INIT: + bfd->bc_laststate = bfd->bc_state; break; case BFD_STATE_UP: + bfd->bc_laststate = + bfd->bc_state == BFD_STATE_INIT ? + bfd->bc_laststate : bfd->bc_state; bfd_set_uptime(bfd); break; } + bfd->bc_state = state; // rt_bfdmsg(bfd); if_put(ifp); @@ -847,7 +856,6 @@ bfd_set_uptime(struct bfd_config *bfd) microtime(&tv); bfd->bc_lastuptime = tv.tv_sec - bfd->bc_time->tv_sec; - bfd->bc_laststate = bfd->bc_state; memcpy(bfd->bc_time, &tv, sizeof(tv)); } |