Show hardware addresses for wifi and ethernet networks.

chrome/browser/chromeos/cros/network_library.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_
 #define CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 235 matching lines @@
   std::string firmware_revision_;
   std::string hardware_revision_;
   std::string last_update_;
   int PRL_version_;
   std::string selected_cellular_network_;
   CellularNetworkList found_cellular_networks_;
 
   friend class NetworkLibraryImpl;
   DISALLOW_COPY_AND_ASSIGN(NetworkDevice);
 };
+typedef std::vector<NetworkDevice*> NetworkDeviceVector;
 
 // Contains data common to all network service types.
 class Network {
  public:
   virtual ~Network() {}
 
   const std::string& service_path() const { return service_path_; }
   const std::string& name() const { return name_; }
   const std::string& device_path() const { return device_path_; }
   const std::string& ip_address() const { return ip_address_; }
@@ skipping 574 matching lines @@
   std::string gateway;
   std::string name_servers;
 };
 typedef std::vector<NetworkIPConfig> NetworkIPConfigVector;
 
 // This class handles the interaction with the ChromeOS network library APIs.
 // Classes can add themselves as observers. Users can get an instance of the
 // library like this: chromeos::CrosLibrary::Get()->GetNetworkLibrary()
 class NetworkLibrary {
  public:
+  enum HardwareAddressFormat {
+    FORMAT_RAW_HEX,
+    FORMAT_COLON_SEPARATED_HEX
+  };
+
   class NetworkManagerObserver {
    public:
     // Called when the state of the network manager has changed,
     // for example, networks have appeared or disappeared.
     virtual void OnNetworkManagerChanged(NetworkLibrary* obj) = 0;
   };
 
   class NetworkObserver {
    public:
     // Called when the state of a single network has changed,
@@ skipping 113 matching lines @@
   // Returns the current list of cellular networks.
   virtual const CellularNetworkVector& cellular_networks() const = 0;
 
   // Returns the current list of virtual networks.
   virtual const VirtualNetworkVector& virtual_networks() const = 0;
 
   // Return a pointer to the device, if it exists, or NULL.
   virtual const NetworkDevice* FindNetworkDeviceByPath(
       const std::string& path) const = 0;
 
-  // Returns device with TYPE_CELLULAR. Returns NULL if such a device doesn't
-  // exist.
+  // Returns device with TYPE_CELLULAR. Returns NULL if none exists.
   virtual const NetworkDevice* FindCellularDevice() const = 0;
 
+  // Returns random device with TYPE_ETHERNET. Returns NULL if none exists.

[Nikita (slow), 2011/04/25 08:51:35]

"Returns random device with TYPE_ETHERNET" is misleading.
Typically we'll have only one device of each type: Ethernet/Wifi/Cellular.

In this particular case I see that you return vector of the devices. I think
that's not needed. Through the NetworkLibrary implementation you could see that
overall assumption is that only one device of each type exists.
I think if we connect multiple adaptors, they might work but things like
wifi_enabled(), wifi_connected() support only one device/network etc.

[stevenjb, 2011/04/25 17:54:27]

In the future, there may be hardware more than one device of a given type.
However, for now I agree that we should keep that out of the interface
until/unless we need it, and make all of the Find[TYPE]Device functions return a
pointer to the first device matching TYPE (not a random device).

[Denis Lagno, 2011/04/26 15:54:58]

Done.

+  virtual NetworkDeviceVector FindEthernetDevices() const = 0;
+
+  // Returns random device with TYPE_WIFI. Returns NULL if none exists.
+  virtual NetworkDeviceVector FindWifiDevices() const = 0;
+
   // Return a pointer to the network, if it exists, or NULL.
   // NOTE: Never store these results, store service paths instead.
   // The pattern for doing an operation on a Network is:
   // Network* network = cros->FindNetworkByPath(service_path);
   // network->SetFoo();
   // network->Connect();
   // As long as this is done in sequence on the UI thread it will be safe;
   // the network list only gets updated on the UI thread.
   virtual Network* FindNetworkByPath(const std::string& path) const = 0;
   virtual WifiNetwork* FindWifiNetworkByPath(const std::string& path) const = 0;
@@ skipping 132 matching lines @@
 
   // Enables/disables offline mode.
   virtual void EnableOfflineMode(bool enable) = 0;
 
   // Fetches IP configs and hardware address for a given device_path.
   // The hardware address is usually a MAC address like "0011AA22BB33".
   // |hardware_address| will be an empty string, if no hardware address is
   // found.
   virtual NetworkIPConfigVector GetIPConfigs(
       const std::string& device_path,
-      std::string* hardware_address) = 0;
+      std::string* hardware_address,
+      HardwareAddressFormat) = 0;
 
   // Factory function, creates a new instance and returns ownership.
   // For normal usage, access the singleton via CrosLibrary::Get().
   static NetworkLibrary* GetImpl(bool stub);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_