Merge "Revert "Use new netlink attribute for scan result timestamp" am: ecb6bb205f...

[android-x86/system-connectivity-wificond.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index 7c90299..6e3f1d7 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -15,6 +15,7 @@
  */
 
 #include <unistd.h>
+#include <sys/capability.h>
 
 #include <csignal>
 #include <memory>
@@ -24,10 +25,24 @@
 #include <binder/IPCThreadState.h>
 #include <binder/IServiceManager.h>
 #include <binder/ProcessState.h>
+#include <cutils/properties.h>
+#include <libminijail.h>
 #include <utils/String16.h>
+#include <wifi_system/interface_tool.h>
 
-#include <looper_backed_event_loop.h>
-#include <server.h>
+#include "wificond/ipc_constants.h"
+#include "wificond/looper_backed_event_loop.h"
+#include "wificond/net/netlink_manager.h"
+#include "wificond/net/netlink_utils.h"
+#include "wificond/scanning/scan_utils.h"
+#include "wificond/server.h"
+
+using android::net::wifi::IWificond;
+using android::wifi_system::HostapdManager;
+using android::wifi_system::InterfaceTool;
+using android::wifi_system::SupplicantManager;
+using android::wificond::ipc_constants::kServiceName;
+using std::unique_ptr;
 
 namespace {
 
@@ -62,6 +77,26 @@ class ScopedSignalHandler final {
 android::wificond::LooperBackedEventLoop*
     ScopedSignalHandler::s_event_loop_ = nullptr;
 
+
+// Setup our interface to the Binder driver or die trying.
+int SetupBinderOrCrash() {
+  int binder_fd = -1;
+  android::ProcessState::self()->setThreadPoolMaxThreadCount(0);
+  android::IPCThreadState::self()->disableBackgroundScheduling(true);
+  int err = android::IPCThreadState::self()->setupPolling(&binder_fd);
+  CHECK_EQ(err, 0) << "Error setting up binder polling: " << strerror(-err);
+  CHECK_GE(binder_fd, 0) << "Invalid binder FD: " << binder_fd;
+  return binder_fd;
+}
+
+void RegisterServiceOrCrash(const android::sp<android::IBinder>& service) {
+  android::sp<android::IServiceManager> sm = android::defaultServiceManager();
+  CHECK_EQ(sm != NULL, true) << "Could not obtain IServiceManager";
+
+  CHECK_EQ(sm->addService(android::String16(kServiceName), service),
+           android::NO_ERROR);
+}
+
 }  // namespace
 
 void OnBinderReadReady(int fd) {
@@ -69,30 +104,34 @@ void OnBinderReadReady(int fd) {
 }
 
 int main(int argc, char** argv) {
-  android::base::InitLogging(argv);
+  android::base::InitLogging(argv, android::base::LogdLogger(android::base::SYSTEM));
   LOG(INFO) << "wificond is starting up...";
-  std::unique_ptr<android::wificond::LooperBackedEventLoop> event_dispatcher_(
+
+  unique_ptr<android::wificond::LooperBackedEventLoop> event_dispatcher(
       new android::wificond::LooperBackedEventLoop());
-  ScopedSignalHandler scoped_signal_handler(event_dispatcher_.get());
+  ScopedSignalHandler scoped_signal_handler(event_dispatcher.get());
 
-  int binder_fd = -1;
-  android::ProcessState::self()->setThreadPoolMaxThreadCount(0);
-  android::IPCThreadState::self()->disableBackgroundScheduling(true);
-  int err = android::IPCThreadState::self()->setupPolling(&binder_fd);
-  CHECK_EQ(err, 0) << "Error setting up binder polling: " << err;
-  CHECK_GE(binder_fd, 0) << "Invalid binder FD: " << binder_fd;
-  if (!event_dispatcher_->WatchFileDescriptor(
+  int binder_fd = SetupBinderOrCrash();
+  CHECK(event_dispatcher->WatchFileDescriptor(
       binder_fd,
       android::wificond::EventLoop::kModeInput,
-      &OnBinderReadReady)) {
-    LOG(FATAL) << "Failed to watch binder FD";
-  }
-  android::sp<android::IServiceManager> sm = android::defaultServiceManager();
-  CHECK_EQ(sm != NULL, true) << "Could not obtain IServiceManager";
-  android::sp<android::wificond::Server> server = new android::wificond::Server();
-  sm->addService(android::String16("wificond"), server);
+      &OnBinderReadReady)) << "Failed to watch binder FD";
+
+  android::wificond::NetlinkManager netlink_manager(event_dispatcher.get());
+  CHECK(netlink_manager.Start()) << "Failed to start netlink manager";
+  android::wificond::NetlinkUtils netlink_utils(&netlink_manager);
+  android::wificond::ScanUtils scan_utils(&netlink_manager);
+
+  unique_ptr<android::wificond::Server> server(new android::wificond::Server(
+      unique_ptr<InterfaceTool>(new InterfaceTool),
+      unique_ptr<SupplicantManager>(new SupplicantManager()),
+      unique_ptr<HostapdManager>(new HostapdManager()),
+      &netlink_utils,
+      &scan_utils));
+  server->CleanUpSystemState();
+  RegisterServiceOrCrash(server.get());
 
-  event_dispatcher_->Poll();
-  LOG(INFO) << "Leaving the loop...";
+  event_dispatcher->Poll();
+  LOG(INFO) << "wificond is about to exit";
   return 0;
 }