X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.h;h=659bcf1f41c4a6b542759491001edcc33f320565;hp=bfd044ae6eab1231d18d340bb4a50be1c6f8cdc2;hb=b314737e9a0f0df710ba5e8691882cd7d42faaf5;hpb=c1692fdcf48ad32217354d5206af31115e562306;ds=sidebyside

diff --git a/device.h b/device.h
index bfd044a..659bcf1 100644
--- a/device.h
+++ b/device.h
@@ -2,16 +2,40 @@
 #define __LL_H
 
 #include <libubox/avl.h>
+#include <netinet/in.h>
 
 struct device;
 struct device_hotplug_ops;
 
 typedef int (*device_state_cb)(struct device *, bool up);
 
+enum {
+	DEV_ATTR_TYPE,
+	DEV_ATTR_NAME,
+	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)(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 *);
 };
@@ -35,9 +59,14 @@ struct device {
 	char ifname[IFNAMSIZ + 1];
 	int ifindex;
 
+	struct blob_attr *config;
+	bool config_pending;
 	bool present;
 	int active;
 
+	bool current_config;
+	bool default_config;
+
 	/* set interface up or down */
 	device_state_cb set_state;
 
@@ -49,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 */
@@ -73,6 +100,7 @@ enum device_event {
 struct device_user {
 	struct list_head list;
 
+	bool claimed;
 	struct device *dev;
 	void (*cb)(struct device_user *, enum device_event);
 };
@@ -82,19 +110,39 @@ struct device_hotplug_ops {
 	int (*del)(struct device *main, struct device *member);
 };
 
-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);
+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;
+
+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);
+
+void device_reset_config(void);
+void device_reset_old(void);
+
+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, bool create);
+void device_add_user(struct device_user *dep, struct device *iface);
+void device_remove_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);
+
+static inline void
+device_free(struct device *dev)
+{
+	dev->type->free(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);
+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);
 
 #endif