Fixed 2 little bugs

- Attack.js error "data undefined"
- Display compiler error "drawInterface() not found"
This commit is contained in:
Stefan Kremser
2017-05-26 21:34:48 +02:00
parent 630d7fc220
commit f2a70bb026
6 changed files with 53 additions and 49 deletions

View File

@@ -47,7 +47,7 @@ class Attack
void refreshLed(); void refreshLed();
void changeRandom(int num); void changeRandom(int num);
bool ssidChange = false; bool ssidChange = true;
private: private:
void buildDeauth(Mac _ap, Mac _client, uint8_t type, uint8_t reason); void buildDeauth(Mac _ap, Mac _client, uint8_t type, uint8_t reason);

File diff suppressed because one or more lines are too long

View File

@@ -80,6 +80,30 @@ void sniffer(uint8_t *buf, uint16_t len) {
clientScan.packetSniffer(buf, len); clientScan.packetSniffer(buf, len);
} }
#ifdef USE_DISPLAY
void drawInterface() {
display.clear();
int _lrow = 0;
for (int i = curSite * rowsPerSite - rowsPerSite; i < curSite * rowsPerSite; i++) {
if (i == 0) display.drawString(3, i * fontSize, " --> WiFi " + wifiMode);
else if (i == 1) display.drawString(3, i * fontSize, " --> " + scanMode);
else if (i == 2) display.drawString(3, i * fontSize, " --> " + attackMode + " attack");
else if (i - 3 <= apScan.results) {
display.drawString(3, _lrow * fontSize, apScan.getAPName(i - 3));
if (apScan.getAPSelected(i - 3)) {
display.drawVerticalLine(1, _lrow * fontSize, fontSize);
display.drawVerticalLine(2, _lrow * fontSize, fontSize);
}
}
if (_lrow == lrow) display.drawVerticalLine(0, _lrow * fontSize, fontSize);
_lrow++;
}
display.display();
}
#endif
void startWifi() { void startWifi() {
Serial.println("\nStarting WiFi AP:"); Serial.println("\nStarting WiFi AP:");
WiFi.mode(WIFI_STA); WiFi.mode(WIFI_STA);
@@ -406,30 +430,6 @@ void resetSettings() {
server.send( 200, "text/json", "true" ); server.send( 200, "text/json", "true" );
} }
#ifdef USE_DISPLAY
void drawInterface() {
display.clear();
int _lrow = 0;
for (int i = curSite * rowsPerSite - rowsPerSite; i < curSite * rowsPerSite; i++) {
if (i == 0) display.drawString(3, i * fontSize, " --> WiFi " + wifiMode);
else if (i == 1) display.drawString(3, i * fontSize, " --> " + scanMode);
else if (i == 2) display.drawString(3, i * fontSize, " --> " + attackMode + " attack");
else if (i - 3 <= apScan.results) {
display.drawString(3, _lrow * fontSize, apScan.getAPName(i - 3));
if (apScan.getAPSelected(i - 3)) {
display.drawVerticalLine(1, _lrow * fontSize, fontSize);
display.drawVerticalLine(2, _lrow * fontSize, fontSize);
}
}
if (_lrow == lrow) display.drawVerticalLine(0, _lrow * fontSize, fontSize);
_lrow++;
}
display.display();
}
#endif
void setup() { void setup() {
Serial.begin(115200); Serial.begin(115200);

View File

@@ -9,7 +9,8 @@ var num = getE("num");
var randomIntrvl = getE("randomIntrvl"); var randomIntrvl = getE("randomIntrvl");
var randomBtn = getE("randomBtn"); var randomBtn = getE("randomBtn");
var resultInterval; var resultInterval;
var data; var data = {};
function getResults() { function getResults() {
getResponse("attackInfo.json", function(responseText) { getResponse("attackInfo.json", function(responseText) {
var res = JSON.parse(responseText); var res = JSON.parse(responseText);
@@ -40,13 +41,13 @@ function getResults() {
table.innerHTML = tr; table.innerHTML = tr;
if(typeof res.ssid != 'undefined'){ if(typeof res.ssid != 'undefined'){
data = res; data = res.ssid;
ssidCounter.innerHTML = res.ssid.length + "/48"; ssidCounter.innerHTML = data.length + "/48";
var tr = "<tr><th>Name</th><th>X</th></tr>"; var tr = "<tr><th>Name</th><th>X</th></tr>";
for (var i = 0; i < res.ssid.length; i++) { for (var i = 0; i < data.length; i++) {
tr += "<tr>"; tr += "<tr>";
tr += "<td>" + res.ssid[i] + "</td>"; tr += "<td>" + data[i] + "</td>";
tr += '<td><button class="marginNull button-warn" onclick="deleteSSID(' + i + ')">x</button></td>'; tr += '<td><button class="marginNull button-warn" onclick="deleteSSID(' + i + ')">x</button></td>';
tr += "</tr>"; tr += "</tr>";
} }
@@ -71,7 +72,7 @@ function addSSID() {
var _ssidName = ssid.value; var _ssidName = ssid.value;
if(_ssidName.length > 0){ if(_ssidName.length > 0){
if(data.ssid.length >= 64) showMessage("SSID list full :(", 2500); if(data.length >= 64) showMessage("SSID list full :(", 2500);
else{ else{
saved.innerHTML = ""; saved.innerHTML = "";
getResponse("addSSID.json?ssid=" + _ssidName + "&num="+num.value, getResults); getResponse("addSSID.json?ssid=" + _ssidName + "&num="+num.value, getResults);
@@ -81,7 +82,7 @@ function addSSID() {
function cloneSSID(_ssidName) { function cloneSSID(_ssidName) {
ssid.value = _ssidName; ssid.value = _ssidName;
num.value = 48 - data.ssid.length; num.value = 48 - data.length;
} }
function deleteSSID(num) { function deleteSSID(num) {

View File

@@ -22,7 +22,7 @@
<div class="col-12"> <div class="col-12">
<h1 class="header">Text to Byte Array Converter</h1> <h1 class="header">Text to Byte Array Converter</h1>
<p> <p>
Please use <a href="https://htmlcompressor.com/compressor/">HTMLCompressor</a> first to get your HTML, CSS and JS minified.<br /> Please use <a href="https://htmlcompressor.com/compressor/" target="_blank">HTMLCompressor</a> first to get your HTML, CSS and JS minified.<br />
Every saved byte can improve the stability of the ESP8266's webserver!<br /> Every saved byte can improve the stability of the ESP8266's webserver!<br />
</p> </p>
</div> </div>

View File

@@ -5,4 +5,4 @@
**5** Copy the results from the right textfield **5** Copy the results from the right textfield
**6** Go to data.h and replace the array of the changed file with the copied bytes **6** Go to data.h and replace the array of the changed file with the copied bytes
**now compile and upload your new sketch :)** **Now compile and upload your new sketch :)**