proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-26 06:39:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: move t_generate_updgrp_packets into peer_connection

Browse Source 
The t_generate_updgrp_packets event pointer belongs in the
peer_connection pointer.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2023-08-26 22:08:19 -04:00
parent 13ae845b94
commit 981dd86920
5 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bgpd/bgp_fsm.c
View File

@ -580,7 +580,7 @@ void bgp_routeadv_timer(struct event *thread)
peer->synctime = monotime(NULL); peer->synctime = monotime(NULL);
event_add_timer_msec(bm->master, bgp_generate_updgrp_packets, peer, 0, event_add_timer_msec(bm->master, bgp_generate_updgrp_packets, peer, 0,
&peer->t_generate_updgrp_packets); &peer->connection->t_generate_updgrp_packets);
/* MRAI timer will be started again when FIFO is built, no need to /* MRAI timer will be started again when FIFO is built, no need to
* do it here. * do it here.
@ -997,7 +997,8 @@ void bgp_adjust_routeadv(struct peer *peer)
* is added to update group packet generate which will allow * is added to update group packet generate which will allow
* more routes to be sent in the update message * more routes to be sent in the update message
*/ */
BGP_UPDATE_GROUP_TIMER_ON(&peer->t_generate_updgrp_packets, BGP_UPDATE_GROUP_TIMER_ON(&peer->connection
->t_generate_updgrp_packets,
bgp_generate_updgrp_packets); bgp_generate_updgrp_packets);
return; return;
} }

4
bgpd/bgp_io.c
View File

@ -68,7 +68,7 @@ void bgp_writes_off(struct peer_connection *connection)
assert(fpt->running); assert(fpt->running);
event_cancel_async(fpt->master, &connection->t_write, NULL); event_cancel_async(fpt->master, &connection->t_write, NULL);
EVENT_OFF(peer->t_generate_updgrp_packets); EVENT_OFF(connection->t_generate_updgrp_packets);
UNSET_FLAG(peer->connection->thread_flags, PEER_THREAD_WRITES_ON); UNSET_FLAG(peer->connection->thread_flags, PEER_THREAD_WRITES_ON);
} }
@ -149,7 +149,7 @@ static void bgp_process_writes(struct event *thread)
event_add_write(fpt->master, bgp_process_writes, connection, event_add_write(fpt->master, bgp_process_writes, connection,
connection->fd, &connection->t_write); connection->fd, &connection->t_write);
} else if (!fatal) { } else if (!fatal) {
BGP_UPDATE_GROUP_TIMER_ON(&peer->t_generate_updgrp_packets, BGP_UPDATE_GROUP_TIMER_ON(&connection->t_generate_updgrp_packets,
bgp_generate_updgrp_packets); bgp_generate_updgrp_packets);
} }
} }

7
bgpd/bgp_packet.c
View File

@ -403,7 +403,7 @@ static void bgp_write_proceed_actions(struct peer *peer)
next_pkt = paf->next_pkt_to_send; next_pkt = paf->next_pkt_to_send;
if (next_pkt && next_pkt->buffer) { if (next_pkt && next_pkt->buffer) {
BGP_TIMER_ON(peer->t_generate_updgrp_packets, BGP_TIMER_ON(peer->connection->t_generate_updgrp_packets,
bgp_generate_updgrp_packets, 0); bgp_generate_updgrp_packets, 0);
return; return;
} }
@ -414,7 +414,7 @@ static void bgp_write_proceed_actions(struct peer *peer)
if (bpacket_queue_is_full(SUBGRP_INST(subgrp), if (bpacket_queue_is_full(SUBGRP_INST(subgrp),
SUBGRP_PKTQ(subgrp)) SUBGRP_PKTQ(subgrp))
|| subgroup_packets_to_build(subgrp)) { || subgroup_packets_to_build(subgrp)) {
BGP_TIMER_ON(peer->t_generate_updgrp_packets, BGP_TIMER_ON(peer->connection->t_generate_updgrp_packets,
bgp_generate_updgrp_packets, 0); bgp_generate_updgrp_packets, 0);
return; return;
} }
@ -429,7 +429,8 @@ static void bgp_write_proceed_actions(struct peer *peer)
&& !CHECK_FLAG(peer->af_sflags[afi][safi], && !CHECK_FLAG(peer->af_sflags[afi][safi],
PEER_STATUS_EOR_SEND) PEER_STATUS_EOR_SEND)
&& safi != SAFI_MPLS_VPN) { && safi != SAFI_MPLS_VPN) {
BGP_TIMER_ON(peer->t_generate_updgrp_packets, BGP_TIMER_ON(peer->connection
->t_generate_updgrp_packets,
bgp_generate_updgrp_packets, 0); bgp_generate_updgrp_packets, 0);
return; return;
} }

9
bgpd/bgp_updgrp.c
View File

@ -2201,10 +2201,11 @@ void subgroup_trigger_write(struct update_subgroup *subgrp)
*/ */
SUBGRP_FOREACH_PEER (subgrp, paf) SUBGRP_FOREACH_PEER (subgrp, paf)
if (peer_established(paf->peer)) if (peer_established(paf->peer))
event_add_timer_msec( event_add_timer_msec(bm->master,
bm->master, bgp_generate_updgrp_packets, bgp_generate_updgrp_packets,
paf->peer, 0, paf->peer, 0,
&paf->peer->t_generate_updgrp_packets); &paf->peer->connection
->t_generate_updgrp_packets);
} }
int update_group_clear_update_dbg(struct update_group *updgrp, void *arg) int update_group_clear_update_dbg(struct update_group *updgrp, void *arg)

3
bgpd/bgpd.h
View File

@ -1149,6 +1149,8 @@ struct peer_connection {
struct event *t_gr_restart; struct event *t_gr_restart;
struct event *t_gr_stale; struct event *t_gr_stale;
struct event *t_generate_updgrp_packets;
struct event *t_routeadv; struct event *t_routeadv;
struct event *t_process_packet; struct event *t_process_packet;
struct event *t_process_packet_error; struct event *t_process_packet_error;
@ -1562,7 +1564,6 @@ struct peer {
struct event *t_pmax_restart; struct event *t_pmax_restart;
struct event *t_llgr_stale[AFI_MAX][SAFI_MAX]; struct event *t_llgr_stale[AFI_MAX][SAFI_MAX];
struct event *t_revalidate_all[AFI_MAX][SAFI_MAX]; struct event *t_revalidate_all[AFI_MAX][SAFI_MAX];
struct event *t_generate_updgrp_packets;
struct event *t_refresh_stalepath; struct event *t_refresh_stalepath;
/* Thread flags. */ /* Thread flags. */