From 19652c3d7cf72241907bf7efc3ca0738c66f2039 Mon Sep 17 00:00:00 2001 From: Yunkai Zhang Date: Mon, 28 Nov 2011 18:32:36 +0800 Subject: [PATCH] Correct nodeid of token when we retransmit it Although incorrect nodeid will not affect program's logic, but it will make us confused when we add some logs to record the transmission path of token in debug mode. Signed-off-by: Yunkai Zhang Reviewed-by: Steven Dake --- exec/totemsrp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/exec/totemsrp.c b/exec/totemsrp.c index cb9d43a6..4011514e 100644 --- a/exec/totemsrp.c +++ b/exec/totemsrp.c @@ -2722,9 +2722,9 @@ static int token_send ( orf_token_size = sizeof (struct orf_token) + (orf_token->rtr_list_entries * sizeof (struct rtr_item)); + orf_token->header.nodeid = instance->my_id.addr[0].nodeid; memcpy (instance->orf_token_retransmit, orf_token, orf_token_size); instance->orf_token_retransmit_size = orf_token_size; - orf_token->header.nodeid = instance->my_id.addr[0].nodeid; assert (orf_token->header.nodeid); if (forward_token == 0) { @@ -2899,6 +2899,7 @@ static int memb_state_commit_token_send_recovery ( unsigned int commit_token_size; commit_token->token_seq++; + commit_token->header.nodeid = instance->my_id.addr[0].nodeid; commit_token_size = sizeof (struct memb_commit_token) + ((sizeof (struct srp_addr) + sizeof (struct memb_commit_token_memb_entry)) * commit_token->addr_entries);