projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
system-linux: fix a glob related memleak
[project/netifd.git]
/
device.h
diff --git
a/device.h
b/device.h
index
1f852ab
..
adf72c5
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,8
@@
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_MAX,
};
__DEV_ATTR_MAX,
};
@@
-44,7
+47,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
+63,9
@@
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),
};
/* events broadcasted to all users of a device */
};
/* events broadcasted to all users of a device */
@@
-67,6
+74,7
@@
enum device_event {
DEV_EVENT_REMOVE,
DEV_EVENT_UPDATE_IFNAME,
DEV_EVENT_REMOVE,
DEV_EVENT_UPDATE_IFNAME,
+ DEV_EVENT_UPDATE_IFINDEX,
DEV_EVENT_SETUP,
DEV_EVENT_TEARDOWN,
DEV_EVENT_SETUP,
DEV_EVENT_TEARDOWN,
@@
-76,6
+84,9
@@
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
};
__DEV_EVENT_MAX
};
@@
-83,7
+94,7
@@
enum device_event {
* 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;
@@
-100,9
+111,11
@@
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;
};
};
-/*
+/*
* 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
*/
@@
-110,8
+123,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
list_head
aliases;
+ struct
safe_list
users;
+ struct
safe_list
aliases;
char ifname[IFNAMSIZ + 1];
int ifindex;
char ifname[IFNAMSIZ + 1];
int ifindex;
@@
-121,6
+134,7
@@
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;
@@
-129,6
+143,7
@@
struct device {
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;
@@
-147,10
+162,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);
@@
-176,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_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);
void device_refresh_present(struct device *dev);
int device_claim(struct device_user *dep);
void device_release(struct device_user *dep);