X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.h;h=adf72c5e1632f18edd61ac0bd7650864a5588c0b;hp=3f8dc37d2b164dd412e39547f6ad77b2a925d080;hb=9af0e57ce2c76db2ce49ea9fbfb5766da6000ec6;hpb=ad272ffe7e9d815aca79def21e35e83fa479840a

diff --git a/device.h b/device.h
index 3f8dc37..adf72c5 100644
--- a/device.h
+++ b/device.h
@@ -11,10 +11,11 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
-#ifndef __LL_H
-#define __LL_H
+#ifndef __NETIFD_DEVICE_H
+#define __NETIFD_DEVICE_H
 
 #include <libubox/avl.h>
+#include <libubox/safe_list.h>
 #include <netinet/in.h>
 
 struct device;
@@ -30,6 +31,8 @@ enum {
 	DEV_ATTR_MACADDR,
 	DEV_ATTR_TXQUEUELEN,
 	DEV_ATTR_ENABLED,
+	DEV_ATTR_IPV6,
+	DEV_ATTR_PROMISC,
 	__DEV_ATTR_MAX,
 };
 
@@ -44,7 +47,9 @@ struct device_type {
 	struct list_head list;
 	const char *name;
 
-	const struct config_param_list *config_params;
+	bool keep_link_status;
+
+	const struct uci_blob_param_list *config_params;
 
 	struct device *(*create)(const char *name, struct blob_attr *attr);
 	void (*config_init)(struct device *);
@@ -58,7 +63,9 @@ struct device_type {
 enum {
 	DEV_OPT_MTU		= (1 << 0),
 	DEV_OPT_MACADDR		= (1 << 1),
-	DEV_OPT_TXQUEUELEN	= (1 << 2)
+	DEV_OPT_TXQUEUELEN	= (1 << 2),
+	DEV_OPT_IPV6		= (1 << 3),
+	DEV_OPT_PROMISC		= (1 << 4),
 };
 
 /* events broadcasted to all users of a device */
@@ -66,6 +73,9 @@ enum device_event {
 	DEV_EVENT_ADD,
 	DEV_EVENT_REMOVE,
 
+	DEV_EVENT_UPDATE_IFNAME,
+	DEV_EVENT_UPDATE_IFINDEX,
+
 	DEV_EVENT_SETUP,
 	DEV_EVENT_TEARDOWN,
 	DEV_EVENT_UP,
@@ -73,16 +83,24 @@ enum device_event {
 
 	DEV_EVENT_LINK_UP,
 	DEV_EVENT_LINK_DOWN,
+
+	/* Topology changed (i.e. bridge member added) */
+	DEV_EVENT_TOPO_CHANGE,
+
+	__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);
@@ -93,9 +111,11 @@ struct device_settings {
 	unsigned int mtu;
 	unsigned int txqueuelen;
 	uint8_t macaddr[6];
+	bool ipv6;
+	bool promisc;
 };
 
-/* 
+/*
  * link layer device. typically represents a linux network device.
  * can be used to support VLANs as well
  */
@@ -103,7 +123,8 @@ 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;
@@ -113,12 +134,16 @@ struct device {
 	bool sys_present;
 	bool present;
 	int active;
+	bool link_active;
+
 	bool external;
 	bool disabled;
 	bool deferred;
+	bool hidden;
 
 	bool current_config;
 	bool default_config;
+	bool wireless;
 
 	/* set interface up or down */
 	device_state_cb set_state;
@@ -137,10 +162,12 @@ 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;
+extern const struct device_type vlandev_device_type;
 
 void device_lock(void);
 void device_unlock(void);
@@ -166,6 +193,8 @@ 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_link(struct device *dev, bool state);
+void device_set_ifindex(struct device *dev, int ifindex);
 void device_refresh_present(struct device *dev);
 int device_claim(struct device_user *dep);
 void device_release(struct device_user *dep);
@@ -177,6 +206,7 @@ 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)