Merge lp:~mandel/location-service/first-connection into lp:location-service/trunk

[Manuel de la Peña]

Make sure that cached modems are considered as well when calculating connection characteristics.

Update fixes from tvoss by merging with trunk.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:191
http://jenkins.qa.ubuntu.com/job/location-service-ci/370/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/42/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/42
        deb: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/42/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/42

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/370/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/location-service/first-connection]

192. By Manuel de la Peña on 2015-04-27

Link bug.

[Michael Frey (mfrey)]

Tested fixes issue.

review: Approve

=== modified file 'src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.cpp'
--- src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.cpp	2015-04-14 14:26:38 +0000
+++ src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.cpp	2015-04-27 19:37:56 +0000
@@ -75,8 +75,9 @@
 {
     std::lock_guard<std::mutex> lg(d.cached.guard);
 
-    for (const auto& pair : d.cached.wireless_devices)
-        pair.second.request_scan();
+    for (const auto& pair : d.cached.nm_devices)
+        if (pair.second.type() == xdg::NetworkManager::Device::Type::wifi)
+            pair.second.request_scan();
 }
 
 const core::Signal<>& connectivity::OfonoNmConnectivityManager::wireless_network_scan_finished() const
@@ -506,16 +507,23 @@
         const core::dbus::types::ObjectPath& device_path,
         std::unique_lock<std::mutex>& ul)
 {
-    if (cached.wireless_devices.count(device_path) > 0)
+    if (cached.nm_devices.count(device_path) > 0)
         return;
 
     auto device = network_manager->device_for_path(device_path);
 
+    if (device.type() == xdg::NetworkManager::Device::Type::modem)
+    {
+      // Make the device known to the cache.
+      std::map<core::dbus::types::ObjectPath, org::freedesktop::NetworkManager::Device>::iterator it;
+      std::tie(it, std::ignore) = cached.nm_devices.insert(std::make_pair(device_path, device));
+    }
+
     if (device.type() == xdg::NetworkManager::Device::Type::wifi)
     {
         // Make the device known to the cache.
         std::map<core::dbus::types::ObjectPath, org::freedesktop::NetworkManager::Device>::iterator it;
-        std::tie(it, std::ignore) = cached.wireless_devices.insert(std::make_pair(device_path, device));
+        std::tie(it, std::ignore) = cached.nm_devices.insert(std::make_pair(device_path, device));
 
         // Iterate over all currently known wifis
         it->second.for_each_access_point([this, device_path, &ul](const core::dbus::types::ObjectPath& path)
@@ -567,7 +575,7 @@
         const core::dbus::types::ObjectPath& path,
         std::unique_lock<std::mutex>&)
 {
-    cached.wireless_devices.erase(path);
+    cached.nm_devices.erase(path);
 }
 
 void connectivity::OfonoNmConnectivityManager::Private::on_access_point_added(
@@ -577,8 +585,8 @@
 {
     // Let's see if we have a device known for the path. We return early
     // if we do not know about the device.
-    auto itd = cached.wireless_devices.find(device_path);
-    if (itd == cached.wireless_devices.end())
+    auto itd = cached.nm_devices.find(device_path);
+    if (itd == cached.nm_devices.end() || itd->second.type() != xdg::NetworkManager::Device::Type::wifi)
         return;
 
     xdg::NetworkManager::AccessPoint ap
@@ -638,8 +646,8 @@
                 // We only consider cached devices and do not reach out to enumerate all of the devices
                 // to prevent from excessive dbus roundtrips.
                 std::lock_guard<std::mutex> lg{cached.guard};
-                if (cached.wireless_devices.count(path) > 0)
-                    type = cached.wireless_devices.at(path).type();                
+                if (cached.nm_devices.count(path) > 0 )
+                    type = cached.nm_devices.at(path).type();
             }
 
             // We interpret a primary connection over a modem device as
@@ -672,7 +680,7 @@
                     }
                 }
 
-                characteristics = characteristics | all_characteristics();
+                characteristics = characteristics | all_characteristics();                
             } else if (type == xdg::NetworkManager::Device::Type::wifi)
             {
                 characteristics = characteristics | connectivity::Characteristics::connection_goes_via_wifi;
@@ -684,6 +692,7 @@
         // Empty on purpose.
     }
 
+    LOG(INFO) << characteristics << std::endl;
     return characteristics;
 }
 

=== modified file 'src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.h'
--- src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.h	2015-04-14 14:26:38 +0000
+++ src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.h	2015-04-27 19:37:56 +0000
@@ -162,7 +162,7 @@
             std::map<core::dbus::types::ObjectPath, detail::CachedRadioCell::Ptr> cells;
             std::map<core::dbus::types::ObjectPath, org::Ofono::Manager::Modem> modems;
             std::map<core::dbus::types::ObjectPath, detail::CachedWirelessNetwork::Ptr> wifis;
-            std::map<core::dbus::types::ObjectPath, org::freedesktop::NetworkManager::Device> wireless_devices;
+            std::map<core::dbus::types::ObjectPath, org::freedesktop::NetworkManager::Device> nm_devices;
             std::map<core::dbus::types::ObjectPath, org::freedesktop::NetworkManager::ActiveConnection> primary_connection;
             std::map<core::dbus::types::ObjectPath, org::freedesktop::NetworkManager::Device> primary_connection_devices;
         } cached;