commit 0828f5f7b1e4b970967e5a499c3279b47f834c11
author Darin Petkov <petkov@chromium.org> Thu Aug 11 10:18:52 2011 -0700
committer Darin Petkov <petkov@chromium.org> Fri Aug 12 15:54:01 2011 -0700
tree 57f85b9acd4949f4d1bbf51a14c3e84fa48d2697
parent e3e1cfaadc69ea67db55f11e55f404b11a70e354

shill: Bring the interface up when the modem is connected.

BUG=chromium-os:18855
TEST=unit tests, tested on device

Change-Id: I91581fbedc959bf4dce63f09d64b920f12a14b53
Reviewed-on: http://gerrit.chromium.org/gerrit/5925
Tested-by: Darin Petkov <petkov@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>

cellular.h

diff --git a/cellular.h b/cellular.h
index 1419b0e..5dadff0 100644
--- a/cellular.h
+++ b/cellular.h
@@ -31,11 +31,21 @@
     kTypeCDMA
   };
 
+  // The device states progress linearly from Disabled to Linked.
   enum State {
+    // This is the initial state of the modem and indicates that the modem radio
+    // is not turned on.
     kStateDisabled,
+    // This state indicates that the modem radio is turned on, and it should be
+    // possible to measure signal strength.
     kStateEnabled,
+    // The modem has registered with a network and has signal quality
+    // measurements.
     kStateRegistered,
+    // The modem has connected to a network.
     kStateConnected,
+    // The network interface is UP.
+    kStateLinked,
   };
 
   // These should be kept in sync with ModemManager's mm-modem.h:MMModemState.
@@ -121,6 +131,7 @@
   virtual void Start();
   virtual void Stop();
   virtual bool TechnologyIs(Technology type) const;
+  virtual void LinkEvent(unsigned int flags, unsigned int change);
 
  private:
   FRIEND_TEST(CellularTest, Connect);
@@ -134,11 +145,14 @@
   FRIEND_TEST(CellularTest, InitProxiesGSM);
   FRIEND_TEST(CellularTest, Start);
   FRIEND_TEST(CellularTest, StartConnected);
+  FRIEND_TEST(CellularTest, StartLinked);
   FRIEND_TEST(CellularTest, StartRegister);
 
   static const char kPhoneNumberCDMA[];
   static const char kPhoneNumberGSM[];
 
+  void SetState(State state);
+
   void ConnectTask(const DBusPropertiesMap &properties);
 
   // Invoked when the modem is connected to the cellular network to transition
@@ -178,6 +192,7 @@
   // Processes a change in the modem registration state, possibly creating,
   // destroying or updating the CellularService.
   void HandleNewRegistrationState();
+  void HandleNewRegistrationStateTask();
 
   void CreateService();
 
@@ -215,7 +230,6 @@
   CDMA cdma_;
 
   CellularServiceRefPtr service_;
-  bool service_registered_;
 
   ScopedRunnableMethodFactory<Cellular> task_factory_;