X-Git-Url: http://git.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.h;h=057506b63bb0a71d429d9d88cf5ee5a1eb694e96;hp=bd5a58122d0a0d97e91265882309e2b30d34a9a9;hb=e8f450ba2e67716cf3ed70060a309b80aa24cf00;hpb=50eb00f20aaf86c84a24b8d2aaad13ffff52d3f1

diff --git a/device.h b/device.h
index bd5a581..057506b 100644
--- a/device.h
+++ b/device.h
@@ -9,10 +9,32 @@ struct device_hotplug_ops;
 
 typedef int (*device_state_cb)(struct device *, bool up);
 
+enum {
+	DEV_ATTR_TYPE,
+	DEV_ATTR_IFNAME,
+	DEV_ATTR_MTU,
+	DEV_ATTR_MACADDR,
+	DEV_ATTR_TXQUEUELEN,
+	__DEV_ATTR_MAX,
+};
+
+enum dev_change_type {
+	DEV_CONFIG_NO_CHANGE,
+	DEV_CONFIG_APPLIED,
+	DEV_CONFIG_RECREATE,
+};
+
 struct device_type {
+	struct list_head list;
 	const char *name;
 
-	void (*dump_status)(struct device *, struct blob_buf *buf);
+	const struct config_param_list *config_params;
+
+	struct device *(*create)(const char *name, struct blob_attr *attr);
+	void (*config_init)(struct device *);
+	enum dev_change_type (*reload)(struct device *, struct blob_attr *);
+	void (*dump_info)(struct device *, struct blob_buf *buf);
+	void (*dump_stats)(struct device *, struct blob_buf *buf);
 	int (*check_state)(struct device *);
 	void (*free)(struct device *);
 };
@@ -23,42 +45,6 @@ enum {
 	DEV_OPT_TXQUEUELEN	= (1 << 2)
 };
 
-enum device_addr_flags {
-	/* address family for routes and addresses */
-	DEVADDR_INET4	= (0 << 0),
-	DEVADDR_INET6	= (1 << 0),
-	DEVADDR_FAMILY	= DEVADDR_INET4 | DEVADDR_INET6,
-
-	/* device route (no gateway) */
-	DEVADDR_DEVICE	= (1 << 1),
-};
-
-union if_addr {
-	struct in_addr in;
-	struct in6_addr in6;
-};
-
-struct device_addr {
-	struct list_head list;
-	void *ctx;
-
-	enum device_addr_flags flags;
-
-	unsigned int mask;
-	union if_addr addr;
-};
-
-struct device_route {
-	struct list_head list;
-	void *ctx;
-
-	enum device_addr_flags flags;
-
-	unsigned int mask;
-	union if_addr addr;
-	union if_addr nexthop;
-};
-
 /* 
  * link layer device. typically represents a linux network device.
  * can be used to support VLANs as well
@@ -72,8 +58,14 @@ struct device {
 	char ifname[IFNAMSIZ + 1];
 	int ifindex;
 
+	struct blob_attr *config;
+	bool config_pending;
 	bool present;
 	int active;
+	bool external;
+
+	bool current_config;
+	bool default_config;
 
 	/* set interface up or down */
 	device_state_cb set_state;
@@ -86,8 +78,6 @@ struct device {
 	unsigned int mtu;
 	unsigned int txqueuelen;
 	uint8_t macaddr[6];
-
-	uint32_t config_hash;
 };
 
 /* events broadcasted to all users of a device */
@@ -110,6 +100,9 @@ enum device_event {
 struct device_user {
 	struct list_head list;
 
+	bool claimed;
+	bool hotplug;
+
 	struct device *dev;
 	void (*cb)(struct device_user *, enum device_event);
 };
@@ -119,31 +112,47 @@ struct device_hotplug_ops {
 	int (*del)(struct device *main, struct device *member);
 };
 
-static inline void
-free_device(struct device *dev)
-{
-	dev->type->free(dev);
-}
-
 extern const struct config_param_list device_attr_list;
+extern const struct device_type simple_device_type;
+extern const struct device_type bridge_device_type;
+
+void device_lock(void);
+void device_unlock(void);
+
+struct device *device_create(const char *name, const struct device_type *type,
+			     struct blob_attr *config);
+void device_init_settings(struct device *dev, struct blob_attr **tb);
+void device_init_pending(void);
+
+enum dev_change_type
+device_set_config(struct device *dev, const struct device_type *type,
+		  struct blob_attr *attr);
+
+void device_reset_config(void);
+void device_reset_old(void);
 
-struct device *device_create(struct blob_attr *attr, struct uci_section *s);
+void device_init_virtual(struct device *dev, const struct device_type *type, const char *name);
+int device_init(struct device *iface, const struct device_type *type, const char *ifname);
+void device_cleanup(struct device *iface);
+struct device *device_get(const char *name, int create);
+void device_add_user(struct device_user *dep, struct device *iface);
+void device_remove_user(struct device_user *dep);
 
-void init_virtual_device(struct device *dev, const struct device_type *type, const char *name);
-int init_device(struct device *iface, const struct device_type *type, const char *ifname);
-void cleanup_device(struct device *iface);
-struct device *get_device(const char *name, bool create);
-void add_device_user(struct device_user *dep, struct device *iface);
-void remove_device_user(struct device_user *dep);
+void device_set_present(struct device *dev, bool state);
+int device_claim(struct device_user *dep);
+void device_release(struct device_user *dep);
+int device_check_state(struct device *dev);
+void device_dump_status(struct blob_buf *b, struct device *dev);
 
-void set_device_present(struct device *dev, bool state);
-int claim_device(struct device *dev);
-void release_device(struct device *dev);
-int check_device_state(struct device *dev);
+static inline void
+device_free(struct device *dev)
+{
+	dev->type->free(dev);
+}
 
-void cleanup_devices(void);
+void device_free_unused(struct device *dev);
 
 struct device *get_vlan_device_chain(const char *ifname, bool create);
-struct device *bridge_create(const char *name, struct uci_section *s);
+void alias_notify_device(const char *name, struct device *dev);
 
 #endif