diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2023-08-26 21:34:59 -0400 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2023-09-10 08:31:25 -0400 |
| commit | d1e7215da064eab02be7c1874cab27a6b7d0cacf (patch) | |
| tree | de4e739a18d63a287e600518e9483544bee8584e /bgpd/bgp_fsm.c | |
| parent | 1f8274e050aefeaf4f8706d6e9a7a2706e44629a (diff) | |
bgpd: make bgp_keepalives_on|off connection oriented
The bgp_keepalives_on|off functions should use a peer_connection
as a basis for it's operation.
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to 'bgpd/bgp_fsm.c')
| -rw-r--r-- | bgpd/bgp_fsm.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c index b8e6cf6caa..a730f97450 100644 --- a/bgpd/bgp_fsm.c +++ b/bgpd/bgp_fsm.c @@ -157,7 +157,7 @@ static struct peer *peer_xfer_conn(struct peer *from_peer) * fd is set to -1. If blocked on lock then keepalive * thread can access peer pointer with fd -1. */ - bgp_keepalives_off(from_peer); + bgp_keepalives_off(from_peer->connection); EVENT_OFF(peer->connection->t_routeadv); EVENT_OFF(peer->connection->t_connect); @@ -366,7 +366,7 @@ void bgp_timer_set(struct peer_connection *connection) } EVENT_OFF(connection->t_connect); EVENT_OFF(connection->t_holdtime); - bgp_keepalives_off(peer); + bgp_keepalives_off(connection); EVENT_OFF(connection->t_routeadv); EVENT_OFF(connection->t_delayopen); break; @@ -384,7 +384,7 @@ void bgp_timer_set(struct peer_connection *connection) peer->v_connect); EVENT_OFF(connection->t_holdtime); - bgp_keepalives_off(peer); + bgp_keepalives_off(connection); EVENT_OFF(connection->t_routeadv); break; @@ -407,7 +407,7 @@ void bgp_timer_set(struct peer_connection *connection) bgp_connect_timer, peer->v_connect); } EVENT_OFF(connection->t_holdtime); - bgp_keepalives_off(peer); + bgp_keepalives_off(connection); EVENT_OFF(connection->t_routeadv); break; @@ -421,7 +421,7 @@ void bgp_timer_set(struct peer_connection *connection) } else { EVENT_OFF(connection->t_holdtime); } - bgp_keepalives_off(peer); + bgp_keepalives_off(connection); EVENT_OFF(connection->t_routeadv); EVENT_OFF(connection->t_delayopen); break; @@ -439,11 +439,11 @@ void bgp_timer_set(struct peer_connection *connection) */ EVENT_OFF(connection->t_holdtime); if (peer->v_holdtime == 0) - bgp_keepalives_off(peer); + bgp_keepalives_off(connection); else { BGP_TIMER_ON(connection->t_holdtime, bgp_holdtime_timer, peer->v_holdtime); - bgp_keepalives_on(peer); + bgp_keepalives_on(connection); } EVENT_OFF(connection->t_routeadv); EVENT_OFF(connection->t_delayopen); @@ -464,11 +464,11 @@ void bgp_timer_set(struct peer_connection *connection) */ EVENT_OFF(connection->t_holdtime); if (peer->v_holdtime == 0) - bgp_keepalives_off(peer); + bgp_keepalives_off(connection); else { BGP_TIMER_ON(connection->t_holdtime, bgp_holdtime_timer, peer->v_holdtime); - bgp_keepalives_on(peer); + bgp_keepalives_on(connection); } break; case Deleted: @@ -485,7 +485,7 @@ void bgp_timer_set(struct peer_connection *connection) EVENT_OFF(connection->t_start); EVENT_OFF(connection->t_connect); EVENT_OFF(connection->t_holdtime); - bgp_keepalives_off(peer); + bgp_keepalives_off(connection); EVENT_OFF(connection->t_routeadv); EVENT_OFF(connection->t_delayopen); break; @@ -1507,7 +1507,7 @@ enum bgp_fsm_state_progress bgp_stop(struct peer_connection *connection) } /* stop keepalives */ - bgp_keepalives_off(peer); + bgp_keepalives_off(connection); /* Stop read and write threads. */ bgp_writes_off(connection); @@ -2290,7 +2290,7 @@ bgp_establish(struct peer_connection *connection) /* Reset uptime, turn on keepalives, send current table. */ if (!peer->v_holdtime) - bgp_keepalives_on(peer); + bgp_keepalives_on(connection); peer->uptime = monotime(NULL); |