[shill] Continue fixing sloppy naming stuff
We were using some illegal dbus paths. Stop :-)
BUG=chromium-os:17744
TEST=unit tests, run on device and list-devices, list-services
Change-Id: I812f0f4d3d663e2af50477d46900ea885ee69e21
Reviewed-on: http://gerrit.chromium.org/gerrit/4349
Reviewed-by: Chris Masone <cmasone@chromium.org>
Tested-by: Chris Masone <cmasone@chromium.org>
diff --git a/device.h b/device.h
index e70797a..caa49aa 100644
--- a/device.h
+++ b/device.h
@@ -62,12 +62,14 @@
std::string GetRpcIdentifier();
- PropertyStore *store() { return &store_; }
+ const std::string &FriendlyName() const;
// Returns a string that is guaranteed to uniquely identify this Device
// instance.
const std::string &UniqueName() const;
+ PropertyStore *store() { return &store_; }
+
protected:
FRIEND_TEST(DeviceTest, AcquireDHCPConfig);
FRIEND_TEST(DeviceTest, DestroyIPConfig);
@@ -102,6 +104,7 @@
int interface_index_;
bool running_;
const std::string link_name_;
+ const std::string unique_id_;
Manager *manager_;
IPConfigRefPtr ipconfig_;