X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=system.h;h=97fbc8b1e06c3e0222f7437cb6bd5d3680a6c470;hp=76eee23fb522806952233507c8a70446cf031319;hb=e27e23f76437edc7871c03c8c92d69fbe52d30f5;hpb=59217785704fca27d2c7a19e279d27c384a452cd

diff --git a/system.h b/system.h
index 76eee23..97fbc8b 100644
--- a/system.h
+++ b/system.h
@@ -28,14 +28,16 @@ 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 */
@@ -48,6 +50,7 @@ struct bridge_config {
 	enum bridge_opt flags;
 	bool stp;
 	bool igmp_snoop;
+	bool multicast_querier;
 	unsigned short priority;
 	int forward_delay;
 	bool bridge_empty;
@@ -55,6 +58,7 @@ struct bridge_config {
 	int ageing_time;
 	int hello_time;
 	int max_age;
+	int hash_max;
 };
 
 enum macvlan_opt {
@@ -88,7 +92,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);
@@ -110,10 +114,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);
@@ -128,9 +135,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);