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

diff --git a/interface.h b/interface.h
index dd72389..e3b5ff7 100644
--- a/interface.h
+++ b/interface.h
@@ -1,32 +1,21 @@
 #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,
 };
 
-enum interface_proto_event {
-	PROTO_UP,
-	PROTO_DOWN,
-};
-
-struct interface_proto_state {
-	struct interface *iface;
-	const struct interface_proto *proto;
-
-	/* filled in by the protocol user */
-	int (*proto_event)(struct interface_proto_state *, enum interface_proto_event ev);
-
-	/* filled in by the protocol handler */
-	int (*event)(struct interface_proto_state *, enum interface_event ev);
-	void (*free)(struct interface_proto_state *);
+enum interface_state {
+	IFS_SETUP,
+	IFS_UP,
+	IFS_TEARDOWN,
+	IFS_DOWN,
 };
 
 struct interface_error {
@@ -45,10 +34,11 @@ struct interface {
 
 	char name[IFNAMSIZ];
 
-	bool up;
 	bool active;
 	bool autostart;
 
+	enum interface_state state;
+
 	/* main interface that the interface is bound to */
 	struct device_user main_dev;
 
@@ -56,7 +46,7 @@ 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;
@@ -65,9 +55,11 @@ struct interface {
 };
 
 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);
 
@@ -79,4 +71,6 @@ void interface_add_error(struct interface *iface, const char *subsystem,
 
 int interface_attach_bridge(struct interface *iface, struct uci_section *s);
 
+void start_pending_interfaces(void);
+
 #endif