X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.h;h=bfdc28e4c7d8309bae0abcb44805d7cfcf42eece;hp=6620796306363e2c5a6fb107e131d43e53c0dd17;hb=e64619267d7b4e5f5fec57718c0e11e7844dc9ee;hpb=41842d3f91733786cb4d2bcdc6ca0c3a1a1c594b

diff --git a/interface.h b/interface.h
index 6620796..bfdc28e 100644
--- a/interface.h
+++ b/interface.h
@@ -10,6 +10,8 @@ struct interface_proto_state;
 enum interface_event {
 	IFEV_DOWN,
 	IFEV_UP,
+	IFEV_FREE,
+	IFEV_RELOAD,
 };
 
 enum interface_state {
@@ -33,6 +35,29 @@ struct interface_error {
 	const char *data[];
 };
 
+struct interface_user {
+	struct list_head list;
+	struct interface *iface;
+	void (*cb)(struct interface_user *dep, struct interface *iface, enum interface_event ev);
+};
+
+struct interface_ip_settings {
+	struct interface *iface;
+	bool enabled;
+	bool no_defaultroute;
+
+	struct vlist_tree addr;
+	struct vlist_tree route;
+
+	struct vlist_simple_tree dns_servers;
+	struct vlist_simple_tree dns_search;
+};
+
+struct interface_data {
+	struct avl_node node;
+	struct blob_attr data[];
+};
+
 /*
  * interface configuration
  */
@@ -52,11 +77,13 @@ struct interface {
 	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_dev;
+	struct device_user l3_dev;
 
 	struct blob_attr *config;
 
@@ -64,15 +91,18 @@ struct interface {
 	const struct proto_handler *proto_handler;
 	struct interface_proto_state *proto;
 
-	struct vlist_tree proto_addr;
-	struct vlist_tree proto_route;
+	struct interface_ip_settings proto_ip;
+	struct interface_ip_settings config_ip;
+	struct vlist_tree host_routes;
 
-	struct list_head proto_dns_servers;
-	struct list_head proto_dns_search;
+	int metric;
 
 	/* errors/warnings while trying to bring up the interface */
 	struct list_head errors;
 
+	/* extra data provided by protocol handlers or modules */
+	struct avl_tree data;
+
 	struct uloop_timeout remove_timer;
 	struct ubus_object ubus;
 };
@@ -90,15 +120,24 @@ void interface_set_proto_state(struct interface *iface, struct interface_proto_s
 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);
 
-int interface_add_link(struct interface *iface, struct device *llif);
-void interface_remove_link(struct interface *iface, struct device *llif);
+void interface_set_main_dev(struct interface *iface, struct device *dev);
+void interface_set_l3_dev(struct interface *iface, struct device *dev);
+
+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 *dev);
+int interface_remove_link(struct interface *iface, struct device *dev);
 
 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);
+int interface_add_data(struct interface *iface, const struct blob_attr *data);
+
+void interface_update_start(struct interface *iface);
+void interface_update_complete(struct interface *iface);
 
 void interface_start_pending(void);