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.cpp b/nexus/VpnController.cpp
index add4dc3..015710f 100644
--- a/nexus/VpnController.cpp
+++ b/nexus/VpnController.cpp
@@ -27,56 +27,66 @@
VpnController::VpnController(PropertyManager *propmngr,
IControllerHandler *handlers) :
- Controller("VPN", propmngr, handlers) {
+ Controller("vpn", propmngr, handlers) {
mEnabled = false;
+
+ mStaticProperties.propEnabled = new VpnEnabledProperty(this);
+ mDynamicProperties.propGateway = new IPV4AddressPropertyHelper("Gateway",
+ false,
+ &mGateway);
}
int VpnController::start() {
- mPropMngr->registerProperty("vpn.enabled", this);
+ mPropMngr->attachProperty("vpn", mStaticProperties.propEnabled);
return 0;
}
int VpnController::stop() {
- mPropMngr->unregisterProperty("vpn.enabled");
+ mPropMngr->detachProperty("vpn", mStaticProperties.propEnabled);
return 0;
}
-int VpnController::set(const char *name, const char *value) {
- if (!strcmp(name, "vpn.enabled")) {
- int en = atoi(value);
- int rc;
-
- if (en == mEnabled)
- return 0;
- rc = (en ? enable() : disable());
-
- if (!rc) {
- mEnabled = en;
- if (en)
- mPropMngr->unregisterProperty("vpn.gateway");
- else
- mPropMngr->unregisterProperty("vpn.gateway");
- }
- return rc;
- } if (!strcmp(name, "vpn.gateway")) {
- if (!inet_aton(value, &mVpnGateway)) {
- errno = EINVAL;
- return -1;
- }
- return 0;
- }
-
- return Controller::set(name, value);
+VpnController::VpnIntegerProperty::VpnIntegerProperty(VpnController *c,
+ const char *name,
+ bool ro,
+ int elements) :
+ IntegerProperty(name, ro, elements) {
+ mVc = c;
}
-const char *VpnController::get(const char *name, char *buffer, size_t maxsize) {
- if (!strcmp(name, "vpn.enabled")) {
- snprintf(buffer, maxsize, "%d", mEnabled);
- return buffer;
- } if (!strcmp(name, "vpn.gateway")) {
- snprintf(buffer, maxsize, "%s", inet_ntoa(mVpnGateway));
- return buffer;
- }
+VpnController::VpnStringProperty::VpnStringProperty(VpnController *c,
+ const char *name,
+ bool ro, int elements) :
+ StringProperty(name, ro, elements) {
+ mVc = c;
+}
- return Controller::get(name, buffer, maxsize);
+VpnController::VpnIPV4AddressProperty::VpnIPV4AddressProperty(VpnController *c,
+ const char *name,
+ bool ro, int elements) :
+ IPV4AddressProperty(name, ro, elements) {
+ mVc = c;
+}
+
+VpnController::VpnEnabledProperty::VpnEnabledProperty(VpnController *c) :
+ VpnIntegerProperty(c, "Enabled", false, 1) {
+}
+int VpnController::VpnEnabledProperty::get(int idx, int *buffer) {
+ *buffer = mVc->mEnabled;
+ return 0;
+}
+int VpnController::VpnEnabledProperty::set(int idx, int value) {
+ int rc;
+ if (!value) {
+ mVc->mPropMngr->detachProperty("vpn", mVc->mDynamicProperties.propGateway);
+ rc = mVc->disable();
+ } else {
+ rc = mVc->enable();
+ if (!rc) {
+ mVc->mPropMngr->attachProperty("vpn", mVc->mDynamicProperties.propGateway);
+ }
+ }
+ if (!rc)
+ mVc->mEnabled = value;
+ return rc;
}