Skip to content

Commit cb03c3e

Browse files
author
Stefan Kremser
committed
Added copyright infos and fixed oled scan bug
1 parent 0caac26 commit cb03c3e

File tree

9 files changed

+57
-11
lines changed

9 files changed

+57
-11
lines changed

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@ Make sure you select the right com-port, the right upload size of your ESP8266 a
113113
**11** Scroll down and before `#endif` add following lines:
114114

115115
`typedef void (*freedom_outside_cb_t)(uint8 status);`
116-
`int Wi-Fi_register_send_pkt_freedom_cb(freedom_outside_cb_t cb);`
117-
`void Wi-Fi_unregister_send_pkt_freedom_cb(void);`
118-
`int Wi-Fi_send_pkt_freedom(uint8 *buf, int len, bool sys_seq);`
116+
`int wifi_register_send_pkt_freedom_cb(freedom_outside_cb_t cb);`
117+
`void wifi_unregister_send_pkt_freedom_cb(void);`
118+
`int wifi_send_pkt_freedom(uint8 *buf, int len, bool sys_seq);`
119119

120120
![screenshot of notepad, copy paste the right code](https://raw.githubusercontent.com/spacehuhn/esp8266_deauther/master/screenshots/notepad_screenshot_1.JPG)
121121

esp8266_deauther/ClientScan.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,10 @@ void ClientScan::packetSniffer(uint8_t *buf, uint16_t len){
8989

9090
for(int i=0;i<apScan.results;i++){
9191
if(apScan.isSelected(i)){
92-
if(apScan.aps._get(i).compare(from)){
93-
int clientNum = clients.getNum(to);
92+
if(apScan.aps._get(i).compare(from) || apScan.aps._get(i).compare(to)){
93+
int clientNum = -2;
94+
if(apScan.aps._get(i).compare(from)) clientNum = clients.getNum(to);
95+
else clientNum = clients.getNum(from);
9496
if(clientNum == -1 && results < maxClientScanResults){
9597
data_getVendor(to._get(0),to._get(1),to._get(2)).toCharArray(vendors[results],9);
9698
results++;

esp8266_deauther/data.h

+5-5
Large diffs are not rendered by default.

esp8266_deauther/esp8266_deauther.ino

+15-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <ESP8266WebServer.h>
1414
#include <ESP8266mDNS.h>
1515

16-
//#define USE_DISPLAY // <-- uncomment that if you wanna use the display
16+
//#define USE_DISPLAY /* <-- uncomment that if you wanna use the display */
1717

1818
#ifdef USE_DISPLAY
1919

@@ -122,9 +122,23 @@ void startWiFi(bool start){
122122

123123
//==========AP-Scan==========
124124
void startAPScan() {
125+
scanMode = "scanning...";
126+
#ifdef USE_DISPLAY
127+
drawInterface();
128+
#endif
125129
if(apScan.start()) {
130+
131+
#ifdef USE_DISPLAY
132+
apScan.sort();
133+
rows = 3;
134+
rows += apScan.results;
135+
sites = rows/rowsPerSite;
136+
if(rows%rowsPerSite > 0) sites++;
137+
#endif
138+
126139
server.send ( 200, "text/json", "true");
127140
attack.stopAll();
141+
scanMode = "scan";
128142
}
129143
}
130144

web_server/attack.html

+6
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,11 @@ <h1>Attack</h1>
5959
</div>
6060
<script src="js/functions.js"></script>
6161
<script src="js/attack.js"></script>
62+
<div id="copyright">
63+
Copyright 2017 Stefan Kremser<br />
64+
<br />
65+
<a href="https://github.com/spacehuhn" target="_blank">github.com/spacehuhn</a><br />
66+
<a href="https://twitter.com/spacehuhn" target="_blank">twitter.com/spacehuhn</a><br />
67+
</div>
6268
</body>
6369
</html>

web_server/clients.html

+6
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,11 @@ <h1>Scan for client devices</h1>
3737
</table>
3838
<script src="js/functions.js"></script>
3939
<script src="js/clients.js"></script>
40+
<div id="copyright">
41+
Copyright 2017 Stefan Kremser<br />
42+
<br />
43+
<a href="https://github.com/spacehuhn" target="_blank">github.com/spacehuhn</a><br />
44+
<a href="https://twitter.com/spacehuhn" target="_blank">twitter.com/spacehuhn</a><br />
45+
</div>
4046
</body>
4147
</html>

web_server/index.html

+6
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,11 @@ <h1>Scan for WiFi access points</h1>
3939
</p>
4040
<script src="js/functions.js"></script>
4141
<script src="js/index.js"></script>
42+
<div id="copyright">
43+
Copyright 2017 Stefan Kremser<br />
44+
<br />
45+
<a href="https://github.com/spacehuhn" target="_blank">github.com/spacehuhn</a><br />
46+
<a href="https://twitter.com/spacehuhn" target="_blank">twitter.com/spacehuhn</a><br />
47+
</div>
4248
</body>
4349
</html>

web_server/settings.html

+6
Original file line numberDiff line numberDiff line change
@@ -95,5 +95,11 @@ <h1>Settings</h1>
9595
</table>
9696
<script src="js/functions.js"></script>
9797
<script src="js/settings.js"></script>
98+
<div id="copyright">
99+
Copyright 2017 Stefan Kremser<br />
100+
<br />
101+
<a href="https://github.com/spacehuhn" target="_blank">github.com/spacehuhn</a><br />
102+
<a href="https://twitter.com/spacehuhn" target="_blank">twitter.com/spacehuhn</a><br />
103+
</div>
98104
</body>
99105
</html>

web_server/style.css

+6
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,12 @@ nav a:hover {
101101
#content {
102102
padding: 0.34em;
103103
}
104+
#copyright{
105+
margin-top: 15px;
106+
padding-bottom: 15px;
107+
font-size: 0.85em;
108+
text-align: center;
109+
}
104110
table {
105111
padding: 0;
106112
width: 100%;

0 commit comments

Comments
 (0)