X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.h;h=d63ffe3b6ad68da0cca0c4de4947dcdc147d48a9;hp=c0b112dddebfd53190766a06d60d7d45b488165e;hb=134775b1f41fa19a816768268b9d0f8dad86bd90;hpb=a6baf95e700f1abe8dafe71f5f8722baea6b6ac2

diff --git a/device.h b/device.h
index c0b112d..d63ffe3 100644
--- a/device.h
+++ b/device.h
@@ -1,7 +1,21 @@
+/*
+ * 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
 
 #include <libubox/avl.h>
+#include <libubox/safe_list.h>
 #include <netinet/in.h>
 
 struct device;
@@ -16,12 +30,14 @@ enum {
 	DEV_ATTR_MTU,
 	DEV_ATTR_MACADDR,
 	DEV_ATTR_TXQUEUELEN,
+	DEV_ATTR_ENABLED,
 	__DEV_ATTR_MAX,
 };
 
 enum dev_change_type {
 	DEV_CONFIG_NO_CHANGE,
 	DEV_CONFIG_APPLIED,
+	DEV_CONFIG_RESTART,
 	DEV_CONFIG_RECREATE,
 };
 
@@ -29,7 +45,7 @@ struct device_type {
 	struct list_head list;
 	const char *name;
 
-	const struct config_param_list *config_params;
+	const struct uci_blob_param_list *config_params;
 
 	struct device *(*create)(const char *name, struct blob_attr *attr);
 	void (*config_init)(struct device *);
@@ -43,7 +59,7 @@ struct device_type {
 enum {
 	DEV_OPT_MTU		= (1 << 0),
 	DEV_OPT_MACADDR		= (1 << 1),
-	DEV_OPT_TXQUEUELEN	= (1 << 2)
+	DEV_OPT_TXQUEUELEN	= (1 << 2),
 };
 
 /* events broadcasted to all users of a device */
@@ -51,6 +67,8 @@ enum device_event {
 	DEV_EVENT_ADD,
 	DEV_EVENT_REMOVE,
 
+	DEV_EVENT_UPDATE_IFNAME,
+
 	DEV_EVENT_SETUP,
 	DEV_EVENT_TEARDOWN,
 	DEV_EVENT_UP,
@@ -58,22 +76,34 @@ enum device_event {
 
 	DEV_EVENT_LINK_UP,
 	DEV_EVENT_LINK_DOWN,
+
+	__DEV_EVENT_MAX
 };
 
 /*
  * device dependency with callbacks
  */
 struct device_user {
-	struct list_head list;
+	struct safe_list list;
 
 	bool claimed;
 	bool hotplug;
+	bool alias;
+
+	uint8_t ev_idx[__DEV_EVENT_MAX];
 
 	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
  */
@@ -81,16 +111,22 @@ struct device {
 	const struct device_type *type;
 
 	struct avl_node avl;
-	struct list_head users;
+	struct safe_list users;
+	struct safe_list aliases;
 
 	char ifname[IFNAMSIZ + 1];
 	int ifindex;
 
 	struct blob_attr *config;
 	bool config_pending;
+	bool sys_present;
 	bool present;
 	int active;
+
 	bool external;
+	bool disabled;
+	bool deferred;
+	bool hidden;
 
 	bool current_config;
 	bool default_config;
@@ -102,12 +138,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 {
@@ -116,9 +148,11 @@ struct device_hotplug_ops {
 	int (*del)(struct device *main, struct device *member);
 };
 
-extern const struct config_param_list device_attr_list;
+extern const struct uci_blob_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;
+extern const struct device_type macvlan_device_type;
 
 void device_lock(void);
 void device_unlock(void);
@@ -141,8 +175,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_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);
@@ -153,5 +189,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