Remove underscores in MAC address

The current MAC address string contains underscores that need to be
removed so that it can be parsed correctly.

Change-Id: Ib3cab182de56ebdef51e0e903279ba8d307fa081
Signed-off-by: Jimmy Huang <jimmy.huang@intel.com>

diff --git a/packaging/phoned.changes b/packaging/phoned.changes
index 0e21f37..59ea458 100644 (file)
--- a/packaging/phoned.changes
+++ b/packaging/phoned.changes
@@ -1,3 +1,6 @@
+* Mon Sep 08 2014 Jimmy Huang <jimmy.huang@intel.com> submit/tizen_ivi/20140908.173512-2-ge0fa798
+- Remove underscores in MAC address
+
 * Mon Sep 08 2014 Jimmy Huang <jimmy.huang@intel.com> submit/tizen_ivi/20140908.173512-1-g3635592
 - Fixes invalid check for power state
 

diff --git a/src/ofono.cpp b/src/ofono.cpp
index 6af38ca..db7ccb6 100644 (file)
--- a/src/ofono.cpp
+++ b/src/ofono.cpp
@@ -444,6 +444,8 @@ void OFono::handleSignal(GDBusConnection       *connection,
                 std::string modemString(modem);
                 size_t idx = modemString.find( "_" ) + 1; // index of address of remote device
                 std::string modemRemoteBtAddress = modemString.substr (idx, modemString.length()-idx);
+                modemRemoteBtAddress.erase(std::remove_if(modemRemoteBtAddress.begin(),
+                    modemRemoteBtAddress.end(), isnxdigit), modemRemoteBtAddress.end());
                 if(makeMACFromRawMAC(modemRemoteBtAddress)) {
                     ctx->modemAdded(modemRemoteBtAddress);
                 }