diff options
Diffstat (limited to 'src/Mgmt.cpp')
| -rw-r--r-- | src/Mgmt.cpp | 172 |
1 files changed, 17 insertions, 155 deletions
diff --git a/src/Mgmt.cpp b/src/Mgmt.cpp index 34537f0..e61653e 100644 --- a/src/Mgmt.cpp +++ b/src/Mgmt.cpp @@ -48,92 +48,7 @@ namespace ggk { Mgmt::Mgmt(uint16_t controllerIndex) : controllerIndex(controllerIndex) { -} - -// Returns the version information: -// -// bits 0-15 = revision -// bits 16-23 = version -// -// ... or -1 on error -int Mgmt::getVersion() -{ - struct SResponse : HciAdapter::ResponseEvent - { - uint8_t version; - uint16_t revision; - - void toHost() - { - revision = Utils::endianToHost(revision); - } - } __attribute__((packed)); - - HciAdapter::Header request; - request.code = 1; - request.controllerId = kNonController; - request.dataSize = 0; - - SResponse response; - if (!hciAdapter.sendCommand(request, response, sizeof(response))) - { - Logger::warn(SSTR << " + Failed to get version information"); - return -1; - } - - response.toHost(); - - Logger::debug(SSTR << " + Version response has version=" << Utils::hex(response.version) << " and revision=" << Utils::hex(response.revision)); - return (response.version << 16) | response.revision; -} - -// Returns information about the controller (address, name, current settings, etc.) -// -// See the definition for MgmtControllerInformation for details. -// -// ... or nullptr on error -Mgmt::ControllerInformation *Mgmt::getControllerInformation() -{ - struct SResponse : HciAdapter::ResponseEvent - { - ControllerInformation info; - - void toHost() - { - info.toHost(); - } - } __attribute__((packed)); - - HciAdapter::Header request; - request.code = 4; // Controller Information Command - request.controllerId = controllerIndex; - request.dataSize = 0; - - Logger::debug("Dumping device information after configuration..."); - - SResponse response; - if (!hciAdapter.sendCommand(request, response, sizeof(response))) - { - Logger::warn(SSTR << " + Failed to get current settings"); - return nullptr; - } - - response.toHost(); - - // Copy it to our local - controllerInfo = response.info; - - Logger::debug(" + Controller information"); - Logger::debug(SSTR << " + Current settings : " << Utils::hex(controllerInfo.currentSettings)); - Logger::debug(SSTR << " + Address : " << Utils::bluetoothAddressString(controllerInfo.address)); - Logger::debug(SSTR << " + BT Version : " << controllerInfo.bluetoothVersion); - Logger::debug(SSTR << " + Manufacturer : " << Utils::hex(controllerInfo.manufacturer)); - Logger::debug(SSTR << " + Supported settings : " << controllerSettingsString(controllerInfo.supportedSettings)); - Logger::debug(SSTR << " + Current settings : " << controllerSettingsString(controllerInfo.currentSettings)); - Logger::debug(SSTR << " + Name : " << controllerInfo.name); - Logger::debug(SSTR << " + Short name : " << controllerInfo.shortName); - - return &controllerInfo; + HciAdapter::getInstance().sync(controllerIndex); } // Set the adapter name and short name @@ -149,22 +64,16 @@ bool Mgmt::setName(std::string name, std::string shortName) name = truncateName(name); shortName = truncateShortName(shortName); - struct SRequest : HciAdapter::Header - { - char name[249]; - char shortName[11]; - } __attribute__((packed)); - - struct SResponse : HciAdapter::ResponseEvent + struct SRequest : HciAdapter::HciHeader { char name[249]; char shortName[11]; } __attribute__((packed)); SRequest request; - request.code = 0x000F; + request.code = Mgmt::ESetLocalNameCommand; request.controllerId = controllerIndex; - request.dataSize = sizeof(SRequest) - sizeof(HciAdapter::Header); + request.dataSize = sizeof(SRequest) - sizeof(HciAdapter::HciHeader); memset(request.name, 0, sizeof(request.name)); snprintf(request.name, sizeof(request.name), "%s", name.c_str()); @@ -172,14 +81,12 @@ bool Mgmt::setName(std::string name, std::string shortName) memset(request.shortName, 0, sizeof(request.shortName)); snprintf(request.shortName, sizeof(request.shortName), "%s", shortName.c_str()); - SResponse response; - if (!hciAdapter.sendCommand(request, response, sizeof(response))) + if (!HciAdapter::getInstance().sendCommand(request)) { Logger::warn(SSTR << " + Failed to set name"); return false; } - Logger::info(SSTR << " + Name set to '" << request.name << "', short name set to '" << request.shortName << "'"); return true; } @@ -188,39 +95,25 @@ bool Mgmt::setName(std::string name, std::string shortName) // Many settings are set the same way, this is just a convenience routine to handle them all // // Returns true on success, otherwise false -bool Mgmt::setState(const char *pSettingName, uint16_t commandCode, uint16_t controllerId, uint8_t newState) +bool Mgmt::setState(uint16_t commandCode, uint16_t controllerId, uint8_t newState) { - struct SRequest : HciAdapter::Header + struct SRequest : HciAdapter::HciHeader { uint8_t state; } __attribute__((packed)); - struct SResponse : HciAdapter::ResponseEvent - { - uint32_t currentSettings; - - void toHost() - { - currentSettings = Utils::endianToHost(currentSettings); - } - } __attribute__((packed)); - SRequest request; request.code = commandCode; request.controllerId = controllerId; - request.dataSize = sizeof(SRequest) - sizeof(HciAdapter::Header); + request.dataSize = sizeof(SRequest) - sizeof(HciAdapter::HciHeader); request.state = newState; - SResponse response; - if (!hciAdapter.sendCommand(request, response, sizeof(response))) + if (!HciAdapter::getInstance().sendCommand(request)) { - Logger::warn(SSTR << " + Failed to set " << pSettingName << " state to: " << static_cast<int>(newState)); + Logger::warn(SSTR << " + Failed to set " << HciAdapter::kCommandCodeNames[commandCode] << " state to: " << static_cast<int>(newState)); return false; } - response.toHost(); - - Logger::debug(SSTR << " + " << pSettingName << " set to " << static_cast<int>(newState) << ": " << controllerSettingsString(response.currentSettings)); return true; } @@ -229,7 +122,7 @@ bool Mgmt::setState(const char *pSettingName, uint16_t commandCode, uint16_t con // Returns true on success, otherwise false bool Mgmt::setPowered(bool newState) { - return setState("Powered", 0x0005, controllerIndex, newState ? 1 : 0); + return setState(Mgmt::ESetPoweredCommand, controllerIndex, newState ? 1 : 0); } // Set the BR/EDR state to `newState` (true = enabled, false = disabled) @@ -237,7 +130,7 @@ bool Mgmt::setPowered(bool newState) // Returns true on success, otherwise false bool Mgmt::setBredr(bool newState) { - return setState("BR/EDR", 0x002A, controllerIndex, newState ? 1 : 0); + return setState(Mgmt::ESetBREDRCommand, controllerIndex, newState ? 1 : 0); } // Set the Secure Connection state (0 = disabled, 1 = enabled, 2 = secure connections only mode) @@ -245,7 +138,7 @@ bool Mgmt::setBredr(bool newState) // Returns true on success, otherwise false bool Mgmt::setSecureConnections(uint8_t newState) { - return setState("SecureConnections", 0x002D, controllerIndex, newState); + return setState(Mgmt::ESetSecureConnectionsCommand, controllerIndex, newState); } // Set the bondable state to `newState` (true = enabled, false = disabled) @@ -253,7 +146,7 @@ bool Mgmt::setSecureConnections(uint8_t newState) // Returns true on success, otherwise false bool Mgmt::setBondable(bool newState) { - return setState("SecureConnections", 0x0009, controllerIndex, newState ? 1 : 0); + return setState(Mgmt::ESetBondableCommand, controllerIndex, newState ? 1 : 0); } // Set the connectable state to `newState` (true = enabled, false = disabled) @@ -261,7 +154,7 @@ bool Mgmt::setBondable(bool newState) // Returns true on success, otherwise false bool Mgmt::setConnectable(bool newState) { - return setState("Connectable", 0x0007, controllerIndex, newState ? 1 : 0); + return setState(Mgmt::ESetConnectableCommand, controllerIndex, newState ? 1 : 0); } // Set the LE state to `newState` (true = enabled, false = disabled) @@ -269,7 +162,7 @@ bool Mgmt::setConnectable(bool newState) // Returns true on success, otherwise false bool Mgmt::setLE(bool newState) { - return setState("LowEnergy", 0x000D, controllerIndex, newState ? 1 : 0); + return setState(Mgmt::ESetLowEnergyCommand, controllerIndex, newState ? 1 : 0); } // Set the advertising state to `newState` (0 = disabled, 1 = enabled (with consideration towards the connectable setting), @@ -278,44 +171,13 @@ bool Mgmt::setLE(bool newState) // Returns true on success, otherwise false bool Mgmt::setAdvertising(uint8_t newState) { - return setState("Advertising", 0x0029, controllerIndex, newState); + return setState(Mgmt::ESetAdvertisingCommand, controllerIndex, newState); } // --------------------------------------------------------------------------------------------------------------------------------- // Utilitarian // --------------------------------------------------------------------------------------------------------------------------------- -// Transforms a "Current_Settings" value (4 octets as defined by the Bluetooth Management API specification) into a human-readable -// string of flags and settings. -std::string Mgmt::controllerSettingsString(uint32_t bits) -{ - std::string result = ""; - - if ((bits & EHciPowered) != 0) { result += "Powered, "; } - if ((bits & EHciConnectable) != 0) { result += "Connectable, "; } - if ((bits & EHciFastConnectable) != 0) { result += "FC, "; } - if ((bits & EHciDiscoverable) != 0) { result += "Discov, "; } - if ((bits & EHciBondable) != 0) { result += "Bondable, "; } - if ((bits & EHciLinkLevelSecurity) != 0) { result += "LLS, "; } - if ((bits & EHciSecureSimplePairing) != 0) { result += "SSP, "; } - if ((bits & EHciBasicRate_EnhancedDataRate) != 0) { result += "BR/EDR, "; } - if ((bits & EHciHighSpeed) != 0) { result += "HS, "; } - if ((bits & EHciLowEnergy) != 0) { result += "LE, "; } - if ((bits & EHciAdvertising) != 0) { result += "Adv, "; } - if ((bits & EHciSecureConnections) != 0) { result += "SC, "; } - if ((bits & EHciDebugKeys) != 0) { result += "DebugKeys, "; } - if ((bits & EHciPrivacy) != 0) { result += "Privacy, "; } - if ((bits & EHciControllerConfiguration) != 0) { result += "ControllerConfig, "; } - if ((bits & EHciStaticAddress) != 0) { result += "StaticAddr, "; } - - if (result.length() != 0) - { - result = result.substr(0, result.length() - 2); - } - - return result; -} - // Truncates the string `name` to the maximum allowed length for an adapter name. If `name` needs no truncation, a copy of // `name` is returned. std::string Mgmt::truncateName(const std::string &name) |