StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Fix friends test

Browse Source
This commit is contained in:
Simon Levermann 2013-08-20 23:10:51 +02:00
parent 6adbefab2b
commit 7c3447466f
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
auto_tests/friends_test.c
View File

@ -44,6 +44,8 @@
#define c_sleep(x) usleep(1000*x) #define c_sleep(x) usleep(1000*x)
#endif #endif
#define PORT 33445
static Messenger *m; static Messenger *m;
uint8_t *parent_id = NULL; uint8_t *parent_id = NULL;
@ -52,13 +54,13 @@ uint8_t *child_id = NULL;
pid_t child_pid = 0; pid_t child_pid = 0;
int request_flags = 0; int request_flags = 0;
void do_tox(void) void do_tox(DHT *dht)
{ {
static int dht_on = 0; static int dht_on = 0;
if (!dht_on && DHT_isconnected()) { if (!dht_on && DHT_isconnected(dht)) {
dht_on = 1; dht_on = 1;
} else if (dht_on && !DHT_isconnected()) { } else if (dht_on && !DHT_isconnected(dht)) {
dht_on = 0; dht_on = 0;
} }
@ -77,7 +79,7 @@ void parent_confirm_status(Messenger *m, int num, uint8_t *data, uint16_t length
request_flags |= FIRST_FLAG; request_flags |= FIRST_FLAG;
} }
int parent_friend_request(void) int parent_friend_request(DHT *dht)
{ {
char *message = "Watson, come here, I need you."; char *message = "Watson, come here, I need you.";
int len = strlen(message); int len = strlen(message);
@ -90,7 +92,7 @@ int parent_friend_request(void)
/* wait on the status change */ /* wait on the status change */
for (i = 0; i < WAIT_COUNT; i++) { for (i = 0; i < WAIT_COUNT; i++) {
do_tox(); do_tox(dht);
if (request_flags & FIRST_FLAG) if (request_flags & FIRST_FLAG)
break; break;
@ -123,7 +125,7 @@ void child_got_statuschange(Messenger *m, int friend_num, uint8_t *string, uint1
request_flags |= SECOND_FLAG; request_flags |= SECOND_FLAG;
} }
int parent_wait_for_message(void) int parent_wait_for_message(DHT *dht)
{ {
int i = 0; int i = 0;
@ -131,7 +133,7 @@ int parent_wait_for_message(void)
fflush(stdout); fflush(stdout);
for (i = 0; i < WAIT_COUNT; i++) { for (i = 0; i < WAIT_COUNT; i++) {
do_tox(); do_tox(dht);
if (request_flags & SECOND_FLAG) if (request_flags & SECOND_FLAG)
break; break;
@ -185,16 +187,16 @@ int main(int argc, char *argv[])
/* wait on the friend request */ /* wait on the friend request */
while (!(request_flags & FIRST_FLAG)) while (!(request_flags & FIRST_FLAG))
do_tox(); do_tox(m->dht);
/* wait for the status change */ /* wait for the status change */
while (!(request_flags & SECOND_FLAG)) while (!(request_flags & SECOND_FLAG))
do_tox(); do_tox(m->dht);
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++) {
/* send the message six times, just to be sure */ /* send the message six times, just to be sure */
m_sendmessage(m, 0, (uint8_t *)message, strlen(message)); m_sendmessage(m, 0, (uint8_t *)message, strlen(message));
do_tox(); do_tox(m->dht);
} }
cleanupMessenger(m); cleanupMessenger(m);
@ -220,10 +222,10 @@ int main(int argc, char *argv[])
Messenger_save(m, parent_id); Messenger_save(m, parent_id);
if (parent_friend_request() == -1) if (parent_friend_request(m->dht) == -1)
return -1; return -1;
if (parent_wait_for_message() == -1) if (parent_wait_for_message(m->dht) == -1)
return -1; return -1;
wait(NULL); wait(NULL);