- 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>
61 lines
1.7 KiB
C++
61 lines
1.7 KiB
C++
/*
|
|
* Copyright (C) 2008 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef _NETWORKMANAGER_H
|
|
#define _NETWORKMANAGER_H
|
|
|
|
#include <sysutils/SocketListener.h>
|
|
|
|
#include "Controller.h"
|
|
#include "PropertyManager.h"
|
|
#include "IControllerHandler.h"
|
|
|
|
class InterfaceConfig;
|
|
|
|
class NetworkManager : public IControllerHandler {
|
|
private:
|
|
static NetworkManager *sInstance;
|
|
|
|
private:
|
|
ControllerCollection *mControllers;
|
|
SocketListener *mBroadcaster;
|
|
PropertyManager *mPropMngr;
|
|
|
|
public:
|
|
virtual ~NetworkManager();
|
|
|
|
int run();
|
|
|
|
int attachController(Controller *controller);
|
|
|
|
Controller *findController(const char *name);
|
|
|
|
void setBroadcaster(SocketListener *sl) { mBroadcaster = sl; }
|
|
SocketListener *getBroadcaster() { return mBroadcaster; }
|
|
PropertyManager *getPropMngr() { return mPropMngr; }
|
|
|
|
static NetworkManager *Instance();
|
|
|
|
private:
|
|
int startControllers();
|
|
int stopControllers();
|
|
|
|
NetworkManager(PropertyManager *propMngr);
|
|
|
|
void onInterfaceStarted(Controller *c, const InterfaceConfig *cfg);
|
|
void onInterfaceStopping(Controller *c, const char *name);
|
|
};
|
|
#endif
|