diff options
Diffstat (limited to 'toxcore/Messenger.c')
-rw-r--r-- | toxcore/Messenger.c | 48 |
1 files changed, 25 insertions, 23 deletions
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c index b2c860c6..6728231d 100644 --- a/toxcore/Messenger.c +++ b/toxcore/Messenger.c | |||
@@ -517,8 +517,10 @@ static int send_userstatus(Messenger *m, int friendnumber, USERSTATUS status) | |||
517 | static int send_ping(Messenger *m, int friendnumber) | 517 | static int send_ping(Messenger *m, int friendnumber) |
518 | { | 518 | { |
519 | int ret = write_cryptpacket_id(m, friendnumber, PACKET_ID_PING, 0, 0); | 519 | int ret = write_cryptpacket_id(m, friendnumber, PACKET_ID_PING, 0, 0); |
520 | |||
520 | if (ret == 1) | 521 | if (ret == 1) |
521 | m->friendlist[friendnumber].ping_lastsent = unix_time(); | 522 | m->friendlist[friendnumber].ping_lastsent = unix_time(); |
523 | |||
522 | return ret; | 524 | return ret; |
523 | } | 525 | } |
524 | 526 | ||
@@ -1187,7 +1189,7 @@ void doFriends(Messenger *m) | |||
1187 | 1189 | ||
1188 | if (m->group_invite) | 1190 | if (m->group_invite) |
1189 | (*m->group_invite)(m, i, data, m->group_invite_userdata); | 1191 | (*m->group_invite)(m, i, data, m->group_invite_userdata); |
1190 | 1192 | ||
1191 | break; | 1193 | break; |
1192 | } | 1194 | } |
1193 | 1195 | ||
@@ -1204,10 +1206,10 @@ void doFriends(Messenger *m) | |||
1204 | break; | 1206 | break; |
1205 | 1207 | ||
1206 | group_newpeer(m->chats[groupnum], data + crypto_box_PUBLICKEYBYTES); | 1208 | group_newpeer(m->chats[groupnum], data + crypto_box_PUBLICKEYBYTES); |
1207 | 1209 | ||
1208 | break; | 1210 | break; |
1209 | } | 1211 | } |
1210 | 1212 | ||
1211 | default: { | 1213 | default: { |
1212 | break; | 1214 | break; |
1213 | } | 1215 | } |
@@ -1304,17 +1306,17 @@ void doMessenger(Messenger *m) | |||
1304 | 1306 | ||
1305 | for (a = 0, assoc = &cptr->assoc4; a < 2; a++, assoc = &cptr->assoc6) | 1307 | for (a = 0, assoc = &cptr->assoc4; a < 2; a++, assoc = &cptr->assoc6) |
1306 | #endif | 1308 | #endif |
1307 | if (ip_isset(&assoc->ip_port.ip)) { | 1309 | if (ip_isset(&assoc->ip_port.ip)) { |
1308 | last_pinged = lastdump - assoc->last_pinged; | 1310 | last_pinged = lastdump - assoc->last_pinged; |
1309 | 1311 | ||
1310 | if (last_pinged > 999) | 1312 | if (last_pinged > 999) |
1311 | last_pinged = 999; | 1313 | last_pinged = 999; |
1312 | 1314 | ||
1313 | snprintf(logbuffer, sizeof(logbuffer), "C[%2u] %s:%u [%3u] %s\n", | 1315 | snprintf(logbuffer, sizeof(logbuffer), "C[%2u] %s:%u [%3u] %s\n", |
1314 | client, ip_ntoa(&assoc->ip_port.ip), ntohs(assoc->ip_port.port), | 1316 | client, ip_ntoa(&assoc->ip_port.ip), ntohs(assoc->ip_port.port), |
1315 | last_pinged, ID2String(cptr->client_id)); | 1317 | last_pinged, ID2String(cptr->client_id)); |
1316 | loglog(logbuffer); | 1318 | loglog(logbuffer); |
1317 | } | 1319 | } |
1318 | } | 1320 | } |
1319 | 1321 | ||
1320 | loglog(" = = = = = = = = \n"); | 1322 | loglog(" = = = = = = = = \n"); |
@@ -1365,18 +1367,18 @@ void doMessenger(Messenger *m) | |||
1365 | 1367 | ||
1366 | for (a = 0, assoc = &cptr->assoc4; a < 2; a++, assoc = &cptr->assoc6) | 1368 | for (a = 0, assoc = &cptr->assoc4; a < 2; a++, assoc = &cptr->assoc6) |
1367 | #endif | 1369 | #endif |
1368 | if (ip_isset(&assoc->ip_port.ip)) { | 1370 | if (ip_isset(&assoc->ip_port.ip)) { |
1369 | last_pinged = lastdump - assoc->last_pinged; | 1371 | last_pinged = lastdump - assoc->last_pinged; |
1370 | 1372 | ||
1371 | if (last_pinged > 999) | 1373 | if (last_pinged > 999) |
1372 | last_pinged = 999; | 1374 | last_pinged = 999; |
1373 | 1375 | ||
1374 | snprintf(logbuffer, sizeof(logbuffer), "F[%2u] => C[%2u] %s:%u [%3u] %s\n", | 1376 | snprintf(logbuffer, sizeof(logbuffer), "F[%2u] => C[%2u] %s:%u [%3u] %s\n", |
1375 | friend, client, ip_ntoa(&assoc->ip_port.ip), | 1377 | friend, client, ip_ntoa(&assoc->ip_port.ip), |
1376 | ntohs(assoc->ip_port.port), last_pinged, | 1378 | ntohs(assoc->ip_port.port), last_pinged, |
1377 | ID2String(cptr->client_id)); | 1379 | ID2String(cptr->client_id)); |
1378 | loglog(logbuffer); | 1380 | loglog(logbuffer); |
1379 | } | 1381 | } |
1380 | } | 1382 | } |
1381 | } | 1383 | } |
1382 | 1384 | ||