Skip to content

Commit eb3273b

Browse files
author
=
committed
show hcxdumptool MAC CLIENT ROGUE in uppercase
1 parent f968487 commit eb3273b

1 file changed

Lines changed: 156 additions & 29 deletions

File tree

‎hcxdumptool.c‎

Lines changed: 156 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -713,15 +713,30 @@ if(rds == 1)
713713
{
714714
tvlast = (aplist +i)->tsakt / 1000000000ULL;
715715
strftime(timestring, TIMESTRING_LEN, "%H:%M:%S", localtime(&tvlast));
716-
fprintf(stdout, "%3u|%s|%c%c%c%c%c%c|%02x%02x%02x%02x%02x%02x|%02x%02x%02x%02x%02x%02x|%.*s\n", (aplist + i)->apdata->channel, timestring,
717-
(aplist + i)->apdata->privacy,
718-
(aplist + i)->apdata->akmstat,
719-
(aplist + i)->apdata->m1, (aplist + i)->apdata->m1m2, (aplist + i)->apdata->m1m2m3, (aplist + i)->apdata->pmkid,
720-
(aplist + i)->apdata->macc[00], (aplist + i)->apdata->macc[01], (aplist + i)->apdata->macc[02],
721-
(aplist + i)->apdata->macc[03], (aplist + i)->apdata->macc[04], (aplist + i)->apdata->macc[05],
722-
(aplist + i)->apdata->maca[00], (aplist + i)->apdata->maca[01], (aplist + i)->apdata->maca[02],
723-
(aplist + i)->apdata->maca[03], (aplist + i)->apdata->maca[04], (aplist + i)->apdata->maca[05],
724-
(aplist + i)->apdata->essidlen, (aplist + i)->apdata->essid);
716+
if(memcmp((aplist + i)->apdata->macc, macclientrg, ETH_ALEN) != 0)
717+
{
718+
fprintf(stdout, "%3u|%s|%c%c%c%c%c%c|%02x%02x%02x%02x%02x%02x|%02x%02x%02x%02x%02x%02x|%.*s\n", (aplist + i)->apdata->channel, timestring,
719+
(aplist + i)->apdata->privacy,
720+
(aplist + i)->apdata->akmstat,
721+
(aplist + i)->apdata->m1, (aplist + i)->apdata->m1m2, (aplist + i)->apdata->m1m2m3, (aplist + i)->apdata->pmkid,
722+
(aplist + i)->apdata->macc[00], (aplist + i)->apdata->macc[01], (aplist + i)->apdata->macc[02],
723+
(aplist + i)->apdata->macc[03], (aplist + i)->apdata->macc[04], (aplist + i)->apdata->macc[05],
724+
(aplist + i)->apdata->maca[00], (aplist + i)->apdata->maca[01], (aplist + i)->apdata->maca[02],
725+
(aplist + i)->apdata->maca[03], (aplist + i)->apdata->maca[04], (aplist + i)->apdata->maca[05],
726+
(aplist + i)->apdata->essidlen, (aplist + i)->apdata->essid);
727+
}
728+
else
729+
{
730+
fprintf(stdout, "%3u|%s|%c%c%c%c%c%c|%02X%02X%02X%02X%02X%02X|%02x%02x%02x%02x%02x%02x|%.*s\n", (aplist + i)->apdata->channel, timestring,
731+
(aplist + i)->apdata->privacy,
732+
(aplist + i)->apdata->akmstat,
733+
(aplist + i)->apdata->m1, (aplist + i)->apdata->m1m2, (aplist + i)->apdata->m1m2m3, (aplist + i)->apdata->pmkid,
734+
(aplist + i)->apdata->macc[00], (aplist + i)->apdata->macc[01], (aplist + i)->apdata->macc[02],
735+
(aplist + i)->apdata->macc[03], (aplist + i)->apdata->macc[04], (aplist + i)->apdata->macc[05],
736+
(aplist + i)->apdata->maca[00], (aplist + i)->apdata->maca[01], (aplist + i)->apdata->maca[02],
737+
(aplist + i)->apdata->maca[03], (aplist + i)->apdata->maca[04], (aplist + i)->apdata->maca[05],
738+
(aplist + i)->apdata->essidlen, (aplist + i)->apdata->essid);
739+
}
725740
if(rdtflag == false)
726741
{
727742
if((ii += 1) > w.ws_row) break;
@@ -736,13 +751,26 @@ if(rds == 1)
736751
{
737752
tvlast = (calist +i)->tsakt / 1000000000ULL;
738753
strftime(timestring, TIMESTRING_LEN, "%H:%M:%S", localtime(&tvlast));
754+
if(memcmp((calist + i)->cadata->macc, macclientrg, ETH_ALEN) == 0)
755+
{
739756
fprintf(stdout, "%3u|%s|ep+%c |%02x%02x%02x%02x%02x%02x|%02x%02x%02x%02x%02x%02x|%.*s\n", (calist + i)->cadata->channel, timestring,
740757
(calist + i)->cadata->m2,
741758
(calist + i)->cadata->macc[00], (calist + i)->cadata->macc[01], (calist + i)->cadata->macc[02],
742759
(calist + i)->cadata->macc[03], (calist + i)->cadata->macc[04], (calist + i)->cadata->macc[05],
743760
(calist + i)->cadata->maca[00], (calist + i)->cadata->maca[01], (calist + i)->cadata->maca[02],
744761
(calist + i)->cadata->maca[03], (calist + i)->cadata->maca[04], (calist + i)->cadata->maca[05],
745762
(calist + i)->cadata->essidlen, (calist + i)->cadata->essid);
763+
}
764+
else
765+
{
766+
fprintf(stdout, "%3u|%s|ep+%c |%02X%02X%02X%02X%02X%02X|%02x%02x%02x%02x%02x%02x|%.*s\n", (calist + i)->cadata->channel, timestring,
767+
(calist + i)->cadata->m2,
768+
(calist + i)->cadata->macc[00], (calist + i)->cadata->macc[01], (calist + i)->cadata->macc[02],
769+
(calist + i)->cadata->macc[03], (calist + i)->cadata->macc[04], (calist + i)->cadata->macc[05],
770+
(calist + i)->cadata->maca[00], (calist + i)->cadata->maca[01], (calist + i)->cadata->maca[02],
771+
(calist + i)->cadata->maca[03], (calist + i)->cadata->maca[04], (calist + i)->cadata->maca[05],
772+
(calist + i)->cadata->essidlen, (calist + i)->cadata->essid);
773+
}
746774
if(rdtflag == false)
747775
{
748776
if((ii += 1) > w.ws_row) break;
@@ -759,6 +787,8 @@ else if(rds == 2)
759787
{
760788
tvlast = (aplist +i)->tsakt / 1000000000ULL;
761789
strftime(timestring, TIMESTRING_LEN, "%H:%M:%S", localtime(&tvlast));
790+
if(memcmp((aplist + i)->apdata->macc, macclientrg, ETH_ALEN) != 0)
791+
{
762792
fprintf(stdout, "%3u|%s|%c%c%c%c%c%c|%02x%02x%02x%02x%02x%02x|%02x%02x%02x%02x%02x%02x|%.*s\n", (aplist + i)->apdata->channel, timestring,
763793
(aplist + i)->apdata->privacy,
764794
(aplist + i)->apdata->akmstat,
@@ -768,6 +798,20 @@ else if(rds == 2)
768798
(aplist + i)->apdata->maca[00], (aplist + i)->apdata->maca[01], (aplist + i)->apdata->maca[02],
769799
(aplist + i)->apdata->maca[03], (aplist + i)->apdata->maca[04], (aplist + i)->apdata->maca[05],
770800
(aplist + i)->apdata->essidlen, (aplist + i)->apdata->essid);
801+
}
802+
else
803+
if(memcmp((aplist + i)->apdata->macc, macclientrg, ETH_ALEN) != 0)
804+
{
805+
fprintf(stdout, "%3u|%s|%c%c%c%c%c%c|%02X%02X%02X%02X%02X%02X|%02x%02x%02x%02x%02x%02x|%.*s\n", (aplist + i)->apdata->channel, timestring,
806+
(aplist + i)->apdata->privacy,
807+
(aplist + i)->apdata->akmstat,
808+
(aplist + i)->apdata->m1, (aplist + i)->apdata->m1m2, (aplist + i)->apdata->m1m2m3, (aplist + i)->apdata->pmkid,
809+
(aplist + i)->apdata->macc[00], (aplist + i)->apdata->macc[01], (aplist + i)->apdata->macc[02],
810+
(aplist + i)->apdata->macc[03], (aplist + i)->apdata->macc[04], (aplist + i)->apdata->macc[05],
811+
(aplist + i)->apdata->maca[00], (aplist + i)->apdata->maca[01], (aplist + i)->apdata->maca[02],
812+
(aplist + i)->apdata->maca[03], (aplist + i)->apdata->maca[04], (aplist + i)->apdata->maca[05],
813+
(aplist + i)->apdata->essidlen, (aplist + i)->apdata->essid);
814+
}
771815
if(rdtflag == false)
772816
{
773817
if((ii += 1) > w.ws_row) break;
@@ -781,13 +825,26 @@ else if(rds == 2)
781825
{
782826
tvlast = (calist +i)->tsakt / 1000000000ULL;
783827
strftime(timestring, TIMESTRING_LEN, "%H:%M:%S", localtime(&tvlast));
828+
if(memcmp((calist + i)->cadata->macc, macclientrg, ETH_ALEN) == 0)
829+
{
784830
fprintf(stdout, "%3u|%s|ep+%c |%02x%02x%02x%02x%02x%02x|%02x%02x%02x%02x%02x%02x|%.*s\n", (calist + i)->cadata->channel, timestring,
785831
(calist + i)->cadata->m2,
786832
(calist + i)->cadata->macc[00], (calist + i)->cadata->macc[01], (calist + i)->cadata->macc[02],
787833
(calist + i)->cadata->macc[03], (calist + i)->cadata->macc[04], (calist + i)->cadata->macc[05],
788834
(calist + i)->cadata->maca[00], (calist + i)->cadata->maca[01], (calist + i)->cadata->maca[02],
789835
(calist + i)->cadata->maca[03], (calist + i)->cadata->maca[04], (calist + i)->cadata->maca[05],
790836
(calist + i)->cadata->essidlen, (calist + i)->cadata->essid);
837+
}
838+
else
839+
{
840+
fprintf(stdout, "%3u|%s|ep+%c |%02X%02X%02X%02X%02X%02X|%02x%02x%02x%02x%02x%02x|%.*s\n", (calist + i)->cadata->channel, timestring,
841+
(calist + i)->cadata->m2,
842+
(calist + i)->cadata->macc[00], (calist + i)->cadata->macc[01], (calist + i)->cadata->macc[02],
843+
(calist + i)->cadata->macc[03], (calist + i)->cadata->macc[04], (calist + i)->cadata->macc[05],
844+
(calist + i)->cadata->maca[00], (calist + i)->cadata->maca[01], (calist + i)->cadata->maca[02],
845+
(calist + i)->cadata->maca[03], (calist + i)->cadata->maca[04], (calist + i)->cadata->maca[05],
846+
(calist + i)->cadata->essidlen, (calist + i)->cadata->essid);
847+
}
791848
if(rdtflag == false)
792849
{
793850
if((ii += 1) > w.ws_row) break;
@@ -802,6 +859,8 @@ else if(rds == 3)
802859
if((aplist + i)->tsakt == 0) break;
803860
tvlast = (aplist +i)->tsakt / 1000000000ULL;
804861
strftime(timestring, TIMESTRING_LEN, "%H:%M:%S", localtime(&tvlast));
862+
if(memcmp((aplist + i)->apdata->macc, macclientrg, ETH_ALEN) != 0)
863+
{
805864
fprintf(stdout, "%3u|%s|%c%c%c%c%c%c|%02x%02x%02x%02x%02x%02x|%02x%02x%02x%02x%02x%02x|%.*s\n", (aplist + i)->apdata->channel, timestring,
806865
(aplist + i)->apdata->privacy,
807866
(aplist + i)->apdata->akmstat,
@@ -811,10 +870,23 @@ else if(rds == 3)
811870
(aplist + i)->apdata->maca[00], (aplist + i)->apdata->maca[01], (aplist + i)->apdata->maca[02],
812871
(aplist + i)->apdata->maca[03], (aplist + i)->apdata->maca[04], (aplist + i)->apdata->maca[05],
813872
(aplist + i)->apdata->essidlen, (aplist + i)->apdata->essid);
814-
if(rdtflag == false)
815-
{
816-
if((ii += 1) > w.ws_row) break;
817-
}
873+
}
874+
else
875+
{
876+
fprintf(stdout, "%3u|%s|%c%c%c%c%c%c|%02X%02X%02X%02X%02X%02X|%02x%02x%02x%02x%02x%02x|%.*s\n", (aplist + i)->apdata->channel, timestring,
877+
(aplist + i)->apdata->privacy,
878+
(aplist + i)->apdata->akmstat,
879+
(aplist + i)->apdata->m1, (aplist + i)->apdata->m1m2, (aplist + i)->apdata->m1m2m3, (aplist + i)->apdata->pmkid,
880+
(aplist + i)->apdata->macc[00], (aplist + i)->apdata->macc[01], (aplist + i)->apdata->macc[02],
881+
(aplist + i)->apdata->macc[03], (aplist + i)->apdata->macc[04], (aplist + i)->apdata->macc[05],
882+
(aplist + i)->apdata->maca[00], (aplist + i)->apdata->maca[01], (aplist + i)->apdata->maca[02],
883+
(aplist + i)->apdata->maca[03], (aplist + i)->apdata->maca[04], (aplist + i)->apdata->maca[05],
884+
(aplist + i)->apdata->essidlen, (aplist + i)->apdata->essid);
885+
}
886+
if(rdtflag == false)
887+
{
888+
if((ii += 1) > w.ws_row) break;
889+
}
818890
}
819891
for(i = 0; i < CALIST_MAX - 1; i++)
820892
{
@@ -823,13 +895,27 @@ else if(rds == 3)
823895
{
824896
tvlast = (calist +i)->tsakt / 1000000000ULL;
825897
strftime(timestring, TIMESTRING_LEN, "%H:%M:%S", localtime(&tvlast));
898+
if(memcmp((calist + i)->cadata->macc, macclientrg, ETH_ALEN) == 0)
899+
{
826900
fprintf(stdout, "%3u|%s|ep+%c |%02x%02x%02x%02x%02x%02x|%02x%02x%02x%02x%02x%02x|%.*s\n", (calist + i)->cadata->channel, timestring,
827901
(calist + i)->cadata->m2,
828902
(calist + i)->cadata->macc[00], (calist + i)->cadata->macc[01], (calist + i)->cadata->macc[02],
829903
(calist + i)->cadata->macc[03], (calist + i)->cadata->macc[04], (calist + i)->cadata->macc[05],
830904
(calist + i)->cadata->maca[00], (calist + i)->cadata->maca[01], (calist + i)->cadata->maca[02],
831905
(calist + i)->cadata->maca[03], (calist + i)->cadata->maca[04], (calist + i)->cadata->maca[05],
832906
(calist + i)->cadata->essidlen, (calist + i)->cadata->essid);
907+
}
908+
else
909+
{
910+
911+
fprintf(stdout, "%3u|%s|ep+%c |%02X%02X%02X%02X%02X%02X|%02x%02x%02x%02x%02x%02x|%.*s\n", (calist + i)->cadata->channel, timestring,
912+
(calist + i)->cadata->m2,
913+
(calist + i)->cadata->macc[00], (calist + i)->cadata->macc[01], (calist + i)->cadata->macc[02],
914+
(calist + i)->cadata->macc[03], (calist + i)->cadata->macc[04], (calist + i)->cadata->macc[05],
915+
(calist + i)->cadata->maca[00], (calist + i)->cadata->maca[01], (calist + i)->cadata->maca[02],
916+
(calist + i)->cadata->maca[03], (calist + i)->cadata->maca[04], (calist + i)->cadata->maca[05],
917+
(calist + i)->cadata->essidlen, (calist + i)->cadata->essid);
918+
}
833919
if(rdtflag == false)
834920
{
835921
if((ii += 1) > w.ws_row) break;
@@ -1288,10 +1374,20 @@ for(i = 0; i < APLIST_MAX - 1; i++)
12881374
{
12891375
tvlast = (aplist +i)->tsakt / 1000000000ULL;
12901376
strftime(timestring, TIMESTRING_LEN, "%H:%M:%S", localtime(&tvlast));
1291-
fprintf(stdout, "%s M123 %02x%02x%02x%02x%02x%02x %02x%02x%02x%02x%02x%02x %.*s\n", timestring,
1292-
(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],
1293-
(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],
1294-
(aplist + i)->apdata->essidlen, (aplist + i)->apdata->essid);
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+
}
12951391
}
12961392
}
12971393
(aplist + i)->apdata->m1m2m3 = '+';
@@ -1327,10 +1423,20 @@ if(replaycountrg == replaycount)
13271423
{
13281424
tvlast = (calist +i)->tsakt / 1000000000ULL;
13291425
strftime(timestring, TIMESTRING_LEN, "%H:%M:%S", localtime(&tvlast));
1330-
fprintf(stdout, "%s M12RG %02x%02x%02x%02x%02x%02x %02x%02x%02x%02x%02x%02x %.*s\n", timestring,
1331-
(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],
1332-
(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],
1333-
(calist + i)->cadata->essidlen, (calist + i)->cadata->essid);
1426+
if(memcmp((aplist + i)->apdata->macc, macclientrg, ETH_ALEN) != 0)
1427+
{
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],
1431+
(calist + i)->cadata->essidlen, (calist + i)->cadata->essid);
1432+
}
1433+
else
1434+
{
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],
1438+
(calist + i)->cadata->essidlen, (calist + i)->cadata->essid);
1439+
}
13341440
}
13351441
}
13361442
(calist + i)->cadata->m2 = '+';
@@ -1362,10 +1468,20 @@ for(i = 0; i < APLIST_MAX - 1; i++)
13621468
{
13631469
tvlast = (aplist +i)->tsakt / 1000000000ULL;
13641470
strftime(timestring, TIMESTRING_LEN, "%H:%M:%S", localtime(&tvlast));
1365-
fprintf(stdout, "%s M12 %02x%02x%02x%02x%02x%02x %02x%02x%02x%02x%02x%02x %.*s\n", timestring,
1366-
(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],
1367-
(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],
1368-
(aplist + i)->apdata->essidlen, (aplist + i)->apdata->essid);
1471+
if(memcmp((aplist + i)->apdata->macc, macclientrg, ETH_ALEN) != 0)
1472+
{
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],
1475+
(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],
1476+
(aplist + i)->apdata->essidlen, (aplist + i)->apdata->essid);
1477+
}
1478+
else
1479+
{
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],
1482+
(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],
1483+
(aplist + i)->apdata->essidlen, (aplist + i)->apdata->essid);
1484+
}
13691485
}
13701486
}
13711487
(aplist + i)->apdata->m1m2 = '+';
@@ -1420,10 +1536,20 @@ for(i = 0; i < APLIST_MAX - 1; i++)
14201536
{
14211537
tvlast = (aplist +i)->tsakt / 1000000000ULL;
14221538
strftime(timestring, TIMESTRING_LEN, "%H:%M:%S", localtime(&tvlast));
1423-
fprintf(stdout, "%s PMKID %02x%02x%02x%02x%02x%02x %02x%02x%02x%02x%02x%02x %.*s\n", timestring,
1424-
(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],
1425-
(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-
(aplist + i)->apdata->essidlen, (aplist + i)->apdata->essid);
1539+
if(memcmp((aplist + i)->apdata->macc, macclientrg, ETH_ALEN) != 0)
1540+
{
1541+
fprintf(stdout, "%s PMKID %02x%02x%02x%02x%02x%02x %02x%02x%02x%02x%02x%02x %.*s\n", timestring,
1542+
(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],
1543+
(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],
1544+
(aplist + i)->apdata->essidlen, (aplist + i)->apdata->essid);
1545+
}
1546+
else
1547+
{
1548+
fprintf(stdout, "%s PMKID %02X%02X%02X%02X%02X%02X %02x%02x%02x%02x%02x%02x %.*s\n", timestring,
1549+
(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],
1550+
(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],
1551+
(aplist + i)->apdata->essidlen, (aplist + i)->apdata->essid);
1552+
}
14271553
}
14281554
}
14291555
(aplist + i)->apdata->pmkid = '+';
@@ -5560,6 +5686,7 @@ fprintf(stdout, "--ftc : enable fake time clock\n"
55605686
" 4 = show waterfall (PMKID & EAPOL)\n"
55615687
" columns mode 4:\n"
55625688
" TIME TYPE MAC_CLIENT MAC_AP ESSID\n"
5689+
" MAC CLIENT ROGUE == uppercase\n"
55635690
" rcascan mode\n"
55645691
" 0 = show APs on current channel sorted by BEACON timestamp\n"
55655692
" 1 = show APs on current channel sorted by PROBERESPONSE timestamp\n"

0 commit comments

Comments
 (0)