commit 41c0e0accae6602dbc9fc31f336dabee7af1b170
author Darin Petkov <petkov@chromium.org> Mon Jan 09 16:38:53 2012 +0100
committer Gerrit <chrome-bot@google.com> Tue Jan 10 09:51:26 2012 -0800
tree d09e5ead39368f769cdee24651d9df9a04a7a80a
parent d8ad3c4266195daeb440a9fb65c612e4f6bfc7f8

shill: Delay cellular device creation if DeviceInfo is not available yet.

DeviceInfo notifies ModemInfo/ModemManager/Modem whenever a new cellular device
link is added so that cellular devices can be constructed and registered. This
fixes the current behavior where the device is not created at all if its device
info is not available yet.

BUG=chromium-os:24855
TEST=tested on device

Change-Id: I929bd70a6692a9ec6c66f51e01e44fca4433eb87
Reviewed-on: https://gerrit.chromium.org/gerrit/13866
Tested-by: Darin Petkov <petkov@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>
Reviewed-by: Eric Shienbrood <ers@chromium.org>
Commit-Ready: Darin Petkov <petkov@chromium.org>

modem.cc

diff --git a/modem.cc b/modem.cc
index 9490656..f4f46cb 100644
--- a/modem.cc
+++ b/modem.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -36,7 +36,8 @@
       control_interface_(control_interface),
       dispatcher_(dispatcher),
       manager_(manager),
-      provider_db_(provider_db) {
+      provider_db_(provider_db),
+      pending_device_info_(false) {
   LOG(INFO) << "Modem created: " << owner << " at " << path;
 }
 
@@ -57,15 +58,31 @@
 
   dbus_properties_proxy_.reset(
       proxy_factory_->CreateDBusPropertiesProxy(this, path_, owner_));
+  CreateDevice();
+}
 
+void Modem::OnDeviceInfoAvailable(const string &link_name) {
+  VLOG(2) << __func__;
+  if (pending_device_info_ && link_name_ == link_name) {
+    pending_device_info_ = false;
+    CreateDevice();
+  }
+}
+
+void Modem::CreateDevice() {
+  VLOG(2) << __func__;
   // TODO(petkov): Switch to asynchronous calls (crosbug.com/17583).
   DBusPropertiesMap properties =
       dbus_properties_proxy_->GetAll(MM_MODEM_INTERFACE);
-  CreateCellularDevice(properties);
+  CreateDeviceFromProperties(properties);
 }
 
-void Modem::CreateCellularDevice(const DBusPropertiesMap &properties) {
+void Modem::CreateDeviceFromProperties(const DBusPropertiesMap &properties) {
   VLOG(2) << __func__;
+  if (device_.get()) {
+    return;
+  }
+
   uint32 ip_method = kuint32max;
   if (!DBusProperties::GetUint32(properties, kPropertyIPMethod, &ip_method) ||
       ip_method != MM_MODEM_IP_METHOD_DHCP) {
@@ -73,13 +90,14 @@
     return;
   }
 
-  string link_name;
-  if (!DBusProperties::GetString(properties, kPropertyLinkName, &link_name)) {
+  if (!DBusProperties::GetString(properties, kPropertyLinkName, &link_name_)) {
     LOG(ERROR) << "Unable to create cellular device without a link name.";
     return;
   }
+  // TODO(petkov): Get the interface index from DeviceInfo, similar to the MAC
+  // address below.
   int interface_index =
-      RTNLHandler::GetInstance()->GetInterfaceIndex(link_name);
+      RTNLHandler::GetInstance()->GetInterfaceIndex(link_name_);
   if (interface_index < 0) {
     LOG(ERROR) << "Unable to create cellular device -- no interface index.";
     return;
@@ -88,9 +106,8 @@
   ByteString address_bytes;
   if (!manager_->device_info()->GetMACAddress(interface_index,
                                               &address_bytes)) {
-    // TODO(petkov): ensure that DeviceInfo has heard about this device before
-    //               we go ahead and try to add it.
-    LOG(ERROR) << "Unable to create cellular device without a hardware addr.";
+    LOG(WARNING) << "No hardware address, device creation pending device info.";
+    pending_device_info_ = true;
     return;
   }
 
@@ -109,12 +126,12 @@
       return;
   }
 
-  LOG(INFO) << "Creating a cellular device on link " << link_name
+  LOG(INFO) << "Creating a cellular device on link " << link_name_
             << " interface index " << interface_index << ".";
   device_ = new Cellular(control_interface_,
                          dispatcher_,
                          manager_,
-                         link_name,
+                         link_name_,
                          address_bytes.HexEncode(),
                          interface_index,
                          type,