projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netifd: Remove unnecessary default_config check in config_parse_interface
[project/netifd.git]
/
device.h
diff --git
a/device.h
b/device.h
index
d41042b
..
ca4cc11
100644
(file)
--- 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.
*/
* 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/avl.h>
+#include <libubox/safe_list.h>
#include <netinet/in.h>
struct device;
#include <netinet/in.h>
struct device;
@@
-30,6
+31,12
@@
enum {
DEV_ATTR_MACADDR,
DEV_ATTR_TXQUEUELEN,
DEV_ATTR_ENABLED,
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_MAX,
};
__DEV_ATTR_MAX,
};
@@
-44,7
+51,9
@@
struct device_type {
struct list_head list;
const char *name;
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 *);
struct device *(*create)(const char *name, struct blob_attr *attr);
void (*config_init)(struct device *);
@@
-58,7
+67,13
@@
struct device_type {
enum {
DEV_OPT_MTU = (1 << 0),
DEV_OPT_MACADDR = (1 << 1),
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),
+ DEV_OPT_RPFILTER = (1 << 5),
+ DEV_OPT_ACCEPTLOCAL = (1 << 6),
+ DEV_OPT_IGMPVERSION = (1 << 7),
+ DEV_OPT_MLDVERSION = (1 << 8),
};
/* events broadcasted to all users of a device */
};
/* events broadcasted to all users of a device */
@@
-66,6
+81,9
@@
enum device_event {
DEV_EVENT_ADD,
DEV_EVENT_REMOVE,
DEV_EVENT_ADD,
DEV_EVENT_REMOVE,
+ DEV_EVENT_UPDATE_IFNAME,
+ DEV_EVENT_UPDATE_IFINDEX,
+
DEV_EVENT_SETUP,
DEV_EVENT_TEARDOWN,
DEV_EVENT_UP,
DEV_EVENT_SETUP,
DEV_EVENT_TEARDOWN,
DEV_EVENT_UP,
@@
-73,16
+91,24
@@
enum device_event {
DEV_EVENT_LINK_UP,
DEV_EVENT_LINK_DOWN,
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 {
};
/*
* device dependency with callbacks
*/
struct device_user {
- struct
list_head
list;
+ struct
safe_list
list;
bool claimed;
bool hotplug;
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 *dev;
void (*cb)(struct device_user *, enum device_event);
@@
-93,9
+119,15
@@
struct device_settings {
unsigned int mtu;
unsigned int txqueuelen;
uint8_t macaddr[6];
unsigned int mtu;
unsigned int txqueuelen;
uint8_t macaddr[6];
+ bool ipv6;
+ bool promisc;
+ unsigned int rpfilter;
+ bool acceptlocal;
+ unsigned int igmpversion;
+ unsigned int mldversion;
};
};
-/*
+/*
* link layer device. typically represents a linux network device.
* can be used to support VLANs as well
*/
* link layer device. typically represents a linux network device.
* can be used to support VLANs as well
*/
@@
-103,7
+135,8
@@
struct device {
const struct device_type *type;
struct avl_node avl;
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;
char ifname[IFNAMSIZ + 1];
int ifindex;
@@
-113,11
+146,16
@@
struct device {
bool sys_present;
bool present;
int active;
bool sys_present;
bool present;
int active;
+ bool link_active;
+
bool external;
bool disabled;
bool external;
bool disabled;
+ bool deferred;
+ bool hidden;
bool current_config;
bool default_config;
bool current_config;
bool default_config;
+ bool wireless;
/* set interface up or down */
device_state_cb set_state;
/* set interface up or down */
device_state_cb set_state;
@@
-136,10
+174,12
@@
struct device_hotplug_ops {
int (*del)(struct device *main, struct device *member);
};
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 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);
void device_lock(void);
void device_unlock(void);
@@
-152,6
+192,9
@@
void device_init_pending(void);
enum dev_change_type
device_set_config(struct device *dev, const struct device_type *type,
struct blob_attr *attr);
enum dev_change_type
device_set_config(struct device *dev, const struct device_type *type,
struct blob_attr *attr);
+enum dev_change_type
+device_apply_config(struct device *dev, const struct device_type *type,
+ struct blob_attr *config);
void device_reset_config(void);
void device_reset_old(void);
void device_reset_config(void);
void device_reset_old(void);
@@
-162,9
+205,12
@@
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);
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_set_present(struct device *dev, bool state);
-void device_set_disabled(struct device *dev, bool value);
+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);
int device_check_state(struct device *dev);
int device_claim(struct device_user *dep);
void device_release(struct device_user *dep);
int device_check_state(struct device *dev);
@@
-175,5
+221,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 *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
#endif