From aa63c1330c49ee1c4b675037e2e54516950203a2 Mon Sep 17 00:00:00 2001 From: zugz Date: Wed, 25 Jul 2018 08:46:28 +0100 Subject: Fix problems with initial connections and name-setting in conferences * test names in conference_test * raise error on attempt to invite friend to group before we are connected * revise handling of temporary invited connections We are now careful not to prematurely delete a connection to a peer established during the invitation process; namely, before we have sufficient other connections and have confirmed that we have an alternative route to the peer. * process out-of-order messages from a peer * don't reset names when handling a Peer Response --- toxcore/tox.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'toxcore/tox.c') diff --git a/toxcore/tox.c b/toxcore/tox.c index 101494cc..750a52fa 100644 --- a/toxcore/tox.c +++ b/toxcore/tox.c @@ -1290,6 +1290,10 @@ bool tox_conference_invite(Tox *tox, uint32_t friend_number, uint32_t conference case -2: SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_INVITE_FAIL_SEND); return false; + + case -3: + SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_INVITE_NO_CONNECTION); + return false; } SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_INVITE_OK); -- cgit v1.2.3