X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.h;h=4d53c83b2e37fd4b657b5e9aaa25bdaf78fb6836;hp=bde069c8d95959a96b21da45c575f7908a72b46f;hb=11bd51d22596cf26be9ba486d52ef336b4035cae;hpb=818abd9f2f42c36a0f91ff6d29a9a635398216e0

diff --git a/interface.h b/interface.h
index bde069c..4d53c83 100644
--- a/interface.h
+++ b/interface.h
@@ -8,8 +8,8 @@ struct interface;
 struct interface_proto_state;
 
 enum interface_event {
-	IFEV_UP,
 	IFEV_DOWN,
+	IFEV_UP,
 };
 
 enum interface_state {
@@ -19,6 +19,12 @@ enum interface_state {
 	IFS_DOWN,
 };
 
+enum interface_config_state {
+	IFC_NORMAL,
+	IFC_RELOAD,
+	IFC_REMOVE
+};
+
 struct interface_error {
 	struct list_head list;
 
@@ -31,41 +37,53 @@ struct interface_error {
  * interface configuration
  */
 struct interface {
-	struct list_head list;
+	struct vlist_node node;
+	struct list_head hotplug_list;
+	enum interface_event hotplug_ev;
 
 	char name[IFNAMSIZ];
+	const char *ifname;
 
-	bool active;
+	bool available;
 	bool autostart;
+	bool config_autostart;
 
 	enum interface_state state;
+	enum interface_config_state config_state;
 
 	/* main interface that the interface is bound to */
 	struct device_user main_dev;
 
 	/* interface that layer 3 communication will go through */
-	struct device_user *l3_iface;
+	struct device_user *l3_dev;
+
+	struct blob_attr *config;
 
 	/* primary protocol state */
 	const struct proto_handler *proto_handler;
 	struct interface_proto_state *proto;
 
-	struct list_head address, routes;
+	struct vlist_tree proto_addr;
+	struct vlist_tree proto_route;
 
 	/* errors/warnings while trying to bring up the interface */
 	struct list_head errors;
 
+	struct uloop_timeout remove_timer;
 	struct ubus_object ubus;
 };
 
+extern struct vlist_tree interfaces;
 extern const struct config_param_list interface_attr_list;
 
-struct interface *interface_get(const char *name);
-struct interface *interface_alloc(const char *name, struct blob_attr *attr);
-void interface_free(struct interface *iface);
+void interface_init(struct interface *iface, const char *name,
+		    struct blob_attr *config);
+
+void interface_add(struct interface *iface, struct blob_attr *config);
 
 void interface_set_proto_state(struct interface *iface, struct interface_proto_state *state);
 
+void interface_set_available(struct interface *iface, bool new_state);
 int interface_set_up(struct interface *iface);
 int interface_set_down(struct interface *iface);
 
@@ -75,6 +93,9 @@ void interface_remove_link(struct interface *iface, struct device *llif);
 void interface_add_error(struct interface *iface, const char *subsystem,
 			 const char *code, const char **data, int n_data);
 
+void interface_queue_event(struct interface *iface, enum interface_event ev);
+void interface_dequeue_event(struct interface *iface);
+
 void interface_start_pending(void);
 
 #endif