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>
diff --git a/nexus/NetworkManager.h b/nexus/NetworkManager.h
index e75382d..edc80c9 100644
--- a/nexus/NetworkManager.h
+++ b/nexus/NetworkManager.h
@@ -20,12 +20,12 @@
#include <sysutils/SocketListener.h>
#include "Controller.h"
-
#include "PropertyManager.h"
+#include "IControllerHandler.h"
class InterfaceConfig;
-class NetworkManager {
+class NetworkManager : public IControllerHandler {
private:
static NetworkManager *sInstance;
@@ -55,16 +55,7 @@
NetworkManager(PropertyManager *propMngr);
-public:
- /*
- * Called from a controller when an interface is available/ready for use.
- * 'cfg' contains information on how this interface should be configured.
- */
- int onInterfaceStart(Controller *c, const InterfaceConfig *cfg);
-
- /*
- * Called from a controller when an interface should be shut down
- */
- int onInterfaceStop(Controller *c, const char *name);
+ void onInterfaceStarted(Controller *c, const InterfaceConfig *cfg);
+ void onInterfaceStopping(Controller *c, const char *name);
};
#endif