From db07bda7f7b1ab7f5f219a9ed3d7f732b7da66b0 Mon Sep 17 00:00:00 2001 From: "zugz (tox)" Date: Sun, 1 Mar 2020 00:00:00 +0000 Subject: Add "member" invite response This allows invitations to work in the case that the invitee is already in the group, which can happen if the group becomes split. Such an invitation is automatically accepted, leading to the peers becoming connected in the group and sharing peer lists. --- auto_tests/conference_double_invite_test.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'auto_tests/conference_double_invite_test.c') diff --git a/auto_tests/conference_double_invite_test.c b/auto_tests/conference_double_invite_test.c index 17124f1c..c9e64e5b 100644 --- a/auto_tests/conference_double_invite_test.c +++ b/auto_tests/conference_double_invite_test.c @@ -28,6 +28,8 @@ static void handle_conference_invite( state->index, friend_number, type, (unsigned)length); fprintf(stderr, "tox%u joining conference\n", state->index); + ck_assert_msg(!state->joined, "invitation callback generated for already joined conference"); + if (friend_number != -1) { Tox_Err_Conference_Join err; state->conference = tox_conference_join(tox, friend_number, cookie, length, &err); @@ -71,7 +73,7 @@ static void conference_double_invite_test(Tox **toxes, State *state) fprintf(stderr, "Invitations accepted\n"); - // Invite one more time, resulting in friend -1 inviting tox1 (toxes[1]). + fprintf(stderr, "Sending second invitation; should be ignored\n"); tox_conference_invite(toxes[0], 0, state[0].conference, nullptr); iterate_all_wait(2, toxes, state, ITERATION_INTERVAL); -- cgit v1.2.3