X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.h;h=3ce4c997068492e0b817757c81bf97d747532e7b;hp=a63997ad6cb8f30a5b1ac4df5155938720e55aca;hb=43c2934a4d3f9a3e9d7fc2a4e9a32a2bef7174ba;hpb=5d0a6b0744c7c57108773b34110ab487a24b3db6

diff --git a/interface.h b/interface.h
index a63997a..3ce4c99 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;
 
@@ -27,46 +33,84 @@ struct interface_error {
 	const char *data[];
 };
 
+struct interface_user {
+	struct list_head list;
+	struct interface *iface;
+	void (*cb)(struct interface_user *dep, enum interface_event ev);
+};
+
+struct interface_ip_settings {
+	struct interface *iface;
+	bool enabled;
+
+	struct vlist_tree addr;
+	struct vlist_tree route;
+
+	struct list_head dns_servers;
+	struct list_head dns_search;
+};
+
 /*
  * 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;
 
+	time_t start_time;
 	enum interface_state state;
+	enum interface_config_state config_state;
+
+	struct list_head users;
 
 	/* 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 interface_ip_settings proto_ip;
+	struct interface_ip_settings config_ip;
 
 	/* 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 uci_section *s, 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);
+void __interface_set_down(struct interface *iface, bool force);
+
+
+void interface_add_user(struct interface_user *dep, struct interface *iface);
+void interface_remove_user(struct interface_user *dep);
 
 int interface_add_link(struct interface *iface, struct device *llif);
 void interface_remove_link(struct interface *iface, struct device *llif);
@@ -74,15 +118,11 @@ 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);
 
-int interface_attach_bridge(struct interface *iface, struct uci_section *s);
-
-int interface_add_address(struct interface *iface, struct device_addr *addr);
-void interface_del_address(struct interface *iface, struct device_addr *addr);
-void interface_del_ctx_addr(struct interface *iface, void *ctx);
+void interface_update_start(struct interface *iface);
+void interface_update_complete(struct interface *iface);
 
-int interface_add_route(struct interface *iface, struct device_route *route);
-void interface_del_route(struct interface *iface, struct device_route *route);
-void interface_del_all_routes(struct interface *iface);
+void interface_queue_event(struct interface *iface, enum interface_event ev);
+void interface_dequeue_event(struct interface *iface);
 
 void interface_start_pending(void);