diff options
Diffstat (limited to 'testing')
-rw-r--r-- | testing/nTox.c | 98 | ||||
-rw-r--r-- | testing/nTox.h | 46 |
2 files changed, 92 insertions, 52 deletions
diff --git a/testing/nTox.c b/testing/nTox.c index a476cc19..87fec818 100644 --- a/testing/nTox.c +++ b/testing/nTox.c | |||
@@ -43,22 +43,22 @@ char *help = "[i] commands:\n/f ID (to add friend)\n/m friendnumber message " | |||
43 | int x, y; | 43 | int x, y; |
44 | 44 | ||
45 | typedef struct { | 45 | typedef struct { |
46 | uint8_t id[CLIENT_ID_SIZE]; | 46 | uint8_t id[TOX_CLIENT_ID_SIZE]; |
47 | uint8_t accepted; | 47 | uint8_t accepted; |
48 | } Friend_request; | 48 | } Friend_request; |
49 | 49 | ||
50 | Friend_request pending_requests[256]; | 50 | Friend_request pending_requests[256]; |
51 | uint8_t num_requests = 0; | 51 | uint8_t num_requests = 0; |
52 | 52 | ||
53 | void get_id(Messenger *m, char *data) | 53 | void get_id(Tox *m, char *data) |
54 | { | 54 | { |
55 | sprintf(data, "[i] ID: "); | 55 | sprintf(data, "[i] ID: "); |
56 | int offset = strlen(data); | 56 | int offset = strlen(data); |
57 | int i = 0; | 57 | int i = 0; |
58 | uint8_t address[FRIEND_ADDRESS_SIZE]; | 58 | uint8_t address[TOX_FRIEND_ADDRESS_SIZE]; |
59 | getaddress(m, address); | 59 | tox_getaddress(m, address); |
60 | 60 | ||
61 | for (; i < FRIEND_ADDRESS_SIZE; i++) { | 61 | for (; i < TOX_FRIEND_ADDRESS_SIZE; i++) { |
62 | sprintf(data + 2 * i + offset, "%02X ", address[i]); | 62 | sprintf(data + 2 * i + offset, "%02X ", address[i]); |
63 | } | 63 | } |
64 | } | 64 | } |
@@ -75,15 +75,15 @@ void new_lines(char *line) | |||
75 | } | 75 | } |
76 | 76 | ||
77 | 77 | ||
78 | void print_friendlist(Messenger *m) | 78 | void print_friendlist(Tox *m) |
79 | { | 79 | { |
80 | char name[MAX_NAME_LENGTH]; | 80 | char name[TOX_MAX_NAME_LENGTH]; |
81 | int i = 0; | 81 | int i = 0; |
82 | new_lines("[i] Friend List:"); | 82 | new_lines("[i] Friend List:"); |
83 | 83 | ||
84 | while (getname(m, i, (uint8_t *)name) != -1) { | 84 | while (tox_getname(m, i, (uint8_t *)name) != -1) { |
85 | /* account for the longest name and the longest "base" string */ | 85 | /* account for the longest name and the longest "base" string */ |
86 | char fstring[MAX_NAME_LENGTH + strlen("[i] Friend: NULL\n\tid: ")]; | 86 | char fstring[TOX_MAX_NAME_LENGTH + strlen("[i] Friend: NULL\n\tid: ")]; |
87 | 87 | ||
88 | if (strlen(name) <= 0) { | 88 | if (strlen(name) <= 0) { |
89 | sprintf(fstring, "[i] Friend: No Friend!\n\tid: %i", i); | 89 | sprintf(fstring, "[i] Friend: No Friend!\n\tid: %i", i); |
@@ -99,14 +99,14 @@ void print_friendlist(Messenger *m) | |||
99 | new_lines("\tno friends! D:"); | 99 | new_lines("\tno friends! D:"); |
100 | } | 100 | } |
101 | 101 | ||
102 | char *format_message(Messenger *m, char *message, int friendnum) | 102 | char *format_message(Tox *m, char *message, int friendnum) |
103 | { | 103 | { |
104 | char name[MAX_NAME_LENGTH]; | 104 | char name[TOX_MAX_NAME_LENGTH]; |
105 | 105 | ||
106 | if (friendnum != -1) { | 106 | if (friendnum != -1) { |
107 | getname(m, friendnum, (uint8_t *)name); | 107 | tox_getname(m, friendnum, (uint8_t *)name); |
108 | } else { | 108 | } else { |
109 | getself_name(m, (uint8_t *)name, sizeof(name)); | 109 | tox_getselfname(m, (uint8_t *)name, sizeof(name)); |
110 | } | 110 | } |
111 | 111 | ||
112 | char *msg = malloc(100 + strlen(message) + strlen(name) + 1); | 112 | char *msg = malloc(100 + strlen(message) + strlen(name) + 1); |
@@ -129,7 +129,7 @@ char *format_message(Messenger *m, char *message, int friendnum) | |||
129 | return msg; | 129 | return msg; |
130 | } | 130 | } |
131 | 131 | ||
132 | void line_eval(Messenger *m, char *line) | 132 | void line_eval(Tox *m, char *line) |
133 | { | 133 | { |
134 | if (line[0] == '/') { | 134 | if (line[0] == '/') { |
135 | char inpt_command = line[1]; | 135 | char inpt_command = line[1]; |
@@ -146,28 +146,28 @@ void line_eval(Messenger *m, char *line) | |||
146 | temp_id[i] = line[i + prompt_offset]; | 146 | temp_id[i] = line[i + prompt_offset]; |
147 | 147 | ||
148 | unsigned char *bin_string = hex_string_to_bin(temp_id); | 148 | unsigned char *bin_string = hex_string_to_bin(temp_id); |
149 | int num = m_addfriend(m, bin_string, (uint8_t *)"Install Gentoo", sizeof("Install Gentoo")); | 149 | int num = tox_addfriend(m, bin_string, (uint8_t *)"Install Gentoo", sizeof("Install Gentoo")); |
150 | free(bin_string); | 150 | free(bin_string); |
151 | char numstring[100]; | 151 | char numstring[100]; |
152 | 152 | ||
153 | switch (num) { | 153 | switch (num) { |
154 | case FAERR_TOOLONG: | 154 | case TOX_FAERR_TOOLONG: |
155 | sprintf(numstring, "[i] Message is too long."); | 155 | sprintf(numstring, "[i] Message is too long."); |
156 | break; | 156 | break; |
157 | 157 | ||
158 | case FAERR_NOMESSAGE: | 158 | case TOX_FAERR_NOMESSAGE: |
159 | sprintf(numstring, "[i] Please add a message to your request."); | 159 | sprintf(numstring, "[i] Please add a message to your request."); |
160 | break; | 160 | break; |
161 | 161 | ||
162 | case FAERR_OWNKEY: | 162 | case TOX_FAERR_OWNKEY: |
163 | sprintf(numstring, "[i] That appears to be your own ID."); | 163 | sprintf(numstring, "[i] That appears to be your own ID."); |
164 | break; | 164 | break; |
165 | 165 | ||
166 | case FAERR_ALREADYSENT: | 166 | case TOX_FAERR_ALREADYSENT: |
167 | sprintf(numstring, "[i] Friend request already sent."); | 167 | sprintf(numstring, "[i] Friend request already sent."); |
168 | break; | 168 | break; |
169 | 169 | ||
170 | case FAERR_UNKNOWN: | 170 | case TOX_FAERR_UNKNOWN: |
171 | sprintf(numstring, "[i] Undefined error when adding friend."); | 171 | sprintf(numstring, "[i] Undefined error when adding friend."); |
172 | break; | 172 | break; |
173 | 173 | ||
@@ -179,7 +179,7 @@ void line_eval(Messenger *m, char *line) | |||
179 | new_lines(numstring); | 179 | new_lines(numstring); |
180 | do_refresh(); | 180 | do_refresh(); |
181 | } else if (inpt_command == 'd') { | 181 | } else if (inpt_command == 'd') { |
182 | doMessenger(m); | 182 | tox_do(m); |
183 | } else if (inpt_command == 'm') { //message command: /m friendnumber messsage | 183 | } else if (inpt_command == 'm') { //message command: /m friendnumber messsage |
184 | size_t len = strlen(line); | 184 | size_t len = strlen(line); |
185 | 185 | ||
@@ -205,13 +205,13 @@ void line_eval(Messenger *m, char *line) | |||
205 | 205 | ||
206 | int num = atoi(numstring); | 206 | int num = atoi(numstring); |
207 | 207 | ||
208 | if (m_sendmessage(m, num, (uint8_t *) message, strlen(message) + 1) != 1) { | 208 | if (tox_sendmessage(m, num, (uint8_t *) message, strlen(message) + 1) != 1) { |
209 | new_lines("[i] could not send message"); | 209 | new_lines("[i] could not send message"); |
210 | } else { | 210 | } else { |
211 | new_lines(format_message(m, message, -1)); | 211 | new_lines(format_message(m, message, -1)); |
212 | } | 212 | } |
213 | } else if (inpt_command == 'n') { | 213 | } else if (inpt_command == 'n') { |
214 | uint8_t name[MAX_NAME_LENGTH]; | 214 | uint8_t name[TOX_MAX_NAME_LENGTH]; |
215 | int i = 0; | 215 | int i = 0; |
216 | size_t len = strlen(line); | 216 | size_t len = strlen(line); |
217 | 217 | ||
@@ -222,14 +222,14 @@ void line_eval(Messenger *m, char *line) | |||
222 | } | 222 | } |
223 | 223 | ||
224 | name[i - 3] = 0; | 224 | name[i - 3] = 0; |
225 | setname(m, name, i - 2); | 225 | tox_setname(m, name, i - 2); |
226 | char numstring[100]; | 226 | char numstring[100]; |
227 | sprintf(numstring, "[i] changed nick to %s", (char *)name); | 227 | sprintf(numstring, "[i] changed nick to %s", (char *)name); |
228 | new_lines(numstring); | 228 | new_lines(numstring); |
229 | } else if (inpt_command == 'l') { | 229 | } else if (inpt_command == 'l') { |
230 | print_friendlist(m); | 230 | print_friendlist(m); |
231 | } else if (inpt_command == 's') { | 231 | } else if (inpt_command == 's') { |
232 | uint8_t status[MAX_STATUSMESSAGE_LENGTH]; | 232 | uint8_t status[TOX_MAX_STATUSMESSAGE_LENGTH]; |
233 | int i = 0; | 233 | int i = 0; |
234 | size_t len = strlen(line); | 234 | size_t len = strlen(line); |
235 | 235 | ||
@@ -240,7 +240,7 @@ void line_eval(Messenger *m, char *line) | |||
240 | } | 240 | } |
241 | 241 | ||
242 | status[i - 3] = 0; | 242 | status[i - 3] = 0; |
243 | m_set_statusmessage(m, status, strlen((char *)status) + 1); | 243 | tox_set_statusmessage(m, status, strlen((char *)status) + 1); |
244 | char numstring[100]; | 244 | char numstring[100]; |
245 | sprintf(numstring, "[i] changed status to %s", (char *)status); | 245 | sprintf(numstring, "[i] changed status to %s", (char *)status); |
246 | new_lines(numstring); | 246 | new_lines(numstring); |
@@ -252,7 +252,7 @@ void line_eval(Messenger *m, char *line) | |||
252 | sprintf(numchar, "[i] you either didn't receive that request or you already accepted it"); | 252 | sprintf(numchar, "[i] you either didn't receive that request or you already accepted it"); |
253 | new_lines(numchar); | 253 | new_lines(numchar); |
254 | } else { | 254 | } else { |
255 | int num = m_addfriend_norequest(m, pending_requests[numf].id); | 255 | int num = tox_addfriend_norequest(m, pending_requests[numf].id); |
256 | 256 | ||
257 | if (num != -1) { | 257 | if (num != -1) { |
258 | pending_requests[numf].accepted = 1; | 258 | pending_requests[numf].accepted = 1; |
@@ -364,40 +364,40 @@ void print_request(uint8_t *public_key, uint8_t *data, uint16_t length, void *us | |||
364 | char numchar[100]; | 364 | char numchar[100]; |
365 | sprintf(numchar, "[i] accept request with /a %u", num_requests); | 365 | sprintf(numchar, "[i] accept request with /a %u", num_requests); |
366 | new_lines(numchar); | 366 | new_lines(numchar); |
367 | memcpy(pending_requests[num_requests].id, public_key, CLIENT_ID_SIZE); | 367 | memcpy(pending_requests[num_requests].id, public_key, TOX_CLIENT_ID_SIZE); |
368 | pending_requests[num_requests].accepted = 0; | 368 | pending_requests[num_requests].accepted = 0; |
369 | ++num_requests; | 369 | ++num_requests; |
370 | do_refresh(); | 370 | do_refresh(); |
371 | } | 371 | } |
372 | 372 | ||
373 | void print_message(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void *userdata) | 373 | void print_message(Tox *m, int friendnumber, uint8_t *string, uint16_t length, void *userdata) |
374 | { | 374 | { |
375 | new_lines(format_message(m, (char *)string, friendnumber)); | 375 | new_lines(format_message(m, (char *)string, friendnumber)); |
376 | } | 376 | } |
377 | 377 | ||
378 | void print_nickchange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void *userdata) | 378 | void print_nickchange(Tox *m, int friendnumber, uint8_t *string, uint16_t length, void *userdata) |
379 | { | 379 | { |
380 | char name[MAX_NAME_LENGTH]; | 380 | char name[TOX_MAX_NAME_LENGTH]; |
381 | 381 | ||
382 | if (getname(m, friendnumber, (uint8_t *)name) != -1) { | 382 | if (tox_getname(m, friendnumber, (uint8_t *)name) != -1) { |
383 | char msg[100 + length]; | 383 | char msg[100 + length]; |
384 | sprintf(msg, "[i] [%d] %s is now known as %s.", friendnumber, name, string); | 384 | sprintf(msg, "[i] [%d] %s is now known as %s.", friendnumber, name, string); |
385 | new_lines(msg); | 385 | new_lines(msg); |
386 | } | 386 | } |
387 | } | 387 | } |
388 | 388 | ||
389 | void print_statuschange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void *userdata) | 389 | void print_statuschange(Tox *m, int friendnumber, uint8_t *string, uint16_t length, void *userdata) |
390 | { | 390 | { |
391 | char name[MAX_NAME_LENGTH]; | 391 | char name[TOX_MAX_NAME_LENGTH]; |
392 | 392 | ||
393 | if (getname(m, friendnumber, (uint8_t *)name) != -1) { | 393 | if (tox_getname(m, friendnumber, (uint8_t *)name) != -1) { |
394 | char msg[100 + length + strlen(name) + 1]; | 394 | char msg[100 + length + strlen(name) + 1]; |
395 | sprintf(msg, "[i] [%d] %s's status changed to %s.", friendnumber, name, string); | 395 | sprintf(msg, "[i] [%d] %s's status changed to %s.", friendnumber, name, string); |
396 | new_lines(msg); | 396 | new_lines(msg); |
397 | } | 397 | } |
398 | } | 398 | } |
399 | 399 | ||
400 | void load_key(Messenger *m, char *path) | 400 | void load_key(Tox *m, char *path) |
401 | { | 401 | { |
402 | FILE *data_file = fopen(path, "r"); | 402 | FILE *data_file = fopen(path, "r"); |
403 | int size = 0; | 403 | int size = 0; |
@@ -415,13 +415,13 @@ void load_key(Messenger *m, char *path) | |||
415 | goto FILE_ERROR; | 415 | goto FILE_ERROR; |
416 | } | 416 | } |
417 | 417 | ||
418 | Messenger_load(m, data, size); | 418 | tox_load(m, data, size); |
419 | 419 | ||
420 | } else { | 420 | } else { |
421 | //else save new keys | 421 | //else save new keys |
422 | int size = Messenger_size(m); | 422 | int size = tox_size(m); |
423 | uint8_t data[size]; | 423 | uint8_t data[size]; |
424 | Messenger_save(m, data); | 424 | tox_save(m, data); |
425 | data_file = fopen(path, "w"); | 425 | data_file = fopen(path, "w"); |
426 | 426 | ||
427 | if (!data_file) { | 427 | if (!data_file) { |
@@ -463,7 +463,7 @@ int main(int argc, char *argv[]) | |||
463 | int i = 0; | 463 | int i = 0; |
464 | char *filename = "data"; | 464 | char *filename = "data"; |
465 | char idstring[200] = {0}; | 465 | char idstring[200] = {0}; |
466 | Messenger *m; | 466 | Tox *m; |
467 | 467 | ||
468 | if (argc < 4) { | 468 | if (argc < 4) { |
469 | printf("[!] Usage: %s [IP] [port] [public_key] <keyfile>\n", argv[0]); | 469 | printf("[!] Usage: %s [IP] [port] [public_key] <keyfile>\n", argv[0]); |
@@ -487,7 +487,7 @@ int main(int argc, char *argv[]) | |||
487 | } | 487 | } |
488 | } | 488 | } |
489 | 489 | ||
490 | m = initMessenger(); | 490 | m = tox_new(); |
491 | 491 | ||
492 | if ( !m ) { | 492 | if ( !m ) { |
493 | fputs("Failed to allocate Messenger datastructure", stderr); | 493 | fputs("Failed to allocate Messenger datastructure", stderr); |
@@ -496,10 +496,10 @@ int main(int argc, char *argv[]) | |||
496 | 496 | ||
497 | load_key(m, filename); | 497 | load_key(m, filename); |
498 | 498 | ||
499 | m_callback_friendrequest(m, print_request, NULL); | 499 | tox_callback_friendrequest(m, print_request, NULL); |
500 | m_callback_friendmessage(m, print_message, NULL); | 500 | tox_callback_friendmessage(m, print_message, NULL); |
501 | m_callback_namechange(m, print_nickchange, NULL); | 501 | tox_callback_namechange(m, print_nickchange, NULL); |
502 | m_callback_statusmessage(m, print_statuschange, NULL); | 502 | tox_callback_statusmessage(m, print_statuschange, NULL); |
503 | 503 | ||
504 | initscr(); | 504 | initscr(); |
505 | noecho(); | 505 | noecho(); |
@@ -521,17 +521,17 @@ int main(int argc, char *argv[]) | |||
521 | exit(1); | 521 | exit(1); |
522 | 522 | ||
523 | unsigned char *binary_string = hex_string_to_bin(argv[3]); | 523 | unsigned char *binary_string = hex_string_to_bin(argv[3]); |
524 | DHT_bootstrap(m->dht, bootstrap_ip_port, binary_string); | 524 | tox_bootstrap(m, bootstrap_ip_port, binary_string); |
525 | free(binary_string); | 525 | free(binary_string); |
526 | nodelay(stdscr, TRUE); | 526 | nodelay(stdscr, TRUE); |
527 | 527 | ||
528 | while (true) { | 528 | while (true) { |
529 | if (on == 0 && DHT_isconnected(m->dht)) { | 529 | if (on == 0 && tox_isconnected(m)) { |
530 | new_lines("[i] connected to DHT\n[i] define username with /n"); | 530 | new_lines("[i] connected to DHT\n[i] define username with /n"); |
531 | on = 1; | 531 | on = 1; |
532 | } | 532 | } |
533 | 533 | ||
534 | doMessenger(m); | 534 | tox_do(m); |
535 | c_sleep(1); | 535 | c_sleep(1); |
536 | do_refresh(); | 536 | do_refresh(); |
537 | 537 | ||
@@ -552,7 +552,7 @@ int main(int argc, char *argv[]) | |||
552 | } | 552 | } |
553 | } | 553 | } |
554 | 554 | ||
555 | cleanupMessenger(m); | 555 | tox_kill(m); |
556 | endwin(); | 556 | endwin(); |
557 | return 0; | 557 | return 0; |
558 | } | 558 | } |
diff --git a/testing/nTox.h b/testing/nTox.h index fdd88fb4..b27a956f 100644 --- a/testing/nTox.h +++ b/testing/nTox.h | |||
@@ -35,15 +35,55 @@ | |||
35 | #include <arpa/inet.h> | 35 | #include <arpa/inet.h> |
36 | #include <sys/types.h> | 36 | #include <sys/types.h> |
37 | #include <netdb.h> | 37 | #include <netdb.h> |
38 | #include "../core/Messenger.h" | 38 | #include "../core/tox.h" |
39 | #include "../core/network.h" | ||
40 | 39 | ||
41 | #define STRING_LENGTH 256 | 40 | #define STRING_LENGTH 256 |
42 | #define HISTORY 50 | 41 | #define HISTORY 50 |
43 | #define PUB_KEY_BYTES 32 | 42 | #define PUB_KEY_BYTES 32 |
44 | 43 | ||
44 | /* | ||
45 | resolve_addr(): | ||
46 | address should represent IPv4 or a hostname with A record | ||
47 | |||
48 | returns a data in network byte order that can be used to set IP.i or IP_Port.ip.i | ||
49 | returns 0 on failure | ||
50 | |||
51 | TODO: Fix ipv6 support | ||
52 | */ | ||
53 | |||
54 | uint32_t resolve_addr(const char *address) | ||
55 | { | ||
56 | struct addrinfo *server = NULL; | ||
57 | struct addrinfo hints; | ||
58 | int rc; | ||
59 | uint32_t addr; | ||
60 | |||
61 | memset(&hints, 0, sizeof(hints)); | ||
62 | hints.ai_family = AF_INET; // IPv4 only right now. | ||
63 | hints.ai_socktype = SOCK_DGRAM; // type of socket Tox uses. | ||
64 | |||
65 | rc = getaddrinfo(address, "echo", &hints, &server); | ||
66 | |||
67 | // Lookup failed. | ||
68 | if (rc != 0) { | ||
69 | return 0; | ||
70 | } | ||
71 | |||
72 | // IPv4 records only.. | ||
73 | if (server->ai_family != AF_INET) { | ||
74 | freeaddrinfo(server); | ||
75 | return 0; | ||
76 | } | ||
77 | |||
78 | |||
79 | addr = ((struct sockaddr_in *)server->ai_addr)->sin_addr.s_addr; | ||
80 | |||
81 | freeaddrinfo(server); | ||
82 | return addr; | ||
83 | } | ||
84 | |||
45 | void new_lines(char *line); | 85 | void new_lines(char *line); |
46 | void line_eval(Messenger *m, char *line); | 86 | void line_eval(Tox *m, char *line); |
47 | void wrap(char output[STRING_LENGTH], char input[STRING_LENGTH], int line_width) ; | 87 | void wrap(char output[STRING_LENGTH], char input[STRING_LENGTH], int line_width) ; |
48 | int count_lines(char *string) ; | 88 | int count_lines(char *string) ; |
49 | char *appender(char *str, const char c); | 89 | char *appender(char *str, const char c); |