ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge change 4228 into donut

Browse source 
* changes:
  Nexus: Clean up supplicant events, protocol, and continue plumbing
This commit is contained in:
Android (Google) Code Review 2009-06-15 14:40:51 -07:00
commit 43c16197b2
47 changed files with 1480 additions and 510 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
nexus/Android.mk
View file

@ -5,26 +5,35 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \ LOCAL_SRC_FILES:= \
main.cpp \ main.cpp \
NetworkManager.cpp \ NetworkManager.cpp \
CommandListener.cpp \ CommandListener.cpp \
Controller.cpp \ Controller.cpp \
WifiController.cpp \ WifiController.cpp \
LoopController.cpp \ LoopController.cpp \
NexusCommand.cpp \ NexusCommand.cpp \
TiwlanWifiController.cpp \ TiwlanWifiController.cpp \
Supplicant.cpp \ Supplicant.cpp \
SupplicantEvent.cpp \ SupplicantEvent.cpp \
SupplicantListener.cpp \ SupplicantListener.cpp \
VpnController.cpp \ VpnController.cpp \
ScanResult.cpp \ ScanResult.cpp \
WifiScanner.cpp \ WifiScanner.cpp \
WifiNetwork.cpp \ WifiNetwork.cpp \
OpenVpnController.cpp \ OpenVpnController.cpp \
InterfaceConfig.cpp \ InterfaceConfig.cpp \
PropertyManager.cpp \ PropertyManager.cpp \
SupplicantState.cpp SupplicantState.cpp \
SupplicantEventFactory.cpp \
SupplicantConnectedEvent.cpp \
SupplicantAssociatingEvent.cpp \
SupplicantAssociatedEvent.cpp \
SupplicantStateChangeEvent.cpp \
SupplicantScanResultsEvent.cpp \
SupplicantConnectionTimeoutEvent.cpp \
SupplicantDisconnectedEvent.cpp \
SupplicantStatus.cpp
LOCAL_MODULE:= nexus LOCAL_MODULE:= nexus

60
nexus/CommandListener.cpp
View file

@ -53,7 +53,8 @@ CommandListener::WifiCreateNetworkCmd::WifiCreateNetworkCmd() :
NexusCommand("wifi_create_network") { NexusCommand("wifi_create_network") {
} }
int CommandListener::WifiCreateNetworkCmd::runCommand(SocketClient *cli, char *data) { int CommandListener::WifiCreateNetworkCmd::runCommand(SocketClient *cli,
int argc, char **argv) {
NetworkManager *nm = NetworkManager::Instance(); NetworkManager *nm = NetworkManager::Instance();
WifiController *wc = (WifiController *) nm->findController("WIFI"); WifiController *wc = (WifiController *) nm->findController("WIFI");
WifiNetwork *wn; WifiNetwork *wn;
@ -72,11 +73,12 @@ CommandListener::WifiRemoveNetworkCmd::WifiRemoveNetworkCmd() :
NexusCommand("wifi_remove_network") { NexusCommand("wifi_remove_network") {
} }
int CommandListener::WifiRemoveNetworkCmd::runCommand(SocketClient *cli, char *data) { int CommandListener::WifiRemoveNetworkCmd::runCommand(SocketClient *cli,
int argc, char **argv) {
NetworkManager *nm = NetworkManager::Instance(); NetworkManager *nm = NetworkManager::Instance();
WifiController *wc = (WifiController *) nm->findController("WIFI"); WifiController *wc = (WifiController *) nm->findController("WIFI");
if (wc->removeNetwork(atoi(data))) if (wc->removeNetwork(atoi(argv[1])))
cli->sendMsg(ErrorCode::OperationFailed, "Failed to remove network", true); cli->sendMsg(ErrorCode::OperationFailed, "Failed to remove network", true);
else { else {
cli->sendMsg(ErrorCode::CommandOkay, "Network removed.", false); cli->sendMsg(ErrorCode::CommandOkay, "Network removed.", false);
@ -88,7 +90,8 @@ CommandListener::WifiScanResultsCmd::WifiScanResultsCmd() :
NexusCommand("wifi_scan_results") { NexusCommand("wifi_scan_results") {
} }
int CommandListener::WifiScanResultsCmd::runCommand(SocketClient *cli, char *data) { int CommandListener::WifiScanResultsCmd::runCommand(SocketClient *cli,
int argc, char **argv) {
NetworkManager *nm = NetworkManager::Instance(); NetworkManager *nm = NetworkManager::Instance();
WifiController *wc = (WifiController *) nm->findController("WIFI"); WifiController *wc = (WifiController *) nm->findController("WIFI");
@ -114,7 +117,8 @@ CommandListener::WifiListNetworksCmd::WifiListNetworksCmd() :
NexusCommand("wifi_list_networks") { NexusCommand("wifi_list_networks") {
} }
int CommandListener::WifiListNetworksCmd::runCommand(SocketClient *cli, char *data) { int CommandListener::WifiListNetworksCmd::runCommand(SocketClient *cli,
int argc, char **argv) {
NetworkManager *nm = NetworkManager::Instance(); NetworkManager *nm = NetworkManager::Instance();
WifiController *wc = (WifiController *) nm->findController("WIFI"); WifiController *wc = (WifiController *) nm->findController("WIFI");
@ -144,23 +148,19 @@ CommandListener::GetCmd::GetCmd() :
NexusCommand("get") { NexusCommand("get") {
} }
int CommandListener::GetCmd::runCommand(SocketClient *cli, char *data) { int CommandListener::GetCmd::runCommand(SocketClient *cli, int argc, char **argv) {
char *next = data; char val[Property::ValueMaxSize];
char *propname;
if (!(propname = strsep(&next, ":"))) if (!NetworkManager::Instance()->getPropMngr()->get(argv[1],
goto out_inval; val,
sizeof(val))) {
char pb[Property::NameMaxSize + 6];
snprintf(pb, sizeof(pb), "%s:", propname);
if (!NetworkManager::Instance()->getPropMngr()->get(propname,
&pb[strlen(pb)],
sizeof(pb) - strlen(pb))) {
goto out_inval; goto out_inval;
} }
cli->sendMsg(ErrorCode::PropertyRead, pb, false); char *tmp;
asprintf(&tmp, "%s %s", argv[1], val);
cli->sendMsg(ErrorCode::PropertyRead, tmp, false);
free(tmp);
cli->sendMsg(ErrorCode::CommandOkay, "Property read.", false); cli->sendMsg(ErrorCode::CommandOkay, "Property read.", false);
return 0; return 0;
@ -174,23 +174,9 @@ CommandListener::SetCmd::SetCmd() :
NexusCommand("set") { NexusCommand("set") {
} }
int CommandListener::SetCmd::runCommand(SocketClient *cli, char *data) { int CommandListener::SetCmd::runCommand(SocketClient *cli, int argc,
char *bword; char **argv) {
char *last; if (NetworkManager::Instance()->getPropMngr()->set(argv[1], argv[2]))
char propname[Property::NameMaxSize];
char propval[Property::ValueMaxSize];
if (!(bword = strtok_r(data, ":", &last)))
goto out_inval;
strncpy(propname, bword, sizeof(propname));
if (!(bword = strtok_r(NULL, ":", &last)))
goto out_inval;
strncpy(propval, bword, sizeof(propval));
if (NetworkManager::Instance()->getPropMngr()->set(propname, propval))
goto out_inval; goto out_inval;
cli->sendMsg(ErrorCode::CommandOkay, "Property set.", false); cli->sendMsg(ErrorCode::CommandOkay, "Property set.", false);
@ -206,7 +192,7 @@ CommandListener::ListCmd::ListCmd() :
NexusCommand("list") { NexusCommand("list") {
} }
int CommandListener::ListCmd::runCommand(SocketClient *cli, char *data) { int CommandListener::ListCmd::runCommand(SocketClient *cli, int argc, char **argv) {
android::List<char *> *pc; android::List<char *> *pc;
if (!(pc = NetworkManager::Instance()->getPropMngr()->createPropertyList())) { if (!(pc = NetworkManager::Instance()->getPropMngr()->createPropertyList())) {
@ -227,7 +213,7 @@ int CommandListener::ListCmd::runCommand(SocketClient *cli, char *data) {
} }
char *buf; char *buf;
if (asprintf(&buf, "%s:%s", (*it), p_v) < 0) { if (asprintf(&buf, "%s %s", (*it), p_v) < 0) {
LOGE("Failed to allocate memory"); LOGE("Failed to allocate memory");
free((*it)); free((*it));
continue; continue;

16
nexus/CommandListener.h
View file

@ -31,56 +31,56 @@ private:
public: public:
WifiScanCmd(); WifiScanCmd();
virtual ~WifiScanCmd() {} virtual ~WifiScanCmd() {}
int runCommand(SocketClient *c, char *data); int runCommand(SocketClient *c, int argc, char ** argv);
}; };
class WifiScanResultsCmd : public NexusCommand { class WifiScanResultsCmd : public NexusCommand {
public: public:
WifiScanResultsCmd(); WifiScanResultsCmd();
virtual ~WifiScanResultsCmd() {} virtual ~WifiScanResultsCmd() {}
int runCommand(SocketClient *c, char *data); int runCommand(SocketClient *c, int argc, char ** argv);
}; };
class WifiCreateNetworkCmd : public NexusCommand { class WifiCreateNetworkCmd : public NexusCommand {
public: public:
WifiCreateNetworkCmd(); WifiCreateNetworkCmd();
virtual ~WifiCreateNetworkCmd() {} virtual ~WifiCreateNetworkCmd() {}
int runCommand(SocketClient *c, char *data); int runCommand(SocketClient *c, int argc, char ** argv);
}; };
class WifiRemoveNetworkCmd : public NexusCommand { class WifiRemoveNetworkCmd : public NexusCommand {
public: public:
WifiRemoveNetworkCmd(); WifiRemoveNetworkCmd();
virtual ~WifiRemoveNetworkCmd() {} virtual ~WifiRemoveNetworkCmd() {}
int runCommand(SocketClient *c, char *data); int runCommand(SocketClient *c, int argc, char ** argv);
}; };
class WifiListNetworksCmd : public NexusCommand { class WifiListNetworksCmd : public NexusCommand {
public: public:
WifiListNetworksCmd(); WifiListNetworksCmd();
virtual ~WifiListNetworksCmd() {} virtual ~WifiListNetworksCmd() {}
int runCommand(SocketClient *c, char *data); int runCommand(SocketClient *c, int argc, char ** argv);
}; };
class SetCmd : public NexusCommand { class SetCmd : public NexusCommand {
public: public:
SetCmd(); SetCmd();
virtual ~SetCmd() {} virtual ~SetCmd() {}
int runCommand(SocketClient *c, char *data); int runCommand(SocketClient *c, int argc, char ** argv);
}; };
class GetCmd : public NexusCommand { class GetCmd : public NexusCommand {
public: public:
GetCmd(); GetCmd();
virtual ~GetCmd() {} virtual ~GetCmd() {}
int runCommand(SocketClient *c, char *data); int runCommand(SocketClient *c, int argc, char ** argv);
}; };
class ListCmd : public NexusCommand { class ListCmd : public NexusCommand {
public: public:
ListCmd(); ListCmd();
virtual ~ListCmd() {} virtual ~ListCmd() {}
int runCommand(SocketClient *c, char *data); int runCommand(SocketClient *c, int argc, char ** argv);
}; };
}; };

4
nexus/Controller.cpp
View file

@ -34,9 +34,11 @@
extern "C" int init_module(void *, unsigned int, const char *); extern "C" int init_module(void *, unsigned int, const char *);
extern "C" int delete_module(const char *, unsigned int); extern "C" int delete_module(const char *, unsigned int);
Controller::Controller(const char *name, PropertyManager *propMngr) { Controller::Controller(const char *name, PropertyManager *propMngr,
IControllerHandler *handlers) {
mPropMngr = propMngr; mPropMngr = propMngr;
mName = strdup(name); mName = strdup(name);
mHandlers = handlers;
mBoundInterface = NULL; mBoundInterface = NULL;
} }

6
nexus/Controller.h
View file

@ -23,12 +23,12 @@
#include <utils/List.h> #include <utils/List.h>
class PropertyManager; class PropertyManager;
class IControllerHandler;
#include "PropertyManager.h" #include "PropertyManager.h"
#include "IPropertyProvider.h" #include "IPropertyProvider.h"
class Controller : public IPropertyProvider { class Controller : public IPropertyProvider {
private:
/* /*
* Name of this controller - WIFI/VPN/USBNET/BTNET/BTDUN/LOOP/etc * Name of this controller - WIFI/VPN/USBNET/BTNET/BTDUN/LOOP/etc
*/ */
@ -42,9 +42,11 @@ private:
protected: protected:
PropertyManager *mPropMngr; PropertyManager *mPropMngr;
IControllerHandler *mHandlers;
public: public:
Controller(const char *name, PropertyManager *propMngr); Controller(const char *name, PropertyManager *propMngr,
IControllerHandler *handlers);
virtual ~Controller(); virtual ~Controller();
virtual int start(); virtual int start();

30
nexus/IControllerHandler.h Normal file
View file

@ -0,0 +1,30 @@
/*
* 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 _ICONTROLLER_HANDLER_H
#define _ICONTROLLER_HANDLER_H
class Controller;
class InterfaceConfig;
class IControllerHandler {
public:
virtual void onInterfaceStarted(Controller *c, const InterfaceConfig *cfg) = 0;
virtual void onInterfaceStopping(Controller *c, const char *name) = 0;
};
#endif

39
nexus/ISupplicantEventHandler.h
View file

@ -17,21 +17,34 @@
#ifndef _ISUPPLICANT_EVENT_HANDLER_H #ifndef _ISUPPLICANT_EVENT_HANDLER_H
#define _ISUPPLICANT_EVENT_HANDLER_H #define _ISUPPLICANT_EVENT_HANDLER_H
class SupplicantAssociatingEvent;
class SupplicantAssociatedEvent;
class SupplicantConnectedEvent;
class SupplicantScanResultsEvent;
class SupplicantStateChangeEvent;
class SupplicantConnectionTimeoutEvent;
class SupplicantDisconnectedEvent;
class ISupplicantEventHandler { class ISupplicantEventHandler {
public: public:
virtual int onConnectedEvent(SupplicantEvent *evt) = 0; virtual void onAssociatingEvent(SupplicantAssociatingEvent *evt) = 0;
virtual int onDisconnectedEvent(SupplicantEvent *evt) = 0; virtual void onAssociatedEvent(SupplicantAssociatedEvent *evt) = 0;
virtual int onTerminatingEvent(SupplicantEvent *evt) = 0; virtual void onConnectedEvent(SupplicantConnectedEvent *evt) = 0;
virtual int onPasswordChangedEvent(SupplicantEvent *evt) = 0; virtual void onScanResultsEvent(SupplicantScanResultsEvent *evt) = 0;
virtual int onEapNotificationEvent(SupplicantEvent *evt) = 0; virtual void onStateChangeEvent(SupplicantStateChangeEvent *evt) = 0;
virtual int onEapStartedEvent(SupplicantEvent *evt) = 0; virtual void onConnectionTimeoutEvent(SupplicantConnectionTimeoutEvent *evt) = 0;
virtual int onEapMethodEvent(SupplicantEvent *evt) = 0; virtual void onDisconnectedEvent(SupplicantDisconnectedEvent *evt) = 0;
virtual int onEapSuccessEvent(SupplicantEvent *evt) = 0; #if 0
virtual int onEapFailureEvent(SupplicantEvent *evt) = 0; virtual void onTerminatingEvent(SupplicantEvent *evt) = 0;
virtual int onScanResultsEvent(SupplicantEvent *evt) = 0; virtual void onPasswordChangedEvent(SupplicantEvent *evt) = 0;
virtual int onStateChangeEvent(SupplicantEvent *evt) = 0; virtual void onEapNotificationEvent(SupplicantEvent *evt) = 0;
virtual int onLinkSpeedEvent(SupplicantEvent *evt) = 0; virtual void onEapStartedEvent(SupplicantEvent *evt) = 0;
virtual int onDriverStateEvent(SupplicantEvent *evt) = 0; virtual void onEapMethodEvent(SupplicantEvent *evt) = 0;
virtual void onEapSuccessEvent(SupplicantEvent *evt) = 0;
virtual void onEapFailureEvent(SupplicantEvent *evt) = 0;
virtual void onLinkSpeedEvent(SupplicantEvent *evt) = 0;
virtual void onDriverStateEvent(SupplicantEvent *evt) = 0;
#endif
}; };
#endif #endif

5
nexus/LoopController.cpp
View file

@ -19,8 +19,9 @@
#include "LoopController.h" #include "LoopController.h"
#include "PropertyManager.h" #include "PropertyManager.h"
LoopController::LoopController(PropertyManager *propmngr) : LoopController::LoopController(PropertyManager *propmngr,
Controller("LOOP", propmngr) { IControllerHandler *handlers) :
Controller("LOOP", propmngr, handlers) {
} }
int LoopController::set(const char *name, const char *value) { int LoopController::set(const char *name, const char *value) {

3
nexus/LoopController.h
View file

@ -19,10 +19,11 @@
#include "Controller.h" #include "Controller.h"
class ControllerHandler;
class LoopController : public Controller { class LoopController : public Controller {
public: public:
LoopController(PropertyManager *propmngr); LoopController(PropertyManager *propmngr, IControllerHandler *h);
virtual ~LoopController() {} virtual ~LoopController() {}
int set(const char *name, const char *value); int set(const char *name, const char *value);

17
nexus/NetworkManager.cpp
View file

@ -89,23 +89,26 @@ Controller *NetworkManager::findController(const char *name) {
return NULL; return NULL;
} }
int NetworkManager::onInterfaceStart(Controller *c, const InterfaceConfig *cfg) { void NetworkManager::onInterfaceStarted(Controller *c, const InterfaceConfig *cfg) {
LOGD("Interface %s started by controller %s", c->getBoundInterface(), c->getName()); LOGD("Interface %s started by controller %s", c->getBoundInterface(), c->getName());
// Look up the interface // Look up the interface
if (0) { // already started? if (0) { // already started?
errno = EADDRINUSE;
return -1;
} }
if (cfg->getUseDhcp()) { if (cfg) {
if (cfg->getUseDhcp()) {
// Launch DHCP thread
} else {
// Static configuration
}
} else { } else {
LOGD("No InterfaceConfig for %s:%s - assuming self-managed",
c->getName(), c->getBoundInterface());
} }
return 0;
} }
int NetworkManager::onInterfaceStop(Controller *c, const char *name) { void NetworkManager::onInterfaceStopping(Controller *c, const char *name) {
LOGD("Interface %s stopped by controller %s", name, c->getName()); LOGD("Interface %s stopped by controller %s", name, c->getName());
return 0;
} }

17
nexus/NetworkManager.h
View file

@ -20,12 +20,12 @@
#include <sysutils/SocketListener.h> #include <sysutils/SocketListener.h>
#include "Controller.h" #include "Controller.h"
#include "PropertyManager.h" #include "PropertyManager.h"
#include "IControllerHandler.h"
class InterfaceConfig; class InterfaceConfig;
class NetworkManager { class NetworkManager : public IControllerHandler {
private: private:
static NetworkManager *sInstance; static NetworkManager *sInstance;
@ -55,16 +55,7 @@ private:
NetworkManager(PropertyManager *propMngr); NetworkManager(PropertyManager *propMngr);
public: void onInterfaceStarted(Controller *c, const InterfaceConfig *cfg);
/* void onInterfaceStopping(Controller *c, const char *name);
* 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);
}; };
#endif #endif

9
nexus/OpenVpnController.cpp
View file

@ -30,8 +30,9 @@
#define DAEMON_PROP_NAME "vpn.openvpn.status" #define DAEMON_PROP_NAME "vpn.openvpn.status"
#define DAEMON_CONFIG_FILE "/data/misc/openvpn/openvpn.conf" #define DAEMON_CONFIG_FILE "/data/misc/openvpn/openvpn.conf"
OpenVpnController::OpenVpnController(PropertyManager *propmngr) : OpenVpnController::OpenVpnController(PropertyManager *propmngr,
VpnController(propmngr) { IControllerHandler *handlers) :
VpnController(propmngr, handlers) {
mServiceManager = new ServiceManager(); mServiceManager = new ServiceManager();
} }
@ -40,11 +41,11 @@ OpenVpnController::~OpenVpnController() {
} }
int OpenVpnController::start() { int OpenVpnController::start() {
return 0; return VpnController::start();
} }
int OpenVpnController::stop() { int OpenVpnController::stop() {
return 0; return VpnController::stop();
} }
int OpenVpnController::enable() { int OpenVpnController::enable() {

3
nexus/OpenVpnController.h
View file

@ -21,13 +21,14 @@
#include "VpnController.h" #include "VpnController.h"
class ServiceManager; class ServiceManager;
class IControllerHandler;
class OpenVpnController : public VpnController { class OpenVpnController : public VpnController {
private: private:
ServiceManager *mServiceManager; ServiceManager *mServiceManager;
public: public:
OpenVpnController(PropertyManager *propmngr); OpenVpnController(PropertyManager *propmngr, IControllerHandler *handlers);
virtual ~OpenVpnController(); virtual ~OpenVpnController();
int start(); int start();

3
nexus/PropertyManager.cpp
View file

@ -37,7 +37,8 @@ int PropertyManager::registerProperty(const char *name, IPropertyProvider *pp) {
for (it = mPropertyPairs->begin(); it != mPropertyPairs->end(); ++it) { for (it = mPropertyPairs->begin(); it != mPropertyPairs->end(); ++it) {
if (!strcmp(name, (*it)->getName())) { if (!strcmp(name, (*it)->getName())) {
errno = EADDRINUSE; errno = EADDRINUSE;
LOGE("Failed to register property (%s)", strerror(errno)); LOGE("Failed to register property %s (%s)",
name, strerror(errno));
pthread_mutex_unlock(&mLock); pthread_mutex_unlock(&mLock);
return -1; return -1;
} }

286
nexus/Supplicant.cpp
View file

@ -29,13 +29,10 @@
#include "Supplicant.h" #include "Supplicant.h"
#include "SupplicantListener.h" #include "SupplicantListener.h"
#include "SupplicantState.h"
#include "SupplicantEvent.h"
#include "ScanResult.h"
#include "PropertyManager.h"
#include "NetworkManager.h" #include "NetworkManager.h"
#include "ErrorCode.h" #include "ErrorCode.h"
#include "WifiController.h" #include "WifiController.h"
#include "SupplicantStatus.h"
#include "libwpa_client/wpa_ctrl.h" #include "libwpa_client/wpa_ctrl.h"
@ -45,21 +42,16 @@
#define SUPP_CONFIG_TEMPLATE "/system/etc/wifi/wpa_supplicant.conf" #define SUPP_CONFIG_TEMPLATE "/system/etc/wifi/wpa_supplicant.conf"
#define SUPP_CONFIG_FILE "/data/misc/wifi/wpa_supplicant.conf" #define SUPP_CONFIG_FILE "/data/misc/wifi/wpa_supplicant.conf"
Supplicant::Supplicant(WifiController *wc, PropertyManager *propmngr) { Supplicant::Supplicant(WifiController *wc, ISupplicantEventHandler *handlers) {
mHandlers = handlers;
mController = wc; mController = wc;
mPropMngr = propmngr;
mInterfaceName = NULL; mInterfaceName = NULL;
mCtrl = NULL; mCtrl = NULL;
mMonitor = NULL; mMonitor = NULL;
mListener = NULL; mListener = NULL;
mState = SupplicantState::UNKNOWN;
mServiceManager = new ServiceManager(); mServiceManager = new ServiceManager();
mLatestScanResults = new ScanResultCollection();
pthread_mutex_init(&mLatestScanResultsLock, NULL);
mNetworks = new WifiNetworkCollection(); mNetworks = new WifiNetworkCollection();
pthread_mutex_init(&mNetworksLock, NULL); pthread_mutex_init(&mNetworksLock, NULL);
} }
@ -92,14 +84,11 @@ int Supplicant::start() {
return -1; return -1;
} }
mPropMngr->registerProperty("wifi.supplicant.state", this);
return 0; return 0;
} }
int Supplicant::stop() { int Supplicant::stop() {
mPropMngr->unregisterProperty("wifi.supplicant.state");
if (mListener->stopListener()) { if (mListener->stopListener()) {
LOGW("Unable to stop supplicant listener (%s)", strerror(errno)); LOGW("Unable to stop supplicant listener (%s)", strerror(errno));
return -1; return -1;
@ -125,6 +114,30 @@ bool Supplicant::isStarted() {
return mServiceManager->isRunning(SUPPLICANT_SERVICE_NAME); return mServiceManager->isRunning(SUPPLICANT_SERVICE_NAME);
} }
SupplicantStatus *Supplicant::getStatus() {
char *reply;
size_t len = 4096;
if (!(reply = (char *) malloc(len))) {
errno = ENOMEM;
return NULL;
}
if (sendCommand("STATUS", reply, &len)) {
free(reply);
return NULL;
}
SupplicantStatus *ss = SupplicantStatus::createStatus(reply, len);
free (reply);
return ss;
}
/*
* Retrieves the list of networks from Supplicant
* and merge them into our current list
*/
int Supplicant::refreshNetworkList() { int Supplicant::refreshNetworkList() {
char *reply; char *reply;
size_t len = 4096; size_t len = 4096;
@ -144,27 +157,59 @@ int Supplicant::refreshNetworkList() {
if (!strtok_r(reply, "\n", &linep_next)) { if (!strtok_r(reply, "\n", &linep_next)) {
LOGW("Malformatted network list\n"); LOGW("Malformatted network list\n");
} else { free(reply);
pthread_mutex_lock(&mNetworksLock); errno = EIO;
if (!mNetworks->empty()) { return -1;
WifiNetworkCollection::iterator i;
for (i = mNetworks->begin(); i !=mNetworks->end(); ++i)
delete *i;
mNetworks->clear();
}
while((linep = strtok_r(NULL, "\n", &linep_next))) {
WifiNetwork *wn = new WifiNetwork(mController, this, linep);
mNetworks->push_back(wn);
if (wn->refresh())
LOGW("Unable to refresh network id %d", wn->getNetworkId());
}
LOGD("Loaded %d networks\n", mNetworks->size());
pthread_mutex_unlock(&mNetworksLock);
} }
pthread_mutex_lock(&mNetworksLock);
int num_added = 0;
int num_refreshed = 0;
int num_removed = 0;
while((linep = strtok_r(NULL, "\n", &linep_next))) {
// TODO: Move the decode into a static method so we
// don't create new_wn when we don't have to.
WifiNetwork *new_wn = new WifiNetwork(mController, this, linep);
WifiNetwork *merge_wn;
if ((merge_wn = this->lookupNetwork_UNLOCKED(new_wn->getNetworkId()))) {
num_refreshed++;
if (merge_wn->refresh()) {
LOGW("Error refreshing network %d (%s)",
merge_wn->getNetworkId(), strerror(errno));
}
delete new_wn;
} else {
num_added++;
new_wn->registerProperties();
mNetworks->push_back(new_wn);
if (new_wn->refresh()) {
LOGW("Unable to refresh network id %d (%s)",
new_wn->getNetworkId(), strerror(errno));
}
}
}
if (!mNetworks->empty()) {
// TODO: Add support for detecting removed networks
WifiNetworkCollection::iterator i;
for (i = mNetworks->begin(); i != mNetworks->end(); ++i) {
if (0) {
num_removed++;
(*i)->unregisterProperties();
delete (*i);
i = mNetworks->erase(i);
}
}
}
LOGD("Networks added %d, refreshed %d, removed %d\n",
num_added, num_refreshed, num_removed);
pthread_mutex_unlock(&mNetworksLock);
free(reply); free(reply);
return 0; return 0;
} }
@ -192,7 +237,7 @@ int Supplicant::connectToSupplicant() {
return -1; return -1;
} }
mListener = new SupplicantListener(this, mMonitor); mListener = new SupplicantListener(mHandlers, mMonitor);
if (mListener->startListener()) { if (mListener->startListener()) {
LOGE("Error - unable to start supplicant listener"); LOGE("Error - unable to start supplicant listener");
@ -245,165 +290,6 @@ int Supplicant::triggerScan(bool active) {
return 0; return 0;
} }
int Supplicant::set(const char *name, const char *value) {
const char *n = name + strlen("wifi.supplicant.");
errno = -EROFS;
return -1;
}
const char *Supplicant::get(const char *name, char *buffer, size_t max) {
const char *n = name + strlen("wifi.supplicant.");
if (!strcasecmp(n, "state"))
return SupplicantState::toString(mState, buffer, max);
errno = ENOENT;
return NULL;
}
int Supplicant::onConnectedEvent(SupplicantEvent *evt) {
LOGD("onConnectedEvent(%s)", evt->getEvent());
return 0;
}
int Supplicant::onDisconnectedEvent(SupplicantEvent *evt) {
LOGD("onDisconnectedEvent(%s)", evt->getEvent());
return 0;
}
int Supplicant::onTerminatingEvent(SupplicantEvent *evt) {
LOGD("onTerminatingEvent(%s)", evt->getEvent());
return 0;
}
int Supplicant::onPasswordChangedEvent(SupplicantEvent *evt) {
LOGD("onPasswordChangedEvent(%s)", evt->getEvent());
return 0;
}
int Supplicant::onEapNotificationEvent(SupplicantEvent *evt) {
LOGD("onEapNotificationEvent(%s)", evt->getEvent());
return 0;
}
int Supplicant::onEapStartedEvent(SupplicantEvent *evt) {
LOGD("onEapStartedEvent(%s)", evt->getEvent());
return 0;
}
int Supplicant::onEapMethodEvent(SupplicantEvent *evt) {
LOGD("onEapMethodEvent(%s)", evt->getEvent());
return 0;
}
int Supplicant::onEapSuccessEvent(SupplicantEvent *evt) {
LOGD("onEapSuccessEvent(%s)", evt->getEvent());
return 0;
}
int Supplicant::onEapFailureEvent(SupplicantEvent *evt) {
LOGD("onEapFailureEvent(%s)", evt->getEvent());
return 0;
}
int Supplicant::onScanResultsEvent(SupplicantEvent *evt) {
if (!strcmp(evt->getEvent(), "Ready")) {
char *reply;
if (!(reply = (char *) malloc(4096))) {
errno = ENOMEM;
return -1;
}
size_t len = 4096;
if (sendCommand("SCAN_RESULTS", reply, &len)) {
LOGW("onScanResultsEvent(%s): Error getting scan results (%s)",
evt->getEvent(), strerror(errno));
free(reply);
return -1;
}
pthread_mutex_lock(&mLatestScanResultsLock);
if (!mLatestScanResults->empty()) {
ScanResultCollection::iterator i;
for (i = mLatestScanResults->begin();
i !=mLatestScanResults->end(); ++i) {
delete *i;
}
mLatestScanResults->clear();
}
char *linep;
char *linep_next = NULL;
if (!strtok_r(reply, "\n", &linep_next)) {
free(reply);
pthread_mutex_unlock(&mLatestScanResultsLock);
return 0;
}
while((linep = strtok_r(NULL, "\n", &linep_next)))
mLatestScanResults->push_back(new ScanResult(linep));
char tmp[128];
sprintf(tmp, "Scan results ready (%d)", mLatestScanResults->size());
NetworkManager::Instance()->getBroadcaster()->
sendBroadcast(ErrorCode::UnsolicitedInformational, tmp, false);
pthread_mutex_unlock(&mLatestScanResultsLock);
free(reply);
} else {
LOGW("Unknown SCAN_RESULTS event (%s)", evt->getEvent());
}
return 0;
}
int Supplicant::onStateChangeEvent(SupplicantEvent *evt) {
char *bword, *last;
char *tmp = strdup(evt->getEvent());
if (!(bword = strtok_r(tmp, " ", &last))) {
LOGE("Malformatted state update (%s)", evt->getEvent());
free(tmp);
return 0;
}
if (!(bword = strtok_r(NULL, " ", &last))) {
LOGE("Malformatted state update (%s)", evt->getEvent());
free(tmp);
return 0;
}
mState = atoi(&bword[strlen("state=")]);
LOGD("State changed to %d", mState);
free(tmp);
return 0;
}
int Supplicant::onLinkSpeedEvent(SupplicantEvent *evt) {
LOGD("onLinkSpeedEvent(%s)", evt->getEvent());
return 0;
}
int Supplicant::onDriverStateEvent(SupplicantEvent *evt) {
LOGD("onDriverStateEvent(%s)", evt->getEvent());
return 0;
}
// XXX: Use a cursor + smartptr instead
ScanResultCollection *Supplicant::createLatestScanResults() {
ScanResultCollection *d = new ScanResultCollection();
ScanResultCollection::iterator i;
pthread_mutex_lock(&mLatestScanResultsLock);
for (i = mLatestScanResults->begin(); i != mLatestScanResults->end(); ++i)
d->push_back((*i)->clone());
pthread_mutex_unlock(&mLatestScanResultsLock);
return d;
}
WifiNetwork *Supplicant::createNetwork() { WifiNetwork *Supplicant::createNetwork() {
char reply[255]; char reply[255];
size_t len = sizeof(reply) -1; size_t len = sizeof(reply) -1;
@ -445,14 +331,18 @@ int Supplicant::removeNetwork(WifiNetwork *wn) {
WifiNetwork *Supplicant::lookupNetwork(int networkId) { WifiNetwork *Supplicant::lookupNetwork(int networkId) {
pthread_mutex_lock(&mNetworksLock); pthread_mutex_lock(&mNetworksLock);
WifiNetwork *wn = lookupNetwork_UNLOCKED(networkId);
pthread_mutex_unlock(&mNetworksLock);
return wn;
}
WifiNetwork *Supplicant::lookupNetwork_UNLOCKED(int networkId) {
WifiNetworkCollection::iterator it; WifiNetworkCollection::iterator it;
for (it = mNetworks->begin(); it != mNetworks->end(); ++it) { for (it = mNetworks->begin(); it != mNetworks->end(); ++it) {
if ((*it)->getNetworkId() == networkId) { if ((*it)->getNetworkId() == networkId) {
pthread_mutex_unlock(&mNetworksLock);
return *it; return *it;
} }
} }
pthread_mutex_unlock(&mNetworksLock);
errno = ENOENT; errno = ENOENT;
return NULL; return NULL;
} }
@ -528,6 +418,12 @@ int Supplicant::setNetworkVar(int networkId, const char *var, const char *val) {
return -1; return -1;
} }
free(tmp); free(tmp);
len = sizeof(reply) -1;
if (sendCommand("SAVE_CONFIG", reply, &len)) {
LOGE("Error saving config after %s = %s", var, val);
return -1;
}
return 0; return 0;
} }

43
nexus/Supplicant.h
View file

@ -19,38 +19,31 @@
struct wpa_ctrl; struct wpa_ctrl;
class SupplicantListener; class SupplicantListener;
class SupplicantEvent;
class ServiceManager; class ServiceManager;
class PropertyManager;
class Controller; class Controller;
class WifiController; class WifiController;
class SupplicantStatus;
#include <pthread.h> #include <pthread.h>
#include "ScanResult.h"
#include "WifiNetwork.h" #include "WifiNetwork.h"
#include "IPropertyProvider.h"
#include "ISupplicantEventHandler.h" #include "ISupplicantEventHandler.h"
class Supplicant : public IPropertyProvider, public ISupplicantEventHandler { class Supplicant {
private: private:
struct wpa_ctrl *mCtrl; struct wpa_ctrl *mCtrl;
struct wpa_ctrl *mMonitor; struct wpa_ctrl *mMonitor;
SupplicantListener *mListener; SupplicantListener *mListener;
int mState;
ServiceManager *mServiceManager; ServiceManager *mServiceManager;
PropertyManager *mPropMngr;
WifiController *mController; WifiController *mController;
char *mInterfaceName; char *mInterfaceName;
ScanResultCollection *mLatestScanResults; WifiNetworkCollection *mNetworks;
pthread_mutex_t mLatestScanResultsLock; pthread_mutex_t mNetworksLock;
ISupplicantEventHandler *mHandlers;
WifiNetworkCollection *mNetworks;
pthread_mutex_t mNetworksLock;
public: public:
Supplicant(WifiController *wc, PropertyManager *propmngr); Supplicant(WifiController *wc, ISupplicantEventHandler *handlers);
virtual ~Supplicant(); virtual ~Supplicant();
int start(); int start();
@ -58,7 +51,6 @@ public:
bool isStarted(); bool isStarted();
int triggerScan(bool active); int triggerScan(bool active);
ScanResultCollection *createLatestScanResults();
WifiNetwork *createNetwork(); WifiNetwork *createNetwork();
WifiNetwork *lookupNetwork(int networkId); WifiNetwork *lookupNetwork(int networkId);
@ -71,33 +63,18 @@ public:
size_t max); size_t max);
int enableNetwork(int networkId, bool enabled); int enableNetwork(int networkId, bool enabled);
int getState() { return mState; } SupplicantStatus *getStatus();
Controller *getController() { return (Controller *) mController; } Controller *getController() { return (Controller *) mController; }
const char *getInterfaceName() { return mInterfaceName; } const char *getInterfaceName() { return mInterfaceName; }
int set(const char *name, const char *value); int sendCommand(const char *cmd, char *reply, size_t *reply_len);
const char *get(const char *name, char *buffer, size_t max);
private: private:
int connectToSupplicant(); int connectToSupplicant();
int sendCommand(const char *cmd, char *reply, size_t *reply_len);
int setupConfig(); int setupConfig();
int retrieveInterfaceName(); int retrieveInterfaceName();
WifiNetwork *lookupNetwork_UNLOCKED(int networkId);
// ISupplicantEventHandler methods
virtual int onConnectedEvent(SupplicantEvent *evt);
virtual int onDisconnectedEvent(SupplicantEvent *evt);
virtual int onTerminatingEvent(SupplicantEvent *evt);
virtual int onPasswordChangedEvent(SupplicantEvent *evt);
virtual int onEapNotificationEvent(SupplicantEvent *evt);
virtual int onEapStartedEvent(SupplicantEvent *evt);
virtual int onEapMethodEvent(SupplicantEvent *evt);
virtual int onEapSuccessEvent(SupplicantEvent *evt);
virtual int onEapFailureEvent(SupplicantEvent *evt);
virtual int onScanResultsEvent(SupplicantEvent *evt);
virtual int onStateChangeEvent(SupplicantEvent *evt);
virtual int onLinkSpeedEvent(SupplicantEvent *evt);
virtual int onDriverStateEvent(SupplicantEvent *evt);
}; };
#endif #endif

40
nexus/SupplicantAssociatedEvent.cpp Normal file
View file

@ -0,0 +1,40 @@
/*
* 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.
*/
#include <stdlib.h>
#define LOG_TAG "SupplicantAssociatedEvent"
#include <cutils/log.h>
#include "SupplicantAssociatedEvent.h"
SupplicantAssociatedEvent::SupplicantAssociatedEvent(int level, char *event,
size_t len) :
SupplicantEvent(SupplicantEvent::EVENT_ASSOCIATED,
level) {
char *p = event;
// "00:13:46:40:40:aa"
mBssid = (char *) malloc(18);
strncpy(mBssid, p, 17);
mBssid[17] = '\0';
}
SupplicantAssociatedEvent::~SupplicantAssociatedEvent() {
if (mBssid)
free(mBssid);
}

34
nexus/SupplicantAssociatedEvent.h Normal file
View file

@ -0,0 +1,34 @@
/*
* 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 _SupplicantAssociatedEvent_H
#define _SupplicantAssociatedEvent_H
#include "SupplicantEvent.h"
class SupplicantAssociatedEvent : public SupplicantEvent {
char *mBssid;
char *mSsid;
int mFreq;
public:
SupplicantAssociatedEvent(int level, char *event, size_t len);
virtual ~SupplicantAssociatedEvent();
const char *getBssid() { return mBssid; }
};
#endif

99
nexus/SupplicantAssociatingEvent.cpp Normal file
View file

@ -0,0 +1,99 @@
/*
* 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.
*/
#include <stdlib.h>
#define LOG_TAG "SupplicantAssociatingEvent"
#include <cutils/log.h>
#include "SupplicantAssociatingEvent.h"
SupplicantAssociatingEvent::SupplicantAssociatingEvent(int level, char *event,
size_t len) :
SupplicantEvent(SupplicantEvent::EVENT_ASSOCIATING,
level) {
char *p = event;
mBssid = NULL;
mSsid = NULL;
// SSID 'default'
// OR
// "00:13:46:40:40:aa (SSID='default' freq=2437 MHz)"
if (strncmp(event, "SSID", 4)) {
mBssid = (char *) malloc(18);
strncpy(mBssid, p, 17);
mBssid[17] = '\0';
p += 25;
// "00:13:46:40:40:aa (SSID='default' freq=2437 MHz)"
// ^
// p
char *q = index(p, '\'');
if (!q) {
LOGE("Unable to decode SSID (p = {%s})\n", p);
return;
}
mSsid = (char *) malloc((q - p) +1);
strncpy(mSsid, p, q-p);
mSsid[q-p] = '\0';
p = q + 7;
// "00:13:46:40:40:aa (SSID='default' freq=2437 MHz)"
// ^
// p
if (!(q = index(p, ' '))) {
LOGE("Unable to decode frequency\n");
return;
}
*q = '\0';
mFreq = atoi(p);
} else {
p+= 6;
// SSID 'default'
// ^
// p
char *q = index(p, '\'');
if (!q) {
LOGE("Unable to decode SSID (p = {%s})\n", p);
return;
}
mSsid = (char *) malloc((q - p) +1);
strncpy(mSsid, p, q-p);
mSsid[q-p] = '\0';
}
}
SupplicantAssociatingEvent::SupplicantAssociatingEvent(const char *bssid,
const char *ssid,
int freq) :
SupplicantEvent(SupplicantEvent::EVENT_ASSOCIATING, -1) {
mBssid = strdup(bssid);
mSsid= strdup(ssid);
mFreq = freq;
}
SupplicantAssociatingEvent::~SupplicantAssociatingEvent() {
if (mBssid)
free(mBssid);
if (mSsid)
free(mSsid);
}

37
nexus/SupplicantAssociatingEvent.h Normal file
View file

@ -0,0 +1,37 @@
/*
* 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 _SupplicantAssociatingEvent_H
#define _SupplicantAssociatingEvent_H
#include "SupplicantEvent.h"
class SupplicantAssociatingEvent : public SupplicantEvent {
char *mBssid;
char *mSsid;
int mFreq;
public:
SupplicantAssociatingEvent(int level, char *event, size_t len);
SupplicantAssociatingEvent(const char *bssid, const char *ssid, int freq);
virtual ~SupplicantAssociatingEvent();
const char *getBssid() { return mBssid; }
const char *getSsid() { return mSsid; }
int getFreq() { return mFreq;}
};
#endif

61
nexus/SupplicantConnectedEvent.cpp Normal file
View file

@ -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);
}

36
nexus/SupplicantConnectedEvent.h Normal file
View file

@ -0,0 +1,36 @@
/*
* 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 _SupplicantConnectedEvent_H
#define _SupplicantConnectedEvent_H
#include "SupplicantEvent.h"
class SupplicantConnectedEvent : public SupplicantEvent {
private:
char *mBssid;
bool mReassociated;
public:
SupplicantConnectedEvent(int level, char *event, size_t len);
SupplicantConnectedEvent(const char *bssid, bool reassicated);
virtual ~SupplicantConnectedEvent();
const char *getBssid() { return mBssid; }
bool getReassociated() { return mReassociated; }
};
#endif

36
nexus/SupplicantConnectionTimeoutEvent.cpp Normal file
View file

@ -0,0 +1,36 @@
/*
* 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 "SupplicantConnectionTimeoutEvent"
#include <cutils/log.h>
#include "SupplicantConnectionTimeoutEvent.h"
SupplicantConnectionTimeoutEvent::SupplicantConnectionTimeoutEvent(int level, char *event,
size_t len) :
SupplicantEvent(SupplicantEvent::EVENT_CONNECTIONTIMEOUT,
level) {
// 00:13:46:40:40:aa timed out.'
mBssid = (char *) malloc(18);
strncpy(mBssid, event, 17);
mBssid[17] = '\0';
}
SupplicantConnectionTimeoutEvent::~SupplicantConnectionTimeoutEvent() {
if (mBssid)
free(mBssid);
}

34
nexus/SupplicantConnectionTimeoutEvent.h Normal file
View file

@ -0,0 +1,34 @@
/*
* 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 _SupplicantConnectionTimeoutEvent_H
#define _SupplicantConnectionTimeoutEvent_H
#include "SupplicantEvent.h"
class SupplicantConnectionTimeoutEvent : public SupplicantEvent {
private:
char *mBssid;
bool mReassociated;
public:
SupplicantConnectionTimeoutEvent(int level, char *event, size_t len);
virtual ~SupplicantConnectionTimeoutEvent();
const char *getBssid() { return mBssid; }
};
#endif

33
nexus/SupplicantDisconnectedEvent.cpp Normal file
View file

@ -0,0 +1,33 @@
/*
* 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 "SupplicantDisconnectedEvent"
#include <cutils/log.h>
#include "SupplicantDisconnectedEvent.h"
SupplicantDisconnectedEvent::SupplicantDisconnectedEvent(int level, char *event,
size_t len) :
SupplicantEvent(SupplicantEvent::EVENT_DISCONNECTED,
level) {
}
SupplicantDisconnectedEvent::SupplicantDisconnectedEvent() :
SupplicantEvent(SupplicantEvent::EVENT_DISCONNECTED, -1) {
}
SupplicantDisconnectedEvent::~SupplicantDisconnectedEvent() {
}

30
nexus/SupplicantDisconnectedEvent.h Normal file
View file

@ -0,0 +1,30 @@
/*
* 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 _SupplicantDisconnectedEvent_H
#define _SupplicantDisconnectedEvent_H
#include "SupplicantEvent.h"
class SupplicantDisconnectedEvent : public SupplicantEvent {
public:
SupplicantDisconnectedEvent(int level, char *event, size_t len);
SupplicantDisconnectedEvent();
virtual ~SupplicantDisconnectedEvent();
};
#endif

73
nexus/SupplicantEvent.cpp
View file

@ -23,74 +23,7 @@
#include "libwpa_client/wpa_ctrl.h" #include "libwpa_client/wpa_ctrl.h"
SupplicantEvent::SupplicantEvent(char *event, size_t len) { SupplicantEvent::SupplicantEvent(int type, int level) {
mType = type;
if (event[0] == '<') { mLevel = level;
char *match = strchr(event, '>');
if (match) {
char tmp[16];
strncpy(tmp, &event[1], (match - event));
mLevel = atoi(tmp);
event += (match - event) + 1;
} else
LOGW("Unclosed level brace in event");
} else
LOGW("No level specified in event");
/*
* <N>CTRL-EVENT-XXX
* ^
* +---- event
*/
if (!strncmp(event, WPA_EVENT_CONNECTED, strlen(WPA_EVENT_CONNECTED)))
mType = SupplicantEvent::EVENT_CONNECTED;
else if (!strncmp(event, WPA_EVENT_DISCONNECTED, strlen(WPA_EVENT_DISCONNECTED)))
mType = SupplicantEvent::EVENT_DISCONNECTED;
else if (!strncmp(event, WPA_EVENT_TERMINATING, strlen(WPA_EVENT_TERMINATING)))
mType = SupplicantEvent::EVENT_TERMINATING;
else if (!strncmp(event, WPA_EVENT_PASSWORD_CHANGED, strlen(WPA_EVENT_PASSWORD_CHANGED)))
mType = SupplicantEvent::EVENT_PASSWORD_CHANGED;
else if (!strncmp(event, WPA_EVENT_EAP_NOTIFICATION, strlen(WPA_EVENT_EAP_NOTIFICATION)))
mType = SupplicantEvent::EVENT_EAP_NOTIFICATION;
else if (!strncmp(event, WPA_EVENT_EAP_STARTED, strlen(WPA_EVENT_EAP_STARTED)))
mType = SupplicantEvent::EVENT_EAP_STARTED;
else if (!strncmp(event, WPA_EVENT_EAP_METHOD, strlen(WPA_EVENT_EAP_METHOD)))
mType = SupplicantEvent::EVENT_EAP_METHOD;
else if (!strncmp(event, WPA_EVENT_EAP_SUCCESS, strlen(WPA_EVENT_EAP_SUCCESS)))
mType = SupplicantEvent::EVENT_EAP_SUCCESS;
else if (!strncmp(event, WPA_EVENT_EAP_FAILURE, strlen(WPA_EVENT_EAP_FAILURE)))
mType = SupplicantEvent::EVENT_EAP_FAILURE;
else if (!strncmp(event, WPA_EVENT_SCAN_RESULTS, strlen(WPA_EVENT_SCAN_RESULTS)))
mType = SupplicantEvent::EVENT_SCAN_RESULTS;
else if (!strncmp(event, WPA_EVENT_STATE_CHANGE, strlen(WPA_EVENT_STATE_CHANGE)))
mType = SupplicantEvent::EVENT_STATE_CHANGE;
else if (!strncmp(event, WPA_EVENT_LINK_SPEED, strlen(WPA_EVENT_LINK_SPEED)))
mType = SupplicantEvent::EVENT_LINK_SPEED;
else if (!strncmp(event, WPA_EVENT_DRIVER_STATE, strlen(WPA_EVENT_DRIVER_STATE)))
mType = SupplicantEvent::EVENT_DRIVER_STATE;
else {
LOGW("Unknown supplicant event '%s'", event);
mType = SupplicantEvent::EVENT_UNKNOWN;
}
for (event; *event != ' '; event++);
event++;
/*
* <N>CTRL-EVENT-XXX YYYY
* ^
* +---- event
*/
for (event; *event == ' '; event++);
mEvent = strdup(event);
mLen = len;
}
SupplicantEvent::~SupplicantEvent() {
if (mEvent)
free(mEvent);
} }

39
nexus/SupplicantEvent.h
View file

@ -22,33 +22,32 @@
class SupplicantEvent { class SupplicantEvent {
private: private:
int mType; int mType;
char *mEvent;
size_t mLen;
int mLevel; int mLevel;
public: public:
static const int EVENT_UNKNOWN = 0; static const int EVENT_UNKNOWN = 0;
static const int EVENT_CONNECTED = 1; static const int EVENT_CONNECTED = 1;
static const int EVENT_DISCONNECTED = 2; static const int EVENT_DISCONNECTED = 2;
static const int EVENT_TERMINATING = 3; static const int EVENT_TERMINATING = 3;
static const int EVENT_PASSWORD_CHANGED = 4; static const int EVENT_PASSWORD_CHANGED = 4;
static const int EVENT_EAP_NOTIFICATION = 5; static const int EVENT_EAP_NOTIFICATION = 5;
static const int EVENT_EAP_STARTED = 6; static const int EVENT_EAP_STARTED = 6;
static const int EVENT_EAP_METHOD = 7; static const int EVENT_EAP_METHOD = 7;
static const int EVENT_EAP_SUCCESS = 8; static const int EVENT_EAP_SUCCESS = 8;
static const int EVENT_EAP_FAILURE = 9; static const int EVENT_EAP_FAILURE = 9;
static const int EVENT_SCAN_RESULTS = 10; static const int EVENT_SCAN_RESULTS = 10;
static const int EVENT_STATE_CHANGE = 11; static const int EVENT_STATE_CHANGE = 11;
static const int EVENT_LINK_SPEED = 12; static const int EVENT_LINK_SPEED = 12;
static const int EVENT_DRIVER_STATE = 13; static const int EVENT_DRIVER_STATE = 13;
static const int EVENT_ASSOCIATING = 14;
static const int EVENT_ASSOCIATED = 15;
static const int EVENT_CONNECTIONTIMEOUT = 16;
public: public:
SupplicantEvent(char *event, size_t len); SupplicantEvent(int type, int level);
virtual ~SupplicantEvent(); virtual ~SupplicantEvent() {}
int getType() { return mType; } int getType() { return mType; }
const char *getEvent() { return mEvent; }
int getLen() { return mLen; }
int getLevel() { return mLevel; } int getLevel() { return mLevel; }
}; };

119
nexus/SupplicantEventFactory.cpp Normal file
View file

@ -0,0 +1,119 @@
/*
* 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.
*/
#include <stdlib.h>
#define LOG_TAG "SupplicantEventFactory"
#include <cutils/log.h>
#include "SupplicantEvent.h"
#include "SupplicantEventFactory.h"
#include "SupplicantAssociatingEvent.h"
#include "SupplicantAssociatedEvent.h"
#include "SupplicantConnectedEvent.h"
#include "SupplicantStateChangeEvent.h"
#include "SupplicantScanResultsEvent.h"
#include "SupplicantConnectionTimeoutEvent.h"
#include "SupplicantDisconnectedEvent.h"
#if 0
#include "SupplicantTerminatingEvent.h"
#include "SupplicantPasswordChangedEvent.h"
#include "SupplicantEapNotificationEvent.h"
#include "SupplicantEapStartedEvent.h"
#include "SupplicantEapMethodEvent.h"
#include "SupplicantEapSuccessEvent.h"
#include "SupplicantEapFailureEvent.h"
#include "SupplicantLinkSpeedEvent.h"
#include "SupplicantDriverStateEvent.h"
#endif
#include "libwpa_client/wpa_ctrl.h"
SupplicantEventFactory::SupplicantEventFactory() {
}
SupplicantEvent *SupplicantEventFactory::createEvent(char *event, size_t len) {
int level = 0;
if (event[0] == '<') {
char *match = strchr(event, '>');
if (match) {
char tmp[16];
strncpy(tmp, &event[1], (match - event));
level = atoi(tmp);
event += (match - event) + 1;
} else
LOGW("Unclosed level brace in event");
} else
LOGW("No level specified in event");
/*
* <N>CTRL-EVENT-XXX
* ^
* +---- event
*/
if (!strncmp(event, "Authentication with ", 20)) {
if (!strcmp(event + strlen(event) - strlen(" timed out."),
" timed out.")) {
return new SupplicantConnectionTimeoutEvent(level,
event + 20,
len);
} else
return NULL;
} else if (!strncmp(event, "Associated with ", 16))
return new SupplicantAssociatedEvent(level, event + 16, len);
else if (!strncmp(event, "Trying to associate with ", 25))
return new SupplicantAssociatingEvent(level, event + 25, len);
else if (!strncmp(event, WPA_EVENT_CONNECTED, strlen(WPA_EVENT_CONNECTED))) {
return new SupplicantConnectedEvent(level,
event + strlen(WPA_EVENT_CONNECTED),
len);
} else if (!strncmp(event, WPA_EVENT_SCAN_RESULTS, strlen(WPA_EVENT_SCAN_RESULTS))) {
return new SupplicantScanResultsEvent(level,
event + strlen(WPA_EVENT_SCAN_RESULTS),
len);
} else if (!strncmp(event, WPA_EVENT_STATE_CHANGE, strlen(WPA_EVENT_STATE_CHANGE))) {
return new SupplicantStateChangeEvent(level,
event + strlen(WPA_EVENT_STATE_CHANGE),
len);
}
else if (!strncmp(event, WPA_EVENT_DISCONNECTED, strlen(WPA_EVENT_DISCONNECTED)))
return new SupplicantDisconnectedEvent(level, event, len);
#if 0
else if (!strncmp(event, WPA_EVENT_TERMINATING, strlen(WPA_EVENT_TERMINATING)))
return new SupplicantTerminatingEvent(event, len);
else if (!strncmp(event, WPA_EVENT_PASSWORD_CHANGED, strlen(WPA_EVENT_PASSWORD_CHANGED)))
return new SupplicantPasswordChangedEvent(event, len);
else if (!strncmp(event, WPA_EVENT_EAP_NOTIFICATION, strlen(WPA_EVENT_EAP_NOTIFICATION)))
return new SupplicantEapNotificationEvent(event, len);
else if (!strncmp(event, WPA_EVENT_EAP_STARTED, strlen(WPA_EVENT_EAP_STARTED)))
return new SupplicantEapStartedEvent(event, len);
else if (!strncmp(event, WPA_EVENT_EAP_METHOD, strlen(WPA_EVENT_EAP_METHOD)))
return new SupplicantEapMethodEvent(event, len);
else if (!strncmp(event, WPA_EVENT_EAP_SUCCESS, strlen(WPA_EVENT_EAP_SUCCESS)))
return new SupplicantEapSuccessEvent(event, len);
else if (!strncmp(event, WPA_EVENT_EAP_FAILURE, strlen(WPA_EVENT_EAP_FAILURE)))
return new SupplicantEapFailureEvent(event, len);
else if (!strncmp(event, WPA_EVENT_LINK_SPEED, strlen(WPA_EVENT_LINK_SPEED)))
return new SupplicantLinkSpeedEvent(event, len);
else if (!strncmp(event, WPA_EVENT_DRIVER_STATE, strlen(WPA_EVENT_DRIVER_STATE)))
return new SupplicantDriverStateEvent(event, len);
#endif
return NULL;
}

31
nexus/SupplicantEventFactory.h Normal file
View file

@ -0,0 +1,31 @@
/*
* 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 _SupplicantEventFactory_H
#define _SupplicantEventFactory_H
class SupplicantEvent;
class SupplicantEventFactory {
public:
SupplicantEventFactory();
virtual ~SupplicantEventFactory() {}
SupplicantEvent *createEvent(char *event, size_t len);
};
#endif

83
nexus/SupplicantListener.cpp
View file

@ -24,14 +24,21 @@
#include "libwpa_client/wpa_ctrl.h" #include "libwpa_client/wpa_ctrl.h"
#include "SupplicantListener.h" #include "SupplicantListener.h"
#include "SupplicantEvent.h"
#include "ISupplicantEventHandler.h" #include "ISupplicantEventHandler.h"
#include "SupplicantEventFactory.h"
#include "SupplicantEvent.h"
#include "SupplicantAssociatingEvent.h"
#include "SupplicantAssociatedEvent.h"
#include "SupplicantConnectedEvent.h"
#include "SupplicantScanResultsEvent.h"
#include "SupplicantStateChangeEvent.h"
SupplicantListener::SupplicantListener(ISupplicantEventHandler *handlers, SupplicantListener::SupplicantListener(ISupplicantEventHandler *handlers,
struct wpa_ctrl *monitor) : struct wpa_ctrl *monitor) :
SocketListener(wpa_ctrl_get_fd(monitor), false) { SocketListener(wpa_ctrl_get_fd(monitor), false) {
mHandlers = handlers; mHandlers = handlers;
mMonitor = monitor; mMonitor = monitor;
mFactory = new SupplicantEventFactory();
} }
bool SupplicantListener::onDataAvailable(SocketClient *cli) { bool SupplicantListener::onDataAvailable(SocketClient *cli) {
@ -53,44 +60,50 @@ bool SupplicantListener::onDataAvailable(SocketClient *cli) {
return false; return false;
} }
SupplicantEvent *evt = new SupplicantEvent(buf, nread); SupplicantEvent *evt = mFactory->createEvent(buf, nread);
// XXX: Make this a factory if (!evt) {
// XXX: Instead of calling Supplicant directly LOGW("Dropping unknown supplicant event '%s'", buf);
// extract an Interface and use that instead return true;
if (evt->getType() == SupplicantEvent::EVENT_CONNECTED)
rc = mHandlers->onConnectedEvent(evt);
else if (evt->getType() == SupplicantEvent::EVENT_DISCONNECTED)
rc = mHandlers->onDisconnectedEvent(evt);
else if (evt->getType() == SupplicantEvent::EVENT_TERMINATING)
rc = mHandlers->onTerminatingEvent(evt);
else if (evt->getType() == SupplicantEvent::EVENT_PASSWORD_CHANGED)
rc = mHandlers->onPasswordChangedEvent(evt);
else if (evt->getType() == SupplicantEvent::EVENT_EAP_NOTIFICATION)
rc = mHandlers->onEapNotificationEvent(evt);
else if (evt->getType() == SupplicantEvent::EVENT_EAP_STARTED)
rc = mHandlers->onEapStartedEvent(evt);
else if (evt->getType() == SupplicantEvent::EVENT_EAP_SUCCESS)
rc = mHandlers->onEapSuccessEvent(evt);
else if (evt->getType() == SupplicantEvent::EVENT_EAP_FAILURE)
rc = mHandlers->onEapFailureEvent(evt);
else if (evt->getType() == SupplicantEvent::EVENT_SCAN_RESULTS)
rc = mHandlers->onScanResultsEvent(evt);
else if (evt->getType() == SupplicantEvent::EVENT_STATE_CHANGE)
rc = mHandlers->onStateChangeEvent(evt);
else if (evt->getType() == SupplicantEvent::EVENT_LINK_SPEED)
rc = mHandlers->onLinkSpeedEvent(evt);
else if (evt->getType() == SupplicantEvent::EVENT_DRIVER_STATE)
rc = mHandlers->onDriverStateEvent(evt);
else {
LOGW("Ignoring unknown event");
} }
// Call the appropriate handler
if (evt->getType() == SupplicantEvent::EVENT_ASSOCIATING)
mHandlers->onAssociatingEvent((SupplicantAssociatingEvent *) evt);
else if (evt->getType() == SupplicantEvent::EVENT_ASSOCIATED)
mHandlers->onAssociatedEvent((SupplicantAssociatedEvent *) evt);
else if (evt->getType() == SupplicantEvent::EVENT_CONNECTED)
mHandlers->onConnectedEvent((SupplicantConnectedEvent *) evt);
else if (evt->getType() == SupplicantEvent::EVENT_SCAN_RESULTS)
mHandlers->onScanResultsEvent((SupplicantScanResultsEvent *) evt);
else if (evt->getType() == SupplicantEvent::EVENT_STATE_CHANGE)
mHandlers->onStateChangeEvent((SupplicantStateChangeEvent *) evt);
else if (evt->getType() == SupplicantEvent::EVENT_CONNECTIONTIMEOUT)
mHandlers->onConnectionTimeoutEvent((SupplicantConnectionTimeoutEvent *) evt);
else if (evt->getType() == SupplicantEvent::EVENT_DISCONNECTED)
mHandlers->onDisconnectedEvent((SupplicantDisconnectedEvent *) evt);
else
LOGW("Whoops - no handler available for event '%s'\n", buf);
#if 0
else if (evt->getType() == SupplicantEvent::EVENT_TERMINATING)
mHandlers->onTerminatingEvent(evt);
else if (evt->getType() == SupplicantEvent::EVENT_PASSWORD_CHANGED)
mHandlers->onPasswordChangedEvent(evt);
else if (evt->getType() == SupplicantEvent::EVENT_EAP_NOTIFICATION)
mHandlers->onEapNotificationEvent(evt);
else if (evt->getType() == SupplicantEvent::EVENT_EAP_STARTED)
mHandlers->onEapStartedEvent(evt);
else if (evt->getType() == SupplicantEvent::EVENT_EAP_SUCCESS)
mHandlers->onEapSuccessEvent(evt);
else if (evt->getType() == SupplicantEvent::EVENT_EAP_FAILURE)
mHandlers->onEapFailureEvent(evt);
else if (evt->getType() == SupplicantEvent::EVENT_LINK_SPEED)
mHandlers->onLinkSpeedEvent(evt);
else if (evt->getType() == SupplicantEvent::EVENT_DRIVER_STATE)
mHandlers->onDriverStateEvent(evt);
#endif
delete evt; delete evt;
if (rc) {
LOGW("Handler %d (%s) error: %s", evt->getType(), evt->getEvent(), strerror(errno));
return false;
}
return true; return true;
} }

5
nexus/SupplicantListener.h
View file

@ -23,12 +23,13 @@ struct wpa_ctrl;
class Supplicant; class Supplicant;
class SocketClient; class SocketClient;
class ISupplicantEventHandler; class ISupplicantEventHandler;
class SupplicantEventFactory;
class SupplicantListener: public SocketListener { class SupplicantListener: public SocketListener {
private:
struct wpa_ctrl *mMonitor; struct wpa_ctrl *mMonitor;
ISupplicantEventHandler *mHandlers; ISupplicantEventHandler *mHandlers;
SupplicantEventFactory *mFactory;
public: public:
SupplicantListener(ISupplicantEventHandler *handlers, SupplicantListener(ISupplicantEventHandler *handlers,
struct wpa_ctrl *monitor); struct wpa_ctrl *monitor);

34
nexus/SupplicantScanResultsEvent.cpp Normal file
View file

@ -0,0 +1,34 @@
/*
* 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 "SupplicantScanResultsEvent"
#include <cutils/log.h>
#include "SupplicantScanResultsEvent.h"
SupplicantScanResultsEvent::SupplicantScanResultsEvent(int level, char *event,
size_t len) :
SupplicantEvent(SupplicantEvent::EVENT_SCAN_RESULTS,
level) {
}
SupplicantScanResultsEvent::SupplicantScanResultsEvent() :
SupplicantEvent(SupplicantEvent::EVENT_SCAN_RESULTS, -1) {
}
SupplicantScanResultsEvent::~SupplicantScanResultsEvent() {
}

30
nexus/SupplicantScanResultsEvent.h Normal file
View file

@ -0,0 +1,30 @@
/*
* 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 _SupplicantScanResultsEvent_H
#define _SupplicantScanResultsEvent_H
#include "SupplicantEvent.h"
class SupplicantScanResultsEvent : public SupplicantEvent {
public:
SupplicantScanResultsEvent(int level, char *event, size_t len);
SupplicantScanResultsEvent();
virtual ~SupplicantScanResultsEvent();
};
#endif

45
nexus/SupplicantStateChangeEvent.cpp Normal file
View file

@ -0,0 +1,45 @@
/*
* 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.
*/
#include <stdlib.h>
#define LOG_TAG "SupplicantStateChangeEvent"
#include <cutils/log.h>
#include "SupplicantStateChangeEvent.h"
SupplicantStateChangeEvent::SupplicantStateChangeEvent(int level, char *event,
size_t len) :
SupplicantEvent(SupplicantEvent::EVENT_STATE_CHANGE,
level) {
// XXX: move this stuff into a static creation method
char *p = index(event, ' ');
if (!p) {
LOGW("Bad event '%s'\n", event);
return;
}
mState = atoi(p + strlen("state=") + 1);
}
SupplicantStateChangeEvent::SupplicantStateChangeEvent(int state) :
SupplicantEvent(SupplicantEvent::EVENT_STATE_CHANGE, -1) {
mState = state;
}
SupplicantStateChangeEvent::~SupplicantStateChangeEvent() {
}

34
nexus/SupplicantStateChangeEvent.h Normal file
View file

@ -0,0 +1,34 @@
/*
* 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 _SupplicantStateChangeEvent_H
#define _SupplicantStateChangeEvent_H
#include "SupplicantEvent.h"
class SupplicantStateChangeEvent : public SupplicantEvent {
private:
int mState;
public:
SupplicantStateChangeEvent(int level, char *event, size_t len);
SupplicantStateChangeEvent(int state);
virtual ~SupplicantStateChangeEvent();
int getState() { return mState; }
};
#endif

72
nexus/SupplicantStatus.cpp Normal file
View file

@ -0,0 +1,72 @@
/*
* 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.
*/
#include <stdlib.h>
#include <string.h>
#define LOG_TAG "SupplicantState"
#include <cutils/log.h>
#include "SupplicantStatus.h"
#include "SupplicantState.h"
SupplicantStatus::SupplicantStatus() {
mWpaState = SupplicantState::UNKNOWN;
mId = -1;
mBssid = NULL;
mSsid = NULL;
}
SupplicantStatus::SupplicantStatus(int state, int id, char *bssid, char *ssid) :
mWpaState(state), mId(id), mBssid(bssid), mSsid(ssid) {
LOGD("state %d, id %d, bssid %p, ssid %p\n", mWpaState, mId, mBssid, mSsid);
}
SupplicantStatus::~SupplicantStatus() {
if (mBssid)
free(mBssid);
if (mSsid)
free(mSsid);
}
SupplicantStatus *SupplicantStatus::createStatus(char *data, int len) {
char *bssid = NULL;
char *ssid = NULL;
int id = -1;
int state = SupplicantState::UNKNOWN;
char *next = data;
char *line;
while((line = strsep(&next, "\n"))) {
char *token = strsep(&next, "=");
char *value = strsep(&next, "=");
if (!strcmp(token, "bssid"))
bssid = strdup(value);
else if (!strcmp(token, "ssid"))
ssid = strdup(value);
else if (!strcmp(token, "id"))
id = atoi(value);
else if (!strcmp(token, "wpa_state"))
state = atoi(value);
else
LOGD("Ignoring unsupported status token '%s'", token);
}
return new SupplicantStatus(state, id, bssid, ssid);
}

42
nexus/SupplicantStatus.h Normal file
View file

@ -0,0 +1,42 @@
/*
* 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 _SupplicantStatus_H
#define _SupplicantStatus_H
class SupplicantStatus {
private:
int mWpaState;
int mId;
char *mBssid;
char *mSsid;
private:
SupplicantStatus();
SupplicantStatus(int state, int id, char *bssid, char *ssid);
public:
virtual ~SupplicantStatus();
static SupplicantStatus *createStatus(char *data, int len);
int getWpaState() { return mWpaState; }
int getId() { return mId; }
const char *getBssid() { return mBssid; }
const char *getSsid() { return mSsid; }
};
#endif

8
nexus/TiwlanWifiController.cpp
View file

@ -30,8 +30,12 @@
extern "C" int sched_yield(void); extern "C" int sched_yield(void);
TiwlanWifiController::TiwlanWifiController(PropertyManager *propmngr, char *modpath, char *modname, char *modargs) : TiwlanWifiController::TiwlanWifiController(PropertyManager *propmngr,
WifiController(propmngr, modpath, modname, modargs) { IControllerHandler *handlers,
char *modpath, char *modname,
char *modargs) :
WifiController(propmngr, handlers, modpath, modname,
modargs) {
} }
int TiwlanWifiController::powerUp() { int TiwlanWifiController::powerUp() {

4
nexus/TiwlanWifiController.h
View file

@ -20,9 +20,11 @@
#include "PropertyManager.h" #include "PropertyManager.h"
#include "WifiController.h" #include "WifiController.h"
class IControllerHandler;
class TiwlanWifiController : public WifiController { class TiwlanWifiController : public WifiController {
public: public:
TiwlanWifiController(PropertyManager *propmngr, char *modpath, char *modname, char *modargs); TiwlanWifiController(PropertyManager *propmngr, IControllerHandler *handlers, char *modpath, char *modname, char *modargs);
virtual ~TiwlanWifiController() {} virtual ~TiwlanWifiController() {}
virtual int powerUp(); virtual int powerUp();

16
nexus/VpnController.cpp
View file

@ -25,18 +25,19 @@
#include "PropertyManager.h" #include "PropertyManager.h"
#include "VpnController.h" #include "VpnController.h"
VpnController::VpnController(PropertyManager *propmngr) : VpnController::VpnController(PropertyManager *propmngr,
Controller("VPN", propmngr) { IControllerHandler *handlers) :
Controller("VPN", propmngr, handlers) {
mEnabled = false; mEnabled = false;
propmngr->registerProperty("vpn.enabled", this);
propmngr->registerProperty("vpn.gateway", this);
} }
int VpnController::start() { int VpnController::start() {
mPropMngr->registerProperty("vpn.enabled", this);
return 0; return 0;
} }
int VpnController::stop() { int VpnController::stop() {
mPropMngr->unregisterProperty("vpn.enabled");
return 0; return 0;
} }
@ -49,8 +50,13 @@ int VpnController::set(const char *name, const char *value) {
return 0; return 0;
rc = (en ? enable() : disable()); rc = (en ? enable() : disable());
if (!rc) if (!rc) {
mEnabled = en; mEnabled = en;
if (en)
mPropMngr->unregisterProperty("vpn.gateway");
else
mPropMngr->unregisterProperty("vpn.gateway");
}
return rc; return rc;
} if (!strcmp(name, "vpn.gateway")) { } if (!strcmp(name, "vpn.gateway")) {
if (!inet_aton(value, &mVpnGateway)) { if (!inet_aton(value, &mVpnGateway)) {

4
nexus/VpnController.h
View file

@ -21,6 +21,8 @@
#include "Controller.h" #include "Controller.h"
class IControllerHandler;
class VpnController : public Controller { class VpnController : public Controller {
bool mEnabled; bool mEnabled;
/* /*
@ -29,7 +31,7 @@ class VpnController : public Controller {
struct in_addr mVpnGateway; struct in_addr mVpnGateway;
public: public:
VpnController(PropertyManager *propmngr); VpnController(PropertyManager *propmngr, IControllerHandler *handlers);
virtual ~VpnController() {} virtual ~VpnController() {}
virtual int start(); virtual int start();

210
nexus/WifiController.cpp
View file

@ -27,34 +27,50 @@
#include "NetworkManager.h" #include "NetworkManager.h"
#include "ErrorCode.h" #include "ErrorCode.h"
#include "WifiNetwork.h" #include "WifiNetwork.h"
#include "ISupplicantEventHandler.h"
#include "SupplicantState.h"
#include "SupplicantStatus.h"
#include "SupplicantAssociatingEvent.h"
#include "SupplicantAssociatedEvent.h"
#include "SupplicantConnectedEvent.h"
#include "SupplicantScanResultsEvent.h"
#include "SupplicantStateChangeEvent.h"
#include "SupplicantConnectionTimeoutEvent.h"
#include "SupplicantDisconnectedEvent.h"
WifiController::WifiController(PropertyManager *propmngr, char *modpath, char *modname, char *modargs) : WifiController::WifiController(PropertyManager *mPropMngr,
Controller("WIFI", propmngr) { IControllerHandler *handlers,
char *modpath, char *modname, char *modargs) :
Controller("WIFI", mPropMngr, handlers) {
strncpy(mModulePath, modpath, sizeof(mModulePath)); strncpy(mModulePath, modpath, sizeof(mModulePath));
strncpy(mModuleName, modname, sizeof(mModuleName)); strncpy(mModuleName, modname, sizeof(mModuleName));
strncpy(mModuleArgs, modargs, sizeof(mModuleArgs)); strncpy(mModuleArgs, modargs, sizeof(mModuleArgs));
mSupplicant = new Supplicant(this, propmngr); mLatestScanResults = new ScanResultCollection();
pthread_mutex_init(&mLatestScanResultsLock, NULL);
mSupplicant = new Supplicant(this, this);
mScanner = new WifiScanner(mSupplicant, 10); mScanner = new WifiScanner(mSupplicant, 10);
mCurrentScanMode = 0; mCurrentScanMode = 0;
mEnabled = false; mEnabled = false;
propmngr->registerProperty("wifi.enabled", this); mSupplicantState = SupplicantState::UNKNOWN;
} }
int WifiController::start() { int WifiController::start() {
mPropMngr->registerProperty("wifi.enabled", this);
return 0; return 0;
} }
int WifiController::stop() { int WifiController::stop() {
errno = ENOSYS; mPropMngr->unregisterProperty("wifi.enabled");
return -1; return 0;
} }
int WifiController::enable() { int WifiController::enable() {
if (!isPoweredUp()) { if (!isPoweredUp()) {
sendStatusBroadcast("POWERING_UP"); sendStatusBroadcast("Powering up WiFi hardware");
if (powerUp()) { if (powerUp()) {
LOGE("Powerup failed (%s)", strerror(errno)); LOGE("Powerup failed (%s)", strerror(errno));
return -1; return -1;
@ -62,7 +78,7 @@ int WifiController::enable() {
} }
if (mModuleName[0] != '\0' && !isKernelModuleLoaded(mModuleName)) { if (mModuleName[0] != '\0' && !isKernelModuleLoaded(mModuleName)) {
sendStatusBroadcast("LOADING_DRIVER"); sendStatusBroadcast("Loading WiFi driver");
if (loadKernelModule(mModulePath, mModuleArgs)) { if (loadKernelModule(mModulePath, mModuleArgs)) {
LOGE("Kernel module load failed (%s)", strerror(errno)); LOGE("Kernel module load failed (%s)", strerror(errno));
goto out_powerdown; goto out_powerdown;
@ -70,7 +86,7 @@ int WifiController::enable() {
} }
if (!isFirmwareLoaded()) { if (!isFirmwareLoaded()) {
sendStatusBroadcast("LOADING_FIRMWARE"); sendStatusBroadcast("Loading WiFI firmware");
if (loadFirmware()) { if (loadFirmware()) {
LOGE("Firmware load failed (%s)", strerror(errno)); LOGE("Firmware load failed (%s)", strerror(errno));
goto out_powerdown; goto out_powerdown;
@ -78,7 +94,7 @@ int WifiController::enable() {
} }
if (!mSupplicant->isStarted()) { if (!mSupplicant->isStarted()) {
sendStatusBroadcast("STARTING_SUPPLICANT"); sendStatusBroadcast("Starting WPA Supplicant");
if (mSupplicant->start()) { if (mSupplicant->start()) {
LOGE("Supplicant start failed (%s)", strerror(errno)); LOGE("Supplicant start failed (%s)", strerror(errno));
goto out_unloadmodule; goto out_unloadmodule;
@ -93,6 +109,7 @@ int WifiController::enable() {
if (mSupplicant->refreshNetworkList()) if (mSupplicant->refreshNetworkList())
LOGW("Error getting list of networks (%s)", strerror(errno)); LOGW("Error getting list of networks (%s)", strerror(errno));
mPropMngr->registerProperty("wifi.supplicant.state", this);
mPropMngr->registerProperty("wifi.scanmode", this); mPropMngr->registerProperty("wifi.scanmode", this);
mPropMngr->registerProperty("wifi.interface", this); mPropMngr->registerProperty("wifi.interface", this);
@ -121,8 +138,11 @@ void WifiController::sendStatusBroadcast(const char *msg) {
int WifiController::disable() { int WifiController::disable() {
mPropMngr->unregisterProperty("wifi.scanmode"); mPropMngr->unregisterProperty("wifi.scanmode");
mPropMngr->unregisterProperty("wifi.supplicant.state");
mPropMngr->unregisterProperty("wifi.scanmode");
if (mSupplicant->isStarted()) { if (mSupplicant->isStarted()) {
sendStatusBroadcast("STOPPING_SUPPLICANT"); sendStatusBroadcast("Stopping WPA Supplicant");
if (mSupplicant->stop()) { if (mSupplicant->stop()) {
LOGE("Supplicant stop failed (%s)", strerror(errno)); LOGE("Supplicant stop failed (%s)", strerror(errno));
return -1; return -1;
@ -131,7 +151,7 @@ int WifiController::disable() {
LOGW("disable(): Supplicant not running?"); LOGW("disable(): Supplicant not running?");
if (mModuleName[0] != '\0' && isKernelModuleLoaded(mModuleName)) { if (mModuleName[0] != '\0' && isKernelModuleLoaded(mModuleName)) {
sendStatusBroadcast("UNLOADING_DRIVER"); sendStatusBroadcast("Unloading WiFi driver");
if (unloadKernelModule(mModuleName)) { if (unloadKernelModule(mModuleName)) {
LOGE("Unable to unload module (%s)", strerror(errno)); LOGE("Unable to unload module (%s)", strerror(errno));
return -1; return -1;
@ -139,7 +159,7 @@ int WifiController::disable() {
} }
if (isPoweredUp()) { if (isPoweredUp()) {
sendStatusBroadcast("POWERING_DOWN"); sendStatusBroadcast("Powering down WiFi hardware");
if (powerDown()) { if (powerDown()) {
LOGE("Powerdown failed (%s)", strerror(errno)); LOGE("Powerdown failed (%s)", strerror(errno));
return -1; return -1;
@ -184,7 +204,15 @@ int WifiController::removeNetwork(int networkId) {
} }
ScanResultCollection *WifiController::createScanResults() { ScanResultCollection *WifiController::createScanResults() {
return mSupplicant->createLatestScanResults(); ScanResultCollection *d = new ScanResultCollection();
ScanResultCollection::iterator i;
pthread_mutex_lock(&mLatestScanResultsLock);
for (i = mLatestScanResults->begin(); i != mLatestScanResults->end(); ++i)
d->push_back((*i)->clone());
pthread_mutex_unlock(&mLatestScanResultsLock);
return d;
} }
WifiNetworkCollection *WifiController::createNetworkList() { WifiNetworkCollection *WifiController::createNetworkList() {
@ -207,7 +235,10 @@ int WifiController::set(const char *name, const char *value) {
return -1; return -1;
} else if (!strcmp(name, "wifi.scanmode")) } else if (!strcmp(name, "wifi.scanmode"))
return setScanMode((uint32_t) strtoul(value, NULL, 0)); return setScanMode((uint32_t) strtoul(value, NULL, 0));
else else if (!strcmp(name, "wifi.supplicant.state")) {
errno = EROFS;
return -1;
} else
return Controller::set(name, value); return Controller::set(name, value);
return rc; return rc;
} }
@ -221,9 +252,158 @@ const char *WifiController::get(const char *name, char *buffer, size_t maxsize)
(getBoundInterface() ? getBoundInterface() : "none")); (getBoundInterface() ? getBoundInterface() : "none"));
} else if (!strcmp(name, "wifi.scanmode")) } else if (!strcmp(name, "wifi.scanmode"))
snprintf(buffer, maxsize, "0x%.8x", mCurrentScanMode); snprintf(buffer, maxsize, "0x%.8x", mCurrentScanMode);
else if (!strcmp(name, "wifi.supplicant.state"))
return SupplicantState::toString(mSupplicantState, buffer, maxsize);
else else
return Controller::get(name, buffer, maxsize); return Controller::get(name, buffer, maxsize);
return buffer; return buffer;
} }
void WifiController::onAssociatingEvent(SupplicantAssociatingEvent *evt) {
LOGD("onAssociatingEvent(%s, %s, %d)",
(evt->getBssid() ? evt->getBssid() : "n/a"),
(evt->getSsid() ? evt->getSsid() : "n/a"),
evt->getFreq());
}
void WifiController::onAssociatedEvent(SupplicantAssociatedEvent *evt) {
LOGD("onAssociatedEvent(%s)", evt->getBssid());
}
void WifiController::onConnectedEvent(SupplicantConnectedEvent *evt) {
LOGD("onConnectedEvent(%s, %d)", evt->getBssid(), evt->getReassociated());
if (!evt->getReassociated()) {
SupplicantStatus *ss = mSupplicant->getStatus();
WifiNetwork *wn;
if (ss->getWpaState() != SupplicantState::COMPLETED) {
char tmp[32];
LOGW("onConnected() with SupplicantState = %s!",
SupplicantState::toString(ss->getWpaState(), tmp,
sizeof(tmp)));
return;
}
if (ss->getId() == -1) {
LOGW("onConnected() with id = -1!");
return;
}
if (!(wn = mSupplicant->lookupNetwork(ss->getId()))) {
LOGW("Error looking up connected network id %d (%s)",
ss->getId(), strerror(errno));
return;
}
delete ss;
mHandlers->onInterfaceStarted(this, wn->getIfaceCfg());
}
}
void WifiController::onScanResultsEvent(SupplicantScanResultsEvent *evt) {
char *reply;
if (!(reply = (char *) malloc(4096))) {
LOGE("Out of memory");
return;
}
size_t len = 4096;
if (mSupplicant->sendCommand("SCAN_RESULTS", reply, &len)) {
LOGW("onScanResultsEvent: Error getting scan results (%s)",
strerror(errno));
free(reply);
return;
}
pthread_mutex_lock(&mLatestScanResultsLock);
if (!mLatestScanResults->empty()) {
ScanResultCollection::iterator i;
for (i = mLatestScanResults->begin();
i !=mLatestScanResults->end(); ++i) {
delete *i;
}
mLatestScanResults->clear();
}
char *linep;
char *linep_next = NULL;
if (!strtok_r(reply, "\n", &linep_next)) {
free(reply);
pthread_mutex_unlock(&mLatestScanResultsLock);
return;
}
while((linep = strtok_r(NULL, "\n", &linep_next)))
mLatestScanResults->push_back(new ScanResult(linep));
char *tmp;
asprintf(&tmp, "Scan results ready (%d)", mLatestScanResults->size());
NetworkManager::Instance()->getBroadcaster()->
sendBroadcast(ErrorCode::UnsolicitedInformational, tmp, false);
free(tmp);
pthread_mutex_unlock(&mLatestScanResultsLock);
free(reply);
}
void WifiController::onStateChangeEvent(SupplicantStateChangeEvent *evt) {
char tmp[32];
char tmp2[32];
LOGD("onStateChangeEvent(%s -> %s)",
SupplicantState::toString(mSupplicantState, tmp, sizeof(tmp)),
SupplicantState::toString(evt->getState(), tmp2, sizeof(tmp2)));
mSupplicantState = evt->getState();
}
void WifiController::onConnectionTimeoutEvent(SupplicantConnectionTimeoutEvent *evt) {
LOGD("onConnectionTimeoutEvent(%s)", evt->getBssid());
}
void WifiController::onDisconnectedEvent(SupplicantDisconnectedEvent *evt) {
LOGD("onDisconnectedEvent()");
}
#if 0
void WifiController::onTerminatingEvent(SupplicantEvent *evt) {
LOGD("onTerminatingEvent(%s)", evt->getEvent());
}
void WifiController::onPasswordChangedEvent(SupplicantEvent *evt) {
LOGD("onPasswordChangedEvent(%s)", evt->getEvent());
}
void WifiController::onEapNotificationEvent(SupplicantEvent *evt) {
LOGD("onEapNotificationEvent(%s)", evt->getEvent());
}
void WifiController::onEapStartedEvent(SupplicantEvent *evt) {
LOGD("onEapStartedEvent(%s)", evt->getEvent());
}
void WifiController::onEapMethodEvent(SupplicantEvent *evt) {
LOGD("onEapMethodEvent(%s)", evt->getEvent());
}
void WifiController::onEapSuccessEvent(SupplicantEvent *evt) {
LOGD("onEapSuccessEvent(%s)", evt->getEvent());
}
void WifiController::onEapFailureEvent(SupplicantEvent *evt) {
LOGD("onEapFailureEvent(%s)", evt->getEvent());
}
void WifiController::onLinkSpeedEvent(SupplicantEvent *evt) {
LOGD("onLinkSpeedEvent(%s)", evt->getEvent());
}
void WifiController::onDriverStateEvent(SupplicantEvent *evt) {
LOGD("onDriverStateEvent(%s)", evt->getEvent());
}
#endif

43
nexus/WifiController.h
View file

@ -20,15 +20,21 @@
#include <sys/types.h> #include <sys/types.h>
#include "Controller.h" #include "Controller.h"
#include "ScanResult.h"
#include "WifiNetwork.h"
#include "ISupplicantEventHandler.h"
class NetInterface; class NetInterface;
class Supplicant; class Supplicant;
class WifiScanner; class WifiScanner;
class SupplicantAssociatingEvent;
class SupplicantAssociatedEvent;
class SupplicantConnectedEvent;
class SupplicantScanResultsEvent;
class SupplicantStateChangeEvent;
class SupplicantDisconnectedEvent;
#include "ScanResult.h" class WifiController : public Controller, public ISupplicantEventHandler {
#include "WifiNetwork.h"
class WifiController : public Controller {
public: public:
static const uint32_t SCAN_ENABLE_MASK = 0x01; static const uint32_t SCAN_ENABLE_MASK = 0x01;
static const uint32_t SCAN_ACTIVE_MASK = 0x02; static const uint32_t SCAN_ACTIVE_MASK = 0x02;
@ -45,12 +51,18 @@ private:
char mModulePath[255]; char mModulePath[255];
char mModuleName[64]; char mModuleName[64];
char mModuleArgs[255]; char mModuleArgs[255];
uint32_t mCurrentScanMode; uint32_t mCurrentScanMode;
WifiScanner *mScanner; WifiScanner *mScanner;
int mSupplicantState;
ScanResultCollection *mLatestScanResults;
pthread_mutex_t mLatestScanResultsLock;
bool mEnabled; bool mEnabled;
public: public:
WifiController(PropertyManager *propmngr, char *modpath, char *modname, char *modargs); WifiController(PropertyManager *propmngr, IControllerHandler *handlers, char *modpath, char *modname, char *modargs);
virtual ~WifiController() {} virtual ~WifiController() {}
int start(); int start();
@ -85,6 +97,27 @@ private:
int setScanMode(uint32_t mode); int setScanMode(uint32_t mode);
int enable(); int enable();
int disable(); int disable();
// ISupplicantEventHandler methods
virtual void onAssociatingEvent(SupplicantAssociatingEvent *evt);
virtual void onAssociatedEvent(SupplicantAssociatedEvent *evt);
virtual void onConnectedEvent(SupplicantConnectedEvent *evt);
virtual void onScanResultsEvent(SupplicantScanResultsEvent *evt);
virtual void onStateChangeEvent(SupplicantStateChangeEvent *evt);
virtual void onConnectionTimeoutEvent(SupplicantConnectionTimeoutEvent *evt);
virtual void onDisconnectedEvent(SupplicantDisconnectedEvent *evt);
#if 0
virtual void onTerminatingEvent(SupplicantEvent *evt);
virtual void onPasswordChangedEvent(SupplicantEvent *evt);
virtual void onEapNotificationEvent(SupplicantEvent *evt);
virtual void onEapStartedEvent(SupplicantEvent *evt);
virtual void onEapMethodEvent(SupplicantEvent *evt);
virtual void onEapSuccessEvent(SupplicantEvent *evt);
virtual void onEapFailureEvent(SupplicantEvent *evt);
virtual void onLinkSpeedEvent(SupplicantEvent *evt);
virtual void onDriverStateEvent(SupplicantEvent *evt);
#endif
}; };
#endif #endif

54
nexus/WifiNetwork.cpp
View file

@ -76,7 +76,7 @@ WifiNetwork::WifiNetwork(WifiController *c, Supplicant *suppl, const char *data)
mDefaultKeyIndex = -1; mDefaultKeyIndex = -1;
mPriority = -1; mPriority = -1;
mHiddenSsid = NULL; mHiddenSsid = NULL;
mAllowedKeyManagement = 0; mAllowedKeyManagement = KeyManagementMask::UNKNOWN;
mAllowedProtocols = 0; mAllowedProtocols = 0;
mAllowedAuthAlgorithms = 0; mAllowedAuthAlgorithms = 0;
mAllowedPairwiseCiphers = 0; mAllowedPairwiseCiphers = 0;
@ -94,8 +94,6 @@ WifiNetwork::WifiNetwork(WifiController *c, Supplicant *suppl, const char *data)
asprintf(&tmp2, "wifi.net.%d", mNetid); asprintf(&tmp2, "wifi.net.%d", mNetid);
mIfaceCfg = new InterfaceConfig(tmp2); mIfaceCfg = new InterfaceConfig(tmp2);
free(tmp2); free(tmp2);
registerProperties();
free(tmp); free(tmp);
} }
@ -121,8 +119,6 @@ WifiNetwork::WifiNetwork(WifiController *c, Supplicant *suppl, int networkId) {
asprintf(&tmp2, "wifi.net.%d", mNetid); asprintf(&tmp2, "wifi.net.%d", mNetid);
mIfaceCfg = new InterfaceConfig(tmp2); mIfaceCfg = new InterfaceConfig(tmp2);
free(tmp2); free(tmp2);
registerProperties();
} }
WifiNetwork *WifiNetwork::clone() { WifiNetwork *WifiNetwork::clone() {
@ -153,7 +149,6 @@ WifiNetwork *WifiNetwork::clone() {
} }
WifiNetwork::~WifiNetwork() { WifiNetwork::~WifiNetwork() {
unregisterProperties();
if (mSsid) if (mSsid)
free(mSsid); free(mSsid);
if (mBssid) if (mBssid)
@ -203,7 +198,26 @@ int WifiNetwork::refresh() {
len = sizeof(buffer); len = sizeof(buffer);
if (mSuppl->getNetworkVar(mNetid, "key_mgmt", buffer, len)) { if (mSuppl->getNetworkVar(mNetid, "key_mgmt", buffer, len)) {
// TODO if (!strcmp(buffer, "NONE"))
setAllowedKeyManagement(KeyManagementMask::NONE);
else if (index(buffer, ' ')) {
char *next = buffer;
char *token;
uint32_t mask = 0;
while((token = strsep(&next, " "))) {
if (!strcmp(token, "WPA-PSK"))
mask |= KeyManagementMask::WPA_PSK;
else if (!strcmp(token, "WPA-EAP"))
mask |= KeyManagementMask::WPA_EAP;
else if (!strcmp(token, "IEE8021X"))
mask |= KeyManagementMask::IEEE8021X;
else
LOGW("Unsupported key management scheme '%s'" , token);
}
setAllowedKeyManagement(mask);
} else
LOGE("Unsupported key management '%s'", buffer);
} }
len = sizeof(buffer); len = sizeof(buffer);
@ -273,7 +287,7 @@ int WifiNetwork::set(const char *name, const char *value) {
while((v_token = strsep(&v_next, " "))) { while((v_token = strsep(&v_next, " "))) {
if (!strcasecmp(v_token, "NONE")) { if (!strcasecmp(v_token, "NONE")) {
mask = 0; mask = KeyManagementMask::NONE;
none = true; none = true;
} else if (!none) { } else if (!none) {
if (!strcasecmp(v_token, "WPA_PSK")) if (!strcasecmp(v_token, "WPA_PSK"))
@ -363,7 +377,29 @@ const char *WifiNetwork::get(const char *name, char *buffer, size_t maxsize) {
snprintf(buffer, maxsize, "%d", getDefaultKeyIndex()); snprintf(buffer, maxsize, "%d", getDefaultKeyIndex());
else if (!strcasecmp(fc, "pri")) else if (!strcasecmp(fc, "pri"))
snprintf(buffer, maxsize, "%d", getPriority()); snprintf(buffer, maxsize, "%d", getPriority());
else if (!strcasecmp(fc, "hiddenssid")) { else if (!strcasecmp(fc, "AllowedKeyManagement")) {
if (getAllowedKeyManagement() == KeyManagementMask::NONE)
strncpy(buffer, "NONE", maxsize);
else {
char tmp[80] = { '\0' };
if (getAllowedKeyManagement() & KeyManagementMask::WPA_PSK)
strcat(tmp, "WPA_PSK ");
if (getAllowedKeyManagement() & KeyManagementMask::WPA_EAP)
strcat(tmp, "WPA_EAP ");
if (getAllowedKeyManagement() & KeyManagementMask::IEEE8021X)
strcat(tmp, "IEEE8021X");
if (tmp[0] == '\0') {
strncpy(buffer, "(internal error)", maxsize);
errno = ENOENT;
return NULL;
}
if (tmp[strlen(tmp)] == ' ')
tmp[strlen(tmp)] = '\0';
strncpy(buffer, tmp, maxsize);
}
} else if (!strcasecmp(fc, "hiddenssid")) {
strncpy(buffer, strncpy(buffer,
getHiddenSsid() ? getHiddenSsid() : "none", getHiddenSsid() ? getHiddenSsid() : "none",
maxsize); maxsize);

6
nexus/WifiNetwork.h
View file

@ -157,8 +157,6 @@ private:
private: private:
WifiNetwork(); WifiNetwork();
int registerProperties();
int unregisterProperties();
public: public:
WifiNetwork(WifiController *c, Supplicant *suppl, int networkId); WifiNetwork(WifiController *c, Supplicant *suppl, int networkId);
@ -167,6 +165,8 @@ public:
virtual ~WifiNetwork(); virtual ~WifiNetwork();
WifiNetwork *clone(); WifiNetwork *clone();
int registerProperties();
int unregisterProperties();
int getNetworkId() { return mNetid; } int getNetworkId() { return mNetid; }
const char *getSsid() { return mSsid; } const char *getSsid() { return mSsid; }
@ -187,7 +187,7 @@ public:
int set(const char *name, const char *value); int set(const char *name, const char *value);
const char *get(const char *name, char *buffer, size_t maxsize); const char *get(const char *name, char *buffer, size_t maxsize);
// InterfaceConfig *getIfaceCfg() { return mIfaceCfg; } InterfaceConfig *getIfaceCfg() { return mIfaceCfg; }
int setEnabled(bool enabled); int setEnabled(bool enabled);
int setSsid(const char *ssid); int setSsid(const char *ssid);

8
nexus/main.cpp
View file

@ -40,10 +40,10 @@ int main() {
nm->setBroadcaster((SocketListener *) cl); nm->setBroadcaster((SocketListener *) cl);
nm->attachController(new LoopController(nm->getPropMngr())); nm->attachController(new LoopController(nm->getPropMngr(), nm));
nm->attachController(new TiwlanWifiController(nm->getPropMngr(), "/system/lib/modules/wlan.ko", "wlan", "")); nm->attachController(new TiwlanWifiController(nm->getPropMngr(), nm, "/system/lib/modules/wlan.ko", "wlan", ""));
// nm->attachController(new AndroidL2TPVpnController()); // nm->attachController(new AndroidL2TPVpnController(nm->getPropMngr(), nm));
nm->attachController(new OpenVpnController(nm->getPropMngr())); nm->attachController(new OpenVpnController(nm->getPropMngr(), nm));
if (NetworkManager::Instance()->run()) { if (NetworkManager::Instance()->run()) {