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

diff --git a/device.h b/device.h
index 1068a46..b2ea0fa 100644
--- a/device.h
+++ b/device.h
@@ -11,26 +11,67 @@
  * 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 <libubox/kvlist.h>
 #include <netinet/in.h>
 
 struct device;
+struct device_type;
 struct device_user;
 struct device_hotplug_ops;
+struct bridge_vlan;
+struct interface;
 
 typedef int (*device_state_cb)(struct device *, bool up);
 
 enum {
 	DEV_ATTR_TYPE,
-	DEV_ATTR_IFNAME,
 	DEV_ATTR_MTU,
+	DEV_ATTR_MTU6,
 	DEV_ATTR_MACADDR,
 	DEV_ATTR_TXQUEUELEN,
 	DEV_ATTR_ENABLED,
+	DEV_ATTR_IPV6,
+	DEV_ATTR_PROMISC,
+	DEV_ATTR_RPFILTER,
+	DEV_ATTR_ACCEPTLOCAL,
+	DEV_ATTR_IGMPVERSION,
+	DEV_ATTR_MLDVERSION,
+	DEV_ATTR_NEIGHREACHABLETIME,
+	DEV_ATTR_DADTRANSMITS,
+	DEV_ATTR_MULTICAST_TO_UNICAST,
+	DEV_ATTR_MULTICAST_ROUTER,
+	DEV_ATTR_MULTICAST_FAST_LEAVE,
+	DEV_ATTR_MULTICAST,
+	DEV_ATTR_LEARNING,
+	DEV_ATTR_UNICAST_FLOOD,
+	DEV_ATTR_NEIGHGCSTALETIME,
+	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,
 };
 
@@ -45,21 +86,64 @@ struct device_type {
 	struct list_head list;
 	const char *name;
 
-	const struct config_param_list *config_params;
+	bool bridge_capability;
+	const char *name_prefix;
 
-	struct device *(*create)(const char *name, struct blob_attr *attr);
+	const struct uci_blob_param_list *config_params;
+
+	struct device *(*create)(const char *name, struct device_type *devtype,
+		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_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 */
@@ -68,15 +152,20 @@ enum device_event {
 	DEV_EVENT_REMOVE,
 
 	DEV_EVENT_UPDATE_IFNAME,
+	DEV_EVENT_UPDATE_IFINDEX,
 
 	DEV_EVENT_SETUP,
 	DEV_EVENT_TEARDOWN,
 	DEV_EVENT_UP,
 	DEV_EVENT_DOWN,
 
+	DEV_EVENT_AUTH_UP,
 	DEV_EVENT_LINK_UP,
 	DEV_EVENT_LINK_DOWN,
 
+	/* Topology changed (i.e. bridge member added) */
+	DEV_EVENT_TOPO_CHANGE,
+
 	__DEV_EVENT_MAX
 };
 
@@ -97,31 +186,84 @@ struct device_user {
 };
 
 struct device_settings {
-	unsigned int flags;
+	uint64_t flags;
+	uint64_t valid_flags;
 	unsigned int mtu;
+	unsigned int mtu6;
 	unsigned int txqueuelen;
 	uint8_t macaddr[6];
+	bool ipv6;
+	bool promisc;
+	unsigned int rpfilter;
+	bool acceptlocal;
+	unsigned int igmpversion;
+	unsigned int mldversion;
+	unsigned int neigh4reachabletime;
+	unsigned int neigh6reachabletime;
+	unsigned int neigh4gcstaletime;
+	unsigned int neigh6gcstaletime;
+	int neigh4locktime;
+	unsigned int dadtransmits;
+	bool multicast_to_unicast;
+	unsigned int multicast_router;
+	bool multicast_fast_leave;
+	bool multicast;
+	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;
 };
 
-/* 
+/*
  * link layer device. typically represents a linux network device.
  * can be used to support VLANs as well
  */
 struct device {
-	const struct device_type *type;
+	struct device_type *type;
 
 	struct avl_node avl;
 	struct safe_list users;
 	struct safe_list aliases;
 
-	char ifname[IFNAMSIZ + 1];
+	struct vlist_tree vlans;
+	struct kvlist vlan_aliases;
+	struct blob_attr *config_auth_vlans;
+	struct blob_attr *auth_vlans;
+
+	char ifname[IFNAMSIZ];
 	int ifindex;
 
 	struct blob_attr *config;
 	bool config_pending;
 	bool sys_present;
+	/* DEV_EVENT_ADD */
 	bool present;
+	/* DEV_EVENT_UP */
 	int active;
+	/* DEV_EVENT_LINK_UP */
+	bool link_active;
+	bool auth_status;
 
 	bool external;
 	bool disabled;
@@ -129,7 +271,17 @@ struct device {
 	bool hidden;
 
 	bool current_config;
+	bool iface_config;
 	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;
@@ -143,53 +295,96 @@ struct device {
 };
 
 struct device_hotplug_ops {
-	int (*prepare)(struct device *dev);
-	int (*add)(struct device *main, struct device *member);
-	int (*del)(struct device *main, struct device *member);
+	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, struct blob_attr *vlan);
 };
 
-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;
+enum bridge_vlan_flags {
+	BRVLAN_F_SELF =		(1 << 0),
+	BRVLAN_F_PVID =		(1 << 1),
+	BRVLAN_F_UNTAGGED =	(1 << 2),
+};
+
+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 {
+	struct vlist_node node;
+
+	struct bridge_vlan_port *ports;
+	int n_ports;
 
-void device_lock(void);
-void device_unlock(void);
+	struct list_head hotplug_ports;
 
-struct device *device_create(const char *name, const struct device_type *type,
+	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_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);
+struct device *device_create(const char *name, struct device_type *type,
 			     struct blob_attr *config);
+void device_merge_settings(struct device *dev, struct device_settings *n);
 void device_init_settings(struct device *dev, struct blob_attr **tb);
 void device_init_pending(void);
 
 enum dev_change_type
-device_set_config(struct device *dev, const struct device_type *type,
-		  struct blob_attr *attr);
+device_apply_config(struct device *dev, struct device_type *type,
+		    struct blob_attr *config);
 
 void device_reset_config(void);
 void device_reset_old(void);
 
-void device_init_virtual(struct device *dev, const struct device_type *type, const char *name);
-int device_init(struct device *iface, const struct device_type *type, const char *ifname);
-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);
+int device_init_virtual(struct device *dev, struct device_type *type, const char *name);
+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, 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);
 
 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);
 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);
 void device_dump_status(struct blob_buf *b, struct device *dev);
 
-void device_free(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)
 {
@@ -204,4 +399,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