X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.h;h=72a00c98c41b7ff6de7bfc254076505946e4b04b;hp=e19d61ddbc13c57ba13f35adb280169129638ee4;hb=7f081660bf24fed49a716022a6ea17bb1dcde73a;hpb=17aab88b83a0e50ab31f18beec78ab07ce864883

diff --git a/interface.h b/interface.h
index e19d61d..72a00c9 100644
--- a/interface.h
+++ b/interface.h
@@ -1,8 +1,8 @@
 #ifndef __NETIFD_INTERFACE_H
 #define __NETIFD_INTERFACE_H
 
-#include <netinet/in.h>
 #include "device.h"
+#include "config.h"
 
 struct interface;
 struct interface_proto_state;
@@ -27,42 +27,6 @@ struct interface_error {
 	const char *data[];
 };
 
-enum interface_addr_flags {
-	/* address family for routes and addresses */
-	IFADDR_INET4	= (0 << 0),
-	IFADDR_INET6	= (1 << 0),
-	IFADDR_FAMILY	= IFADDR_INET4 | IFADDR_INET6,
-
-	/* device route (no gateway) */
-	IFADDR_DEVICE	= (1 << 1),
-};
-
-union if_addr {
-	struct in_addr in;
-	struct in6_addr in6;
-};
-
-struct interface_addr {
-	struct list_head list;
-	void *ctx;
-
-	enum interface_addr_flags flags;
-
-	unsigned int mask;
-	union if_addr addr;
-};
-
-struct interface_route {
-	struct list_head list;
-	void *ctx;
-
-	enum interface_addr_flags flags;
-
-	unsigned int mask;
-	union if_addr addr;
-	union if_addr nexthop;
-};
-
 /*
  * interface configuration
  */
@@ -71,7 +35,7 @@ struct interface {
 
 	char name[IFNAMSIZ];
 
-	bool active;
+	bool available;
 	bool autostart;
 
 	enum interface_state state;
@@ -82,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;
@@ -93,14 +61,17 @@ struct interface {
 	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);
@@ -108,12 +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);
-
-int interface_add_address(struct interface *iface, struct interface_addr *addr);
-void interface_del_address(struct interface *iface, struct interface_addr *addr);
-void interface_del_ctx_addr(struct interface *iface, void *ctx);
-
-void start_pending_interfaces(void);
+void interface_start_pending(void);
 
 #endif