Skip to content

Commit a705280

Browse files
author
=
committed
changed rds 4 according to rds 1..3, see changelog or -h
1 parent a11acfa commit a705280

3 files changed

Lines changed: 20 additions & 13 deletions

File tree

‎changelog‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
05.03.2026
2+
==========
3+
hcxdumptool: changed rds=4 format (according to rds 1..3)
4+
from TIME TYPE MAC_AP MAC_CLIENT ESSID
5+
to TIME TYPE MAC_CLIENT MAC_AP ESSID
16
08.02.2026
27
==========
38
bug fix release v7.1.2

‎docs/example.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,9 @@ P = received PMKID (+)
126126
```
127127
running rds mode 4
128128
129-
08:47:15 M12 dc15c8xxxxxx dce1a9xxxxxx AP_7272
130-
08:47:27 PMKID 5004b8xxxxxx 500ee4xxxxxx AP_7273
129+
TIME TYPE MAC_CLIENT MAC_AP ESSID
130+
08:47:15 M12 dce1a9xxxxxx dc15c8xxxxxx AP_7272
131+
08:47:27 PMKID 500ee4xxxxxx 5004b8xxxxxx AP_7273
131132
^C
132133
1361 Packet(s) captured by kernel
133134
0 Packet(s) dropped by kernel

‎hcxdumptool.c‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1259,9 +1259,9 @@ for(i = 0; i < APLIST_MAX - 1; i++)
12591259
{
12601260
tvlast = (aplist +i)->tsakt / 1000000000ULL;
12611261
strftime(timestring, TIMESTRING_LEN, "%H:%M:%S", localtime(&tvlast));
1262-
fprintf(stdout, "%s M123 %02x%02x%02x%02x%02x%02x %02x%02x%02x%02x%02x%02x %.*s\n", timestring,
1262+
fprintf(stdout, "%s M123 %02x%02x%02x%02x%02x%02x %02x%02x%02x%02x%02x%02x %.*s\n", timestring,
1263+
(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],
12631264
(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],
1264-
(aplist + i)->apdata->maca[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],
12651265
(aplist + i)->apdata->essidlen, (aplist + i)->apdata->essid);
12661266
}
12671267
}
@@ -1298,9 +1298,9 @@ if(replaycountrg == replaycount)
12981298
{
12991299
tvlast = (calist +i)->tsakt / 1000000000ULL;
13001300
strftime(timestring, TIMESTRING_LEN, "%H:%M:%S", localtime(&tvlast));
1301-
fprintf(stdout, "%s M12ROGUE %02x%02x%02x%02x%02x%02x %02x%02x%02x%02x%02x%02x %.*s\n", timestring,
1302-
(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],
1303-
(calist + i)->cadata->maca[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],
1301+
fprintf(stdout, "%s M12RG %02x%02x%02x%02x%02x%02x %02x%02x%02x%02x%02x%02x %.*s\n", timestring,
1302+
(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],
1303+
(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],
13041304
(calist + i)->cadata->essidlen, (calist + i)->cadata->essid);
13051305
}
13061306
}
@@ -1333,9 +1333,9 @@ for(i = 0; i < APLIST_MAX - 1; i++)
13331333
{
13341334
tvlast = (aplist +i)->tsakt / 1000000000ULL;
13351335
strftime(timestring, TIMESTRING_LEN, "%H:%M:%S", localtime(&tvlast));
1336-
fprintf(stdout, "%s M12 %02x%02x%02x%02x%02x%02x %02x%02x%02x%02x%02x%02x %.*s\n", timestring,
1336+
fprintf(stdout, "%s M12 %02x%02x%02x%02x%02x%02x %02x%02x%02x%02x%02x%02x %.*s\n", timestring,
1337+
(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],
13371338
(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],
1338-
(aplist + i)->apdata->maca[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],
13391339
(aplist + i)->apdata->essidlen, (aplist + i)->apdata->essid);
13401340
}
13411341
}
@@ -1391,9 +1391,9 @@ for(i = 0; i < APLIST_MAX - 1; i++)
13911391
{
13921392
tvlast = (aplist +i)->tsakt / 1000000000ULL;
13931393
strftime(timestring, TIMESTRING_LEN, "%H:%M:%S", localtime(&tvlast));
1394-
fprintf(stdout, "%s PMKID %02x%02x%02x%02x%02x%02x %02x%02x%02x%02x%02x%02x %.*s\n", timestring,
1394+
fprintf(stdout, "%s PMKID %02x%02x%02x%02x%02x%02x %02x%02x%02x%02x%02x%02x %.*s\n", timestring,
1395+
(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],
13951396
(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],
1396-
(aplist + i)->apdata->maca[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],
13971397
(aplist + i)->apdata->essidlen, (aplist + i)->apdata->essid);
13981398
}
13991399
}
@@ -5516,7 +5516,7 @@ fprintf(stdout, "--ftc : enable fake time clock\n"
55165516
" P = received PMKID (+)\n"
55175517
" 4 = show waterfall (PMKID & EAPOL)\n"
55185518
" columns mode 4:\n"
5519-
" TIME TYPE MAC_AP MAC_CLIENT ESSID\n"
5519+
" TIME TYPE MAC_CLIENT MAC_AP ESSID\n"
55205520
" rcascan mode\n"
55215521
" 0 = show APs on current channel sorted by BEACON timestamp\n"
55225522
" 1 = show APs on current channel sorted by PROBERESPONSE timestamp\n"
@@ -6122,7 +6122,7 @@ fprintf(stdout, "\nThis is a highly experimental penetration testing tool!\n"
61226122
if(vmflag == false) fprintf(stdout, "Failed to set virtual MAC!\n");
61236123
if((bpf.len == 0) && (rcascanmode == 0)) fprintf(stderr, "Warning: BPF is unset!\nMake sure hcxdumptool is running in a 100%% controlled environment!\nCheckout (and understand) README.md and docs/example.md!\n\n");
61246124
if((ifakttype & IF_IS_SHARED) == IF_IS_SHARED) fprintf(stderr, "Warning:\n%s is running on a shared (virtual) interface!\nThis is not recommended because it leads to an unwanted behavior!\n\n", basename(argv[0]));
6125-
if((rds == 0) && (rcascanmode == 0)) fprintf(stdout, "starting in headless mode (display off)...\033[?25l\n");
6125+
if((rds == 0) && (rcascanmode == 0)) fprintf(stdout, "starting in headless mode (--rds=0 display off)...\033[?25l\n");
61266126
else fprintf(stdout, "starting...\033[?25l\n");
61276127
nanosleep(&tspecifo, &tspeciforem);
61286128
if(rcascanmode > 0)
@@ -6143,6 +6143,7 @@ else if(rds == 0)
61436143
}
61446144
else if(rds == 4)
61456145
{
6146+
fprintf(stdout, "\nTIME EAPOL MAC_CL MAC_AP ESSID\n");
61466147
if(nl_scanloop_waterfall(tottime) == false)
61476148
{
61486149
errorcount++;

0 commit comments

Comments
 (0)