X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=interface.h;h=020306c36c9c6d6705e94c5222a496d91df59d3a;hb=23cfcee20f43d824d61fadef48af84a83d5b8816;hp=a5c747702b3cce5ab2fb7b600e84d42099d86801;hpb=8d60ce8fad81a0951e9d7efe9e57d0b4b331095e;p=project%2Fnetifd.git

diff --git a/interface.h b/interface.h
index a5c7477..020306c 100644
--- a/interface.h
+++ b/interface.h
@@ -35,7 +35,7 @@ struct interface {
 
 	char name[IFNAMSIZ];
 
-	bool active;
+	bool available;
 	bool autostart;
 
 	enum interface_state state;
@@ -46,10 +46,14 @@ struct interface {
 	/* interface that layer 3 communication will go through */
 	struct device_user *l3_iface;
 
+	struct config_state 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,14 +63,14 @@ struct interface {
 
 extern const struct config_param_list interface_attr_list;
 
-struct interface *get_interface(const char *name);
-struct interface *alloc_interface(const char *name, struct uci_section *s, struct blob_attr *attr);
-void free_interface(struct interface *iface);
+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_set_proto_state(struct interface *iface, struct interface_proto_state *state);
 
 int interface_set_up(struct interface *iface);
-int set_interface_down(struct interface *iface);
+int interface_set_down(struct interface *iface);
 
 int interface_add_link(struct interface *iface, struct device *llif);
 void interface_remove_link(struct interface *iface, struct device *llif);
@@ -74,16 +78,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_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);
-
-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 start_pending_interfaces(void);
+void interface_start_pending(void);
 
 #endif