X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.h;h=8c69958fa8edc78df18cb1a66476122843f385bf;hp=750c0f2bb44b880a740b0de9cfdb51b575a8bdb9;hb=ddbd2cc51b3db14f6a8bd46ceebaee9097a50b78;hpb=aff73720b65ca33a487c813f27644f8d5aea0df1

diff --git a/interface.h b/interface.h
index 750c0f2..8c69958 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,9 @@ struct interface_proto_state;
 enum interface_event {
 	IFEV_DOWN,
 	IFEV_UP,
+	IFEV_UPDATE,
+	IFEV_FREE,
+	IFEV_RELOAD,
 };
 
 enum interface_state {
@@ -36,21 +52,33 @@ 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;
 
 	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[];
+};
+
+struct interface_assignment_class {
+	struct list_head head;
+	char name[];
+};
+
 /*
  * interface configuration
  */
@@ -65,6 +93,8 @@ struct interface {
 	bool available;
 	bool autostart;
 	bool config_autostart;
+	bool device_config;
+	bool dynamic;
 
 	time_t start_time;
 	enum interface_state state;
@@ -72,11 +102,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;
 
 	/* interface that layer 3 communication will go through */
-	struct device_user *l3_dev;
+	struct device_user l3_dev;
 
 	struct blob_attr *config;
 
@@ -86,21 +119,36 @@ struct interface {
 
 	struct interface_ip_settings proto_ip;
 	struct interface_ip_settings config_ip;
+	struct vlist_tree host_routes;
+
+	int metric;
+	unsigned int ip4table;
+	unsigned int ip6table;
+
+	/* IPv6 assignment parameters */
+	uint8_t assignment_length;
+	int32_t assignment_hint;
+	struct list_head assignment_classes;
 
 	/* 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;
+extern const struct uci_blob_param_list interface_attr_list;
 
 void interface_init(struct interface *iface, const char *name,
-		    struct blob_attr *config);
+		    struct blob_attr *config, bool dynamic);
 
 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);
 
@@ -109,6 +157,8 @@ 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);
@@ -119,12 +169,11 @@ 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);
 
+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_queue_event(struct interface *iface, enum interface_event ev);
-void interface_dequeue_event(struct interface *iface);
-
 void interface_start_pending(void);
 
 #endif