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/Property.cpp b/nexus/Property.cpp
new file mode 100644
index 0000000..d02769d
--- /dev/null
+++ b/nexus/Property.cpp
@@ -0,0 +1,203 @@
+/*
+ * 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 <errno.h>
+#include <strings.h>
+#include <netinet/in.h>
+
+#define LOG_TAG "Property"
+
+#include <cutils/log.h>
+
+#include "Property.h"
+
+Property::Property(const char *name, bool readOnly,
+ int type, int numElements) :
+ mName(name), mReadOnly(readOnly), mType(type),
+ mNumElements(numElements) {
+ if (index(name, '.')) {
+ LOGW("Property name %s violates namespace rules", name);
+ }
+}
+
+StringProperty::StringProperty(const char *name, bool ro, int elements) :
+ Property(name, ro, Property::Type_STRING, elements) {
+}
+int StringProperty::set(int idx, int value) {
+ LOGE("Integer 'set' called on string property!");
+ errno = EINVAL;
+ return -1;
+}
+int StringProperty::set(int idx, struct in_addr *value) {
+ LOGE("IpAddr 'set' called on string property!");
+ errno = EINVAL;
+ return -1;
+}
+int StringProperty::get(int idx, int *buffer) {
+ LOGE("Integer 'get' called on string property!");
+ errno = EINVAL;
+ return -1;
+}
+int StringProperty::get(int idx, struct in_addr *buffer) {
+ LOGE("IpAddr 'get' called on string property!");
+ errno = EINVAL;
+ return -1;
+}
+
+StringPropertyHelper::StringPropertyHelper(const char *name, bool ro,
+ char *buffer, size_t max) :
+ StringProperty(name, ro, 1) {
+ mBuffer = buffer;
+ mMax = max;
+}
+
+int StringPropertyHelper::set(int idx, const char *value) {
+ if (idx != 0) {
+ LOGW("Attempt to use array index on StringPropertyHelper::set");
+ errno = EINVAL;
+ return -1;
+ }
+ strncpy(mBuffer, value, mMax);
+ return 0;
+}
+
+int StringPropertyHelper::get(int idx, char *buffer, size_t max) {
+ if (idx != 0) {
+ LOGW("Attempt to use array index on StringPropertyHelper::get");
+ errno = EINVAL;
+ return -1;
+ }
+ strncpy(buffer, mBuffer, max);
+ return 0;
+}
+
+IntegerProperty::IntegerProperty(const char *name, bool ro, int elements) :
+ Property(name, ro, Property::Type_INTEGER, elements) {
+}
+
+int IntegerProperty::set(int idx, const char *value) {
+ LOGE("String 'set' called on integer property!");
+ errno = EINVAL;
+ return -1;
+}
+int IntegerProperty::set(int idx, struct in_addr *value) {
+ LOGE("IpAddr 'set' called on integer property!");
+ errno = EINVAL;
+ return -1;
+}
+int IntegerProperty::get(int idx, char *buffer, size_t max) {
+ LOGE("String 'get' called on integer property!");
+ errno = EINVAL;
+ return -1;
+}
+int IntegerProperty::get(int idx, struct in_addr *buffer) {
+ LOGE("IpAddr 'get' called on integer property!");
+ errno = EINVAL;
+ return -1;
+}
+
+IntegerPropertyHelper::IntegerPropertyHelper(const char *name, bool ro,
+ int *buffer) :
+ IntegerProperty(name, ro, 1) {
+ mBuffer = buffer;
+}
+
+int IntegerPropertyHelper::set(int idx, int value) {
+ if (idx != 0) {
+ LOGW("Attempt to use array index on IntegerPropertyHelper::set");
+ errno = EINVAL;
+ return -1;
+ }
+ *mBuffer = value;
+ return 0;
+}
+
+int IntegerPropertyHelper::get(int idx, int *buffer) {
+ if (idx != 0) {
+ LOGW("Attempt to use array index on IntegerPropertyHelper::get");
+ errno = EINVAL;
+ return -1;
+ }
+ *buffer = *mBuffer;
+ return 0;
+}
+
+IPV4AddressProperty::IPV4AddressProperty(const char *name, bool ro, int elements) :
+ Property(name, ro, Property::Type_IPV4, elements) {
+}
+
+int IPV4AddressProperty::set(int idx, const char *value) {
+ LOGE("String 'set' called on ipv4 property!");
+ errno = EINVAL;
+ return -1;
+}
+int IPV4AddressProperty::set(int idx, int value) {
+ LOGE("Integer 'set' called on ipv4 property!");
+ errno = EINVAL;
+ return -1;
+}
+int IPV4AddressProperty::get(int idx, char *buffer, size_t max) {
+ LOGE("String 'get' called on ipv4 property!");
+ errno = EINVAL;
+ return -1;
+}
+int IPV4AddressProperty::get(int idx, int *buffer) {
+ LOGE("Integer 'get' called on ipv4 property!");
+ errno = EINVAL;
+ return -1;
+}
+
+IPV4AddressPropertyHelper::IPV4AddressPropertyHelper(const char *name, bool ro,
+ struct in_addr *buffer) :
+ IPV4AddressProperty(name, ro, 1) {
+ mBuffer = buffer;
+}
+
+int IPV4AddressPropertyHelper::set(int idx, struct in_addr *value) {
+ if (idx != 0) {
+ LOGW("Attempt to use array index on IPV4AddressPropertyHelper::set");
+ errno = EINVAL;
+ return -1;
+ }
+ memcpy(mBuffer, value, sizeof(struct in_addr));
+ return 0;
+}
+
+int IPV4AddressPropertyHelper::get(int idx, struct in_addr *buffer) {
+ if (idx != 0) {
+ LOGW("Attempt to use array index on IPV4AddressPropertyHelper::get");
+ errno = EINVAL;
+ return -1;
+ }
+ memcpy(buffer, mBuffer, sizeof(struct in_addr));
+ return 0;
+}
+
+PropertyNamespace::PropertyNamespace(const char *name) {
+ mName = strdup(name);
+ mProperties = new PropertyCollection();
+}
+
+PropertyNamespace::~PropertyNamespace() {
+ PropertyCollection::iterator it;
+ for (it = mProperties->begin(); it != mProperties->end();) {
+ delete (*it);
+ it = mProperties->erase(it);
+ }
+ delete mProperties;
+ free(mName);
+}