Просмотр исходного кода

totemsrp: Move token received callback

Trigger token received callback only for valid token.

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Christine Caulfield <ccaulfie@redhat.com>
Jan Friesse 5 лет назад
Родитель
Сommit
40d636e9ef
1 измененных файлов с 6 добавлено и 2 удалено
  1. 6 2
      exec/totemsrp.c

+ 6 - 2
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;