[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/dhcp_provider.cc b/dhcp_provider.cc
index a2b3523..e17dbb3 100644
--- a/dhcp_provider.cc
+++ b/dhcp_provider.cc
@@ -6,6 +6,7 @@
#include <base/logging.h>
+#include "shill/control_interface.h"
#include "shill/dhcp_config.h"
#include "shill/dhcpcd_proxy.h"
#include "shill/proxy_factory.h"
@@ -26,16 +27,17 @@
return Singleton<DHCPProvider>::get();
}
-void DHCPProvider::Init(GLib *glib) {
+void DHCPProvider::Init(ControlInterface *control_interface, GLib *glib) {
VLOG(2) << __func__;
listener_.reset(
new DHCPCDListener(ProxyFactory::factory()->connection(), this));
glib_ = glib;
+ control_interface_ = control_interface;
}
DHCPConfigRefPtr DHCPProvider::CreateConfig(const string &device_name) {
VLOG(2) << __func__ << " device: " << device_name;
- return new DHCPConfig(this, device_name, glib_);
+ return new DHCPConfig(control_interface_, this, device_name, glib_);
}
DHCPConfigRefPtr DHCPProvider::GetConfig(int pid) {