X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.h;h=8cedfbae642827b1ff5f650c34cb4dfddb8e4034;hp=338138f42803411ea0e884b6c454c9e8f10cf6a0;hb=67b225a9c0d38989028763de5c07164f0bfee504;hpb=395891b0e4c67591523dd0e2c2ac0c8aa22e88e7

diff --git a/device.h b/device.h
index 338138f..8cedfba 100644
--- a/device.h
+++ b/device.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 __LL_H
 #define __LL_H
 
@@ -23,6 +36,7 @@ enum {
 enum dev_change_type {
 	DEV_CONFIG_NO_CHANGE,
 	DEV_CONFIG_APPLIED,
+	DEV_CONFIG_RESTART,
 	DEV_CONFIG_RECREATE,
 };
 
@@ -52,6 +66,8 @@ enum device_event {
 	DEV_EVENT_ADD,
 	DEV_EVENT_REMOVE,
 
+	DEV_EVENT_UPDATE_IFNAME,
+
 	DEV_EVENT_SETUP,
 	DEV_EVENT_TEARDOWN,
 	DEV_EVENT_UP,
@@ -69,11 +85,19 @@ struct device_user {
 
 	bool claimed;
 	bool hotplug;
+	bool alias;
 
 	struct device *dev;
 	void (*cb)(struct device_user *, enum device_event);
 };
 
+struct device_settings {
+	unsigned int flags;
+	unsigned int mtu;
+	unsigned int txqueuelen;
+	uint8_t macaddr[6];
+};
+
 /* 
  * link layer device. typically represents a linux network device.
  * can be used to support VLANs as well
@@ -83,6 +107,7 @@ struct device {
 
 	struct avl_node avl;
 	struct list_head users;
+	struct list_head aliases;
 
 	char ifname[IFNAMSIZ + 1];
 	int ifindex;
@@ -92,8 +117,11 @@ struct device {
 	bool sys_present;
 	bool present;
 	int active;
+
 	bool external;
 	bool disabled;
+	bool deferred;
+	bool hidden;
 
 	bool current_config;
 	bool default_config;
@@ -105,12 +133,8 @@ struct device {
 
 	struct device_user parent;
 
-	/* settings */
-	unsigned int flags;
-
-	unsigned int mtu;
-	unsigned int txqueuelen;
-	uint8_t macaddr[6];
+	struct device_settings orig_settings;
+	struct device_settings settings;
 };
 
 struct device_hotplug_ops {
@@ -122,6 +146,7 @@ struct device_hotplug_ops {
 extern const struct config_param_list device_attr_list;
 extern const struct device_type simple_device_type;
 extern const struct device_type bridge_device_type;
+extern const struct device_type tunnel_device_type;
 
 void device_lock(void);
 void device_unlock(void);
@@ -144,9 +169,10 @@ void device_cleanup(struct device *iface);
 struct device *device_get(const char *name, int create);
 void device_add_user(struct device_user *dep, struct device *iface);
 void device_remove_user(struct device_user *dep);
+void device_broadcast_event(struct device *dev, enum device_event ev);
 
 void device_set_present(struct device *dev, bool state);
-void device_set_disabled(struct device *dev, bool value);
+void device_refresh_present(struct device *dev);
 int device_claim(struct device_user *dep);
 void device_release(struct device_user *dep);
 int device_check_state(struct device *dev);
@@ -157,5 +183,20 @@ void device_free_unused(struct device *dev);
 
 struct device *get_vlan_device_chain(const char *ifname, bool create);
 void alias_notify_device(const char *name, struct device *dev);
+struct device *device_alias_get(const char *name);
+
+static inline void
+device_set_deferred(struct device *dev, bool value)
+{
+	dev->deferred = value;
+	device_refresh_present(dev);
+}
+
+static inline void
+device_set_disabled(struct device *dev, bool value)
+{
+	dev->disabled = value;
+	device_refresh_present(dev);
+}
 
 #endif