From ecdf05db3f9a3ca6003f087ad294405865a0e28a Mon Sep 17 00:00:00 2001
From: Stefan Kremser <stef.1497@gmail.com>
Date: Wed, 18 Apr 2018 10:50:00 +0200
Subject: [PATCH] Display show packetrate

---
 esp8266_deauther/Attack.cpp    |  5 ++++-
 esp8266_deauther/Attack.h      |  2 ++
 esp8266_deauther/DisplayUI.cpp | 10 +++++-----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/esp8266_deauther/Attack.cpp b/esp8266_deauther/Attack.cpp
index ff3c1cf..608465d 100644
--- a/esp8266_deauther/Attack.cpp
+++ b/esp8266_deauther/Attack.cpp
@@ -424,4 +424,7 @@ uint32_t Attack::getBeaconMaxPkts() {
 uint32_t Attack::getProbeMaxPkts() {
   return probe.maxPkts;
 }
-
+
+uint32_t Attack::getPacketRate(){
+  return packetRate;  
+}
diff --git a/esp8266_deauther/Attack.h b/esp8266_deauther/Attack.h
index 353dca3..a13dd91 100644
--- a/esp8266_deauther/Attack.h
+++ b/esp8266_deauther/Attack.h
@@ -67,6 +67,8 @@ class Attack {
     uint32_t getDeauthMaxPkts();
     uint32_t getBeaconMaxPkts();
     uint32_t getProbeMaxPkts();
+    
+    uint32_t getPacketRate();
   private:
     void deauthUpdate();
     void deauthAllUpdate();
diff --git a/esp8266_deauther/DisplayUI.cpp b/esp8266_deauther/DisplayUI.cpp
index 52a4e9b..a01aed1 100644
--- a/esp8266_deauther/DisplayUI.cpp
+++ b/esp8266_deauther/DisplayUI.cpp
@@ -576,7 +576,7 @@ void DisplayUI::setup() {
 
   // ATTACK MENU
   createMenu(&attackMenu, &mainMenu, [this]() {
-    addMenuNode(&attackMenu, [this]() {
+    addMenuNode(&attackMenu, [this]() { // *DEAUTH 0/0
       if(attack.isRunning()) return buildString(b2a(deauthSelected) + str(D_DEAUTH), (String)attack.getDeauthPkts() + SLASH + (String)attack.getDeauthMaxPkts(), CHARS_PER_LINE);
       else return buildString(b2a(deauthSelected) + str(D_DEAUTH) , (String)scan.countSelected(), CHARS_PER_LINE);
     }, [this]() { // deauth
@@ -585,7 +585,7 @@ void DisplayUI::setup() {
         attack.start(beaconSelected, deauthSelected, false, probeSelected, true, settings.getAttackTimeout() * 1000);
       }
     });
-    addMenuNode(&attackMenu, [this]() {
+    addMenuNode(&attackMenu, [this]() { // *BEACON 0/0
       if(attack.isRunning()) return buildString(b2a(beaconSelected) + str(D_BEACON), (String)attack.getBeaconPkts() + SLASH + (String)attack.getBeaconMaxPkts(), CHARS_PER_LINE);
       else return buildString(b2a(beaconSelected) + str(D_BEACON), (String)ssids.count(), CHARS_PER_LINE);
     }, [this]() { // beacon
@@ -594,7 +594,7 @@ void DisplayUI::setup() {
         attack.start(beaconSelected, deauthSelected, false, probeSelected, true, settings.getAttackTimeout() * 1000);
       }
     });
-    addMenuNode(&attackMenu, [this]() {
+    addMenuNode(&attackMenu, [this]() { // *PROBE 0/0
       if(attack.isRunning()) return buildString(b2a(probeSelected) + str(D_PROBE), (String)attack.getProbePkts() + SLASH + (String)attack.getProbeMaxPkts(), CHARS_PER_LINE);
       else return buildString(b2a(probeSelected) + str(D_PROBE), (String)ssids.count(), CHARS_PER_LINE);
     }, [this]() { // probe
@@ -603,8 +603,8 @@ void DisplayUI::setup() {
         attack.start(beaconSelected, deauthSelected, false, probeSelected, true, settings.getAttackTimeout() * 1000);
       }
     });
-    addMenuNode(&attackMenu, []() {
-      return str(attack.isRunning() ? D_STOP_ATTACK : D_START_ATTACK);
+    addMenuNode(&attackMenu, []() { // START
+      return buildString(str(attack.isRunning() ? D_STOP_ATTACK : D_START_ATTACK), (String)attack.getPacketRate(), CHARS_PER_LINE);
     }, [this]() {
       if (attack.isRunning()) attack.stop();
       else attack.start(beaconSelected, deauthSelected, false, probeSelected, true, settings.getAttackTimeout() * 1000);