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

diff --git a/device.h b/device.h
index 1abd567..176d1ef 100644
--- a/device.h
+++ b/device.h
@@ -19,6 +19,12 @@ enum {
 	__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;
@@ -26,6 +32,8 @@ struct device_type {
 	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_status)(struct device *, struct blob_buf *buf);
 	int (*check_state)(struct device *);
 	void (*free)(struct device *);
@@ -37,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
@@ -86,9 +58,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;
 
@@ -100,8 +77,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 */
@@ -138,7 +113,13 @@ 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);
@@ -150,7 +131,7 @@ 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 check_device_state(struct device *dev);
+int device_check_state(struct device *dev);
 
 static inline void
 device_free(struct device *dev)