diff options
Diffstat (limited to 'auto_tests/friends_test.c')
-rw-r--r-- | auto_tests/friends_test.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/auto_tests/friends_test.c b/auto_tests/friends_test.c index dd2db3e3..b6223489 100644 --- a/auto_tests/friends_test.c +++ b/auto_tests/friends_test.c | |||
@@ -44,6 +44,8 @@ | |||
44 | #define c_sleep(x) usleep(1000*x) | 44 | #define c_sleep(x) usleep(1000*x) |
45 | #endif | 45 | #endif |
46 | 46 | ||
47 | #define PORT 33445 | ||
48 | |||
47 | static Messenger *m; | 49 | static Messenger *m; |
48 | 50 | ||
49 | uint8_t *parent_id = NULL; | 51 | uint8_t *parent_id = NULL; |
@@ -52,13 +54,13 @@ uint8_t *child_id = NULL; | |||
52 | pid_t child_pid = 0; | 54 | pid_t child_pid = 0; |
53 | int request_flags = 0; | 55 | int request_flags = 0; |
54 | 56 | ||
55 | void do_tox(void) | 57 | void do_tox(DHT *dht) |
56 | { | 58 | { |
57 | static int dht_on = 0; | 59 | static int dht_on = 0; |
58 | 60 | ||
59 | if (!dht_on && DHT_isconnected()) { | 61 | if (!dht_on && DHT_isconnected(dht)) { |
60 | dht_on = 1; | 62 | dht_on = 1; |
61 | } else if (dht_on && !DHT_isconnected()) { | 63 | } else if (dht_on && !DHT_isconnected(dht)) { |
62 | dht_on = 0; | 64 | dht_on = 0; |
63 | } | 65 | } |
64 | 66 | ||
@@ -77,7 +79,7 @@ void parent_confirm_status(Messenger *m, int num, uint8_t *data, uint16_t length | |||
77 | request_flags |= FIRST_FLAG; | 79 | request_flags |= FIRST_FLAG; |
78 | } | 80 | } |
79 | 81 | ||
80 | int parent_friend_request(void) | 82 | int parent_friend_request(DHT *dht) |
81 | { | 83 | { |
82 | char *message = "Watson, come here, I need you."; | 84 | char *message = "Watson, come here, I need you."; |
83 | int len = strlen(message); | 85 | int len = strlen(message); |
@@ -90,7 +92,7 @@ int parent_friend_request(void) | |||
90 | 92 | ||
91 | /* wait on the status change */ | 93 | /* wait on the status change */ |
92 | for (i = 0; i < WAIT_COUNT; i++) { | 94 | for (i = 0; i < WAIT_COUNT; i++) { |
93 | do_tox(); | 95 | do_tox(dht); |
94 | 96 | ||
95 | if (request_flags & FIRST_FLAG) | 97 | if (request_flags & FIRST_FLAG) |
96 | break; | 98 | break; |
@@ -123,7 +125,7 @@ void child_got_statuschange(Messenger *m, int friend_num, uint8_t *string, uint1 | |||
123 | request_flags |= SECOND_FLAG; | 125 | request_flags |= SECOND_FLAG; |
124 | } | 126 | } |
125 | 127 | ||
126 | int parent_wait_for_message(void) | 128 | int parent_wait_for_message(DHT *dht) |
127 | { | 129 | { |
128 | int i = 0; | 130 | int i = 0; |
129 | 131 | ||
@@ -131,7 +133,7 @@ int parent_wait_for_message(void) | |||
131 | fflush(stdout); | 133 | fflush(stdout); |
132 | 134 | ||
133 | for (i = 0; i < WAIT_COUNT; i++) { | 135 | for (i = 0; i < WAIT_COUNT; i++) { |
134 | do_tox(); | 136 | do_tox(dht); |
135 | 137 | ||
136 | if (request_flags & SECOND_FLAG) | 138 | if (request_flags & SECOND_FLAG) |
137 | break; | 139 | break; |
@@ -185,16 +187,16 @@ int main(int argc, char *argv[]) | |||
185 | 187 | ||
186 | /* wait on the friend request */ | 188 | /* wait on the friend request */ |
187 | while (!(request_flags & FIRST_FLAG)) | 189 | while (!(request_flags & FIRST_FLAG)) |
188 | do_tox(); | 190 | do_tox(m->dht); |
189 | 191 | ||
190 | /* wait for the status change */ | 192 | /* wait for the status change */ |
191 | while (!(request_flags & SECOND_FLAG)) | 193 | while (!(request_flags & SECOND_FLAG)) |
192 | do_tox(); | 194 | do_tox(m->dht); |
193 | 195 | ||
194 | for (i = 0; i < 6; i++) { | 196 | for (i = 0; i < 6; i++) { |
195 | /* send the message six times, just to be sure */ | 197 | /* send the message six times, just to be sure */ |
196 | m_sendmessage(m, 0, (uint8_t *)message, strlen(message)); | 198 | m_sendmessage(m, 0, (uint8_t *)message, strlen(message)); |
197 | do_tox(); | 199 | do_tox(m->dht); |
198 | } | 200 | } |
199 | 201 | ||
200 | cleanupMessenger(m); | 202 | cleanupMessenger(m); |
@@ -220,10 +222,10 @@ int main(int argc, char *argv[]) | |||
220 | 222 | ||
221 | Messenger_save(m, parent_id); | 223 | Messenger_save(m, parent_id); |
222 | 224 | ||
223 | if (parent_friend_request() == -1) | 225 | if (parent_friend_request(m->dht) == -1) |
224 | return -1; | 226 | return -1; |
225 | 227 | ||
226 | if (parent_wait_for_message() == -1) | 228 | if (parent_wait_for_message(m->dht) == -1) |
227 | return -1; | 229 | return -1; |
228 | 230 | ||
229 | wait(NULL); | 231 | wait(NULL); |