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/InterfaceConfig.h b/nexus/InterfaceConfig.h
index d97f20b..3fc7390 100644
--- a/nexus/InterfaceConfig.h
+++ b/nexus/InterfaceConfig.h
@@ -22,53 +22,58 @@
#include <netinet/in.h>
#include <arpa/inet.h>
-#include "IPropertyProvider.h"
-
+#include "Property.h"
class PropertyManager;
-class InterfaceConfig : public IPropertyProvider {
-public:
- static const char *PropertyNames[];
+class InterfaceConfig {
+ class InterfaceDnsProperty;
+ friend class InterfaceConfig::InterfaceDnsProperty;
-private:
- char *mPropPrefix;
- bool mUseDhcp;
+ struct {
+ IPV4AddressPropertyHelper *propIp;
+ IPV4AddressPropertyHelper *propNetmask;
+ IPV4AddressPropertyHelper *propGateway;
+ IPV4AddressPropertyHelper *propBroadcast;
+ InterfaceDnsProperty *propDns;
+ } mStaticProperties;
+
struct in_addr mIp;
struct in_addr mNetmask;
struct in_addr mGateway;
- struct in_addr mDns1;
- struct in_addr mDns2;
- struct in_addr mDns3;
+ struct in_addr mBroadcast;
+ struct in_addr mDns[2];
public:
- InterfaceConfig(const char *prop_prefix);
- InterfaceConfig(const char *prop_prefix,
- const char *ip, const char *nm,
- const char *gw, const char *dns1, const char *dns2,
- const char *dns3);
-
- InterfaceConfig(const char *prop_prefix,
- const struct in_addr *ip,
- const struct in_addr *nm, const struct in_addr *gw,
- const struct in_addr *dns1, const struct in_addr *dns2,
- const struct in_addr *dns3);
-
+ InterfaceConfig(bool propertiesReadOnly);
virtual ~InterfaceConfig();
int set(const char *name, const char *value);
const char *get(const char *name, char *buffer, size_t maxsize);
- bool getUseDhcp() const { return mUseDhcp; }
const struct in_addr &getIp() const { return mIp; }
const struct in_addr &getNetmask() const { return mNetmask; }
const struct in_addr &getGateway() const { return mGateway; }
- const struct in_addr &getDns1() const { return mDns1; }
- const struct in_addr &getDns2() const { return mDns2; }
- const struct in_addr &getDns3() const { return mDns3; }
+ const struct in_addr &getBroadcast() const { return mBroadcast; }
+ const struct in_addr &getDns(int idx) const { return mDns[idx]; }
+
+ void setIp(struct in_addr *addr);
+ void setNetmask(struct in_addr *addr);
+ void setGateway(struct in_addr *addr);
+ void setBroadcast(struct in_addr *addr);
+ void setDns(int idx, struct in_addr *addr);
+
+ int attachProperties(PropertyManager *pm, const char *nsName);
+ int detachProperties(PropertyManager *pm, const char *nsName);
private:
- int registerProperties();
- int unregisterProperties();
+
+ class InterfaceDnsProperty : public IPV4AddressProperty {
+ InterfaceConfig *mCfg;
+ public:
+ InterfaceDnsProperty(InterfaceConfig *cfg, bool ro);
+ int set(int idx, struct in_addr *value);
+ int get(int idx, struct in_addr *buffer);
+ };
};