]>
Commit | Line | Data |
---|---|---|
975d4064 GS |
1 | *** aircrack.c Thu Dec 16 17:07:09 2004 |
2 | --- aircrack.patched Thu Dec 16 17:20:55 2004 | |
3 | *************** | |
4 | *** 49,54 **** | |
5 | --- 49,55 ---- | |
6 | " -m <maddr> : MAC address to filter usable packets\n" | |
7 | " -n <nbits> : WEP key length: 64 / 128 / 256 / 512\n" | |
8 | " -p <nfork> : SMP support: # of processes to start\n" | |
9 | + " -q <quiet> : Quiet mode (Less print more speed)\n" | |
10 | "\n"; | |
11 | ||
12 | /* command-line parameters */ | |
13 | *************** | |
14 | *** 56,61 **** | |
15 | --- 57,63 ---- | |
16 | int debug_lvl = 0; /* # of keybytes fixed */ | |
17 | int macfilter = 0; /* BSSID check flag */ | |
18 | int stability = 0; /* unstable attacks on */ | |
19 | + int quietmode = 0; /* quiet mode */ | |
20 | unsigned char debug[61]; /* user-defined wepkey */ | |
21 | unsigned char maddr[6]; /* MAC address filter */ | |
22 | int weplen = 13; /* WEP key length */ | |
23 | *************** | |
24 | *** 309,315 **** | |
25 | et_h = delta / 3600; | |
26 | et_m = ( delta - et_h * 3600 ) / 60; | |
27 | et_s = delta - et_h * 3600 - et_m * 60; | |
28 | ! | |
29 | printf( "\33[2;%dH\33[34;1maircrack 2.1\33[0m\n\n", | |
30 | ( ws.ws_col - 12 ) / 2 ); | |
31 | ||
32 | --- 311,317 ---- | |
33 | et_h = delta / 3600; | |
34 | et_m = ( delta - et_h * 3600 ) / 60; | |
35 | et_s = delta - et_h * 3600 - et_m * 60; | |
36 | ! if (quietmode>=1) { | |
37 | printf( "\33[2;%dH\33[34;1maircrack 2.1\33[0m\n\n", | |
38 | ( ws.ws_col - 12 ) / 2 ); | |
39 | ||
40 | *************** | |
41 | *** 319,332 **** | |
42 | printf( " * Elapsed time [%02d:%02d:%02d] | tried " | |
43 | "%ld keys at %ld k/m\n", et_h, et_m, et_s, tried, | |
44 | ( 60 * tried ) / delta ); | |
45 | ! | |
46 | ! printf( "\n KB depth votes\n" ); | |
47 | ||
48 | for( i = 0; i <= B; i++ ) | |
49 | { | |
50 | int j, k = ( ws.ws_col - 20 ) / 9; | |
51 | ||
52 | ! printf( " %2d %3d/%3d ", | |
53 | i, depth[i], fudge[i] ); | |
54 | ||
55 | for( j = depth[i]; j < k + depth[i]; j++ ) | |
56 | --- 321,334 ---- | |
57 | printf( " * Elapsed time [%02d:%02d:%02d] | tried " | |
58 | "%ld keys at %ld k/m\n", et_h, et_m, et_s, tried, | |
59 | ( 60 * tried ) / delta ); | |
60 | ! } | |
61 | ! if (quietmode>1) printf( "\n KB depth votes\n" ); | |
62 | ||
63 | for( i = 0; i <= B; i++ ) | |
64 | { | |
65 | int j, k = ( ws.ws_col - 20 ) / 9; | |
66 | ||
67 | ! if (quietmode>1) printf( " %2d %3d/%3d ", | |
68 | i, depth[i], fudge[i] ); | |
69 | ||
70 | for( j = depth[i]; j < k + depth[i]; j++ ) | |
71 | *************** | |
72 | *** 334,352 **** | |
73 | if( j >= 256 ) break; | |
74 | ||
75 | if( wpoll[i][j].votes == INFINITY ) | |
76 | ! printf( "%02X(+inf) ", wpoll[i][j].index ); | |
77 | else | |
78 | ! printf( "%02X(%4d) ", wpoll[i][j].index, | |
79 | wpoll[i][j].votes ); | |
80 | } | |
81 | ||
82 | ! printf( "\n" ); | |
83 | } | |
84 | ||
85 | if( B < 11 ) | |
86 | ! printf( "\33[J" ); | |
87 | ||
88 | ! printf( "\n" ); | |
89 | } | |
90 | ||
91 | /* safe I/O routines */ | |
92 | --- 336,358 ---- | |
93 | if( j >= 256 ) break; | |
94 | ||
95 | if( wpoll[i][j].votes == INFINITY ) | |
96 | ! { | |
97 | ! if (quietmode>2) printf( "%02X(+inf) ", wpoll[i][j].index ); | |
98 | ! } | |
99 | else | |
100 | ! { | |
101 | ! if (quietmode>2) printf( "%02X(%4d) ", wpoll[i][j].index, | |
102 | wpoll[i][j].votes ); | |
103 | + } | |
104 | } | |
105 | ||
106 | ! if (quietmode>1) printf( "\n" ); | |
107 | } | |
108 | ||
109 | if( B < 11 ) | |
110 | ! if (quietmode>1) printf( "\33[J" ); | |
111 | ||
112 | ! if (quietmode>1) printf( "\n" ); | |
113 | } | |
114 | ||
115 | /* safe I/O routines */ | |
116 | *************** | |
117 | *** 893,899 **** | |
118 | ||
119 | while( 1 ) | |
120 | { | |
121 | ! int option = getopt( argc, argv, "d:f:m:n:p:s:" ); | |
122 | ||
123 | if( option < 0 ) break; | |
124 | ||
125 | --- 899,905 ---- | |
126 | ||
127 | while( 1 ) | |
128 | { | |
129 | ! int option = getopt( argc, argv, "d:f:k:n:m:p:s:q:" ); | |
130 | ||
131 | if( option < 0 ) break; | |
132 | ||
133 | *************** | |
134 | *** 996,1001 **** | |
135 | --- 1002,1017 ---- | |
136 | goto usage; | |
137 | ||
138 | break; | |
139 | + | |
140 | + case 'q': | |
141 | + | |
142 | + if( sscanf( optarg, "%d", &quietmode ) != 1 ) | |
143 | + goto usage; | |
144 | + | |
145 | + if( quietmode < 0 || quietmode > 3 ) | |
146 | + goto usage; | |
147 | + | |
148 | + break; | |
149 | ||
150 | default : goto usage; | |
151 | } |