commit f0f55340a10fea9d106b832cd1392441a5efcfd4
author Alex Vakulenko <avakulenko@google.com> Tue Aug 18 15:51:40 2015 -0700
committer Alex Vakulenko <avakulenko@google.com> Wed Aug 19 07:28:42 2015 -0700
tree b38577be29243bfe1e38e1294a374e78f4678646
parent 0bc967ff82d44609be9ecf339bd344996dee8c31

system/weaved: Make weaved compile and run on Brillo

This is an intermediate step in making weaved daemon compile
and run on Brillo. Right now it starts up successfully at system
boot.

Now we just need to hook it up to other system components such as
web server, avahi, etc.

Bug: 23113639
Change-Id: I163e2558ff2a2ed800d8e4eb28fab727bf844602

buffet/manager.cc

diff --git a/buffet/manager.cc b/buffet/manager.cc
index bad0d8c..0180612 100644
--- a/buffet/manager.cc
+++ b/buffet/manager.cc
@@ -29,13 +29,10 @@
 #include "buffet/dbus_command_dispatcher.h"
 #include "buffet/dbus_conversion.h"
 #include "buffet/http_transport_client.h"
-//#include "buffet/shill_client.h"
+#include "buffet/mdns_client.h"
+#include "buffet/network_client.h"
 #include "buffet/weave_error_conversion.h"
-
-#ifdef BUFFET_USE_WIFI_BOOTSTRAPPING
-//#include "buffet/peerd_client.h"
 //#include "buffet/webserv_client.h"
-#endif  // BUFFET_USE_WIFI_BOOTSTRAPPING
 
 using chromeos::dbus_utils::AsyncEventSequencer;
 using chromeos::dbus_utils::ExportedObjectManager;
@@ -77,16 +74,12 @@
                     AsyncEventSequencer* sequencer) {
   task_runner_.reset(new TaskRunner{});
   http_client_.reset(new HttpTransportClient);
-//  shill_client_.reset(new ShillClient{dbus_object_.GetBus(), device_whitelist});
-  weave::Mdns* mdns{nullptr};
-  weave::HttpServer* http_server{nullptr};
+  network_client_ = NetworkClient::CreateInstance(device_whitelist);
 #ifdef BUFFET_USE_WIFI_BOOTSTRAPPING
-//  if (!options.disable_privet) {
-//    peerd_client_.reset(new PeerdClient{dbus_object_.GetBus()});
-//    web_serv_client_.reset(new WebServClient{dbus_object_.GetBus(), sequencer});
-//    mdns = peerd_client_.get();
-//    http_server = web_serv_client_.get();
-//  }
+  if (!options.disable_privet) {
+    mdns_client_ = MdnsClient::CreateInstance();
+    //web_serv_client_.reset(new WebServClient{dbus_object_.GetBus(), sequencer});
+  }
 #endif  // BUFFET_USE_WIFI_BOOTSTRAPPING
 
   device_ = weave::Device::Create();
@@ -95,7 +88,8 @@
       base::Bind(&Manager::OnConfigChanged, weak_ptr_factory_.GetWeakPtr()));
 
   device_->Start(options, config_.get(), task_runner_.get(), http_client_.get(),
-                 nullptr /*shill_client_.get()*/, mdns, http_server);
+                 network_client_.get(), mdns_client_.get(),
+                 nullptr /*web_serv_client_.get()*/);
 
   command_dispatcher_.reset(new DBusCommandDispacher{
       dbus_object_.GetObjectManager(), device_->GetCommands()});