X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=system.h;h=9c40e4c28cd22f0ef54fd206fb9c5d40d96aaaf4;hb=6228d0f21b2dcf20d7b2223c43f8b90b9b51bc4d;hp=b1215d13bb361b8a51f8c43db065b9b6ea071290;hpb=8e15f409e000ffdd87d1022390e54f14da839b3f;p=project%2Fnetifd.git

diff --git a/system.h b/system.h
index b1215d1..9c40e4c 100644
--- a/system.h
+++ b/system.h
@@ -37,19 +37,30 @@ enum tunnel_param {
 	__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;
@@ -57,6 +68,7 @@ struct bridge_config {
 	int ageing_time;
 	int hello_time;
 	int max_age;
+	int hash_max;
 };
 
 enum macvlan_opt {
@@ -90,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);
@@ -112,10 +124,13 @@ 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);
@@ -131,8 +146,10 @@ 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_proto(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, struct blob_attr *attr);
 int system_add_ip_tunnel(const char *name, struct blob_attr *attr);