X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.h;h=e3b5ff70f583ced6754b3244aa9ea007d76eb3fb;hp=0fd70d7cdde4f934136c982c55ea8b9b2349e09e;hb=20adacee2080e29cad3571da073d7fb4909230b1;hpb=5d1fff7af6f77c9bf0d46572c7af563cd9fc55b3

diff --git a/interface.h b/interface.h
index 0fd70d7..e3b5ff7 100644
--- a/interface.h
+++ b/interface.h
@@ -1,22 +1,29 @@
 #ifndef __NETIFD_INTERFACE_H
 #define __NETIFD_INTERFACE_H
 
+#include "device.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;
+enum interface_state {
+	IFS_SETUP,
+	IFS_UP,
+	IFS_TEARDOWN,
+	IFS_DOWN,
+};
+
+struct interface_error {
+	struct list_head list;
 
-	int (*event)(struct interface *, struct interface_proto_state *, enum interface_event ev);
-	void (*free)(struct interface *, struct interface_proto_state *);
+	const char *subsystem;
+	const char *code;
+	const char *data[];
 };
 
 /*
@@ -25,17 +32,13 @@ struct interface_proto_state {
 struct interface {
 	struct list_head list;
 
-	char name[IFNAMSIZ - 2];
-
-	/* interface is up and running */
-	bool up;
+	char name[IFNAMSIZ];
 
-	/* interface can be brought up */
 	bool active;
-
-	/* interface will be brought up when available */
 	bool autostart;
 
+	enum interface_state state;
+
 	/* main interface that the interface is bound to */
 	struct device_user main_dev;
 
@@ -43,21 +46,31 @@ struct interface {
 	struct device_user *l3_iface;
 
 	/* primary protocol state */
-	struct interface_proto_state *state;
+	struct interface_proto_state *proto;
+
+	/* errors/warnings while trying to bring up the interface */
+	struct list_head errors;
 
 	struct ubus_object ubus;
 };
 
 struct interface *get_interface(const char *name);
-struct interface *alloc_interface(const char *name);
+struct interface *alloc_interface(const char *name, struct uci_section *s);
 void free_interface(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_add_link(struct interface *iface, struct device *llif);
 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 start_pending_interfaces(void);
+
 #endif