X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=system.h;h=d5cb4e37ab9cb876dcd35ca188541b2ae6102fc2;hp=acfaa373f6650f756fbb3562a63091fd4607749d;hb=5e0fb81b9a9a8ad8ef582d8d29d7d243e1903100;hpb=d7f7f002e3d168aedb5f2bc92180f5966482d7d9

diff --git a/system.h b/system.h
index acfaa37..d5cb4e3 100644
--- a/system.h
+++ b/system.h
@@ -19,35 +19,77 @@
 #include <arpa/inet.h>
 #include "device.h"
 #include "interface-ip.h"
+#include "iprule.h"
 
 enum tunnel_param {
 	TUNNEL_ATTR_TYPE,
 	TUNNEL_ATTR_REMOTE,
 	TUNNEL_ATTR_LOCAL,
+	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 config_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;
 
 	int ageing_time;
 	int hello_time;
 	int max_age;
+	int hash_max;
+};
+
+enum macvlan_opt {
+	MACVLAN_OPT_MACADDR = (1 << 0),
+};
+
+struct macvlan_config {
+	const char *mode;
+
+	enum macvlan_opt flags;
+	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)
@@ -60,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);
@@ -73,19 +115,28 @@ int system_bridge_delbr(struct device *bridge);
 int system_bridge_addif(struct device *bridge, struct device *dev);
 int system_bridge_delif(struct device *bridge, struct device *dev);
 
+int system_macvlan_add(struct device *macvlan, struct device *dev, struct macvlan_config *cfg);
+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);
 bool system_if_force_external(const char *ifname);
-void system_if_apply_settings(struct device *dev, struct device_settings *s);
-
+void system_if_apply_settings(struct device *dev, struct device_settings *s,
+			      unsigned int apply_mask);
 
 int system_add_address(struct device *dev, struct device_addr *addr);
 int system_del_address(struct device *dev, struct device_addr *addr);
@@ -94,9 +145,20 @@ 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);
 
-int system_del_ip_tunnel(const char *name);
+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, struct blob_attr *attr);
 int system_add_ip_tunnel(const char *name, struct blob_attr *attr);
 
+int system_add_iprule(struct iprule *rule);
+int system_del_iprule(struct iprule *rule);
+int system_flush_iprules(void);
+
+bool system_resolve_iprule_action(const char *action, unsigned int *id);
+
 time_t system_get_rtime(void);
 
 void system_fd_set_cloexec(int fd);