X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=interface.h;h=9708a5e4113230dba9fe45ade8fa81926fd85e68;hb=78637a9ca3fd717f347d9b44b3b8ac9cafe6db57;hp=e3b5ff70f583ced6754b3244aa9ea007d76eb3fb;hpb=71427e54fa17dacd1ace6077bffb9f9b9d456ebb;p=oweals%2Fnetifd.git

diff --git a/interface.h b/interface.h
index e3b5ff7..9708a5e 100644
--- a/interface.h
+++ b/interface.h
@@ -2,6 +2,7 @@
 #define __NETIFD_INTERFACE_H
 
 #include "device.h"
+#include "config.h"
 
 struct interface;
 struct interface_proto_state;
@@ -34,7 +35,7 @@ struct interface {
 
 	char name[IFNAMSIZ];
 
-	bool active;
+	bool available;
 	bool autostart;
 
 	enum interface_state state;
@@ -43,25 +44,34 @@ 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 config_state config;
 
 	/* primary protocol 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;
 
 	struct ubus_object ubus;
 };
 
-struct interface *get_interface(const char *name);
-struct interface *alloc_interface(const char *name, struct uci_section *s);
-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);
+void interface_set_available(struct interface *iface, bool new_state);
+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);
@@ -69,8 +79,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 start_pending_interfaces(void);
+void interface_start_pending(void);
 
 #endif