X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=device.h;h=b2ea0fa67afe56b243ec13c288ab239b07fb5984;hb=HEAD;hp=ab5a162a964ce0d3be4cdcc98de18b2ddf86213c;hpb=42c48866f1c1fce068f41536baa8dd2e80fc08d7;p=project%2Fnetifd.git

diff --git a/device.h b/device.h
index ab5a162..1c01b58 100644
--- a/device.h
+++ b/device.h
@@ -53,6 +53,25 @@ enum {
 	DEV_ATTR_SENDREDIRECTS,
 	DEV_ATTR_NEIGHLOCKTIME,
 	DEV_ATTR_ISOLATE,
+	DEV_ATTR_IP6SEGMENTROUTING,
+	DEV_ATTR_DROP_V4_UNICAST_IN_L2_MULTICAST,
+	DEV_ATTR_DROP_V6_UNICAST_IN_L2_MULTICAST,
+	DEV_ATTR_DROP_GRATUITOUS_ARP,
+	DEV_ATTR_DROP_UNSOLICITED_NA,
+	DEV_ATTR_ARP_ACCEPT,
+	DEV_ATTR_AUTH,
+	DEV_ATTR_AUTH_VLAN,
+	DEV_ATTR_SPEED,
+	DEV_ATTR_DUPLEX,
+	DEV_ATTR_VLAN,
+	DEV_ATTR_PAUSE,
+	DEV_ATTR_ASYM_PAUSE,
+	DEV_ATTR_RXPAUSE,
+	DEV_ATTR_TXPAUSE,
+	DEV_ATTR_AUTONEG,
+	DEV_ATTR_GRO,
+	DEV_ATTR_MASTER,
+	DEV_ATTR_EEE,
 	__DEV_ATTR_MAX,
 };
 
@@ -76,37 +95,55 @@ struct device_type {
 		struct blob_attr *attr);
 	void (*config_init)(struct device *);
 	enum dev_change_type (*reload)(struct device *, struct blob_attr *);
+	void (*vlan_update)(struct device *);
 	void (*dump_info)(struct device *, struct blob_buf *buf);
 	void (*dump_stats)(struct device *, struct blob_buf *buf);
 	int (*check_state)(struct device *);
+	void (*stp_init)(struct device *);
 	void (*free)(struct device *);
 };
 
 enum {
-	DEV_OPT_MTU			= (1 << 0),
-	DEV_OPT_MACADDR			= (1 << 1),
-	DEV_OPT_TXQUEUELEN		= (1 << 2),
-	DEV_OPT_IPV6			= (1 << 3),
-	DEV_OPT_PROMISC			= (1 << 4),
-	DEV_OPT_RPFILTER		= (1 << 5),
-	DEV_OPT_ACCEPTLOCAL		= (1 << 6),
-	DEV_OPT_IGMPVERSION		= (1 << 7),
-	DEV_OPT_MLDVERSION		= (1 << 8),
-	DEV_OPT_NEIGHREACHABLETIME	= (1 << 9),
-	DEV_OPT_DEFAULT_MACADDR		= (1 << 10),
-	/* 1 bit hole */
-	DEV_OPT_MTU6			= (1 << 12),
-	DEV_OPT_DADTRANSMITS		= (1 << 13),
-	DEV_OPT_MULTICAST_TO_UNICAST	= (1 << 14),
-	DEV_OPT_MULTICAST_ROUTER	= (1 << 15),
-	DEV_OPT_MULTICAST		= (1 << 16),
-	DEV_OPT_LEARNING		= (1 << 17),
-	DEV_OPT_UNICAST_FLOOD		= (1 << 18),
-	DEV_OPT_NEIGHGCSTALETIME	= (1 << 19),
-	DEV_OPT_MULTICAST_FAST_LEAVE	= (1 << 20),
-	DEV_OPT_SENDREDIRECTS		= (1 << 21),
-	DEV_OPT_NEIGHLOCKTIME		= (1 << 22),
-	DEV_OPT_ISOLATE			= (1 << 23),
+	DEV_OPT_MTU			= (1ULL << 0),
+	DEV_OPT_MACADDR			= (1ULL << 1),
+	DEV_OPT_TXQUEUELEN		= (1ULL << 2),
+	DEV_OPT_IPV6			= (1ULL << 3),
+	DEV_OPT_PROMISC			= (1ULL << 4),
+	DEV_OPT_RPFILTER		= (1ULL << 5),
+	DEV_OPT_ACCEPTLOCAL		= (1ULL << 6),
+	DEV_OPT_IGMPVERSION		= (1ULL << 7),
+	DEV_OPT_MLDVERSION		= (1ULL << 8),
+	DEV_OPT_NEIGHREACHABLETIME	= (1ULL << 9),
+	DEV_OPT_DEFAULT_MACADDR		= (1ULL << 10),
+	DEV_OPT_AUTH			= (1ULL << 11),
+	DEV_OPT_MTU6			= (1ULL << 12),
+	DEV_OPT_DADTRANSMITS		= (1ULL << 13),
+	DEV_OPT_MULTICAST_TO_UNICAST	= (1ULL << 14),
+	DEV_OPT_MULTICAST_ROUTER	= (1ULL << 15),
+	DEV_OPT_MULTICAST		= (1ULL << 16),
+	DEV_OPT_LEARNING		= (1ULL << 17),
+	DEV_OPT_UNICAST_FLOOD		= (1ULL << 18),
+	DEV_OPT_NEIGHGCSTALETIME	= (1ULL << 19),
+	DEV_OPT_MULTICAST_FAST_LEAVE	= (1ULL << 20),
+	DEV_OPT_SENDREDIRECTS		= (1ULL << 21),
+	DEV_OPT_NEIGHLOCKTIME		= (1ULL << 22),
+	DEV_OPT_ISOLATE			= (1ULL << 23),
+	DEV_OPT_IP6SEGMENTROUTING	= (1ULL << 24),
+	DEV_OPT_DROP_V4_UNICAST_IN_L2_MULTICAST = (1ULL << 25),
+	DEV_OPT_DROP_V6_UNICAST_IN_L2_MULTICAST = (1ULL << 26),
+	DEV_OPT_DROP_GRATUITOUS_ARP	= (1ULL << 27),
+	DEV_OPT_DROP_UNSOLICITED_NA	= (1ULL << 28),
+	DEV_OPT_ARP_ACCEPT		= (1ULL << 29),
+	DEV_OPT_SPEED			= (1ULL << 30),
+	DEV_OPT_DUPLEX			= (1ULL << 31),
+	DEV_OPT_PAUSE			= (1ULL << 32),
+	DEV_OPT_ASYM_PAUSE		= (1ULL << 33),
+	DEV_OPT_RXPAUSE			= (1ULL << 34),
+	DEV_OPT_TXPAUSE			= (1ULL << 35),
+	DEV_OPT_AUTONEG			= (1ULL << 36),
+	DEV_OPT_GRO			= (1ULL << 37),
+	DEV_OPT_MASTER			= (1ULL << 38),
+	DEV_OPT_EEE			= (1ULL << 39),
 };
 
 /* events broadcasted to all users of a device */
@@ -122,6 +159,7 @@ enum device_event {
 	DEV_EVENT_UP,
 	DEV_EVENT_DOWN,
 
+	DEV_EVENT_AUTH_UP,
 	DEV_EVENT_LINK_UP,
 	DEV_EVENT_LINK_DOWN,
 
@@ -148,8 +186,8 @@ struct device_user {
 };
 
 struct device_settings {
-	unsigned int flags;
-	unsigned int valid_flags;
+	uint64_t flags;
+	uint64_t valid_flags;
 	unsigned int mtu;
 	unsigned int mtu6;
 	unsigned int txqueuelen;
@@ -173,7 +211,28 @@ struct device_settings {
 	bool learning;
 	bool unicast_flood;
 	bool sendredirects;
+	bool ip6segmentrouting;
 	bool isolate;
+	bool drop_v4_unicast_in_l2_multicast;
+	bool drop_v6_unicast_in_l2_multicast;
+	bool drop_gratuitous_arp;
+	bool drop_unsolicited_na;
+	bool arp_accept;
+	bool auth;
+	unsigned int speed;
+	bool duplex;
+	bool pause;
+	bool asym_pause;
+	bool rxpause;
+	bool txpause;
+	bool autoneg;
+	bool gro;
+	int master_ifindex;
+	bool eee;
+};
+
+struct device_vlan_range {
+	uint16_t start, end;
 };
 
 /*
@@ -189,8 +248,10 @@ struct device {
 
 	struct vlist_tree vlans;
 	struct kvlist vlan_aliases;
+	struct blob_attr *config_auth_vlans;
+	struct blob_attr *auth_vlans;
 
-	char ifname[IFNAMSIZ + 1];
+	char ifname[IFNAMSIZ];
 	int ifindex;
 
 	struct blob_attr *config;
@@ -202,6 +263,7 @@ struct device {
 	int active;
 	/* DEV_EVENT_LINK_UP */
 	bool link_active;
+	bool auth_status;
 
 	bool external;
 	bool disabled;
@@ -213,9 +275,13 @@ struct device {
 	bool default_config;
 	bool wireless;
 	bool wireless_ap;
+	bool wireless_proxyarp;
 	bool wireless_isolate;
+	bool bpdu_filter;
 
 	struct interface *config_iface;
+	struct device_vlan_range *extra_vlan;
+	int n_extra_vlan;
 
 	/* set interface up or down */
 	device_state_cb set_state;
@@ -231,7 +297,7 @@ struct device {
 struct device_hotplug_ops {
 	int (*prepare)(struct device *dev, struct device **bridge_dev);
 	int (*add)(struct device *main, struct device *member, struct blob_attr *vlan);
-	int (*del)(struct device *main, struct device *member);
+	int (*del)(struct device *main, struct device *member, struct blob_attr *vlan);
 };
 
 enum bridge_vlan_flags {
@@ -243,6 +309,12 @@ enum bridge_vlan_flags {
 struct bridge_vlan_port {
 	const char *ifname;
 	uint16_t flags;
+	int8_t check;
+};
+
+struct bridge_vlan_hotplug_port {
+	struct list_head list;
+	struct bridge_vlan_port port;
 };
 
 struct bridge_vlan {
@@ -255,16 +327,15 @@ struct bridge_vlan {
 
 	uint16_t vid;
 	bool local;
+	bool pending;
 };
 
 extern const struct uci_blob_param_list device_attr_list;
 extern struct device_type simple_device_type;
 extern struct device_type tunnel_device_type;
 
-void device_lock(void);
-void device_unlock(void);
-
 void device_vlan_update(bool done);
+void device_stp_init(void);
 
 int device_type_add(struct device_type *devtype);
 struct device_type *device_type_get(const char *tname);
@@ -285,12 +356,35 @@ int device_init_virtual(struct device *dev, struct device_type *type, const char
 int device_init(struct device *dev, struct device_type *type, const char *ifname);
 void device_cleanup(struct device *dev);
 struct device *device_find(const char *name);
-struct device *device_get(const char *name, int create);
+
+struct device *__device_get(const char *name, int create, bool check_vlan);
+static inline struct device *device_get(const char *name, int create)
+{
+	return __device_get(name, create, true);
+}
+
 void device_add_user(struct device_user *dep, struct device *dev);
 void device_remove_user(struct device_user *dep);
-void device_broadcast_event(struct device *dev, enum device_event ev);
+const char *device_event_name(enum device_event ev);
+void __device_broadcast_event(struct device *dev, enum device_event ev);
+#define device_broadcast_event(dev, ev) do {					\
+	struct device *__ev_dev = (dev);					\
+	D(DEVICE, "%s: event (%s)",						\
+	  (__ev_dev && __ev_dev->ifname[0] ? __ev_dev->ifname : "(none)"),	\
+	  device_event_name(ev));						\
+	__device_broadcast_event(__ev_dev, ev);					\
+} while (0)
+
+void _device_set_present(struct device *dev, bool state);
+#define device_set_present(dev, state) do {					\
+	struct device *__ev_dev = (dev);					\
+	bool __ev_state = state;						\
+	D(DEVICE, "%s: set present=%d",						\
+	  (__ev_dev && __ev_dev->ifname[0] ? __ev_dev->ifname : "(none)"),	\
+	  __ev_state);								\
+	_device_set_present(__ev_dev, __ev_state);				\
+} while (0)
 
-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);
 int device_set_ifname(struct device *dev, const char *name);
@@ -300,12 +394,14 @@ void device_release(struct device_user *dep);
 int device_check_state(struct device *dev);
 void device_dump_status(struct blob_buf *b, struct device *dev);
 
-void device_free_unused(struct device *dev);
+void device_free_unused(void);
 
-struct device *get_vlan_device_chain(const char *ifname, bool create);
+struct device *get_vlan_device_chain(const char *ifname, int create);
 void alias_notify_device(const char *name, struct device *dev);
 struct device *device_alias_get(const char *name);
 
+void device_set_auth_status(struct device *dev, bool value, struct blob_attr *vlans);
+
 static inline void
 device_set_deferred(struct device *dev, bool value)
 {
@@ -320,4 +416,16 @@ device_set_disabled(struct device *dev, bool value)
 	device_refresh_present(dev);
 }
 
+static inline bool
+device_link_active(struct device *dev)
+{
+	if (dev->settings.auth && !dev->auth_status)
+		return false;
+
+	return dev->link_active;
+}
+
+bool device_check_ip6segmentrouting(void);
+void device_hotplug_event(const char *name, bool add);
+
 #endif