X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=system.h;h=d5cb4e37ab9cb876dcd35ca188541b2ae6102fc2;hp=1ad861a79736877cec00466c343e723f4eec9374;hb=4789adf1e55cf51a8b556fba0c7c31bb5f430c7d;hpb=02021e2069d0ee315b0ff263b6c010bef63b879c

diff --git a/system.h b/system.h
index 1ad861a..d5cb4e3 100644
--- a/system.h
+++ b/system.h
@@ -28,25 +28,39 @@ enum tunnel_param {
 	TUNNEL_ATTR_MTU,
 	TUNNEL_ATTR_DF,
 	TUNNEL_ATTR_TTL,
+	TUNNEL_ATTR_TOS,
 	TUNNEL_ATTR_6RD_PREFIX,
 	TUNNEL_ATTR_6RD_RELAY_PREFIX,
 	TUNNEL_ATTR_LINK,
+	TUNNEL_ATTR_FMRS,
+	TUNNEL_ATTR_INFO,
 	__TUNNEL_ATTR_MAX
 };
 
-const struct uci_blob_param_list tunnel_attr_list;
+extern const struct uci_blob_param_list tunnel_attr_list;
 
 enum bridge_opt {
 	/* stp and forward delay always set */
-	BRIDGE_OPT_AGEING_TIME = (1 << 0),
-	BRIDGE_OPT_HELLO_TIME  = (1 << 1),
-	BRIDGE_OPT_MAX_AGE     = (1 << 2),
+	BRIDGE_OPT_AGEING_TIME             = (1 << 0),
+	BRIDGE_OPT_HELLO_TIME              = (1 << 1),
+	BRIDGE_OPT_MAX_AGE                 = (1 << 2),
+	BRIDGE_OPT_ROBUSTNESS              = (1 << 3),
+	BRIDGE_OPT_QUERY_INTERVAL          = (1 << 4),
+	BRIDGE_OPT_QUERY_RESPONSE_INTERVAL = (1 << 5),
+	BRIDGE_OPT_LAST_MEMBER_INTERVAL    = (1 << 6),
 };
 
 struct bridge_config {
 	enum bridge_opt flags;
 	bool stp;
+
 	bool igmp_snoop;
+	bool multicast_querier;
+	int robustness;
+	int query_interval;
+	int query_response_interval;
+	int last_member_interval;
+
 	unsigned short priority;
 	int forward_delay;
 	bool bridge_empty;
@@ -54,6 +68,7 @@ struct bridge_config {
 	int ageing_time;
 	int hello_time;
 	int max_age;
+	int hash_max;
 };
 
 enum macvlan_opt {
@@ -67,6 +82,16 @@ struct macvlan_config {
 	unsigned char macaddr[6];
 };
 
+enum vlan_proto {
+	VLAN_PROTO_8021Q = 0x8100,
+	VLAN_PROTO_8021AD = 0x88A8
+};
+
+struct vlandev_config {
+	enum vlan_proto proto;
+	uint16_t vid;
+};
+
 static inline int system_get_addr_family(unsigned int flags)
 {
 	if ((flags & DEVADDR_FAMILY) == DEVADDR_INET6)
@@ -77,7 +102,7 @@ static inline int system_get_addr_family(unsigned int flags)
 
 static inline int system_get_addr_len(unsigned int flags)
 {
-	if ((flags & DEVADDR_FAMILY) == DEVADDR_INET6)
+	if ((flags & DEVADDR_FAMILY) != DEVADDR_INET6)
 		return sizeof(struct in_addr);
 	else
 		return sizeof(struct in6_addr);
@@ -96,10 +121,16 @@ int system_macvlan_del(struct device *macvlan);
 int system_vlan_add(struct device *dev, int id);
 int system_vlan_del(struct device *dev);
 
+int system_vlandev_add(struct device *vlandev, struct device *dev, struct vlandev_config *cfg);
+int system_vlandev_del(struct device *vlandev);
+
+void system_if_get_settings(struct device *dev, struct device_settings *s);
 void system_if_clear_state(struct device *dev);
 int system_if_up(struct device *dev);
 int system_if_down(struct device *dev);
 int system_if_check(struct device *dev);
+int system_if_resolve(struct device *dev);
+
 int system_if_dump_info(struct device *dev, struct blob_buf *b);
 int system_if_dump_stats(struct device *dev, struct blob_buf *b);
 struct device *system_if_get_parent(struct device *dev);
@@ -114,9 +145,12 @@ int system_add_route(struct device *dev, struct device_route *route);
 int system_del_route(struct device *dev, struct device_route *route);
 int system_flush_routes(void);
 
+bool system_resolve_rt_type(const char *type, unsigned int *id);
 bool system_resolve_rt_table(const char *name, unsigned int *id);
+bool system_is_default_rt_table(unsigned int id);
+bool system_resolve_rpfilter(const char *filter, unsigned int *id);
 
-int system_del_ip_tunnel(const char *name);
+int system_del_ip_tunnel(const char *name, struct blob_attr *attr);
 int system_add_ip_tunnel(const char *name, struct blob_attr *attr);
 
 int system_add_iprule(struct iprule *rule);