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/SupplicantConnectedEvent.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/SupplicantConnectedEvent.cpp')
| -rw-r--r-- | nexus/SupplicantConnectedEvent.cpp | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/nexus/SupplicantConnectedEvent.cpp b/nexus/SupplicantConnectedEvent.cpp new file mode 100644 index 00000000..e58bab22 --- /dev/null +++ b/nexus/SupplicantConnectedEvent.cpp @@ -0,0 +1,61 @@ +/* + * 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. + */ + +#define LOG_TAG "SupplicantConnectedEvent" +#include <cutils/log.h> + +#include "SupplicantConnectedEvent.h" + +SupplicantConnectedEvent::SupplicantConnectedEvent(int level, char *event, + size_t len) : + SupplicantEvent(SupplicantEvent::EVENT_CONNECTED, + level) { + char *p; + + // "- Connection to 00:13:46:40:40:aa completed (auth) [id=1 id_str=], 89" + + if ((p = index(event + 2, ' ')) && (++p = index(p, ' '))) { + mBssid = (char *) malloc(18); + strncpy(mBssid, ++p, 17); + mBssid[17] = '\0'; + + // "- Connection to 00:13:46:40:40:aa completed (auth) [id=1 id_str=], 89" + // ^ + // p + + if ((p = index(p, ' ')) && ((++p = index(p, ' ')))) { + if (!strncmp(++p, "(auth)", 6)) + mReassociated = false; + else + mReassociated = true; + } else + LOGE("Unable to decode re-assocation"); + } else + LOGE("Unable to decode event"); +} + +SupplicantConnectedEvent::SupplicantConnectedEvent(const char *bssid, + bool reassocated) : + SupplicantEvent(SupplicantEvent::EVENT_CONNECTED, -1) { + mBssid = strdup(bssid); + mReassociated = reassocated; +} + +SupplicantConnectedEvent::~SupplicantConnectedEvent() { + if (mBssid) + free(mBssid); +} + |
