diff options
| -rw-r--r-- | bgpd/bgp_peer.c | 8 | ||||
| -rw-r--r-- | bgpd/bgp_route.c | 2 | ||||
| -rw-r--r-- | bgpd/bgpd.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/bgpd/bgp_peer.c b/bgpd/bgp_peer.c index 1a1d95de..dea87a74 100644 --- a/bgpd/bgp_peer.c +++ b/bgpd/bgp_peer.c @@ -159,7 +159,7 @@ bgp_session_has_established(bgp_peer peer) assert(session->state == bgp_session_sEnabled) ; session->state = bgp_session_sEstablished ; - peer_change_status (peer, Established); + peer_change_status (peer, bgp_peer_sEstablished); /* update peer state from received open */ bgp_peer_open_state_receive(peer); @@ -794,7 +794,7 @@ peer_delete (struct peer *peer) */ peer->last_reset = PEER_DOWN_NEIGHBOR_DELETE; bgp_peer_stop (peer); - peer_change_status (peer, Deleted); + peer_change_status (peer, bgp_peer_sDeleted); /* Password configuration */ if (peer->password) @@ -995,7 +995,7 @@ bgp_peer_disable(bgp_peer peer, bgp_notify notification) /* and the peer */ bgp_peer_stop(peer); - peer_change_status (peer, Clearing); + peer_change_status (peer, bgp_peer_sClearing); } /* Called after event occurred, this function change status and reset @@ -1008,7 +1008,7 @@ peer_change_status (bgp_peer peer, int status) /* Transition into Clearing or Deleted must /always/ clear all routes.. * (and must do so before actually changing into Deleted.. */ - if (status >= Clearing) + if (status >= bgp_peer_sClearing) bgp_clear_route_all (peer); /* Preserve old status and change into new status. */ diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 86432b18..27e28fd3 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -2727,7 +2727,7 @@ bgp_clear_node_complete (struct work_queue *wq) bgp_peer_stop(peer); BGP_EVENT_FLUSH (peer); if (peer->state == bgp_peer_sClearing) - peer_change_status (peer, Idle); + peer_change_status (peer, bgp_peer_sIdle); peer_unlock (peer); /* bgp_clear_route */ } diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h index fb97d154..04121b74 100644 --- a/bgpd/bgpd.h +++ b/bgpd/bgpd.h @@ -272,17 +272,17 @@ struct bgp_nlri #define BGP_ORIGIN_INCOMPLETE 2 /* BGP finite state machine status. */ -#define Idle 1 /* Obsolete +#define Idle 1 #define Connect 2 #define Active 3 #define OpenSent 4 #define OpenConfirm 5 -*/ #define Established 6 #define Clearing 7 #define Deleted 8 #define BGP_STATUS_MAX 9 +*/ /* BGP finite state machine events. */ #define BGP_Start 1 |