summaryrefslogtreecommitdiff
path: root/toxcore/tox.h
diff options
context:
space:
mode:
authorzugz <mbays+tox@sdf.org>2018-07-25 08:46:28 +0100
committerzugz (tox) <mbays+tox@sdf.org>2018-08-02 22:03:18 +0100
commitaa63c1330c49ee1c4b675037e2e54516950203a2 (patch)
treed9064b106cd62e7c7fbc212c4dbaefc0298d977b /toxcore/tox.h
parent3a4987da18b165d5a5297ddaf64f1336958bb3c7 (diff)
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
Diffstat (limited to 'toxcore/tox.h')
-rw-r--r--toxcore/tox.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/toxcore/tox.h b/toxcore/tox.h
index 4c83ca23..35ff19e7 100644
--- a/toxcore/tox.h
+++ b/toxcore/tox.h
@@ -2613,6 +2613,11 @@ typedef enum TOX_ERR_CONFERENCE_INVITE {
2613 */ 2613 */
2614 TOX_ERR_CONFERENCE_INVITE_FAIL_SEND, 2614 TOX_ERR_CONFERENCE_INVITE_FAIL_SEND,
2615 2615
2616 /**
2617 * The client is not connected to the conference.
2618 */
2619 TOX_ERR_CONFERENCE_INVITE_NO_CONNECTION,
2620
2616} TOX_ERR_CONFERENCE_INVITE; 2621} TOX_ERR_CONFERENCE_INVITE;
2617 2622
2618 2623