diff options
-rw-r--r-- | cmake/FindLIBCONFIG.cmake | 7 | ||||
-rw-r--r-- | core/CMakeLists.txt | 4 | ||||
-rw-r--r-- | core/DHT.c | 63 | ||||
-rw-r--r-- | core/Messenger.c | 88 | ||||
-rw-r--r-- | core/Messenger.h | 38 | ||||
-rw-r--r-- | core/friend_requests.c | 2 | ||||
-rw-r--r-- | core/ping.c | 103 | ||||
-rw-r--r-- | core/ping.h | 13 | ||||
-rw-r--r-- | core/util.c | 34 | ||||
-rw-r--r-- | core/util.h | 10 | ||||
-rw-r--r-- | docs/install.rst | 2 | ||||
-rw-r--r-- | testing/nTox.c | 6 | ||||
-rw-r--r-- | testing/nTox_win32.c | 26 | ||||
-rw-r--r-- | testing/toxic/chat.c | 6 | ||||
-rw-r--r-- | testing/toxic/friendlist.c | 2 | ||||
-rw-r--r-- | testing/toxic/main.c | 8 | ||||
-rw-r--r-- | testing/toxic/prompt.c | 94 |
17 files changed, 360 insertions, 146 deletions
diff --git a/cmake/FindLIBCONFIG.cmake b/cmake/FindLIBCONFIG.cmake index d5018240..b3ae4d11 100644 --- a/cmake/FindLIBCONFIG.cmake +++ b/cmake/FindLIBCONFIG.cmake | |||
@@ -5,7 +5,12 @@ | |||
5 | # LIBCONFIG_FOUND | 5 | # LIBCONFIG_FOUND |
6 | # | 6 | # |
7 | 7 | ||
8 | FIND_PATH(LIBCONFIG_INCLUDE_DIR NAMES libconfig.h) | 8 | if (UNIX) |
9 | find_package(PkgConfig QUIET) | ||
10 | pkg_check_modules(_LIBCONFIG QUIET libconfig) | ||
11 | endif () | ||
12 | |||
13 | FIND_PATH(LIBCONFIG_INCLUDE_DIR NAMES libconfig.h HINTS ${_LIBCONFIG_INCLUDEDIR}) | ||
9 | 14 | ||
10 | FIND_LIBRARY(LIBCONFIG_LIBRARY NAMES config) | 15 | FIND_LIBRARY(LIBCONFIG_LIBRARY NAMES config) |
11 | 16 | ||
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index eacb772c..55a41912 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt | |||
@@ -8,7 +8,9 @@ set(core_sources | |||
8 | net_crypto.c | 8 | net_crypto.c |
9 | friend_requests.c | 9 | friend_requests.c |
10 | LAN_discovery.c | 10 | LAN_discovery.c |
11 | Messenger.c) | 11 | Messenger.c |
12 | util.c | ||
13 | ping.c) | ||
12 | 14 | ||
13 | if(SHARED_TOXCORE) | 15 | if(SHARED_TOXCORE) |
14 | add_library(toxcore SHARED ${core_sources}) | 16 | add_library(toxcore SHARED ${core_sources}) |
@@ -24,6 +24,7 @@ | |||
24 | /*----------------------------------------------------------------------------------*/ | 24 | /*----------------------------------------------------------------------------------*/ |
25 | 25 | ||
26 | #include "DHT.h" | 26 | #include "DHT.h" |
27 | #include "ping.h" | ||
27 | 28 | ||
28 | /* maximum number of clients stored per friend. */ | 29 | /* maximum number of clients stored per friend. */ |
29 | #define MAX_FRIEND_CLIENTS 8 | 30 | #define MAX_FRIEND_CLIENTS 8 |
@@ -109,7 +110,6 @@ uint8_t self_secret_key[crypto_box_SECRETKEYBYTES]; | |||
109 | static Client_data close_clientlist[LCLIENT_LIST]; | 110 | static Client_data close_clientlist[LCLIENT_LIST]; |
110 | static Friend * friends_list; | 111 | static Friend * friends_list; |
111 | static uint16_t num_friends; | 112 | static uint16_t num_friends; |
112 | static Pinged pings[LPING_ARRAY]; | ||
113 | static Pinged send_nodes[LSEND_NODES_ARRAY]; | 113 | static Pinged send_nodes[LSEND_NODES_ARRAY]; |
114 | 114 | ||
115 | /*----------------------------------------------------------------------------------*/ | 115 | /*----------------------------------------------------------------------------------*/ |
@@ -426,35 +426,6 @@ static void returnedip_ports(IP_Port ip_port, uint8_t * client_id, uint8_t * nod | |||
426 | } | 426 | } |
427 | } | 427 | } |
428 | 428 | ||
429 | /* check if we are currently pinging an ip_port and/or a ping_id variables with | ||
430 | * values of zero will not be checked. If we are already, return 1 else return 0 | ||
431 | * | ||
432 | * TODO: optimize this | ||
433 | */ | ||
434 | static int is_pinging(IP_Port ip_port, uint64_t ping_id) | ||
435 | { | ||
436 | uint32_t i; | ||
437 | uint8_t pinging; | ||
438 | uint64_t temp_time = unix_time(); | ||
439 | |||
440 | for (i = 0; i < LPING_ARRAY; ++i ) { | ||
441 | if (!is_timeout(temp_time, pings[i].timestamp, PING_TIMEOUT)) { | ||
442 | pinging = 0; | ||
443 | |||
444 | if (ip_port.ip.i != 0 && ipport_equal(pings[i].ip_port, ip_port)) | ||
445 | ++pinging; | ||
446 | |||
447 | if (ping_id != 0 && pings[i].ping_id == ping_id) | ||
448 | ++pinging; | ||
449 | |||
450 | if (pinging == ((ping_id != 0) + (ip_port.ip.i != 0))) | ||
451 | return 1; | ||
452 | } | ||
453 | } | ||
454 | |||
455 | return 0; | ||
456 | } | ||
457 | |||
458 | /* Same as last function but for get_node requests. */ | 429 | /* Same as last function but for get_node requests. */ |
459 | static int is_gettingnodes(IP_Port ip_port, uint64_t ping_id) | 430 | static int is_gettingnodes(IP_Port ip_port, uint64_t ping_id) |
460 | { | 431 | { |
@@ -480,32 +451,6 @@ static int is_gettingnodes(IP_Port ip_port, uint64_t ping_id) | |||
480 | return 0; | 451 | return 0; |
481 | } | 452 | } |
482 | 453 | ||
483 | /* Add a new ping request to the list of ping requests | ||
484 | * returns the ping_id to put in the ping request | ||
485 | * returns 0 if problem. | ||
486 | * | ||
487 | * TODO: optimize this | ||
488 | */ | ||
489 | static uint64_t add_pinging(IP_Port ip_port) | ||
490 | { | ||
491 | uint32_t i, j; | ||
492 | uint64_t ping_id = ((uint64_t)random_int() << 32) + random_int(); | ||
493 | uint64_t temp_time = unix_time(); | ||
494 | |||
495 | for(i = 0; i < PING_TIMEOUT; ++i ) { | ||
496 | for(j = 0; j < LPING_ARRAY; ++j ) { | ||
497 | if(is_timeout(temp_time, pings[j].timestamp, PING_TIMEOUT - i)) { | ||
498 | pings[j].timestamp = temp_time; | ||
499 | pings[j].ip_port = ip_port; | ||
500 | pings[j].ping_id = ping_id; | ||
501 | return ping_id; | ||
502 | } | ||
503 | } | ||
504 | } | ||
505 | |||
506 | return 0; | ||
507 | } | ||
508 | |||
509 | /* Same but for get node requests */ | 454 | /* Same but for get node requests */ |
510 | static uint64_t add_gettingnodes(IP_Port ip_port) | 455 | static uint64_t add_gettingnodes(IP_Port ip_port) |
511 | { | 456 | { |
@@ -536,7 +481,7 @@ static int pingreq(IP_Port ip_port, uint8_t * public_key) | |||
536 | if(id_equal(public_key, self_public_key) || is_pinging(ip_port, 0)) | 481 | if(id_equal(public_key, self_public_key) || is_pinging(ip_port, 0)) |
537 | return 1; | 482 | return 1; |
538 | 483 | ||
539 | uint64_t ping_id = add_pinging(ip_port); | 484 | uint64_t ping_id = add_ping(ip_port); |
540 | if(ping_id == 0) | 485 | if(ping_id == 0) |
541 | return 1; | 486 | return 1; |
542 | 487 | ||
@@ -1108,7 +1053,7 @@ static int send_NATping(uint8_t * public_key, uint64_t ping_id, uint8_t type) | |||
1108 | static int handle_NATping(uint8_t * packet, uint32_t length, IP_Port source) | 1053 | static int handle_NATping(uint8_t * packet, uint32_t length, IP_Port source) |
1109 | { | 1054 | { |
1110 | if (length < crypto_box_PUBLICKEYBYTES * 2 + crypto_box_NONCEBYTES + ENCRYPTION_PADDING | 1055 | if (length < crypto_box_PUBLICKEYBYTES * 2 + crypto_box_NONCEBYTES + ENCRYPTION_PADDING |
1111 | && length > MAX_DATA_SIZE + ENCRYPTION_PADDING) | 1056 | || length > MAX_DATA_SIZE + ENCRYPTION_PADDING) |
1112 | return 1; | 1057 | return 1; |
1113 | 1058 | ||
1114 | /* check if request is for us. */ | 1059 | /* check if request is for us. */ |
@@ -1301,6 +1246,8 @@ void DHT_save(uint8_t * data) | |||
1301 | */ | 1246 | */ |
1302 | int DHT_load(uint8_t * data, uint32_t size) | 1247 | int DHT_load(uint8_t * data, uint32_t size) |
1303 | { | 1248 | { |
1249 | init_ping(); | ||
1250 | |||
1304 | if(size < sizeof(close_clientlist)) | 1251 | if(size < sizeof(close_clientlist)) |
1305 | return -1; | 1252 | return -1; |
1306 | 1253 | ||
diff --git a/core/Messenger.c b/core/Messenger.c index 57d485bb..d8bf3413 100644 --- a/core/Messenger.c +++ b/core/Messenger.c | |||
@@ -35,6 +35,7 @@ typedef struct { | |||
35 | uint8_t *userstatus; | 35 | uint8_t *userstatus; |
36 | uint16_t userstatus_length; | 36 | uint16_t userstatus_length; |
37 | uint8_t userstatus_sent; | 37 | uint8_t userstatus_sent; |
38 | USERSTATUS_KIND userstatus_kind; | ||
38 | uint16_t info_size; /* length of the info */ | 39 | uint16_t info_size; /* length of the info */ |
39 | } Friend; | 40 | } Friend; |
40 | 41 | ||
@@ -45,6 +46,7 @@ static uint16_t self_name_length; | |||
45 | 46 | ||
46 | static uint8_t *self_userstatus; | 47 | static uint8_t *self_userstatus; |
47 | static uint16_t self_userstatus_len; | 48 | static uint16_t self_userstatus_len; |
49 | static USERSTATUS_KIND self_userstatus_kind; | ||
48 | 50 | ||
49 | #define MAX_NUM_FRIENDS 256 | 51 | #define MAX_NUM_FRIENDS 256 |
50 | 52 | ||
@@ -98,12 +100,12 @@ int getclient_id(int friend_id, uint8_t *client_id) | |||
98 | * return FAERR_NOMESSAGE if no message (message length must be >= 1 byte) | 100 | * return FAERR_NOMESSAGE if no message (message length must be >= 1 byte) |
99 | * return FAERR_OWNKEY if user's own key | 101 | * return FAERR_OWNKEY if user's own key |
100 | * return FAERR_ALREADYSENT if friend request already sent or already a friend | 102 | * return FAERR_ALREADYSENT if friend request already sent or already a friend |
101 | * return FAERR_UNKNOWN for unknown error | 103 | * return FAERR_UNKNOWN for unknown error |
102 | */ | 104 | */ |
103 | int m_addfriend(uint8_t *client_id, uint8_t *data, uint16_t length) | 105 | int m_addfriend(uint8_t *client_id, uint8_t *data, uint16_t length) |
104 | { | 106 | { |
105 | if (length >= (MAX_DATA_SIZE - crypto_box_PUBLICKEYBYTES | 107 | if (length >= (MAX_DATA_SIZE - crypto_box_PUBLICKEYBYTES |
106 | - crypto_box_NONCEBYTES - crypto_box_BOXZEROBYTES | 108 | - crypto_box_NONCEBYTES - crypto_box_BOXZEROBYTES |
107 | + crypto_box_ZEROBYTES)) | 109 | + crypto_box_ZEROBYTES)) |
108 | return FAERR_TOOLONG; | 110 | return FAERR_TOOLONG; |
109 | if (length < 1) | 111 | if (length < 1) |
@@ -123,6 +125,7 @@ int m_addfriend(uint8_t *client_id, uint8_t *data, uint16_t length) | |||
123 | memcpy(friendlist[i].client_id, client_id, CLIENT_ID_SIZE); | 125 | memcpy(friendlist[i].client_id, client_id, CLIENT_ID_SIZE); |
124 | friendlist[i].userstatus = calloc(1, 1); | 126 | friendlist[i].userstatus = calloc(1, 1); |
125 | friendlist[i].userstatus_length = 1; | 127 | friendlist[i].userstatus_length = 1; |
128 | friendlist[i].userstatus_kind = USERSTATUS_KIND_OFFLINE; | ||
126 | memcpy(friendlist[i].info, data, length); | 129 | memcpy(friendlist[i].info, data, length); |
127 | friendlist[i].info_size = length; | 130 | friendlist[i].info_size = length; |
128 | 131 | ||
@@ -205,7 +208,7 @@ int m_sendmessage(int friendnumber, uint8_t *message, uint32_t length) | |||
205 | return write_cryptpacket(friendlist[friendnumber].crypt_connection_id, temp, length + 1); | 208 | return write_cryptpacket(friendlist[friendnumber].crypt_connection_id, temp, length + 1); |
206 | } | 209 | } |
207 | 210 | ||
208 | /* send a name packet to friendnumber | 211 | /* send a name packet to friendnumber |
209 | length is the length with the NULL terminator*/ | 212 | length is the length with the NULL terminator*/ |
210 | static int m_sendname(int friendnumber, uint8_t * name, uint16_t length) | 213 | static int m_sendname(int friendnumber, uint8_t * name, uint16_t length) |
211 | { | 214 | { |
@@ -247,14 +250,14 @@ int setname(uint8_t * name, uint16_t length) | |||
247 | } | 250 | } |
248 | 251 | ||
249 | /* get our nickname | 252 | /* get our nickname |
250 | put it in name | 253 | put it in name |
251 | name needs to be a valid memory location with a size of at least MAX_NAME_LENGTH bytes. | 254 | name needs to be a valid memory location with a size of at least MAX_NAME_LENGTH bytes. |
252 | return the length of the name */ | 255 | return the length of the name */ |
253 | uint16_t getself_name(uint8_t *name) | 256 | uint16_t getself_name(uint8_t *name) |
254 | { | 257 | { |
255 | memcpy(name, self_name, self_name_length); | 258 | memcpy(name, self_name, self_name_length); |
256 | return self_name_length; | 259 | return self_name_length; |
257 | } | 260 | } |
258 | 261 | ||
259 | /* get name of friendnumber | 262 | /* get name of friendnumber |
260 | put it in name | 263 | put it in name |
@@ -269,10 +272,13 @@ int getname(int friendnumber, uint8_t * name) | |||
269 | return 0; | 272 | return 0; |
270 | } | 273 | } |
271 | 274 | ||
272 | int m_set_userstatus(uint8_t *status, uint16_t length) | 275 | int m_set_userstatus(USERSTATUS_KIND kind, uint8_t *status, uint16_t length) |
273 | { | 276 | { |
274 | if (length > MAX_USERSTATUS_LENGTH) | 277 | if (length > MAX_USERSTATUS_LENGTH) |
275 | return -1; | 278 | return -1; |
279 | if (kind != USERSTATUS_KIND_RETAIN) { | ||
280 | self_userstatus_kind = kind; | ||
281 | } | ||
276 | uint8_t *newstatus = calloc(length, 1); | 282 | uint8_t *newstatus = calloc(length, 1); |
277 | memcpy(newstatus, status, length); | 283 | memcpy(newstatus, status, length); |
278 | free(self_userstatus); | 284 | free(self_userstatus); |
@@ -285,6 +291,20 @@ int m_set_userstatus(uint8_t *status, uint16_t length) | |||
285 | return 0; | 291 | return 0; |
286 | } | 292 | } |
287 | 293 | ||
294 | int m_set_userstatus_kind(USERSTATUS_KIND kind) { | ||
295 | if (kind >= USERSTATUS_KIND_INVALID) { | ||
296 | return -1; | ||
297 | } | ||
298 | if (kind == USERSTATUS_KIND_RETAIN) { | ||
299 | return 0; | ||
300 | } | ||
301 | self_userstatus_kind = kind; | ||
302 | uint32_t i; | ||
303 | for (i = 0; i < numfriends; ++i) | ||
304 | friendlist[i].userstatus_sent = 0; | ||
305 | return 0; | ||
306 | } | ||
307 | |||
288 | /* return the size of friendnumber's user status | 308 | /* return the size of friendnumber's user status |
289 | guaranteed to be at most MAX_USERSTATUS_LENGTH */ | 309 | guaranteed to be at most MAX_USERSTATUS_LENGTH */ |
290 | int m_get_userstatus_size(int friendnumber) | 310 | int m_get_userstatus_size(int friendnumber) |
@@ -305,11 +325,33 @@ int m_copy_userstatus(int friendnumber, uint8_t * buf, uint32_t maxlen) | |||
305 | return 0; | 325 | return 0; |
306 | } | 326 | } |
307 | 327 | ||
328 | int m_copy_self_userstatus(uint8_t * buf, uint32_t maxlen) | ||
329 | { | ||
330 | memset(buf, 0, maxlen); | ||
331 | memcpy(buf, self_userstatus, MIN(maxlen, MAX_USERSTATUS_LENGTH) - 1); | ||
332 | return 0; | ||
333 | } | ||
334 | |||
335 | USERSTATUS_KIND m_get_userstatus_kind(int friendnumber) { | ||
336 | if (friendnumber >= numfriends || friendnumber < 0) | ||
337 | return USERSTATUS_KIND_INVALID; | ||
338 | USERSTATUS_KIND uk = friendlist[friendnumber].userstatus_kind; | ||
339 | if (uk >= USERSTATUS_KIND_INVALID) { | ||
340 | uk = USERSTATUS_KIND_ONLINE; | ||
341 | } | ||
342 | return uk; | ||
343 | } | ||
344 | |||
345 | USERSTATUS_KIND m_get_self_userstatus_kind(void) { | ||
346 | return self_userstatus_kind; | ||
347 | } | ||
348 | |||
308 | static int send_userstatus(int friendnumber, uint8_t * status, uint16_t length) | 349 | static int send_userstatus(int friendnumber, uint8_t * status, uint16_t length) |
309 | { | 350 | { |
310 | uint8_t *thepacket = malloc(length + 1); | 351 | uint8_t *thepacket = malloc(length + 2); |
311 | memcpy(thepacket + 1, status, length); | 352 | memcpy(thepacket + 2, status, length); |
312 | thepacket[0] = PACKET_ID_USERSTATUS; | 353 | thepacket[0] = PACKET_ID_USERSTATUS; |
354 | thepacket[1] = self_userstatus_kind; | ||
313 | int written = write_cryptpacket(friendlist[friendnumber].crypt_connection_id, thepacket, length + 1); | 355 | int written = write_cryptpacket(friendlist[friendnumber].crypt_connection_id, thepacket, length + 1); |
314 | free(thepacket); | 356 | free(thepacket); |
315 | return written; | 357 | return written; |
@@ -327,6 +369,11 @@ static int set_friend_userstatus(int friendnumber, uint8_t * status, uint16_t le | |||
327 | return 0; | 369 | return 0; |
328 | } | 370 | } |
329 | 371 | ||
372 | static void set_friend_userstatus_kind(int friendnumber, USERSTATUS_KIND k) | ||
373 | { | ||
374 | friendlist[friendnumber].userstatus_kind = k; | ||
375 | } | ||
376 | |||
330 | /* static void (*friend_request)(uint8_t *, uint8_t *, uint16_t); | 377 | /* static void (*friend_request)(uint8_t *, uint8_t *, uint16_t); |
331 | static uint8_t friend_request_isset = 0; */ | 378 | static uint8_t friend_request_isset = 0; */ |
332 | /* set the function that will be executed when a friend request is received. */ | 379 | /* set the function that will be executed when a friend request is received. */ |
@@ -353,9 +400,9 @@ void m_callback_namechange(void (*function)(int, uint8_t *, uint16_t)) | |||
353 | friend_namechange_isset = 1; | 400 | friend_namechange_isset = 1; |
354 | } | 401 | } |
355 | 402 | ||
356 | static void (*friend_statuschange)(int, uint8_t *, uint16_t); | 403 | static void (*friend_statuschange)(int, USERSTATUS_KIND, uint8_t *, uint16_t); |
357 | static uint8_t friend_statuschange_isset = 0; | 404 | static uint8_t friend_statuschange_isset = 0; |
358 | void m_callback_userstatus(void (*function)(int, uint8_t *, uint16_t)) | 405 | void m_callback_userstatus(void (*function)(int, USERSTATUS_KIND, uint8_t *, uint16_t)) |
359 | { | 406 | { |
360 | friend_statuschange = function; | 407 | friend_statuschange = function; |
361 | friend_statuschange_isset = 1; | 408 | friend_statuschange_isset = 1; |
@@ -366,7 +413,7 @@ void m_callback_userstatus(void (*function)(int, uint8_t *, uint16_t)) | |||
366 | int initMessenger(void) | 413 | int initMessenger(void) |
367 | { | 414 | { |
368 | new_keys(); | 415 | new_keys(); |
369 | m_set_userstatus((uint8_t*)"Online", sizeof("Online")); | 416 | m_set_userstatus(USERSTATUS_KIND_ONLINE, (uint8_t*)"Online", sizeof("Online")); |
370 | initNetCrypto(); | 417 | initNetCrypto(); |
371 | IP ip; | 418 | IP ip; |
372 | ip.i = 0; | 419 | ip.i = 0; |
@@ -438,12 +485,17 @@ static void doFriends(void) | |||
438 | break; | 485 | break; |
439 | } | 486 | } |
440 | case PACKET_ID_USERSTATUS: { | 487 | case PACKET_ID_USERSTATUS: { |
441 | uint8_t *status = calloc(MIN(len - 1, MAX_USERSTATUS_LENGTH), 1); | 488 | if (len > 2) { |
442 | memcpy(status, temp + 1, MIN(len - 1, MAX_USERSTATUS_LENGTH)); | 489 | uint8_t *status = calloc(MIN(len - 2, MAX_USERSTATUS_LENGTH), 1); |
443 | if (friend_statuschange_isset) | 490 | memcpy(status, temp + 2, MIN(len - 2, MAX_USERSTATUS_LENGTH)); |
444 | friend_statuschange(i, status, MIN(len - 1, MAX_USERSTATUS_LENGTH)); | 491 | if (friend_statuschange_isset) |
445 | set_friend_userstatus(i, status, MIN(len - 1, MAX_USERSTATUS_LENGTH)); | 492 | friend_statuschange(i, temp[1], status, MIN(len - 2, MAX_USERSTATUS_LENGTH)); |
446 | free(status); | 493 | set_friend_userstatus(i, status, MIN(len - 2, MAX_USERSTATUS_LENGTH)); |
494 | free(status); | ||
495 | } else if (friend_statuschange_isset) { | ||
496 | friend_statuschange(i, temp[1], friendlist[i].userstatus, friendlist[i].userstatus_length); | ||
497 | } | ||
498 | set_friend_userstatus_kind(i, temp[1]); | ||
447 | break; | 499 | break; |
448 | } | 500 | } |
449 | case PACKET_ID_MESSAGE: { | 501 | case PACKET_ID_MESSAGE: { |
diff --git a/core/Messenger.h b/core/Messenger.h index 20b38caa..8940aadd 100644 --- a/core/Messenger.h +++ b/core/Messenger.h | |||
@@ -60,6 +60,22 @@ extern "C" { | |||
60 | /* don't assume MAX_USERSTATUS_LENGTH will stay at 128, it may be increased | 60 | /* don't assume MAX_USERSTATUS_LENGTH will stay at 128, it may be increased |
61 | to an absurdly large number later */ | 61 | to an absurdly large number later */ |
62 | 62 | ||
63 | /* USERSTATUS_KIND | ||
64 | * Represents the different kinds of userstatus | ||
65 | * someone can have. | ||
66 | * More on this later... */ | ||
67 | |||
68 | typedef enum { | ||
69 | USERSTATUS_KIND_RETAIN = (uint8_t)0, /* This is a special value that must not be returned by | ||
70 | * m_get_userstatus_kind. You can pass it into m_set_userstatus | ||
71 | * to keep the current USERSTATUS_KIND. */ | ||
72 | USERSTATUS_KIND_ONLINE, /* Recommended representation: Green. */ | ||
73 | USERSTATUS_KIND_AWAY, /* Recommended representation: Orange, or yellow. */ | ||
74 | USERSTATUS_KIND_BUSY, /* Recommended representation: Red. */ | ||
75 | USERSTATUS_KIND_OFFLINE, /* Recommended representation: Grey, semi-transparent. */ | ||
76 | USERSTATUS_KIND_INVALID, | ||
77 | } USERSTATUS_KIND; | ||
78 | |||
63 | /* | 79 | /* |
64 | * add a friend | 80 | * add a friend |
65 | * set the data that will be sent along with friend request | 81 | * set the data that will be sent along with friend request |
@@ -70,7 +86,7 @@ extern "C" { | |||
70 | * return -2 if no message (message length must be >= 1 byte) | 86 | * return -2 if no message (message length must be >= 1 byte) |
71 | * return -3 if user's own key | 87 | * return -3 if user's own key |
72 | * return -4 if friend request already sent or already a friend | 88 | * return -4 if friend request already sent or already a friend |
73 | * return -5 for unknown error | 89 | * return -5 for unknown error |
74 | */ | 90 | */ |
75 | int m_addfriend(uint8_t *client_id, uint8_t *data, uint16_t length); | 91 | int m_addfriend(uint8_t *client_id, uint8_t *data, uint16_t length); |
76 | 92 | ||
@@ -114,7 +130,7 @@ int m_sendmessage(int friendnumber, uint8_t *message, uint32_t length); | |||
114 | int setname(uint8_t *name, uint16_t length); | 130 | int setname(uint8_t *name, uint16_t length); |
115 | 131 | ||
116 | /* get our nickname | 132 | /* get our nickname |
117 | put it in name | 133 | put it in name |
118 | return the length of the name*/ | 134 | return the length of the name*/ |
119 | uint16_t getself_name(uint8_t *name); | 135 | uint16_t getself_name(uint8_t *name); |
120 | 136 | ||
@@ -128,7 +144,8 @@ int getname(int friendnumber, uint8_t *name); | |||
128 | /* set our user status | 144 | /* set our user status |
129 | you are responsible for freeing status after | 145 | you are responsible for freeing status after |
130 | returns 0 on success, -1 on failure */ | 146 | returns 0 on success, -1 on failure */ |
131 | int m_set_userstatus(uint8_t *status, uint16_t length); | 147 | int m_set_userstatus(USERSTATUS_KIND kind, uint8_t *status, uint16_t length); |
148 | int m_set_userstatus_kind(USERSTATUS_KIND kind); | ||
132 | 149 | ||
133 | /* return the length of friendnumber's user status, | 150 | /* return the length of friendnumber's user status, |
134 | including null | 151 | including null |
@@ -136,8 +153,17 @@ int m_set_userstatus(uint8_t *status, uint16_t length); | |||
136 | int m_get_userstatus_size(int friendnumber); | 153 | int m_get_userstatus_size(int friendnumber); |
137 | 154 | ||
138 | /* copy friendnumber's userstatus into buf, truncating if size is over maxlen | 155 | /* copy friendnumber's userstatus into buf, truncating if size is over maxlen |
139 | get the size you need to allocate from m_get_userstatus_size */ | 156 | get the size you need to allocate from m_get_userstatus_size |
157 | The self variant will copy our own userstatus. */ | ||
140 | int m_copy_userstatus(int friendnumber, uint8_t *buf, uint32_t maxlen); | 158 | int m_copy_userstatus(int friendnumber, uint8_t *buf, uint32_t maxlen); |
159 | int m_copy_self_userstatus(uint8_t *buf, uint32_t maxlen); | ||
160 | |||
161 | /* Return one of USERSTATUS_KIND values, except USERSTATUS_KIND_RETAIN. | ||
162 | * Values unknown to your application should be represented as USERSTATUS_KIND_ONLINE. | ||
163 | * As above, the self variant will return our own USERSTATUS_KIND. | ||
164 | * If friendnumber is invalid, this shall return USERSTATUS_KIND_INVALID. */ | ||
165 | USERSTATUS_KIND m_get_userstatus_kind(int friendnumber); | ||
166 | USERSTATUS_KIND m_get_self_userstatus_kind(void); | ||
141 | 167 | ||
142 | /* set the function that will be executed when a friend request is received. | 168 | /* set the function that will be executed when a friend request is received. |
143 | function format is function(uint8_t * public_key, uint8_t * data, uint16_t length) */ | 169 | function format is function(uint8_t * public_key, uint8_t * data, uint16_t length) */ |
@@ -153,9 +179,9 @@ void m_callback_friendmessage(void (*function)(int, uint8_t *, uint16_t)); | |||
153 | void m_callback_namechange(void (*function)(int, uint8_t *, uint16_t)); | 179 | void m_callback_namechange(void (*function)(int, uint8_t *, uint16_t)); |
154 | 180 | ||
155 | /* set the callback for user status changes | 181 | /* set the callback for user status changes |
156 | function(int friendnumber, uint8_t *newstatus, uint16_t length) | 182 | function(int friendnumber, USERSTATUS_KIND kind, uint8_t *newstatus, uint16_t length) |
157 | you are not responsible for freeing newstatus */ | 183 | you are not responsible for freeing newstatus */ |
158 | void m_callback_userstatus(void (*function)(int, uint8_t *, uint16_t)); | 184 | void m_callback_userstatus(void (*function)(int, USERSTATUS_KIND, uint8_t *, uint16_t)); |
159 | 185 | ||
160 | /* run this at startup | 186 | /* run this at startup |
161 | returns 0 if no connection problems | 187 | returns 0 if no connection problems |
diff --git a/core/friend_requests.c b/core/friend_requests.c index f1ffb8d0..5550b662 100644 --- a/core/friend_requests.c +++ b/core/friend_requests.c | |||
@@ -104,7 +104,7 @@ static int request_recieved(uint8_t * client_id) | |||
104 | int friendreq_handlepacket(uint8_t * packet, uint32_t length, IP_Port source) | 104 | int friendreq_handlepacket(uint8_t * packet, uint32_t length, IP_Port source) |
105 | { | 105 | { |
106 | if (packet[0] == 32) { | 106 | if (packet[0] == 32) { |
107 | if (length <= crypto_box_PUBLICKEYBYTES * 2 + crypto_box_NONCEBYTES + 1 + ENCRYPTION_PADDING && | 107 | if (length <= crypto_box_PUBLICKEYBYTES * 2 + crypto_box_NONCEBYTES + 1 + ENCRYPTION_PADDING || |
108 | length > MAX_DATA_SIZE + ENCRYPTION_PADDING) | 108 | length > MAX_DATA_SIZE + ENCRYPTION_PADDING) |
109 | return 1; | 109 | return 1; |
110 | if (memcmp(packet + 1, self_public_key, crypto_box_PUBLICKEYBYTES) == 0) {// check if request is for us. | 110 | if (memcmp(packet + 1, self_public_key, crypto_box_PUBLICKEYBYTES) == 0) {// check if request is for us. |
diff --git a/core/ping.c b/core/ping.c new file mode 100644 index 00000000..ffabe221 --- /dev/null +++ b/core/ping.c | |||
@@ -0,0 +1,103 @@ | |||
1 | /* | ||
2 | * ping.c -- Buffered pinging using cyclic arrays. | ||
3 | * | ||
4 | * This file is donated to the Tox Project. | ||
5 | * Copyright 2013 plutooo | ||
6 | */ | ||
7 | |||
8 | #include <stdbool.h> | ||
9 | #include <stdint.h> | ||
10 | |||
11 | #include "network.h" | ||
12 | #include "util.h" | ||
13 | |||
14 | #define PING_NUM_MAX 256 | ||
15 | #define PING_TIMEOUT 5 // 5s | ||
16 | |||
17 | typedef struct { | ||
18 | IP_Port ipp; | ||
19 | uint64_t id; | ||
20 | uint64_t timestamp; | ||
21 | } pinged_t; | ||
22 | |||
23 | static pinged_t pings[PING_NUM_MAX]; | ||
24 | static size_t num_pings; | ||
25 | static size_t pos_pings; | ||
26 | |||
27 | |||
28 | void init_ping() | ||
29 | { | ||
30 | num_pings = 0; | ||
31 | pos_pings = 0; | ||
32 | } | ||
33 | |||
34 | static bool is_timeout(uint64_t time) | ||
35 | { | ||
36 | return (time + PING_TIMEOUT) < now(); | ||
37 | } | ||
38 | |||
39 | static void remove_timeouts() // O(n) | ||
40 | { | ||
41 | size_t i, id; | ||
42 | size_t new_pos = pos_pings; | ||
43 | size_t new_num = num_pings; | ||
44 | |||
45 | // Loop through buffer, oldest first | ||
46 | for (i=0; i<num_pings; i++) { | ||
47 | id = (pos_pings + i) % PING_NUM_MAX; | ||
48 | |||
49 | if(is_timeout(pings[id].timestamp)) { | ||
50 | new_pos++; | ||
51 | new_num--; | ||
52 | } | ||
53 | // Break here because list is sorted. | ||
54 | else | ||
55 | break; | ||
56 | } | ||
57 | |||
58 | num_pings = new_num; | ||
59 | pos_pings = new_pos % PING_NUM_MAX; | ||
60 | } | ||
61 | |||
62 | uint64_t add_ping(IP_Port ipp) // O(n) | ||
63 | { | ||
64 | size_t p; | ||
65 | |||
66 | remove_timeouts(); | ||
67 | |||
68 | // Remove oldest ping if full buffer | ||
69 | if (num_pings == PING_NUM_MAX) { | ||
70 | num_pings--; | ||
71 | pos_pings = (pos_pings + 1) % PING_NUM_MAX; | ||
72 | } | ||
73 | |||
74 | // Insert new ping at end of list | ||
75 | p = (pos_pings + num_pings) % PING_NUM_MAX; | ||
76 | |||
77 | pings[p].ipp = ipp; | ||
78 | pings[p].timestamp = now(); | ||
79 | pings[p].id = random_64b(); | ||
80 | |||
81 | num_pings++; | ||
82 | return pings[p].id; | ||
83 | } | ||
84 | |||
85 | bool is_pinging(IP_Port ipp, uint64_t ping_id) // O(n) TODO: replace this with something else. | ||
86 | { | ||
87 | if (ipp.ip.i == 0 && ping_id == 0) | ||
88 | return false; | ||
89 | |||
90 | size_t i, id; | ||
91 | |||
92 | remove_timeouts(); | ||
93 | |||
94 | for (i=0; i<num_pings; i++) { | ||
95 | id = (pos_pings + i) % PING_NUM_MAX; | ||
96 | |||
97 | if ((ipp_eq(pings[id].ipp, ipp) || ipp.ip.i == 0) && (pings[id].id == ping_id || ping_id == 0)) { | ||
98 | return true; | ||
99 | } | ||
100 | } | ||
101 | |||
102 | return false; | ||
103 | } | ||
diff --git a/core/ping.h b/core/ping.h new file mode 100644 index 00000000..1d23df97 --- /dev/null +++ b/core/ping.h | |||
@@ -0,0 +1,13 @@ | |||
1 | /* | ||
2 | * ping.h -- Buffered pinging using cyclic arrays. | ||
3 | * | ||
4 | * This file is donated to the Tox Project. | ||
5 | * Copyright 2013 plutooo | ||
6 | */ | ||
7 | |||
8 | #include <stdbool.h> | ||
9 | |||
10 | void init_ping(); | ||
11 | uint64_t add_ping(IP_Port ipp); | ||
12 | bool is_pinging(IP_Port ipp, uint64_t ping_id); | ||
13 | |||
diff --git a/core/util.c b/core/util.c new file mode 100644 index 00000000..4ce9271e --- /dev/null +++ b/core/util.c | |||
@@ -0,0 +1,34 @@ | |||
1 | /* | ||
2 | * util.c -- Utilities. | ||
3 | * | ||
4 | * This file is donated to the Tox Project. | ||
5 | * Copyright 2013 plutooo | ||
6 | */ | ||
7 | |||
8 | #include <time.h> | ||
9 | #include <stdint.h> | ||
10 | #include <stdbool.h> | ||
11 | |||
12 | #include "network.h" | ||
13 | |||
14 | uint64_t now() | ||
15 | { | ||
16 | return time(NULL); | ||
17 | } | ||
18 | |||
19 | uint64_t random_64b() | ||
20 | { | ||
21 | uint64_t r; | ||
22 | |||
23 | // This is probably not random enough? | ||
24 | r = random_int(); | ||
25 | r <<= 32; | ||
26 | r |= random_int(); | ||
27 | |||
28 | return r; | ||
29 | } | ||
30 | |||
31 | bool ipp_eq(IP_Port a, IP_Port b) | ||
32 | { | ||
33 | return (a.ip.i == b.ip.i) && (a.port == b.port); | ||
34 | } | ||
diff --git a/core/util.h b/core/util.h new file mode 100644 index 00000000..aab2ead9 --- /dev/null +++ b/core/util.h | |||
@@ -0,0 +1,10 @@ | |||
1 | /* | ||
2 | * util.h -- Utilities. | ||
3 | * | ||
4 | * This file is donated to the Tox Project. | ||
5 | * Copyright 2013 plutooo | ||
6 | */ | ||
7 | |||
8 | uint64_t now(); | ||
9 | uint64_t random_64b(); | ||
10 | bool ipp_eq(IP_Port a, IP_Port b); | ||
diff --git a/docs/install.rst b/docs/install.rst index c5fea5d1..9b6e2f29 100644 --- a/docs/install.rst +++ b/docs/install.rst | |||
@@ -6,7 +6,7 @@ Linux | |||
6 | 6 | ||
7 | First, install the build dependencies :: | 7 | First, install the build dependencies :: |
8 | 8 | ||
9 | bash apt-get install build-essential libtool autotools-dev automake libconfig-dev ncurses-dev cmake checkinstall | 9 | sudo apt-get install build-essential libtool autotools-dev automake libconfig-dev ncurses-dev cmake checkinstall |
10 | 10 | ||
11 | .. note :: ``libconfig-dev`` should be >= 1.4. | 11 | .. note :: ``libconfig-dev`` should be >= 1.4. |
12 | 12 | ||
diff --git a/testing/nTox.c b/testing/nTox.c index fe91b1fa..63d0c32e 100644 --- a/testing/nTox.c +++ b/testing/nTox.c | |||
@@ -228,7 +228,7 @@ void line_eval(char *line) | |||
228 | status[i-3] = line[i]; | 228 | status[i-3] = line[i]; |
229 | } | 229 | } |
230 | status[i-3] = 0; | 230 | status[i-3] = 0; |
231 | m_set_userstatus(status, strlen((char*)status) + 1); | 231 | m_set_userstatus(USERSTATUS_KIND_ONLINE, status, strlen((char*)status) + 1); |
232 | char numstring[100]; | 232 | char numstring[100]; |
233 | sprintf(numstring, "[i] changed status to %s", (char*)status); | 233 | sprintf(numstring, "[i] changed status to %s", (char*)status); |
234 | new_lines(numstring); | 234 | new_lines(numstring); |
@@ -364,7 +364,7 @@ void print_nickchange(int friendnumber, uint8_t *string, uint16_t length) | |||
364 | } | 364 | } |
365 | } | 365 | } |
366 | 366 | ||
367 | void print_statuschange(int friendnumber, uint8_t *string, uint16_t length) | 367 | void print_statuschange(int friendnumber, USERSTATUS_KIND kind, uint8_t *string, uint16_t length) |
368 | { | 368 | { |
369 | char name[MAX_NAME_LENGTH]; | 369 | char name[MAX_NAME_LENGTH]; |
370 | if(getname(friendnumber, (uint8_t*)name) != -1) { | 370 | if(getname(friendnumber, (uint8_t*)name) != -1) { |
@@ -392,7 +392,7 @@ void load_key(char *path) | |||
392 | } | 392 | } |
393 | Messenger_load(data, size); | 393 | Messenger_load(data, size); |
394 | 394 | ||
395 | } else { | 395 | } else { |
396 | //else save new keys | 396 | //else save new keys |
397 | int size = Messenger_size(); | 397 | int size = Messenger_size(); |
398 | uint8_t data[size]; | 398 | uint8_t data[size]; |
diff --git a/testing/nTox_win32.c b/testing/nTox_win32.c index f3c7a188..dbbd0f6e 100644 --- a/testing/nTox_win32.c +++ b/testing/nTox_win32.c | |||
@@ -18,7 +18,7 @@ | |||
18 | * | 18 | * |
19 | * You should have received a copy of the GNU General Public License | 19 | * You should have received a copy of the GNU General Public License |
20 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 20 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. |
21 | * | 21 | * |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include "nTox_win32.h" | 24 | #include "nTox_win32.h" |
@@ -86,7 +86,7 @@ void print_nickchange(int friendnumber, uint8_t *string, uint16_t length) | |||
86 | printf(msg); | 86 | printf(msg); |
87 | } | 87 | } |
88 | 88 | ||
89 | void print_statuschange(int friendnumber, uint8_t *string, uint16_t length) | 89 | void print_statuschange(int friendnumber, USERSTATUS_KIND kind, uint8_t *string, uint16_t length) |
90 | { | 90 | { |
91 | char name[MAX_NAME_LENGTH]; | 91 | char name[MAX_NAME_LENGTH]; |
92 | getname(friendnumber, (uint8_t*)name); | 92 | getname(friendnumber, (uint8_t*)name); |
@@ -95,7 +95,7 @@ void print_statuschange(int friendnumber, uint8_t *string, uint16_t length) | |||
95 | printf(msg); | 95 | printf(msg); |
96 | } | 96 | } |
97 | 97 | ||
98 | void load_key() | 98 | void load_key() |
99 | { | 99 | { |
100 | FILE *data_file = NULL; | 100 | FILE *data_file = NULL; |
101 | data_file = fopen("data","r"); | 101 | data_file = fopen("data","r"); |
@@ -130,7 +130,7 @@ void add_friend() | |||
130 | int i; | 130 | int i; |
131 | char temp_id[128]; | 131 | char temp_id[128]; |
132 | 132 | ||
133 | for (i = 0; i < 128; i++) | 133 | for (i = 0; i < 128; i++) |
134 | temp_id[i] = line[i+3]; | 134 | temp_id[i] = line[i+3]; |
135 | 135 | ||
136 | int num = m_addfriend(hex_string_to_bin(temp_id), (uint8_t*)"Install Gentoo", sizeof("Install Gentoo")); | 136 | int num = m_addfriend(hex_string_to_bin(temp_id), (uint8_t*)"Install Gentoo", sizeof("Install Gentoo")); |
@@ -141,7 +141,7 @@ void add_friend() | |||
141 | printf(numstring); | 141 | printf(numstring); |
142 | ++maxnumfriends; | 142 | ++maxnumfriends; |
143 | } | 143 | } |
144 | else if (num == -1) | 144 | else if (num == -1) |
145 | printf("\n[i] Message is too long.\n\n"); | 145 | printf("\n[i] Message is too long.\n\n"); |
146 | 146 | ||
147 | else if (num == -2) | 147 | else if (num == -2) |
@@ -180,7 +180,7 @@ void list_friends() | |||
180 | char name[MAX_NAME_LENGTH]; | 180 | char name[MAX_NAME_LENGTH]; |
181 | getname(i, (uint8_t*)name); | 181 | getname(i, (uint8_t*)name); |
182 | 182 | ||
183 | if (m_friendstatus(i) == 4) | 183 | if (m_friendstatus(i) == 4) |
184 | printf("[%d] %s\n", i, (uint8_t*)name); | 184 | printf("[%d] %s\n", i, (uint8_t*)name); |
185 | } | 185 | } |
186 | 186 | ||
@@ -213,7 +213,7 @@ void message_friend() | |||
213 | 213 | ||
214 | for (i = 0; i < len; i++) { | 214 | for (i = 0; i < len; i++) { |
215 | 215 | ||
216 | if (line[i+3] != ' ') | 216 | if (line[i+3] != ' ') |
217 | numstring[i] = line[i+3]; | 217 | numstring[i] = line[i+3]; |
218 | 218 | ||
219 | else { | 219 | else { |
@@ -243,7 +243,7 @@ void change_nickname() | |||
243 | 243 | ||
244 | for (i = 3; i < len; i++) { | 244 | for (i = 3; i < len; i++) { |
245 | 245 | ||
246 | if (line[i] == 0 || line[i] == '\n') | 246 | if (line[i] == 0 || line[i] == '\n') |
247 | break; | 247 | break; |
248 | 248 | ||
249 | name[i-3] = line[i]; | 249 | name[i-3] = line[i]; |
@@ -268,7 +268,7 @@ void change_status(int savetofile) | |||
268 | size_t len = strlen(line); | 268 | size_t len = strlen(line); |
269 | 269 | ||
270 | for (i = 3; i < len; i++) { | 270 | for (i = 3; i < len; i++) { |
271 | if (line[i] == 0 || line[i] == '\n') | 271 | if (line[i] == 0 || line[i] == '\n') |
272 | break; | 272 | break; |
273 | 273 | ||
274 | status[i-3] = line[i]; | 274 | status[i-3] = line[i]; |
@@ -350,7 +350,7 @@ void line_eval(char* line) | |||
350 | accept_friend_request(line); | 350 | accept_friend_request(line); |
351 | } | 351 | } |
352 | /* EXIT */ | 352 | /* EXIT */ |
353 | else if (inpt_command == 'q') { | 353 | else if (inpt_command == 'q') { |
354 | strcpy(line, "---Offline"); | 354 | strcpy(line, "---Offline"); |
355 | change_status(0); | 355 | change_status(0); |
356 | exit(EXIT_SUCCESS); | 356 | exit(EXIT_SUCCESS); |
@@ -398,7 +398,7 @@ int main(int argc, char *argv[]) | |||
398 | nameloaded = 1; | 398 | nameloaded = 1; |
399 | printf("%s\n", name); | 399 | printf("%s\n", name); |
400 | fclose(name_file); | 400 | fclose(name_file); |
401 | } | 401 | } |
402 | 402 | ||
403 | FILE* status_file = NULL; | 403 | FILE* status_file = NULL; |
404 | status_file = fopen("statusfile.txt", "r"); | 404 | status_file = fopen("statusfile.txt", "r"); |
@@ -424,7 +424,7 @@ int main(int argc, char *argv[]) | |||
424 | { | 424 | { |
425 | if(self_public_key[i] < (PUB_KEY_BYTES/2)) | 425 | if(self_public_key[i] < (PUB_KEY_BYTES/2)) |
426 | strcpy(idstring1[i],"0"); | 426 | strcpy(idstring1[i],"0"); |
427 | else | 427 | else |
428 | strcpy(idstring1[i], ""); | 428 | strcpy(idstring1[i], ""); |
429 | sprintf(idstring2[i], "%hhX",self_public_key[i]); | 429 | sprintf(idstring2[i], "%hhX",self_public_key[i]); |
430 | } | 430 | } |
@@ -442,7 +442,7 @@ int main(int argc, char *argv[]) | |||
442 | int resolved_address = resolve_addr(argv[1]); | 442 | int resolved_address = resolve_addr(argv[1]); |
443 | if (resolved_address != 0) | 443 | if (resolved_address != 0) |
444 | bootstrap_ip_port.ip.i = resolved_address; | 444 | bootstrap_ip_port.ip.i = resolved_address; |
445 | else | 445 | else |
446 | exit(1); | 446 | exit(1); |
447 | 447 | ||
448 | DHT_bootstrap(bootstrap_ip_port, hex_string_to_bin(argv[3])); | 448 | DHT_bootstrap(bootstrap_ip_port, hex_string_to_bin(argv[3])); |
diff --git a/testing/toxic/chat.c b/testing/toxic/chat.c index 15d124bc..7262e722 100644 --- a/testing/toxic/chat.c +++ b/testing/toxic/chat.c | |||
@@ -34,7 +34,7 @@ void execute(ToxWindow* self, ChatContext* ctx, char* cmd); | |||
34 | static void chat_onMessage(ToxWindow* self, int num, uint8_t* msg, uint16_t len) { | 34 | static void chat_onMessage(ToxWindow* self, int num, uint8_t* msg, uint16_t len) { |
35 | ChatContext* ctx = (ChatContext*) self->x; | 35 | ChatContext* ctx = (ChatContext*) self->x; |
36 | uint8_t nick[MAX_NAME_LENGTH] = {0}; | 36 | uint8_t nick[MAX_NAME_LENGTH] = {0}; |
37 | 37 | ||
38 | time_t now; | 38 | time_t now; |
39 | time(&now); | 39 | time(&now); |
40 | struct tm * timeinfo; | 40 | struct tm * timeinfo; |
@@ -60,6 +60,8 @@ static void chat_onMessage(ToxWindow* self, int num, uint8_t* msg, uint16_t len) | |||
60 | wprintw(ctx->history, "%s\n", msg); | 60 | wprintw(ctx->history, "%s\n", msg); |
61 | 61 | ||
62 | self->blink = true; | 62 | self->blink = true; |
63 | beep(); | ||
64 | flash(); | ||
63 | } | 65 | } |
64 | 66 | ||
65 | static void chat_onNickChange(ToxWindow* self, int num, uint8_t* nick, uint16_t len) { | 67 | static void chat_onNickChange(ToxWindow* self, int num, uint8_t* nick, uint16_t len) { |
@@ -163,7 +165,7 @@ void execute(ToxWindow* self, ChatContext* ctx, char* cmd) | |||
163 | return; | 165 | return; |
164 | } | 166 | } |
165 | msg++; | 167 | msg++; |
166 | m_set_userstatus((uint8_t*) msg, strlen(msg)+1); | 168 | m_set_userstatus(USERSTATUS_KIND_RETAIN, (uint8_t*) msg, strlen(msg)+1); |
167 | wprintw(ctx->history, "Status set to: %s\n", msg); | 169 | wprintw(ctx->history, "Status set to: %s\n", msg); |
168 | } | 170 | } |
169 | else if (!strncmp(cmd, "/nick ", strlen("/nick "))) { | 171 | else if (!strncmp(cmd, "/nick ", strlen("/nick "))) { |
diff --git a/testing/toxic/friendlist.c b/testing/toxic/friendlist.c index a1f9851e..94e8fb47 100644 --- a/testing/toxic/friendlist.c +++ b/testing/toxic/friendlist.c | |||
@@ -138,7 +138,7 @@ static void friendlist_onDraw(ToxWindow* self) { | |||
138 | curs_set(0); | 138 | curs_set(0); |
139 | size_t i; | 139 | size_t i; |
140 | 140 | ||
141 | wclear(self->window); | 141 | werase(self->window); |
142 | 142 | ||
143 | if(num_friends == 0) { | 143 | if(num_friends == 0) { |
144 | wprintw(self->window, "Empty. Add some friends! :-)\n"); | 144 | wprintw(self->window, "Empty. Add some friends! :-)\n"); |
diff --git a/testing/toxic/main.c b/testing/toxic/main.c index 892f812a..19a0b959 100644 --- a/testing/toxic/main.c +++ b/testing/toxic/main.c | |||
@@ -68,10 +68,10 @@ void on_nickchange(int friendnumber, uint8_t* string, uint16_t length) { | |||
68 | } | 68 | } |
69 | } | 69 | } |
70 | 70 | ||
71 | void on_statuschange(int friendnumber, uint8_t* string, uint16_t length) { | 71 | void on_statuschange(int friendnumber, USERSTATUS_KIND kind, uint8_t* string, uint16_t length) { |
72 | size_t i; | 72 | size_t i; |
73 | 73 | ||
74 | wprintw(prompt->window, "\n(statuschange) %d: %s!\n", friendnumber, string); | 74 | wprintw(prompt->window, "\n(statuschange) %d: %s\n", friendnumber, string); |
75 | 75 | ||
76 | for(i=0; i<MAX_WINDOW_SLOTS; i++) { | 76 | for(i=0; i<MAX_WINDOW_SLOTS; i++) { |
77 | if(windows[i].onStatusChange != NULL) | 77 | if(windows[i].onStatusChange != NULL) |
@@ -216,7 +216,7 @@ static void load_data(char *path) { | |||
216 | 216 | ||
217 | Messenger_load(buf, len); | 217 | Messenger_load(buf, len); |
218 | } | 218 | } |
219 | else { | 219 | else { |
220 | len = Messenger_size(); | 220 | len = Messenger_size(); |
221 | buf = malloc(len); | 221 | buf = malloc(len); |
222 | 222 | ||
@@ -337,7 +337,7 @@ int main(int argc, char* argv[]) { | |||
337 | 337 | ||
338 | for(i = 0; i < argc; i++) { | 338 | for(i = 0; i < argc; i++) { |
339 | if (argv[i] == NULL){ | 339 | if (argv[i] == NULL){ |
340 | break; | 340 | break; |
341 | } else if(argv[i][0] == '-') { | 341 | } else if(argv[i][0] == '-') { |
342 | if(argv[i][1] == 'f') { | 342 | if(argv[i][1] == 'f') { |
343 | if(argv[i + 1] != NULL) | 343 | if(argv[i + 1] != NULL) |
diff --git a/testing/toxic/prompt.c b/testing/toxic/prompt.c index f973afd7..20f6b480 100644 --- a/testing/toxic/prompt.c +++ b/testing/toxic/prompt.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * Toxic -- Tox Curses Client | 2 | * Toxic -- Tox Curses Client |
3 | */ | 3 | */ |
4 | 4 | ||
5 | #include <stdlib.h> | 5 | #include <stdlib.h> |
6 | #include <string.h> | 6 | #include <string.h> |
@@ -41,7 +41,17 @@ unsigned char * hex_string_to_bin(char hex_string[]) | |||
41 | static char prompt_buf[256] = {0}; | 41 | static char prompt_buf[256] = {0}; |
42 | static int prompt_buf_pos=0; | 42 | static int prompt_buf_pos=0; |
43 | 43 | ||
44 | static void execute(ToxWindow* self, char* cmd) { | 44 | static void execute(ToxWindow* self, char* u_cmd) { |
45 | int i; | ||
46 | int newlines = 0; | ||
47 | char cmd[256] = {0}; | ||
48 | for(i = 0; i < strlen(prompt_buf); i++) | ||
49 | { | ||
50 | if (u_cmd[i] == '\n') | ||
51 | ++newlines; | ||
52 | else | ||
53 | cmd[i - newlines] = u_cmd[i]; | ||
54 | } | ||
45 | 55 | ||
46 | if(!strcmp(cmd, "quit") || !strcmp(cmd, "exit") || !strcmp(cmd, "q")) { | 56 | if(!strcmp(cmd, "quit") || !strcmp(cmd, "exit") || !strcmp(cmd, "q")) { |
47 | endwin(); | 57 | endwin(); |
@@ -91,7 +101,7 @@ static void execute(ToxWindow* self, char* cmd) { | |||
91 | dht.ip.i = resolved_address; | 101 | dht.ip.i = resolved_address; |
92 | unsigned char *binary_string = hex_string_to_bin(key); | 102 | unsigned char *binary_string = hex_string_to_bin(key); |
93 | DHT_bootstrap(dht, binary_string); | 103 | DHT_bootstrap(dht, binary_string); |
94 | free(binary_string); | 104 | free(binary_string); |
95 | } | 105 | } |
96 | else if(!strncmp(cmd, "add ", strlen("add "))) { | 106 | else if(!strncmp(cmd, "add ", strlen("add "))) { |
97 | uint8_t id_bin[32]; | 107 | uint8_t id_bin[32]; |
@@ -137,7 +147,7 @@ static void execute(ToxWindow* self, char* cmd) { | |||
137 | 147 | ||
138 | num = m_addfriend(id_bin, (uint8_t*) msg, strlen(msg)+1); | 148 | num = m_addfriend(id_bin, (uint8_t*) msg, strlen(msg)+1); |
139 | switch (num) { | 149 | switch (num) { |
140 | case -1: | 150 | case -1: |
141 | wprintw(self->window, "Message is too long.\n"); | 151 | wprintw(self->window, "Message is too long.\n"); |
142 | break; | 152 | break; |
143 | case -2: | 153 | case -2: |
@@ -151,18 +161,19 @@ static void execute(ToxWindow* self, char* cmd) { | |||
151 | break; | 161 | break; |
152 | case -5: | 162 | case -5: |
153 | wprintw(self->window, "Undefined error when adding friend.\n"); | 163 | wprintw(self->window, "Undefined error when adding friend.\n"); |
154 | break; | 164 | break; |
155 | default: | 165 | default: |
156 | wprintw(self->window, "Friend added as %d.\n", num); | 166 | wprintw(self->window, "Friend added as %d.\n", num); |
157 | on_friendadded(num); | 167 | on_friendadded(num); |
158 | break; | 168 | break; |
159 | } | 169 | } |
160 | } | 170 | } |
161 | else if (!strcmp(cmd, "clear")) { | 171 | else if(!strcmp(cmd, "clear")) { |
162 | wclear(self->window); | 172 | wclear(self->window); |
163 | } | 173 | } |
164 | else if(!strcmp(cmd, "help")) { | 174 | else if(!strcmp(cmd, "help")) { |
165 | print_usage(self); | 175 | wclear(self->window); |
176 | print_usage(self); | ||
166 | } | 177 | } |
167 | else if(!strncmp(cmd, "status ", strlen("status "))) { | 178 | else if(!strncmp(cmd, "status ", strlen("status "))) { |
168 | char* msg; | 179 | char* msg; |
@@ -174,7 +185,7 @@ static void execute(ToxWindow* self, char* cmd) { | |||
174 | } | 185 | } |
175 | msg++; | 186 | msg++; |
176 | 187 | ||
177 | m_set_userstatus((uint8_t*) msg, strlen(msg)+1); | 188 | m_set_userstatus(USERSTATUS_KIND_RETAIN, (uint8_t*) msg, strlen(msg)+1); |
178 | wprintw(self->window, "Status set to: %s\n", msg); | 189 | wprintw(self->window, "Status set to: %s\n", msg); |
179 | } | 190 | } |
180 | else if(!strncmp(cmd, "nick ", strlen("nick "))) { | 191 | else if(!strncmp(cmd, "nick ", strlen("nick "))) { |
@@ -196,7 +207,7 @@ static void execute(ToxWindow* self, char* cmd) { | |||
196 | 207 | ||
197 | for(i=0; i<32; i++) { | 208 | for(i=0; i<32; i++) { |
198 | char xx[3]; | 209 | char xx[3]; |
199 | snprintf(xx, sizeof(xx), "%02x", self_public_key[i] & 0xff); | 210 | snprintf(xx, sizeof(xx), "%02x", self_public_key[i] & 0xff); |
200 | strcat(id, xx); | 211 | strcat(id, xx); |
201 | } | 212 | } |
202 | 213 | ||
@@ -264,8 +275,16 @@ static void execute(ToxWindow* self, char* cmd) { | |||
264 | static void prompt_onKey(ToxWindow* self, int key) { | 275 | static void prompt_onKey(ToxWindow* self, int key) { |
265 | // PRINTABLE characters: Add to line. | 276 | // PRINTABLE characters: Add to line. |
266 | if(isprint(key)) { | 277 | if(isprint(key)) { |
267 | if(prompt_buf_pos == (sizeof(prompt_buf) - 1)) { | 278 | if (prompt_buf_pos == (sizeof(prompt_buf) - 1)){ |
268 | return; | 279 | wprintw(self->window, "\nToo Long.\n"); |
280 | prompt_buf_pos = 0; | ||
281 | prompt_buf[0] = 0; | ||
282 | } | ||
283 | else if(!(prompt_buf_pos == 0) && (prompt_buf_pos < COLS) && (prompt_buf_pos % (COLS - 3) == 0)) { | ||
284 | prompt_buf[prompt_buf_pos++] = '\n'; | ||
285 | } | ||
286 | else if(!(prompt_buf_pos == 0) && (prompt_buf_pos > COLS) && ((prompt_buf_pos - (COLS - 3)) % (COLS) == 0)) { | ||
287 | prompt_buf[prompt_buf_pos++] = '\n'; | ||
269 | } | 288 | } |
270 | prompt_buf[prompt_buf_pos++] = key; | 289 | prompt_buf[prompt_buf_pos++] = key; |
271 | prompt_buf[prompt_buf_pos] = 0; | 290 | prompt_buf[prompt_buf_pos] = 0; |
@@ -288,20 +307,22 @@ static void prompt_onKey(ToxWindow* self, int key) { | |||
288 | } | 307 | } |
289 | 308 | ||
290 | static void prompt_onDraw(ToxWindow* self) { | 309 | static void prompt_onDraw(ToxWindow* self) { |
291 | curs_set(1); | 310 | curs_set(1); |
292 | int x, y; | 311 | int x, y; |
293 | 312 | getyx(self->window, y, x); | |
294 | getyx(self->window, y, x); | 313 | (void) x; |
295 | (void) x; | 314 | int i; |
296 | 315 | for (i = 0; i < (strlen(prompt_buf)); i++) | |
297 | wattron(self->window, COLOR_PAIR(1)); | 316 | { |
298 | mvwprintw(self->window, y, 0, "# "); | 317 | if ((prompt_buf[i] == '\n') && (y != 0)) |
299 | wattroff(self->window, COLOR_PAIR(1)); | 318 | --y; |
300 | 319 | } | |
301 | mvwprintw(self->window, y, 2, "%s", prompt_buf); | 320 | wattron(self->window, COLOR_PAIR(1)); |
302 | wclrtoeol(self->window); | 321 | mvwprintw(self->window, y, 0, "# "); |
303 | 322 | wattroff(self->window, COLOR_PAIR(1)); | |
304 | wrefresh(self->window); | 323 | mvwprintw(self->window, y, 2, "%s", prompt_buf); |
324 | wclrtoeol(self->window); | ||
325 | wrefresh(self->window); | ||
305 | } | 326 | } |
306 | 327 | ||
307 | static void print_usage(ToxWindow* self) { | 328 | static void print_usage(ToxWindow* self) { |
@@ -309,16 +330,15 @@ static void print_usage(ToxWindow* self) { | |||
309 | wprintw(self->window, "Commands:\n"); | 330 | wprintw(self->window, "Commands:\n"); |
310 | wattroff(self->window, A_BOLD); | 331 | wattroff(self->window, A_BOLD); |
311 | 332 | ||
312 | wprintw(self->window, " connect <ip> <port> <key> : Connect to DHT server\n"); | 333 | wprintw(self->window, " connect <ip> <port> <key> : Connect to DHT server\n"); |
313 | wprintw(self->window, " add <id> <message> : Add friend\n"); | 334 | wprintw(self->window, " add <id> <message> : Add friend\n"); |
314 | wprintw(self->window, " status <message> : Set your status\n"); | 335 | wprintw(self->window, " status <message> : Set your status\n"); |
315 | wprintw(self->window, " nick <nickname> : Set your nickname\n"); | 336 | wprintw(self->window, " nick <nickname> : Set your nickname\n"); |
316 | wprintw(self->window, " accept <number> : Accept friend request\n"); | 337 | wprintw(self->window, " accept <number> : Accept friend request\n"); |
317 | wprintw(self->window, " myid : Print your ID\n"); | 338 | wprintw(self->window, " myid : Print your ID\n"); |
318 | wprintw(self->window, " clear : Clear this window\n"); | 339 | wprintw(self->window, " quit/exit : Exit program\n"); |
319 | wprintw(self->window, " quit/exit : Exit program\n"); | 340 | wprintw(self->window, " help : Print this message again\n"); |
320 | wprintw(self->window, " help : Print this message again\n"); | 341 | wprintw(self->window, " clear : Clear this window\n"); |
321 | |||
322 | 342 | ||
323 | wattron(self->window, A_BOLD); | 343 | wattron(self->window, A_BOLD); |
324 | wprintw(self->window, "TIP: Use the TAB key to navigate through the tabs.\n\n"); | 344 | wprintw(self->window, "TIP: Use the TAB key to navigate through the tabs.\n\n"); |