Skip to content

A Hardware Hacking Tool with Web-Based CLI That Speaks Every Protocol

more intuitive behavior to spoof bt mac

Geo6ea34d473328
diff --git a/src/Controllers/BluetoothController.cpp b/src/Controllers/BluetoothController.cpp
index 614f61c7..afb42f04 100644
--- a/src/Controllers/BluetoothController.cpp
+++ b/src/Controllers/BluetoothController.cpp
@@ -198,8 +198,8 @@ Spoof
*/
void BluetoothController::handleSpoof(const TerminalCommand& cmd) {
std::string mac = cmd.getSubcommand();
- if (bluetoothService.isConnected()) {
- terminalView.println("Bluetooth Spoof: You can't spoof mac after bluetooth init");
+ if (bluetoothService.isConnected() || bluetoothService.getMode() != BluetoothMode::NONE) {
+ terminalView.println("Bluetooth Spoof: You must set the address before init Bluetooth. Use 'reset' command");
return;
}
diff --git a/src/Controllers/HdUartController.cpp b/src/Controllers/HdUartController.cpp
index 0e7a61de..c3826025 100644
--- a/src/Controllers/HdUartController.cpp
+++ b/src/Controllers/HdUartController.cpp
@@ -47,15 +47,6 @@ void HdUartController::handleBridge() {
}
}
-/*
-Help
-*/
-void HdUartController::handleHelp() {
- terminalView.println("\nHDUART Commands:\n"
- " bridge Interactive mode\n"
- " config Set TX/RX pin, baud etc.\n");
-}
-
/*
Config
*/
@@ -88,6 +79,15 @@ void HdUartController::handleConfig() {
terminalView.println("HDUART configuration applied.\n");
}
+/*
+Help
+*/
+void HdUartController::handleHelp() {
+ terminalView.println("\nHDUART Commands:\n"
+ " bridge Interactive mode\n"
+ " config Set TX/RX pin, baud etc.\n");
+}
+
uint32_t HdUartController::buildUartConfig(uint8_t bits, char parity, uint8_t stop) {
uint32_t conf = SERIAL_8N1;
if (bits == 5) conf = (stop == 2) ? SERIAL_5N2 : SERIAL_5N1;
diff --git a/src/Dispatchers/ActionDispatcher.cpp b/src/Dispatchers/ActionDispatcher.cpp
index 73ed7edf..50131644 100644
--- a/src/Dispatchers/ActionDispatcher.cpp
+++ b/src/Dispatchers/ActionDispatcher.cpp
@@ -18,8 +18,8 @@ Run loop
*/
void ActionDispatcher::run() {
while (true) {
- auto protocol = ModeEnumMapper::toString(state.getCurrentMode());
- provider.getTerminalView().printPrompt(protocol);
+ auto mode = ModeEnumMapper::toString(state.getCurrentMode());
+ provider.getTerminalView().printPrompt(mode);
std::string action = getUserAction();
if (action.empty()) {
continue;