forked from irungentoo/toxcore
-
Notifications
You must be signed in to change notification settings - Fork 292
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Try ipv6 connections even after udp timeout #1086
Merged
+129
−0
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
try ipv6 connections even after udp timeout
Also adds a test (auto_reconnect_test) which fails without this change.
commit 66ab386d6fb0200d544eb841a05b68fc7151101e
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,108 @@ | ||
/* Auto Tests: Reconnection. | ||
* | ||
* This test checks that when a tox instance is suspended for long enough that | ||
* its friend connections time out, those connections are promptly | ||
* re-established when the instance is resumed. | ||
*/ | ||
|
||
#ifdef HAVE_CONFIG_H | ||
#include "config.h" | ||
#endif | ||
|
||
#include <stdlib.h> | ||
#include <string.h> | ||
#include <time.h> | ||
|
||
#include "../testing/misc_tools.h" | ||
#include "../toxcore/friend_connection.h" | ||
#include "../toxcore/tox.h" | ||
#include "../toxcore/util.h" | ||
#include "check_compat.h" | ||
|
||
#define TOX_COUNT 2 | ||
#define RECONNECT_TIME_MAX (FRIEND_CONNECTION_TIMEOUT + 3) | ||
|
||
typedef struct State { | ||
uint32_t index; | ||
} State; | ||
|
||
#include "run_auto_test.h" | ||
|
||
static uint32_t tox_connected_count(uint32_t tox_count, Tox **toxes, State *state, uint32_t index) | ||
{ | ||
const size_t friend_count = tox_self_get_friend_list_size(toxes[index]); | ||
uint32_t connected_count = 0; | ||
|
||
for (size_t j = 0; j < friend_count; j++) { | ||
if (tox_friend_get_connection_status(toxes[index], j, nullptr) != TOX_CONNECTION_NONE) { | ||
++connected_count; | ||
} | ||
} | ||
|
||
return connected_count; | ||
} | ||
|
||
static bool all_disconnected_from(uint32_t tox_count, Tox **toxes, State *state, uint32_t index) | ||
{ | ||
for (uint32_t i = 0; i < tox_count; i++) { | ||
if (i == index) { | ||
continue; | ||
} | ||
|
||
if (tox_connected_count(tox_count, toxes, state, i) >= tox_count - 1) { | ||
return false; | ||
} | ||
} | ||
|
||
return true; | ||
} | ||
|
||
static void test_reconnect(Tox **toxes, State *state) | ||
{ | ||
const time_t test_start_time = time(nullptr); | ||
|
||
printf("letting connections settle\n"); | ||
|
||
do { | ||
iterate_all(TOX_COUNT, toxes, state); | ||
|
||
c_sleep(ITERATION_INTERVAL); | ||
} while (time(nullptr) - test_start_time < 2); | ||
|
||
uint16_t disconnect = random_u16() % TOX_COUNT; | ||
printf("disconnecting #%u\n", state[disconnect].index); | ||
|
||
do { | ||
for (uint16_t i = 0; i < TOX_COUNT; ++i) { | ||
if (i != disconnect) { | ||
tox_iterate(toxes[i], &state[i]); | ||
} | ||
} | ||
|
||
c_sleep(ITERATION_INTERVAL); | ||
} while (!all_disconnected_from(TOX_COUNT, toxes, state, disconnect)); | ||
|
||
const time_t reconnect_start_time = time(nullptr); | ||
|
||
printf("reconnecting\n"); | ||
|
||
do { | ||
iterate_all(TOX_COUNT, toxes, state); | ||
|
||
c_sleep(ITERATION_INTERVAL); | ||
} while (!all_friends_connected(TOX_COUNT, toxes)); | ||
|
||
const int reconnect_time = (int)(time(nullptr) - reconnect_start_time); | ||
ck_assert_msg(reconnect_time <= RECONNECT_TIME_MAX, "reconnection took %d seconds; expected at most %d seconds", | ||
reconnect_time, RECONNECT_TIME_MAX); | ||
|
||
printf("test_reconnect succeeded, took %d seconds\n", (int)(time(nullptr) - test_start_time)); | ||
} | ||
|
||
int main(void) | ||
{ | ||
setvbuf(stdout, nullptr, _IONBF, 0); | ||
|
||
run_auto_test(TOX_COUNT, test_reconnect); | ||
return 0; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ideally we'd use the state and friend connection callbacks for this, but maybe we need a bit more auto_test framework to make that less repetitive.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes. I'm leaving it as is for now - quite a few of the tests use this deprecated function, best to fix them all at once.