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.h b/nexus/NetworkManager.h
index 44f3417..93702ce 100644
--- a/nexus/NetworkManager.h
+++ b/nexus/NetworkManager.h
@@ -17,6 +17,7 @@
#ifndef _NETWORKMANAGER_H
#define _NETWORKMANAGER_H
+#include <utils/List.h>
#include <sysutils/SocketListener.h>
#include "Controller.h"
@@ -28,14 +29,33 @@
class DhcpClient;
class NetworkManager : public IControllerHandler, public IDhcpEventHandlers {
-private:
static NetworkManager *sInstance;
+ class ControllerBinding {
+ Controller *mController;
+ InterfaceConfig *mCurrentCfg;
+ InterfaceConfig *mBoundCfg;
+
+ public:
+ ControllerBinding(Controller *c);
+ virtual ~ControllerBinding() {}
+
+ InterfaceConfig *getCurrentCfg() { return mCurrentCfg; }
+ InterfaceConfig *getBoundCfg() { return mCurrentCfg; }
+ Controller *getController() { return mController; }
+
+ void setCurrentCfg(InterfaceConfig *cfg);
+ void setBoundCfg(InterfaceConfig *cfg);
+ };
+
+ typedef android::List<ControllerBinding *> ControllerBindingCollection;
+
private:
- ControllerCollection *mControllers;
- SocketListener *mBroadcaster;
- PropertyManager *mPropMngr;
- DhcpClient *mDhcp;
+ ControllerBindingCollection *mControllerBindings;
+ SocketListener *mBroadcaster;
+ PropertyManager *mPropMngr;
+ DhcpClient *mDhcp;
+ int mLastDhcpState;
public:
virtual ~NetworkManager();
@@ -57,8 +77,19 @@
int stopControllers();
NetworkManager(PropertyManager *propMngr);
+ ControllerBinding *lookupBinding(Controller *c);
- void onInterfaceConnected(Controller *c, const InterfaceConfig *cfg);
- void onInterfaceDisconnected(Controller *c, const char *name);
+ void onInterfaceConnected(Controller *c);
+ void onInterfaceDisconnected(Controller *c);
+ void onControllerSuspending(Controller *c);
+ void onControllerResumed(Controller *c);
+
+ void onDhcpStateChanged(Controller *c, int state);
+ void onDhcpEvent(Controller *c, int event);
+ void 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);
};
#endif