Store address type in NimBLEAddress. (#25)

src/NimBLEAddress.cpp

@@ -33,6 +33,7 @@ static const char* LOG_TAG = "NimBLEAddress";
  */
 NimBLEAddress::NimBLEAddress(ble_addr_t address) {
     memcpy(m_address, address.val, 6);
+    m_addrType = address.type;
 } // NimBLEAddress
 
 
@@ -46,8 +47,11 @@ NimBLEAddress::NimBLEAddress(ble_addr_t address) {
  * which is 17 characters in length.
  *
  * @param [in] stringAddress The hex string representation of the address.
+ * @param [in] type The type of the address.
  */
-NimBLEAddress::NimBLEAddress(const std::string &stringAddress) {
+NimBLEAddress::NimBLEAddress(const std::string &stringAddress, uint8_t type) {
+    m_addrType = type;
+
     if (stringAddress.length() == 0) {
         memset(m_address, 0, 6);
         return;
@@ -78,9 +82,11 @@ NimBLEAddress::NimBLEAddress(const std::string &stringAddress) {
 /**
  * @brief Constructor for compatibility with bluedroid esp library using native ESP representation.
  * @param [in] address A uint8_t[6] or esp_bd_addr_t containing the address.
+ * @param [in] type The type of the address.
  */
-NimBLEAddress::NimBLEAddress(uint8_t address[6]) {
+NimBLEAddress::NimBLEAddress(uint8_t address[6], uint8_t type) {
     std::reverse_copy(address, address + sizeof m_address, m_address);
+    m_addrType = type;
 } // NimBLEAddress
 
 
@@ -88,9 +94,11 @@ NimBLEAddress::NimBLEAddress(uint8_t address[6]) {
  * @brief Constructor for address using a hex value.\n
  * Use the same byte order, so use 0xa4c1385def16 for "a4:c1:38:5d:ef:16"
  * @param [in] address uint64_t containing the address.
+ * @param [in] type The type of the address.
  */
-NimBLEAddress::NimBLEAddress(const uint64_t &address) {
+NimBLEAddress::NimBLEAddress(const uint64_t &address, uint8_t type) {
     memcpy(m_address, &address, sizeof m_address);
+    m_addrType = type;
 } // NimBLEAddress
 
 
@@ -113,6 +121,15 @@ const uint8_t *NimBLEAddress::getNative() const {
 } // getNative
 
 
+/**
+ * @brief Get the address type.
+ * @return The address type.
+ */
+uint8_t NimBLEAddress::getType() const {
+    return m_addrType;
+} // getType
+
+
 /**
  * @brief Convert a BLE address to a string.
  *
@@ -152,8 +169,11 @@ bool NimBLEAddress::operator !=(const NimBLEAddress & rhs) const {
  * that accept std::string and/or or it's methods as a parameter.
  */
 NimBLEAddress::operator std::string() const {
-    char buffer[18];
-    sprintf(buffer, "%02x:%02x:%02x:%02x:%02x:%02x", m_address[5], m_address[4], m_address[3], m_address[2], m_address[1], m_address[0]);
+    char buffer[26];
+    snprintf(buffer, sizeof(buffer), "%02x:%02x:%02x:%02x:%02x:%02x type: %d",
+                                     m_address[5], m_address[4], m_address[3],
+                                     m_address[2], m_address[1], m_address[0],
+                                     m_addrType);
     return std::string(buffer);
 } // operator std::string