diff options
| author | San Mehat <san@google.com> | 2009-06-15 14:10:44 -0700 |
|---|---|---|
| committer | San Mehat <san@google.com> | 2009-06-15 14:20:02 -0700 |
| commit | 3aff2d1de59972684bf2ab798351be5544158239 (patch) | |
| tree | e16fdc00ec3615dc4257ef1b57b2d0f49437fdcf /nexus/OpenVpnController.cpp | |
| parent | 669a7011e7e23c0594242465caa15b46b92aa340 (diff) | |
| download | system_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/OpenVpnController.cpp')
| -rw-r--r-- | nexus/OpenVpnController.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nexus/OpenVpnController.cpp b/nexus/OpenVpnController.cpp index 4c144a46..f1ea5102 100644 --- a/nexus/OpenVpnController.cpp +++ b/nexus/OpenVpnController.cpp @@ -30,8 +30,9 @@ #define DAEMON_PROP_NAME "vpn.openvpn.status" #define DAEMON_CONFIG_FILE "/data/misc/openvpn/openvpn.conf" -OpenVpnController::OpenVpnController(PropertyManager *propmngr) : - VpnController(propmngr) { +OpenVpnController::OpenVpnController(PropertyManager *propmngr, + IControllerHandler *handlers) : + VpnController(propmngr, handlers) { mServiceManager = new ServiceManager(); } @@ -40,11 +41,11 @@ OpenVpnController::~OpenVpnController() { } int OpenVpnController::start() { - return 0; + return VpnController::start(); } int OpenVpnController::stop() { - return 0; + return VpnController::stop(); } int OpenVpnController::enable() { |
