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.h b/nexus/Property.h
index 198f722..ceea2d3 100644
--- a/nexus/Property.h
+++ b/nexus/Property.h
@@ -14,8 +14,124 @@
* limitations under the License.
*/
+#ifndef _PROPERTY_H
+#define _PROPERTY_H
+
+#include <netinet/in.h>
+#include <utils/List.h>
+
class Property {
+ const char *mName;
+ bool mReadOnly;
+ int mType;
+ int mNumElements;
+
public:
- static const int NameMaxSize = 128;
+ static const int NameMaxSize = 128;
static const int ValueMaxSize = 255;
+
+ static const int Type_STRING = 1;
+ static const int Type_INTEGER = 2;
+ static const int Type_IPV4 = 3;
+
+ Property(const char *name, bool ro, int type, int elements);
+ virtual ~Property() {}
+
+ virtual int set(int idx, const char *value) = 0;
+ virtual int set(int idx, int value) = 0;
+ virtual int set(int idx, struct in_addr *value) = 0;
+
+ virtual int get(int idx, char *buffer, size_t max) = 0;
+ virtual int get(int idx, int *buffer) = 0;
+ virtual int get(int idx, struct in_addr *buffer) = 0;
+
+ int getType() { return mType; }
+ bool getReadOnly() { return mReadOnly; }
+ int getNumElements() { return mNumElements; }
+ const char *getName() { return mName; }
};
+
+class StringProperty : public Property {
+public:
+ StringProperty(const char *name, bool ro, int elements);
+ virtual ~StringProperty() {}
+
+ virtual int set(int idx, const char *value) = 0;
+ int set(int idx, int value);
+ int set(int idx, struct in_addr *value);
+
+ virtual int get(int idx, char *buffer, size_t max) = 0;
+ int get(int idx, int *buffer);
+ int get(int idx, struct in_addr *buffer);
+};
+
+class StringPropertyHelper : public StringProperty {
+ char *mBuffer;
+ size_t mMax;
+public:
+ StringPropertyHelper(const char *name, bool ro,
+ char *buffer, size_t max);
+ int set(int idx, const char *value);
+ int get(int idx, char *buffer, size_t max);
+};
+
+class IntegerProperty : public Property {
+public:
+ IntegerProperty(const char *name, bool ro, int elements);
+ virtual ~IntegerProperty() {}
+
+ int set(int idx, const char *value);
+ virtual int set(int idx, int value) = 0;
+ int set(int idx, struct in_addr *value);
+
+ int get(int idx, char *buffer, size_t max);
+ virtual int get(int idx, int *buffer) = 0;
+ int get(int idx, struct in_addr *buffer);
+};
+
+class IntegerPropertyHelper : public IntegerProperty {
+ int *mBuffer;
+public:
+ IntegerPropertyHelper(const char *name, bool ro, int *buffer);
+ int set(int idx, int value);
+ int get(int idx, int *buffer);
+};
+
+class IPV4AddressProperty : public Property {
+public:
+ IPV4AddressProperty(const char *name, bool ro, int elements);
+ virtual ~IPV4AddressProperty() {}
+
+ int set(int idx, const char *value);
+ int set(int idx, int value);
+ virtual int set(int idx, struct in_addr *value) = 0;
+
+ int get(int idx, char *buffer, size_t max);
+ int get(int idx, int *buffer);
+ virtual int get(int idx, struct in_addr *buffer) = 0;
+};
+
+class IPV4AddressPropertyHelper : public IPV4AddressProperty {
+ struct in_addr *mBuffer;
+public:
+ IPV4AddressPropertyHelper(const char *name, bool ro, struct in_addr *buf);
+ int set(int idx, struct in_addr *value);
+ int get(int idx, struct in_addr *buffer);
+};
+
+typedef android::List<Property *> PropertyCollection;
+
+class PropertyNamespace {
+ char *mName;
+ PropertyCollection *mProperties;
+
+public:
+ PropertyNamespace(const char *name);
+ virtual ~PropertyNamespace();
+
+ const char *getName() { return mName; }
+ PropertyCollection *getProperties() { return mProperties; }
+};
+
+typedef android::List<PropertyNamespace *> PropertyNamespaceCollection;
+#endif