X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.h;h=7454d54c0b6366faede81f8bb447655a64c2f598;hp=1abd5672b65da872645d41dedeffb19b8592aae1;hb=0f738b8f6c5d89ad5130c74a8dcb9a1df9a190bc;hpb=5f739f10e9d7af0eb412102356434f905ed8f467

diff --git a/device.h b/device.h
index 1abd567..7454d54 100644
--- a/device.h
+++ b/device.h
@@ -5,28 +5,39 @@
 #include <netinet/in.h>
 
 struct device;
+struct device_user;
 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_ENABLED,
 	__DEV_ATTR_MAX,
 };
 
+enum dev_change_type {
+	DEV_CONFIG_NO_CHANGE,
+	DEV_CONFIG_APPLIED,
+	DEV_CONFIG_RESTART,
+	DEV_CONFIG_RECREATE,
+};
+
 struct device_type {
 	struct list_head list;
 	const char *name;
 
 	const struct config_param_list *config_params;
 
-	struct device *(*create)(struct blob_attr *attr);
-	void (*dump_status)(struct device *, struct blob_buf *buf);
+	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 *);
 };
@@ -37,40 +48,38 @@ 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,
+/* events broadcasted to all users of a device */
+enum device_event {
+	DEV_EVENT_ADD,
+	DEV_EVENT_REMOVE,
 
-	/* device route (no gateway) */
-	DEVADDR_DEVICE	= (1 << 1),
-};
+	DEV_EVENT_SETUP,
+	DEV_EVENT_TEARDOWN,
+	DEV_EVENT_UP,
+	DEV_EVENT_DOWN,
 
-union if_addr {
-	struct in_addr in;
-	struct in6_addr in6;
+	DEV_EVENT_LINK_UP,
+	DEV_EVENT_LINK_DOWN,
 };
 
-struct device_addr {
+/*
+ * device dependency with callbacks
+ */
+struct device_user {
 	struct list_head list;
-	void *ctx;
 
-	enum device_addr_flags flags;
+	bool claimed;
+	bool hotplug;
 
-	unsigned int mask;
-	union if_addr addr;
+	struct device *dev;
+	void (*cb)(struct device_user *, enum device_event);
 };
 
-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;
+struct device_settings {
+	unsigned int flags;
+	unsigned int mtu;
+	unsigned int txqueuelen;
+	uint8_t macaddr[6];
 };
 
 /* 
@@ -86,50 +95,30 @@ struct device {
 	char ifname[IFNAMSIZ + 1];
 	int ifindex;
 
+	struct blob_attr *config;
+	bool config_pending;
+	bool sys_present;
 	bool present;
 	int active;
+	bool external;
+	bool disabled;
+
+	bool current_config;
+	bool default_config;
 
 	/* set interface up or down */
 	device_state_cb set_state;
 
 	const struct device_hotplug_ops *hotplug_ops;
 
-	/* settings */
-	unsigned int flags;
-
-	unsigned int mtu;
-	unsigned int txqueuelen;
-	uint8_t macaddr[6];
-
-	uint32_t config_hash;
-};
-
-/* events broadcasted to all users of a device */
-enum device_event {
-	DEV_EVENT_ADD,
-	DEV_EVENT_REMOVE,
-
-	DEV_EVENT_SETUP,
-	DEV_EVENT_TEARDOWN,
-	DEV_EVENT_UP,
-	DEV_EVENT_DOWN,
+	struct device_user parent;
 
-	DEV_EVENT_LINK_UP,
-	DEV_EVENT_LINK_DOWN,
-};
-
-/*
- * device dependency with callbacks
- */
-struct device_user {
-	struct list_head list;
-
-	bool claimed;
-	struct device *dev;
-	void (*cb)(struct device_user *, enum device_event);
+	struct device_settings orig_settings;
+	struct device_settings settings;
 };
 
 struct device_hotplug_ops {
+	int (*prepare)(struct device *dev);
 	int (*add)(struct device *main, struct device *member);
 	int (*del)(struct device *main, struct device *member);
 };
@@ -137,29 +126,41 @@ struct device_hotplug_ops {
 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;
+extern const struct device_type tunnel_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);
 
 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);
+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 device_set_present(struct device *dev, bool state);
+void device_set_disabled(struct device *dev, bool value);
 int device_claim(struct device_user *dep);
 void device_release(struct device_user *dep);
-int check_device_state(struct device *dev);
-
-static inline void
-device_free(struct device *dev)
-{
-	dev->type->free(dev);
-}
+int device_check_state(struct device *dev);
+void device_dump_status(struct blob_buf *b, struct device *dev);
 
+void device_free(struct device *dev);
 void device_free_unused(struct device *dev);
 
 struct device *get_vlan_device_chain(const char *ifname, bool create);
+void alias_notify_device(const char *name, struct device *dev);
 
 #endif