X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.h;h=84acf52ba00bde10dcec01448008ef7d4c1c1369;hp=4d84d80247099dd648c07749a22d29e467e32afb;hb=HEAD;hpb=5b29ffda0099c3bcb8d17a728e1e89dc21a2e68d diff --git a/device.h b/device.h index 4d84d80..84acf52 100644 --- a/device.h +++ b/device.h @@ -19,6 +19,7 @@ #include struct device; +struct device_type; struct device_user; struct device_hotplug_ops; struct interface; @@ -39,8 +40,17 @@ enum { DEV_ATTR_IGMPVERSION, DEV_ATTR_MLDVERSION, DEV_ATTR_NEIGHREACHABLETIME, - DEV_ATTR_RPS, - DEV_ATTR_XPS, + 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_MAX, }; @@ -55,11 +65,13 @@ struct device_type { struct list_head list; const char *name; - bool keep_link_status; + bool bridge_capability; + const char *name_prefix; const struct uci_blob_param_list *config_params; - struct device *(*create)(const char *name, struct blob_attr *attr); + 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 (*dump_info)(struct device *, struct blob_buf *buf); @@ -79,9 +91,19 @@ enum { DEV_OPT_IGMPVERSION = (1 << 7), DEV_OPT_MLDVERSION = (1 << 8), DEV_OPT_NEIGHREACHABLETIME = (1 << 9), - DEV_OPT_RPS = (1 << 10), - DEV_OPT_XPS = (1 << 11), - DEV_OPT_MTU6 = (1 << 12), + /* 2 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), }; /* events broadcasted to all users of a device */ @@ -124,6 +146,7 @@ struct device_user { struct device_settings { unsigned int flags; + unsigned int valid_flags; unsigned int mtu; unsigned int mtu6; unsigned int txqueuelen; @@ -136,8 +159,18 @@ struct device_settings { unsigned int mldversion; unsigned int neigh4reachabletime; unsigned int neigh6reachabletime; - bool rps; - bool xps; + 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 isolate; }; /* @@ -145,7 +178,7 @@ struct device_settings { * 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; @@ -157,8 +190,11 @@ struct device { 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 external; @@ -170,6 +206,8 @@ struct device { bool iface_config; bool default_config; bool wireless; + bool wireless_ap; + bool wireless_isolate; struct interface *config_iface; @@ -191,39 +229,40 @@ struct device_hotplug_ops { }; 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; +extern struct device_type simple_device_type; +extern struct device_type tunnel_device_type; void device_lock(void); void device_unlock(void); -struct device *device_create(const char *name, const struct device_type *type, +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_apply_config(struct device *dev, const struct device_type *type, +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_set_default_ps(bool state); -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); +void 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); -void device_add_user(struct device_user *dep, struct device *iface); +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);