|
@@ -3904,8 +3904,6 @@ static int message_handler_orf_token (
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- token_callbacks_execute (instance, TOTEM_CALLBACK_TOKEN_RECEIVED);
|
|
|
|
|
-
|
|
|
|
|
switch (instance->memb_state) {
|
|
switch (instance->memb_state) {
|
|
|
case MEMB_STATE_COMMIT:
|
|
case MEMB_STATE_COMMIT:
|
|
|
/* Discard token */
|
|
/* Discard token */
|
|
@@ -3946,6 +3944,12 @@ static int message_handler_orf_token (
|
|
|
if (sq_lte_compare (token->token_seq, instance->my_token_seq)) {
|
|
if (sq_lte_compare (token->token_seq, instance->my_token_seq)) {
|
|
|
return (0); /* discard token */
|
|
return (0); /* discard token */
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ /*
|
|
|
|
|
+ * Token is valid so trigger callbacks
|
|
|
|
|
+ */
|
|
|
|
|
+ token_callbacks_execute (instance, TOTEM_CALLBACK_TOKEN_RECEIVED);
|
|
|
|
|
+
|
|
|
last_aru = instance->my_last_aru;
|
|
last_aru = instance->my_last_aru;
|
|
|
instance->my_last_aru = token->aru;
|
|
instance->my_last_aru = token->aru;
|
|
|
|
|
|