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/VpnController.h b/nexus/VpnController.h
index 1af4d9f..4bd86b5 100644
--- a/nexus/VpnController.h
+++ b/nexus/VpnController.h
@@ -24,11 +24,63 @@
class IControllerHandler;
class VpnController : public Controller {
+ class VpnIntegerProperty : public IntegerProperty {
+ protected:
+ VpnController *mVc;
+ public:
+ VpnIntegerProperty(VpnController *c, const char *name, bool ro,
+ int elements);
+ virtual ~VpnIntegerProperty() {}
+ virtual int set(int idx, int value) = 0;
+ virtual int get(int idx, int *buffer) = 0;
+ };
+ friend class VpnController::VpnIntegerProperty;
+
+ class VpnStringProperty : public StringProperty {
+ protected:
+ VpnController *mVc;
+ public:
+ VpnStringProperty(VpnController *c, const char *name, bool ro,
+ int elements);
+ virtual ~VpnStringProperty() {}
+ virtual int set(int idx, const char *value) = 0;
+ virtual int get(int idx, char *buffer, size_t max) = 0;
+ };
+ friend class VpnController::VpnStringProperty;
+
+ class VpnIPV4AddressProperty : public IPV4AddressProperty {
+ protected:
+ VpnController *mVc;
+ public:
+ VpnIPV4AddressProperty(VpnController *c, const char *name, bool ro,
+ int elements);
+ virtual ~VpnIPV4AddressProperty() {}
+ virtual int set(int idx, struct in_addr *value) = 0;
+ virtual int get(int idx, struct in_addr *buffer) = 0;
+ };
+ friend class VpnController::VpnIPV4AddressProperty;
+
+ class VpnEnabledProperty : public VpnIntegerProperty {
+ public:
+ VpnEnabledProperty(VpnController *c);
+ virtual ~VpnEnabledProperty() {};
+ int set(int idx, int value);
+ int get(int idx, int *buffer);
+ };
+
bool mEnabled;
/*
* Gateway of the VPN server to connect to
*/
- struct in_addr mVpnGateway;
+ struct in_addr mGateway;
+
+ struct {
+ VpnEnabledProperty *propEnabled;
+ } mStaticProperties;
+
+ struct {
+ IPV4AddressPropertyHelper *propGateway;
+ } mDynamicProperties;
public:
VpnController(PropertyManager *propmngr, IControllerHandler *handlers);
@@ -37,13 +89,9 @@
virtual int start();
virtual int stop();
- virtual int set(const char *name, const char *value);
- virtual const char *get(const char *name, char *buffer, size_t maxlen);
-
protected:
virtual int enable() = 0;
virtual int disable() = 0;
-
};
#endif