nexus: Rollup update for nexus
nexus: Change field separator from : to ' '
Signed-off-by: San Mehat <san@google.com>
nexus: Add some prototypes for stuff to come
Signed-off-by: San Mehat <san@google.com>
nexus: Add some TODOs
Signed-off-by: San Mehat <san@google.com>
libsysutils: Put a proper token parser into the FrameworkListener which
supports minimal \ escapes and quotes
Signed-off-by: San Mehat <san@google.com>
nexus: Fix a lot of bugs
Signed-off-by: San Mehat <san@google.com>
libsysutils: Remove some debugging
Signed-off-by: San Mehat <san@google.com>
nexus: Send broadcasts for supplicant state changes
Signed-off-by: San Mehat <san@google.com>
nexus: Plumb DHCP listener state changes to NetworkManager
Signed-off-by: San Mehat <san@google.com>
nexus: Make the SupplicantState strings more parsable
Signed-off-by: San Mehat <san@google.com>
nexus: Broadcast a message when dhcp state changes.
Signed-off-by: San Mehat <san@google.com>
nexus: Add a few new response codes
Signed-off-by: San Mehat <san@google.com>
nexus: Rename ErrorCode -> ResponseCode
Signed-off-by: San Mehat <san@google.com>
nexus: Add DHCP event broadcasting. Also adds the framework for
tracking supplicant 'searching-for-AP' state
Signed-off-by: San Mehat <san@google.com>
nexus: REmove WifiScanner
Signed-off-by: San Mehat <san@google.com>
nexus: Change the way scanning works. scanmode can now be selected
independantly of triggering a scan. Also adds rxfilter support
Signed-off-by: San Mehat <san@google.com>
nexus: Add support for configuring bluetooth coexistence scanning and modes
Signed-off-by: San Mehat <san@google.com>
nexus: use case insensitive match for property names
Signed-off-by: San Mehat <san@google.com>
nexus: Rollup of a bunch of stuff:
- 'list' command now takes an argument to match against
- InterfaceConfig has been moved into the Controller base (for now)
- DhcpClient now has some rudimentry locking
- process 'ADDRINFO' messages from dhcpcd
- Drop tertiary dns
Signed-off-by: San Mehat <san@google.com>
nexus: Clean up some of the supplicant variable parsing and add 'wifi.current'
Signed-off-by: San Mehat <san@google.com>
nexus: Add driver-stop/start, initial suspend support
Signed-off-by: San Mehat <san@google.com>
nexus: Add Controller suspend/resume callbacks, as well as locking
Signed-off-by: San Mehat <san@google.com>
nexus: Make ARP probing configurable for DhcpClient
Signed-off-by: San Mehat <san@google.com>
nexus: Add linkspeed / rssi retrieval
Signed-off-by: San Mehat <san@google.com>
nexus: Add WifiStatusPoller to track RSSI/linkspeed when associated
Signed-off-by: San Mehat <san@google.com>
nexus: Disable some debugging and add 'wifi.netcount' property
Signed-off-by: San Mehat <san@google.com>
nexus: Replace the hackish property system with something more flexible with namespaces
Signed-off-by: San Mehat <san@google.com>
libsysutils: Fix a few bugs in SocketListener
Signed-off-by: San Mehat <san@google.com>
nexus: PropertyManager: Add array support
Signed-off-by: San Mehat <san@google.com>
nexus: Clean up properties
Signed-off-by: San Mehat <san@google.com>
nexus: WifiController: Change name of 'CurrentNetwork' property
Signed-off-by: San Mehat <san@google.com>
diff --git a/nexus/NetworkManager.cpp b/nexus/NetworkManager.cpp
index 7450b95..e0df409 100644
--- a/nexus/NetworkManager.cpp
+++ b/nexus/NetworkManager.cpp
@@ -24,6 +24,9 @@
#include "NetworkManager.h"
#include "InterfaceConfig.h"
#include "DhcpClient.h"
+#include "DhcpState.h"
+#include "DhcpEvent.h"
+#include "ResponseCode.h"
NetworkManager *NetworkManager::sInstance = NULL;
@@ -35,8 +38,9 @@
NetworkManager::NetworkManager(PropertyManager *propMngr) {
mBroadcaster = NULL;
- mControllers = new ControllerCollection();
+ mControllerBindings = new ControllerBindingCollection();
mPropMngr = propMngr;
+ mLastDhcpState = DhcpState::INIT;
mDhcp = new DhcpClient(this);
}
@@ -51,17 +55,17 @@
}
int NetworkManager::attachController(Controller *c) {
- mControllers->push_back(c);
+ ControllerBinding *cb = new ControllerBinding(c);
+ mControllerBindings->push_back(cb);
return 0;
}
int NetworkManager::startControllers() {
int rc = 0;
- ControllerCollection::iterator i;
+ ControllerBindingCollection::iterator it;
- for (i = mControllers->begin(); i != mControllers->end(); ++i) {
- int irc = (*i)->start();
- LOGD("Controller '%s' start rc = %d", (*i)->getName(), irc);
+ for (it = mControllerBindings->begin(); it != mControllerBindings->end(); ++it) {
+ int irc = (*it)->getController()->start();
if (irc && !rc)
rc = irc;
}
@@ -70,52 +74,132 @@
int NetworkManager::stopControllers() {
int rc = 0;
- ControllerCollection::iterator i;
+ ControllerBindingCollection::iterator it;
- for (i = mControllers->begin(); i != mControllers->end(); ++i) {
- int irc = (*i)->stop();
- LOGD("Controller '%s' stop rc = %d", (*i)->getName(), irc);
+ for (it = mControllerBindings->begin(); it != mControllerBindings->end(); ++it) {
+ int irc = (*it)->getController()->stop();
if (irc && !rc)
rc = irc;
}
return rc;
}
-Controller *NetworkManager::findController(const char *name) {
- ControllerCollection::iterator i;
- for (i = mControllers->begin(); i != mControllers->end(); ++i) {
- if (!strcmp((*i)->getName(), name))
- return *i;
+NetworkManager::ControllerBinding *NetworkManager::lookupBinding(Controller *c) {
+ ControllerBindingCollection::iterator it;
+
+ for (it = mControllerBindings->begin(); it != mControllerBindings->end(); ++it) {
+ if ((*it)->getController() == c)
+ return (*it);
}
- LOGW("Controller '%s' not found", name);
+ errno = ENOENT;
return NULL;
}
-void NetworkManager::onInterfaceConnected(Controller *c, const InterfaceConfig *cfg) {
+Controller *NetworkManager::findController(const char *name) {
+ ControllerBindingCollection::iterator it;
+
+ for (it = mControllerBindings->begin(); it != mControllerBindings->end(); ++it) {
+ if (!strcasecmp((*it)->getController()->getName(), name))
+ return (*it)->getController();
+ }
+ errno = ENOENT;
+ return NULL;
+}
+
+void NetworkManager::onInterfaceConnected(Controller *c) {
LOGD("Controller %s interface %s connected", c->getName(), c->getBoundInterface());
- // Look up the interface
-
- if (0) { // already started?
- }
-
- if (cfg) {
- if (cfg->getUseDhcp() && mDhcp->start(c->getBoundInterface())) {
- LOGE("DHCP start failed");
- } else if (!cfg->getUseDhcp()) {
- // Static configuration
- }
- } else {
- LOGD("No InterfaceConfig for %s:%s - assuming self-managed",
- c->getName(), c->getBoundInterface());
+ if (mDhcp->start(c)) {
+ LOGE("Failed to start DHCP (%s)", strerror(errno));
+ return;
}
}
-void NetworkManager::onInterfaceDisconnected(Controller *c, const char *name) {
- LOGD("Controller %s interface %s disconnected", c->getName(), name);
+void NetworkManager::onInterfaceDisconnected(Controller *c) {
+ LOGD("Controller %s interface %s disconnected", c->getName(),
+ c->getBoundInterface());
- // If we have a DHCP request out on this interface then stop it
- if (1) {
- mDhcp->stop();
- }
+ mDhcp->stop();
}
+
+void NetworkManager::onControllerSuspending(Controller *c) {
+ LOGD("Controller %s interface %s suspending", c->getName(),
+ c->getBoundInterface());
+ mDhcp->stop();
+}
+
+void NetworkManager::onControllerResumed(Controller *c) {
+ LOGD("Controller %s interface %s resumed", c->getName(),
+ c->getBoundInterface());
+}
+
+void NetworkManager::onDhcpStateChanged(Controller *c, int state) {
+ char tmp[255];
+ char tmp2[255];
+
+ LOGD("onDhcpStateChanged(%s -> %s)",
+ DhcpState::toString(mLastDhcpState, tmp, sizeof(tmp)),
+ DhcpState::toString(state, tmp2, sizeof(tmp2)));
+
+ switch(state) {
+ case DhcpState::BOUND:
+ // Refresh the 'net.xxx' for the controller
+ break;
+ case DhcpState::RENEWING:
+ break;
+ default:
+ break;
+ }
+
+ char *tmp3;
+ asprintf(&tmp3,
+ "DHCP state changed from %d (%s) -> %d (%s)",
+ mLastDhcpState,
+ DhcpState::toString(mLastDhcpState, tmp, sizeof(tmp)),
+ state,
+ DhcpState::toString(state, tmp2, sizeof(tmp2)));
+
+ getBroadcaster()->sendBroadcast(ResponseCode::DhcpStateChange,
+ tmp3,
+ false);
+ free(tmp3);
+
+ mLastDhcpState = state;
+}
+
+void NetworkManager::onDhcpEvent(Controller *c, int evt) {
+ char tmp[64];
+ LOGD("onDhcpEvent(%s)", DhcpEvent::toString(evt, tmp, sizeof(tmp)));
+}
+
+void NetworkManager::onDhcpLeaseUpdated(Controller *c, struct in_addr *addr,
+ struct in_addr *net,
+ struct in_addr *brd,
+ struct in_addr *gw,
+ struct in_addr *dns1,
+ struct in_addr *dns2) {
+ ControllerBinding *bind = lookupBinding(c);
+
+ if (!bind->getCurrentCfg())
+ bind->setCurrentCfg(new InterfaceConfig(true));
+
+ bind->getCurrentCfg()->setIp(addr);
+ bind->getCurrentCfg()->setNetmask(net);
+ bind->getCurrentCfg()->setGateway(gw);
+ bind->getCurrentCfg()->setBroadcast(brd);
+ bind->getCurrentCfg()->setDns(0, dns1);
+ bind->getCurrentCfg()->setDns(1, dns2);
+}
+
+NetworkManager::ControllerBinding::ControllerBinding(Controller *c) :
+ mController(c) {
+}
+
+void NetworkManager::ControllerBinding::setCurrentCfg(InterfaceConfig *c) {
+ mCurrentCfg = c;
+}
+
+void NetworkManager::ControllerBinding::setBoundCfg(InterfaceConfig *c) {
+ mBoundCfg = c;
+}
+