diff options
| author |   Steven Luong <sluong@cisco.com> | 2019-10-22 21:27:22 -0700 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2019-10-24 08:57:19 +0000 |
| commit | 002723c45b042a270e0ab521b4b88da3d2d7ef55 (patch) | |
| tree | 1a7bb8d495307b848d8befa59aea942990458cd8 /src/plugins/lacp | |
| parent | 7331005c16d0e1499080899b2a0676a0cd945595 (diff) | |
lacp: add actor steady state check prior to skip processing lacp pdu
In a rare event, we may be skipping processing lacp pdu's when the it is
not in steady state.
Type: fix
Signed-off-by: Steven Luong <sluong@cisco.com>
Change-Id: I3595d22dbff8a97dce9fb4d4452d2051bcf6f523
Diffstat (limited to 'src/plugins/lacp')
| -rw-r--r-- | src/plugins/lacp/input.c | 4 | ||||
| -rw-r--r-- | src/plugins/lacp/protocol.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/lacp/input.c b/src/plugins/lacp/input.c index ef7cca9c442..befb2ed408b 100644 --- a/src/plugins/lacp/input.c +++ b/src/plugins/lacp/input.c @@ -142,7 +142,6 @@ lacp_input (vlib_main_t * vm, vlib_buffer_t * b0, u32 bi0) lacp_error_t e; marker_pdu_t *marker; uword last_packet_signature; - bond_if_t *bif; sif = bond_get_slave_by_sw_if_index (vnet_buffer (b0)->sw_if_index[VLIB_RX]); @@ -203,10 +202,9 @@ lacp_input (vlib_main_t * vm, vlib_buffer_t * b0, u32 bi0) last_packet_signature = hash_memory (sif->last_rx_pkt, vec_len (sif->last_rx_pkt), 0xd00b); - bif = bond_get_master_by_dev_instance (sif->bif_dev_instance); if (sif->last_packet_signature_valid && (sif->last_packet_signature == last_packet_signature) && - hash_get (bif->active_slave_by_sw_if_index, sif->sw_if_index)) + ((sif->actor.state & LACP_STEADY_STATE) == LACP_STEADY_STATE)) { lacp_start_current_while_timer (lm->vlib_main, sif, sif->ttl_in_seconds); diff --git a/src/plugins/lacp/protocol.h b/src/plugins/lacp/protocol.h index 9fc2f35fd38..347e944f95e 100644 --- a/src/plugins/lacp/protocol.h +++ b/src/plugins/lacp/protocol.h @@ -61,6 +61,10 @@ typedef enum _(6, DEFAULTED, "defaulted") \ _(7, EXPIRED, "expired") +#define LACP_STEADY_STATE (LACP_STATE_SYNCHRONIZATION | \ + LACP_STATE_COLLECTING | \ + LACP_STATE_DISTRIBUTING) + typedef enum { #define _(a, b, c) LACP_STATE_##b = (1 << a), |