X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.h;h=b8c9cad21d764ec1315f5b8c0ac303502641ea7a;hp=5e3f3833df44b92d3502419f320fca3fde5e2d86;hb=74de0901a05271f51ec42beef649e1cc0abc917f;hpb=76d5b041afff56375bb88a18eff33e50acceb1d8

diff --git a/interface.h b/interface.h
index 5e3f383..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,16 +51,19 @@ 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;
@@ -70,6 +88,7 @@ struct interface {
 	bool available;
 	bool autostart;
 	bool config_autostart;
+	bool device_config;
 
 	time_t start_time;
 	enum interface_state state;
@@ -77,6 +96,9 @@ 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;
 
@@ -91,6 +113,7 @@ struct interface {
 
 	struct interface_ip_settings proto_ip;
 	struct interface_ip_settings config_ip;
+	struct vlist_tree host_routes;
 
 	int metric;
 
@@ -104,6 +127,7 @@ struct interface {
 	struct ubus_object ubus;
 };
 
+
 extern struct vlist_tree interfaces;
 extern const struct config_param_list interface_attr_list;
 
@@ -111,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);
 
@@ -136,9 +161,6 @@ 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