X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.h;h=020306c36c9c6d6705e94c5222a496d91df59d3a;hp=afdeb186af09c2b950eae402b0b00f2fda0e4412;hb=82bd6990581a6a424fcabe8e5da9af885d531e07;hpb=ddbc9bb6e4769b9654a5ab12acf64c448c70e7bb

diff --git a/interface.h b/interface.h
index afdeb18..020306c 100644
--- a/interface.h
+++ b/interface.h
@@ -1,22 +1,22 @@
 #ifndef __NETIFD_INTERFACE_H
 #define __NETIFD_INTERFACE_H
 
+#include "device.h"
+#include "config.h"
+
 struct interface;
-struct interface_proto;
 struct interface_proto_state;
 
-extern struct list_head interfaces;
-
 enum interface_event {
 	IFEV_UP,
 	IFEV_DOWN,
 };
 
-struct interface_proto_state {
-	const struct interface_proto *proto;
-
-	int (*event)(struct interface *, struct interface_proto_state *, enum interface_event ev);
-	void (*free)(struct interface *, struct interface_proto_state *);
+enum interface_state {
+	IFS_SETUP,
+	IFS_UP,
+	IFS_TEARDOWN,
+	IFS_DOWN,
 };
 
 struct interface_error {
@@ -35,23 +35,25 @@ struct interface {
 
 	char name[IFNAMSIZ];
 
-	/* interface is up and running */
-	bool up;
-
-	/* interface can be brought up */
-	bool active;
-
-	/* interface will be brought up when available */
+	bool available;
 	bool autostart;
 
+	enum interface_state 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 config_state config;
+
 	/* primary protocol state */
-	struct interface_proto_state *state;
+	const struct proto_handler *proto_handler;
+	struct interface_proto_state *proto;
+
+	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 +61,16 @@ struct interface {
 	struct ubus_object ubus;
 };
 
-struct interface *get_interface(const char *name);
-struct interface *alloc_interface(const char *name);
-void free_interface(struct interface *iface);
+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_set_proto_state(struct interface *iface, struct interface_proto_state *state);
 
-int set_interface_up(struct interface *iface);
-int set_interface_down(struct interface *iface);
+int interface_set_up(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);
@@ -72,6 +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);
+void interface_start_pending(void);
 
 #endif