summaryrefslogtreecommitdiffstats
path: root/network/netmgr/main.cpp
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-11-07 04:07:11 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-11-07 04:07:11 +0000
commit7cedf5da5331fb08ee306eb19958f397f86e97aa (patch)
tree40ddfe92482c4903543dd67a7ffb7842e43f491a /network/netmgr/main.cpp
parent20077d56e6f6dae98d2365d4d67e739bc49a5076 (diff)
parentaa76124b9f5fddd3279bb144267fda7a29aa9afe (diff)
downloadandroid_device_generic_goldfish-7cedf5da5331fb08ee306eb19958f397f86e97aa.tar.gz
android_device_generic_goldfish-7cedf5da5331fb08ee306eb19958f397f86e97aa.tar.bz2
android_device_generic_goldfish-7cedf5da5331fb08ee306eb19958f397f86e97aa.zip
Snap for 5115288 from aa76124b9f5fddd3279bb144267fda7a29aa9afe to pi-qpr2-release
Change-Id: If8d613cafaffda76bdcc72ebb95cc5d85c26f873
Diffstat (limited to 'network/netmgr/main.cpp')
-rw-r--r--network/netmgr/main.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/network/netmgr/main.cpp b/network/netmgr/main.cpp
index c6e20bc..e4b43f6 100644
--- a/network/netmgr/main.cpp
+++ b/network/netmgr/main.cpp
@@ -20,12 +20,15 @@
#include "log.h"
#include "monitor.h"
#include "poller.h"
+#include "wifi_forwarder.h"
#include <arpa/inet.h>
#include <netinet/in.h>
#include <functional>
+static const char kWifiMonitorInterface[] = "hwsim0";
+
static void usage(const char* name) {
LOGE("Usage: %s --if-prefix <prefix> --network <ip/mask>", name);
LOGE(" <prefix> indicates the name of network interfaces to configure.");
@@ -131,9 +134,17 @@ int main(int argc, char* argv[]) {
WifiCommand wifiCommand;
commander.registerCommand("wifi", &wifiCommand);
+ WifiForwarder forwarder(kWifiMonitorInterface);
+ res = forwarder.init();
+ if (!res) {
+ LOGE("%s", res.c_str());
+ return 1;
+ }
+
Poller poller;
poller.addPollable(&monitor);
poller.addPollable(&commander);
+ poller.addPollable(&forwarder);
return poller.run();
}