X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.h;h=b8c9cad21d764ec1315f5b8c0ac303502641ea7a;hp=91cffcab444522e9dde471147299d4f040451e7b;hb=889f3236fde274d6ebff23fe62c5cd66ed8b3eb7;hpb=ccca61c97d460d73f29750abdf38cea20ac440f3

diff --git a/interface.h b/interface.h
index 91cffca..b8c9cad 100644
--- a/interface.h
+++ b/interface.h
@@ -1,3 +1,16 @@
+/*
+ * netifd - network interface daemon
+ * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
 #ifndef __NETIFD_INTERFACE_H
 #define __NETIFD_INTERFACE_H
 
@@ -10,6 +23,8 @@ struct interface_proto_state;
 enum interface_event {
 	IFEV_DOWN,
 	IFEV_UP,
+	IFEV_FREE,
+	IFEV_RELOAD,
 };
 
 enum interface_state {
@@ -36,7 +51,27 @@ struct interface_error {
 struct interface_user {
 	struct list_head list;
 	struct interface *iface;
-	void (*cb)(struct interface_user *dep, enum interface_event ev);
+	void (*cb)(struct interface_user *dep, struct interface *iface, enum interface_event ev);
+};
+
+struct interface_ip_settings {
+	struct interface *iface;
+	bool enabled;
+	bool no_defaultroute;
+	bool no_dns;
+	uint8_t assignment_length;
+
+	struct vlist_tree addr;
+	struct vlist_tree route;
+	struct vlist_tree prefix;
+
+	struct vlist_simple_tree dns_servers;
+	struct vlist_simple_tree dns_search;
+};
+
+struct interface_data {
+	struct avl_node node;
+	struct blob_attr data[];
 };
 
 /*
@@ -53,6 +88,7 @@ struct interface {
 	bool available;
 	bool autostart;
 	bool config_autostart;
+	bool device_config;
 
 	time_t start_time;
 	enum interface_state state;
@@ -60,12 +96,14 @@ struct interface {
 
 	struct list_head users;
 
+	const char *parent_ifname;
+	struct interface_user parent_iface;
+
 	/* main interface that the interface is bound to */
 	struct device_user main_dev;
-	bool hotplug_dev;
 
 	/* interface that layer 3 communication will go through */
-	struct device_user *l3_dev;
+	struct device_user l3_dev;
 
 	struct blob_attr *config;
 
@@ -73,19 +111,23 @@ struct interface {
 	const struct proto_handler *proto_handler;
 	struct interface_proto_state *proto;
 
-	struct vlist_tree proto_addr;
-	struct vlist_tree proto_route;
+	struct interface_ip_settings proto_ip;
+	struct interface_ip_settings config_ip;
+	struct vlist_tree host_routes;
 
-	struct list_head proto_dns_servers;
-	struct list_head proto_dns_search;
+	int metric;
 
 	/* errors/warnings while trying to bring up the interface */
 	struct list_head errors;
 
+	/* extra data provided by protocol handlers or modules */
+	struct avl_tree data;
+
 	struct uloop_timeout remove_timer;
 	struct ubus_object ubus;
 };
 
+
 extern struct vlist_tree interfaces;
 extern const struct config_param_list interface_attr_list;
 
@@ -93,6 +135,7 @@ void interface_init(struct interface *iface, const char *name,
 		    struct blob_attr *config);
 
 void interface_add(struct interface *iface, struct blob_attr *config);
+bool interface_add_alias(struct interface *iface, struct blob_attr *config);
 
 void interface_set_proto_state(struct interface *iface, struct interface_proto_state *state);
 
@@ -101,18 +144,22 @@ int interface_set_up(struct interface *iface);
 int interface_set_down(struct interface *iface);
 void __interface_set_down(struct interface *iface, bool force);
 
+void interface_set_main_dev(struct interface *iface, struct device *dev);
+void interface_set_l3_dev(struct interface *iface, struct device *dev);
 
 void interface_add_user(struct interface_user *dep, struct interface *iface);
 void interface_remove_user(struct interface_user *dep);
 
-int interface_add_link(struct interface *iface, struct device *llif);
-void interface_remove_link(struct interface *iface, struct device *llif);
+int interface_add_link(struct interface *iface, struct device *dev);
+int interface_remove_link(struct interface *iface, struct device *dev);
 
 void interface_add_error(struct interface *iface, const char *subsystem,
 			 const char *code, const char **data, int n_data);
 
-void interface_queue_event(struct interface *iface, enum interface_event ev);
-void interface_dequeue_event(struct interface *iface);
+int interface_add_data(struct interface *iface, const struct blob_attr *data);
+
+void interface_update_start(struct interface *iface);
+void interface_update_complete(struct interface *iface);
 
 void interface_start_pending(void);