aboutsummaryrefslogtreecommitdiffstats
path: root/nexus/main.cpp
diff options
context:
space:
mode:
authorSan Mehat <san@google.com>2009-06-15 14:10:44 -0700
committerSan Mehat <san@google.com>2009-06-15 14:20:02 -0700
commit3aff2d1de59972684bf2ab798351be5544158239 (patch)
treee16fdc00ec3615dc4257ef1b57b2d0f49437fdcf /nexus/main.cpp
parent669a7011e7e23c0594242465caa15b46b92aa340 (diff)
downloadsystem_core-3aff2d1de59972684bf2ab798351be5544158239.tar.gz
system_core-3aff2d1de59972684bf2ab798351be5544158239.tar.bz2
system_core-3aff2d1de59972684bf2ab798351be5544158239.zip
Nexus: Clean up supplicant events, protocol, and continue plumbing
- Create SupplicantEvent classes for events - New SupplicantEventFactory for creating events - Extract Controller -> NetworkManager callbacks into IControllerHandler - Move ScanResult handling from Supplicant -> WifiController - Plumb more 'onConnected()' code - Instead of re-creating NetworkList every-time, merge in new entries - Extract SupplicantListener -> Supplicant callbacks into ISupplicantEventHandler - Move SupplicantListener callback handling to WifiController - Add unlocked version of lookupNetwork() - Save supplicant config after setting a WifiNetwork variable - Move property registration from WifiNetwork -> Supplicant - Change wifi enable broadcast messages - Add 3 new events: 'onAssociating', 'onAssociated', 'onConnectionTimeout' - Add support for handling KeyManagement Signed-off-by: San Mehat <san@google.com>
Diffstat (limited to 'nexus/main.cpp')
-rw-r--r--nexus/main.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/nexus/main.cpp b/nexus/main.cpp
index e460d420..936d33f6 100644
--- a/nexus/main.cpp
+++ b/nexus/main.cpp
@@ -40,10 +40,10 @@ int main() {
nm->setBroadcaster((SocketListener *) cl);
- nm->attachController(new LoopController(nm->getPropMngr()));
- nm->attachController(new TiwlanWifiController(nm->getPropMngr(), "/system/lib/modules/wlan.ko", "wlan", ""));
-// nm->attachController(new AndroidL2TPVpnController());
- nm->attachController(new OpenVpnController(nm->getPropMngr()));
+ nm->attachController(new LoopController(nm->getPropMngr(), nm));
+ nm->attachController(new TiwlanWifiController(nm->getPropMngr(), nm, "/system/lib/modules/wlan.ko", "wlan", ""));
+// nm->attachController(new AndroidL2TPVpnController(nm->getPropMngr(), nm));
+ nm->attachController(new OpenVpnController(nm->getPropMngr(), nm));
if (NetworkManager::Instance()->run()) {