On 11/28/2011 03:32 AM, Yunkai Zhang wrote:
> 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.
>
thanks - i've committed and pushed your patch
> Signed-off-by: Yunkai Zhang <qiushu.zyk@xxxxxxxxxx>
> ---
> exec/totemsrp.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/exec/totemsrp.c b/exec/totemsrp.c
> index cb9d43a..4011514 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);
_______________________________________________
discuss mailing list
discuss@xxxxxxxxxxxx
http://lists.corosync.org/mailman/listinfo/discuss
