diff options
Diffstat (limited to 'toxcore/Messenger.c')
-rw-r--r-- | toxcore/Messenger.c | 51 |
1 files changed, 34 insertions, 17 deletions
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c index 07c8096f..b2c860c6 100644 --- a/toxcore/Messenger.c +++ b/toxcore/Messenger.c | |||
@@ -1296,18 +1296,25 @@ void doMessenger(Messenger *m) | |||
1296 | 1296 | ||
1297 | for (client = 0; client < LCLIENT_LIST; client++) { | 1297 | for (client = 0; client < LCLIENT_LIST; client++) { |
1298 | Client_data *cptr = &m->dht->close_clientlist[client]; | 1298 | Client_data *cptr = &m->dht->close_clientlist[client]; |
1299 | IPPTsPng *assoc = NULL; | ||
1300 | #ifdef CLIENT_ONETOONE_IP | ||
1301 | assoc = &cptr->assoc; | ||
1302 | #else | ||
1303 | uint32_t a; | ||
1299 | 1304 | ||
1300 | if (ip_isset(&cptr->ip_port.ip)) { | 1305 | for (a = 0, assoc = &cptr->assoc4; a < 2; a++, assoc = &cptr->assoc6) |
1301 | last_pinged = lastdump - cptr->last_pinged; | 1306 | #endif |
1307 | if (ip_isset(&assoc->ip_port.ip)) { | ||
1308 | last_pinged = lastdump - assoc->last_pinged; | ||
1302 | 1309 | ||
1303 | if (last_pinged > 999) | 1310 | if (last_pinged > 999) |
1304 | last_pinged = 999; | 1311 | last_pinged = 999; |
1305 | 1312 | ||
1306 | snprintf(logbuffer, sizeof(logbuffer), "C[%2u] %s:%u [%3u] %s\n", | 1313 | snprintf(logbuffer, sizeof(logbuffer), "C[%2u] %s:%u [%3u] %s\n", |
1307 | client, ip_ntoa(&cptr->ip_port.ip), ntohs(cptr->ip_port.port), | 1314 | client, ip_ntoa(&assoc->ip_port.ip), ntohs(assoc->ip_port.port), |
1308 | last_pinged, ID2String(cptr->client_id)); | 1315 | last_pinged, ID2String(cptr->client_id)); |
1309 | loglog(logbuffer); | 1316 | loglog(logbuffer); |
1310 | } | 1317 | } |
1311 | } | 1318 | } |
1312 | 1319 | ||
1313 | loglog(" = = = = = = = = \n"); | 1320 | loglog(" = = = = = = = = \n"); |
@@ -1350,16 +1357,26 @@ void doMessenger(Messenger *m) | |||
1350 | 1357 | ||
1351 | for (client = 0; client < MAX_FRIEND_CLIENTS; client++) { | 1358 | for (client = 0; client < MAX_FRIEND_CLIENTS; client++) { |
1352 | Client_data *cptr = &dhtfptr->client_list[client]; | 1359 | Client_data *cptr = &dhtfptr->client_list[client]; |
1353 | last_pinged = lastdump - cptr->last_pinged; | 1360 | IPPTsPng *assoc = NULL; |
1361 | #ifdef CLIENT_ONETOONE_IP | ||
1362 | assoc = &cptr->assoc; | ||
1363 | #else | ||
1364 | uint32_t a; | ||
1354 | 1365 | ||
1355 | if (last_pinged > 999) | 1366 | for (a = 0, assoc = &cptr->assoc4; a < 2; a++, assoc = &cptr->assoc6) |
1356 | last_pinged = 999; | 1367 | #endif |
1368 | if (ip_isset(&assoc->ip_port.ip)) { | ||
1369 | last_pinged = lastdump - assoc->last_pinged; | ||
1357 | 1370 | ||
1358 | snprintf(logbuffer, sizeof(logbuffer), "F[%2u] => C[%2u] %s:%u [%3u] %s\n", | 1371 | if (last_pinged > 999) |
1359 | friend, client, ip_ntoa(&cptr->ip_port.ip), | 1372 | last_pinged = 999; |
1360 | ntohs(cptr->ip_port.port), last_pinged, | 1373 | |
1361 | ID2String(cptr->client_id)); | 1374 | snprintf(logbuffer, sizeof(logbuffer), "F[%2u] => C[%2u] %s:%u [%3u] %s\n", |
1362 | loglog(logbuffer); | 1375 | friend, client, ip_ntoa(&assoc->ip_port.ip), |
1376 | ntohs(assoc->ip_port.port), last_pinged, | ||
1377 | ID2String(cptr->client_id)); | ||
1378 | loglog(logbuffer); | ||
1379 | } | ||
1363 | } | 1380 | } |
1364 | } | 1381 | } |
1365 | 1382 | ||