From 40d636e9eff33bc9ce2ba95089198cf83a43063c Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Tue, 1 Sep 2020 15:24:19 +0200 Subject: [PATCH] totemsrp: Move token received callback Trigger token received callback only for valid token. Signed-off-by: Jan Friesse Reviewed-by: Christine Caulfield --- exec/totemsrp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/exec/totemsrp.c b/exec/totemsrp.c index 19cfb361..64315bef 100644 --- a/exec/totemsrp.c +++ b/exec/totemsrp.c @@ -3904,8 +3904,6 @@ static int message_handler_orf_token ( } } - token_callbacks_execute (instance, TOTEM_CALLBACK_TOKEN_RECEIVED); - switch (instance->memb_state) { case MEMB_STATE_COMMIT: /* Discard token */ @@ -3946,6 +3944,12 @@ static int message_handler_orf_token ( if (sq_lte_compare (token->token_seq, instance->my_token_seq)) { return (0); /* discard token */ } + + /* + * Token is valid so trigger callbacks + */ + token_callbacks_execute (instance, TOTEM_CALLBACK_TOKEN_RECEIVED); + last_aru = instance->my_last_aru; instance->my_last_aru = token->aru; -- 2.39.5