Skip to content

Commit 7be7569

Browse files
author
=
committed
several fixes in waterfall display
1 parent eb3273b commit 7be7569

1 file changed

Lines changed: 24 additions & 26 deletions

File tree

‎hcxdumptool.c‎

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1374,20 +1374,10 @@ for(i = 0; i < APLIST_MAX - 1; i++)
13741374
{
13751375
tvlast = (aplist +i)->tsakt / 1000000000ULL;
13761376
strftime(timestring, TIMESTRING_LEN, "%H:%M:%S", localtime(&tvlast));
1377-
if(memcmp((aplist + i)->apdata->macc, macclientrg, ETH_ALEN) != 0)
1378-
{
1379-
fprintf(stdout, "%s M123 %02x%02x%02x%02x%02x%02x %02x%02x%02x%02x%02x%02x %.*s\n", timestring,
1380-
(aplist + i)->apdata->macc[0], (aplist + i)->apdata->macc[1], (aplist + i)->apdata->macc[2], (aplist + i)->apdata->macc[3], (aplist + i)->apdata->macc[4], (aplist + i)->apdata->macc[5],
1381-
(aplist + i)->apdata->maca[0], (aplist + i)->apdata->maca[1], (aplist + i)->apdata->maca[2], (aplist + i)->apdata->maca[3], (aplist + i)->apdata->maca[4], (aplist + i)->apdata->maca[5],
1382-
(aplist + i)->apdata->essidlen, (aplist + i)->apdata->essid);
1383-
}
1384-
else
1385-
{
1386-
fprintf(stdout, "%s M123 %02X%02X%02X%02X%02X%02X %02x%02x%02x%02x%02x%02x %.*s\n", timestring,
1387-
(aplist + i)->apdata->macc[0], (aplist + i)->apdata->macc[1], (aplist + i)->apdata->macc[2], (aplist + i)->apdata->macc[3], (aplist + i)->apdata->macc[4], (aplist + i)->apdata->macc[5],
1388-
(aplist + i)->apdata->maca[0], (aplist + i)->apdata->maca[1], (aplist + i)->apdata->maca[2], (aplist + i)->apdata->maca[3], (aplist + i)->apdata->maca[4], (aplist + i)->apdata->maca[5],
1389-
(aplist + i)->apdata->essidlen, (aplist + i)->apdata->essid);
1390-
}
1377+
fprintf(stdout, "%s M123 %02x%02x%02x%02x%02x%02x %02x%02x%02x%02x%02x%02x %.*s\n", timestring,
1378+
(aplist + i)->apdata->macc[0], (aplist + i)->apdata->macc[1], (aplist + i)->apdata->macc[2], (aplist + i)->apdata->macc[3], (aplist + i)->apdata->macc[4], (aplist + i)->apdata->macc[5],
1379+
(aplist + i)->apdata->maca[0], (aplist + i)->apdata->maca[1], (aplist + i)->apdata->maca[2], (aplist + i)->apdata->maca[3], (aplist + i)->apdata->maca[4], (aplist + i)->apdata->maca[5],
1380+
(aplist + i)->apdata->essidlen, (aplist + i)->apdata->essid);
13911381
}
13921382
}
13931383
(aplist + i)->apdata->m1m2m3 = '+';
@@ -1423,18 +1413,18 @@ if(replaycountrg == replaycount)
14231413
{
14241414
tvlast = (calist +i)->tsakt / 1000000000ULL;
14251415
strftime(timestring, TIMESTRING_LEN, "%H:%M:%S", localtime(&tvlast));
1426-
if(memcmp((aplist + i)->apdata->macc, macclientrg, ETH_ALEN) != 0)
1416+
fprintf(stdout, "%s M12RG %02x%02x%02x%02x%02x%02x ", timestring,
1417+
(calist + i)->cadata->macc[0], (calist + i)->cadata->macc[1], (calist + i)->cadata->macc[2], (calist + i)->cadata->macc[3], (calist + i)->cadata->macc[4], (calist + i)->cadata->macc[5]);
1418+
if(memcmp((calist + i)->cadata->maca, macaprg, 3) != 0)
14271419
{
1428-
fprintf(stdout, "%s M12RG %02x%02x%02x%02x%02x%02x %02x%02x%02x%02x%02x%02x %.*s\n", timestring,
1429-
(aplist + i)->apdata->macc[0], (aplist + i)->apdata->macc[1], (aplist + i)->apdata->macc[2], (aplist + i)->apdata->macc[3], (aplist + i)->apdata->macc[4], (aplist + i)->apdata->macc[5],
1430-
(aplist + i)->apdata->maca[0], (aplist + i)->apdata->maca[1], (aplist + i)->apdata->maca[2], (aplist + i)->apdata->maca[3], (aplist + i)->apdata->maca[4], (aplist + i)->apdata->maca[5],
1420+
fprintf(stdout, "%02x%02x%02x%02x%02x%02x %.*s\n",
1421+
(calist + i)->cadata->maca[0], (calist + i)->cadata->maca[1], (calist + i)->cadata->maca[2], (calist + i)->cadata->maca[3], (calist + i)->cadata->maca[4], (calist + i)->cadata->maca[5],
14311422
(calist + i)->cadata->essidlen, (calist + i)->cadata->essid);
14321423
}
14331424
else
14341425
{
1435-
fprintf(stdout, "%s M12RG %02X%02X%02X%02X%02X%02X %02x%02x%02x%02x%02x%02x %.*s\n", timestring,
1436-
(aplist + i)->apdata->macc[0], (aplist + i)->apdata->macc[1], (aplist + i)->apdata->macc[2], (aplist + i)->apdata->macc[3], (aplist + i)->apdata->macc[4], (aplist + i)->apdata->macc[5],
1437-
(aplist + i)->apdata->maca[0], (aplist + i)->apdata->maca[1], (aplist + i)->apdata->maca[2], (aplist + i)->apdata->maca[3], (aplist + i)->apdata->maca[4], (aplist + i)->apdata->maca[5],
1426+
fprintf(stdout, "%02X%02X%02X%02X%02X%02X %.*s\n",
1427+
(calist + i)->cadata->maca[0], (calist + i)->cadata->maca[1], (calist + i)->cadata->maca[2], (calist + i)->cadata->maca[3], (calist + i)->cadata->maca[4], (calist + i)->cadata->maca[5],
14381428
(calist + i)->cadata->essidlen, (calist + i)->cadata->essid);
14391429
}
14401430
}
@@ -1470,15 +1460,23 @@ for(i = 0; i < APLIST_MAX - 1; i++)
14701460
strftime(timestring, TIMESTRING_LEN, "%H:%M:%S", localtime(&tvlast));
14711461
if(memcmp((aplist + i)->apdata->macc, macclientrg, ETH_ALEN) != 0)
14721462
{
1473-
fprintf(stdout, "%s M12 %02x%02x%02x%02x%02x%02x %02x%02x%02x%02x%02x%02x %.*s\n", timestring,
1474-
(aplist + i)->apdata->macc[0], (aplist + i)->apdata->macc[1], (aplist + i)->apdata->macc[2], (aplist + i)->apdata->macc[3], (aplist + i)->apdata->macc[4], (aplist + i)->apdata->macc[5],
1463+
fprintf(stdout, "%s M12 %02x%02x%02x%02x%02x%02x ", timestring,
1464+
(aplist + i)->apdata->macc[0], (aplist + i)->apdata->macc[1], (aplist + i)->apdata->macc[2], (aplist + i)->apdata->macc[3], (aplist + i)->apdata->macc[4], (aplist + i)->apdata->macc[5]);
1465+
}
1466+
else
1467+
{
1468+
fprintf(stdout, "%s M12 %02X%02X%02X%02X%02X%02X ", timestring,
1469+
(aplist + i)->apdata->macc[0], (aplist + i)->apdata->macc[1], (aplist + i)->apdata->macc[2], (aplist + i)->apdata->macc[3], (aplist + i)->apdata->macc[4], (aplist + i)->apdata->macc[5]);
1470+
}
1471+
if(memcmp((aplist + i)->apdata->maca, macaprg, 3) != 0)
1472+
{
1473+
fprintf(stdout, "%02x%02x%02x%02x%02x%02x %.*s\n",
14751474
(aplist + i)->apdata->maca[0], (aplist + i)->apdata->maca[1], (aplist + i)->apdata->maca[2], (aplist + i)->apdata->maca[3], (aplist + i)->apdata->maca[4], (aplist + i)->apdata->maca[5],
14761475
(aplist + i)->apdata->essidlen, (aplist + i)->apdata->essid);
14771476
}
14781477
else
14791478
{
1480-
fprintf(stdout, "%s M12 %02X%02X%02X%02X%02X%02X %02x%02x%02x%02x%02x%02x %.*s\n", timestring,
1481-
(aplist + i)->apdata->macc[0], (aplist + i)->apdata->macc[1], (aplist + i)->apdata->macc[2], (aplist + i)->apdata->macc[3], (aplist + i)->apdata->macc[4], (aplist + i)->apdata->macc[5],
1479+
fprintf(stdout, "%02X%02X%02X%02X%02X%02X %.*s\n",
14821480
(aplist + i)->apdata->maca[0], (aplist + i)->apdata->maca[1], (aplist + i)->apdata->maca[2], (aplist + i)->apdata->maca[3], (aplist + i)->apdata->maca[4], (aplist + i)->apdata->maca[5],
14831481
(aplist + i)->apdata->essidlen, (aplist + i)->apdata->essid);
14841482
}
@@ -5686,7 +5684,7 @@ fprintf(stdout, "--ftc : enable fake time clock\n"
56865684
" 4 = show waterfall (PMKID & EAPOL)\n"
56875685
" columns mode 4:\n"
56885686
" TIME TYPE MAC_CLIENT MAC_AP ESSID\n"
5689-
" MAC CLIENT ROGUE == uppercase\n"
5687+
" ROGUE MACs are uppercase\n"
56905688
" rcascan mode\n"
56915689
" 0 = show APs on current channel sorted by BEACON timestamp\n"
56925690
" 1 = show APs on current channel sorted by PROBERESPONSE timestamp\n"

0 commit comments

Comments
 (0)