X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.h;h=1e8ef44bccfd1eb776d68fc473da4cbfd7dc8fa4;hp=9090164080ab008688319a1833c80b6fa2dd172b;hb=fd50535d7d4060d3cb80f1c317a087507ecfdf2b;hpb=4ed89555c4b5e748ed407f7694b5c9b32eea2e54

diff --git a/interface.h b/interface.h
index 9090164..1e8ef44 100644
--- a/interface.h
+++ b/interface.h
@@ -31,11 +31,11 @@ struct interface_error {
  * interface configuration
  */
 struct interface {
-	struct list_head list;
+	struct vlist_node node;
 
 	char name[IFNAMSIZ];
 
-	bool active;
+	bool available;
 	bool autostart;
 
 	enum interface_state state;
@@ -44,12 +44,16 @@ struct interface {
 	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;
@@ -59,12 +63,14 @@ struct interface {
 
 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);
 
@@ -74,14 +80,6 @@ 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_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);
-
-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_start_pending(void);
 
 #endif