proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-09 23:11:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7167 from donaldsharp/mlag_rd_killer

Browse Source 
zebra: the mlag_rd_buf_offset variable was write only
This commit is contained in:
Mark Stapp 2020-09-30 11:40:40 -04:00 committed by GitHub
commit 4fdfda2e34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
zebra/zebra_mlag.c
View File

@ -49,7 +49,6 @@ DEFINE_HOOK(zebra_mlag_private_cleanup_data, (), ())
uint8_t mlag_wr_buffer[ZEBRA_MLAG_BUF_LIMIT]; uint8_t mlag_wr_buffer[ZEBRA_MLAG_BUF_LIMIT];
uint8_t mlag_rd_buffer[ZEBRA_MLAG_BUF_LIMIT]; uint8_t mlag_rd_buffer[ZEBRA_MLAG_BUF_LIMIT];
uint32_t mlag_rd_buf_offset;
static bool test_mlag_in_progress; static bool test_mlag_in_progress;

2
zebra/zebra_mlag.h
View File

@ -42,12 +42,10 @@ DECLARE_HOOK(zebra_mlag_private_cleanup_data, (), ())
extern uint8_t mlag_wr_buffer[ZEBRA_MLAG_BUF_LIMIT]; extern uint8_t mlag_wr_buffer[ZEBRA_MLAG_BUF_LIMIT];
extern uint8_t mlag_rd_buffer[ZEBRA_MLAG_BUF_LIMIT]; extern uint8_t mlag_rd_buffer[ZEBRA_MLAG_BUF_LIMIT];
extern uint32_t mlag_rd_buf_offset;
static inline void zebra_mlag_reset_read_buffer(void) static inline void zebra_mlag_reset_read_buffer(void)
{ {
memset(mlag_wr_buffer, 0, ZEBRA_MLAG_BUF_LIMIT); memset(mlag_wr_buffer, 0, ZEBRA_MLAG_BUF_LIMIT);
mlag_rd_buf_offset = 0;
} }
enum zebra_mlag_state { enum zebra_mlag_state {

4
zebra/zebra_mlag_private.c
View File

@ -76,7 +76,7 @@ static int zebra_mlag_read(struct thread *thread)
{ {
uint32_t *msglen; uint32_t *msglen;
uint32_t h_msglen; uint32_t h_msglen;
uint32_t tot_len, curr_len = mlag_rd_buf_offset; uint32_t tot_len, curr_len = 0;
zrouter.mlag_info.t_read = NULL; zrouter.mlag_info.t_read = NULL;
@ -101,7 +101,6 @@ static int zebra_mlag_read(struct thread *thread)
zebra_mlag_handle_process_state(MLAG_DOWN); zebra_mlag_handle_process_state(MLAG_DOWN);
return -1; return -1;
} }
mlag_rd_buf_offset += data_len;
if (data_len != (ssize_t)(ZEBRA_MLAG_LEN_SIZE - curr_len)) { if (data_len != (ssize_t)(ZEBRA_MLAG_LEN_SIZE - curr_len)) {
/* Try again later */ /* Try again later */
zebra_mlag_sched_read(); zebra_mlag_sched_read();
@ -139,7 +138,6 @@ static int zebra_mlag_read(struct thread *thread)
zebra_mlag_handle_process_state(MLAG_DOWN); zebra_mlag_handle_process_state(MLAG_DOWN);
return -1; return -1;
} }
mlag_rd_buf_offset += data_len;
if (data_len != (ssize_t)(tot_len - curr_len)) { if (data_len != (ssize_t)(tot_len - curr_len)) {
/* Try again later */ /* Try again later */
zebra_mlag_sched_read(); zebra_mlag_sched_read();