diff options
| author | Esben Norby <norby@cvs.openbsd.org> | 2005-05-26 20:42:11 +0000 |
|---|---|---|
| committer | Esben Norby <norby@cvs.openbsd.org> | 2005-05-26 20:42:11 +0000 |
| commit | 9d9650ec5f807de66278f60c34e86a3eaf338525 (patch) | |
| tree | b97d555c99729755e8375242a32692e330e3715f /usr.sbin | |
| parent | 1fcbd7af8de19e60a7c005b9b6af1ac8d2fff895 (diff) | |
Remove unused neighbor state.
ok claudio@
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/ospfd/neighbor.c | 14 | ||||
| -rw-r--r-- | usr.sbin/ospfd/ospfe.h | 5 |
2 files changed, 2 insertions, 17 deletions
diff --git a/usr.sbin/ospfd/neighbor.c b/usr.sbin/ospfd/neighbor.c index 370152cd9a7..47ad3278860 100644 --- a/usr.sbin/ospfd/neighbor.c +++ b/usr.sbin/ospfd/neighbor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: neighbor.c,v 1.18 2005/05/26 20:21:09 norby Exp $ */ +/* $OpenBSD: neighbor.c,v 1.19 2005/05/26 20:42:10 norby Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -63,7 +63,6 @@ struct { {NBR_STA_BIDIR, NBR_EVT_2_WAY_RCVD, NBR_ACT_NOTHING, 0}, {NBR_STA_INIT, NBR_EVT_1_WAY_RCVD, NBR_ACT_NOTHING, 0}, {NBR_STA_DOWN, NBR_EVT_HELLO_RCVD, NBR_ACT_STRT_ITIMER, NBR_STA_INIT}, - {NBR_STA_DOWN, NBR_EVT_STRT, NBR_ACT_STRT, NBR_STA_ATTEMPT}, {NBR_STA_ATTEMPT, NBR_EVT_HELLO_RCVD, NBR_ACT_RST_ITIMER, NBR_STA_INIT}, {NBR_STA_INIT, NBR_EVT_2_WAY_RCVD, NBR_ACT_EVAL, 0}, {NBR_STA_XSTRT, NBR_EVT_NEG_DONE, NBR_ACT_SNAP, NBR_STA_SNAP}, @@ -145,9 +144,6 @@ nbr_fsm(struct nbr *nbr, enum nbr_event event) } switch (nbr_fsm_tbl[i].action) { - case NBR_ACT_STRT: - ret = nbr_act_start(nbr); - break; case NBR_ACT_RST_ITIMER: ret = nbr_act_reset_itimer(nbr); break; @@ -432,14 +428,6 @@ nbr_start_adj_timer(struct nbr *nbr) /* actions */ int -nbr_act_start(struct nbr *nbr) -{ - log_debug("nbr_act_start: neighbor ID %s", inet_ntoa(nbr->id)); - - return (-1); -} - -int nbr_act_reset_itimer(struct nbr *nbr) { if (nbr_reset_itimer(nbr)) { diff --git a/usr.sbin/ospfd/ospfe.h b/usr.sbin/ospfd/ospfe.h index 0a84c3b6c3d..d0b2506bb21 100644 --- a/usr.sbin/ospfd/ospfe.h +++ b/usr.sbin/ospfd/ospfe.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ospfe.h,v 1.14 2005/04/25 11:31:50 claudio Exp $ */ +/* $OpenBSD: ospfe.h,v 1.15 2005/05/26 20:42:10 norby Exp $ */ /* * Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org> @@ -50,7 +50,6 @@ TAILQ_HEAD(ctl_conns, ctl_conn) ctl_conns; enum nbr_event { NBR_EVT_NOTHING, NBR_EVT_HELLO_RCVD, - NBR_EVT_STRT, NBR_EVT_2_WAY_RCVD, NBR_EVT_NEG_DONE, NBR_EVT_SNAP_DONE, @@ -69,7 +68,6 @@ enum nbr_event { /* neighbor actions */ enum nbr_action { NBR_ACT_NOTHING, - NBR_ACT_STRT, NBR_ACT_RST_ITIMER, NBR_ACT_STRT_ITIMER, NBR_ACT_EVAL, @@ -272,7 +270,6 @@ int nbr_reset_itimer(struct nbr *); void nbr_adj_timer(int, short, void *); int nbr_start_adj_timer(struct nbr *); -int nbr_act_start(struct nbr *); int nbr_act_reset_itimer(struct nbr *); int nbr_act_start_itimer(struct nbr *); int nbr_act_eval(struct nbr *); |