diff options
author | zugz <mbays+tox@sdf.org> | 2018-07-25 08:46:28 +0100 |
---|---|---|
committer | zugz (tox) <mbays+tox@sdf.org> | 2018-08-02 22:03:18 +0100 |
commit | aa63c1330c49ee1c4b675037e2e54516950203a2 (patch) | |
tree | d9064b106cd62e7c7fbc212c4dbaefc0298d977b /toxcore/tox.c | |
parent | 3a4987da18b165d5a5297ddaf64f1336958bb3c7 (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.c')
-rw-r--r-- | toxcore/tox.c | 4 |
1 files changed, 4 insertions, 0 deletions
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 | |||
1290 | case -2: | 1290 | case -2: |
1291 | SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_INVITE_FAIL_SEND); | 1291 | SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_INVITE_FAIL_SEND); |
1292 | return false; | 1292 | return false; |
1293 | |||
1294 | case -3: | ||
1295 | SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_INVITE_NO_CONNECTION); | ||
1296 | return false; | ||
1293 | } | 1297 | } |
1294 | 1298 | ||
1295 | SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_INVITE_OK); | 1299 | SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_INVITE_OK); |