From 5ea572f8d5a08897f4aa15410a9f7e446e624d0a Mon Sep 17 00:00:00 2001 From: Willem Thiart Date: Mon, 11 Apr 2016 13:10:26 -0700 Subject: [PATCH] Fix: append entries array index Regression caused by 6f318d01739226d103a4f246653d04c580d8fe87 --- src/raft_log.c | 2 +- tests/test_server.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/raft_log.c b/src/raft_log.c index c48bcee9..c09a6cbe 100644 --- a/src/raft_log.c +++ b/src/raft_log.c @@ -109,7 +109,7 @@ int log_append_entry(log_t* me_, raft_entry_t* c) if (me->cb && me->cb->log_offer) { void* ud = raft_get_udata(me->raft); - e = me->cb->log_offer(me->raft, ud, c, me->back - 1); + e = me->cb->log_offer(me->raft, ud, c, me->back); if (e == RAFT_ERR_SHUTDOWN) return e; } diff --git a/tests/test_server.c b/tests/test_server.c index 787a2070..83abdbec 100644 --- a/tests/test_server.c +++ b/tests/test_server.c @@ -192,6 +192,7 @@ static int __raft_logentry_offer( int ety_idx ) { + CuAssertIntEquals(udata, ety_idx, 0); ety->data.buf = udata; return 0; } @@ -202,10 +203,9 @@ void TestRaft_server_append_entry_user_can_set_data_buf(CuTest * tc) .log_offer = __raft_logentry_offer, }; - char *data = "xxx"; void *r = raft_new(); raft_set_state(r, RAFT_STATE_CANDIDATE); - raft_set_callbacks(r, &funcs, data); + raft_set_callbacks(r, &funcs, tc); raft_set_current_term(r, 5); raft_entry_t ety = {}; ety.term = 1;