From 1c57a3a3de376c8e9f127c409032fd94298e5e7b Mon Sep 17 00:00:00 2001 From: "Coren[m]" Date: Tue, 17 Sep 2013 01:08:57 +0200 Subject: Tests of state loading/saving lead to two fixes for DHT.c and util.c util.c: - fix in empty section at the end of the state, showed as bug when having an empty name DHT.c: - fix in saving less data than originally announced, showed as bug when not having reached any clients ever (no clients or only with timestamp of zero) --- toxcore/Messenger.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'toxcore/Messenger.c') diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c index cdc133d0..7ab4a92e 100644 --- a/toxcore/Messenger.c +++ b/toxcore/Messenger.c @@ -1483,7 +1483,7 @@ uint32_t Messenger_size(Messenger *m) { uint32_t size32 = sizeof(uint32_t), sizesubhead = size32 * 2; return size32 * 2 // global cookie - + sizesubhead + sizeof(uint32_t) + crypto_box_PUBLICKEYBYTES + crypto_box_SECRETKEYBYTES + + sizesubhead + sizeof(uint32_t) + crypto_box_PUBLICKEYBYTES + crypto_box_SECRETKEYBYTES + sizesubhead + DHT_size(m->dht) // DHT + sizesubhead + sizeof(Friend) * m->numfriends // Friendlist itself. + sizesubhead + m->name_length // Own nickname. @@ -1595,6 +1595,7 @@ static int messenger_load_state_callback(void *outer, uint8_t *data, uint32_t le fprintf(stderr, "Load state: contains unrecognized part (len %u, type %u)\n", length, type); #endif + break; } return 0; -- cgit v1.2.3