X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=system.h;h=371a5244bb12ca53302f88595276fc9c7afeac17;hp=382c907d64d630e54ba24001f135e394b7e2e1d5;hb=HEAD;hpb=1ec1c66f203f2ace5124996e1d765d58fc925ce0

diff --git a/system.h b/system.h
index 382c907..371a524 100644
--- a/system.h
+++ b/system.h
@@ -14,6 +14,7 @@
 #ifndef __NETIFD_SYSTEM_H
 #define __NETIFD_SYSTEM_H
 
+#include <net/if.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
@@ -29,28 +30,80 @@ enum tunnel_param {
 	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_DATA,
 	__TUNNEL_ATTR_MAX
 };
 
-const struct uci_blob_param_list tunnel_attr_list;
+extern const struct uci_blob_param_list tunnel_attr_list;
+
+enum vxlan_data {
+	VXLAN_DATA_ATTR_ID,
+	VXLAN_DATA_ATTR_PORT,
+	VXLAN_DATA_ATTR_MACADDR,
+	VXLAN_DATA_ATTR_RXCSUM,
+	VXLAN_DATA_ATTR_TXCSUM,
+	__VXLAN_DATA_ATTR_MAX
+};
+
+enum gre_data {
+	GRE_DATA_IKEY,
+	GRE_DATA_OKEY,
+	GRE_DATA_ICSUM,
+	GRE_DATA_OCSUM,
+	GRE_DATA_ISEQNO,
+	GRE_DATA_OSEQNO,
+	__GRE_DATA_ATTR_MAX
+};
+
+enum vti_data {
+	VTI_DATA_IKEY,
+	VTI_DATA_OKEY,
+	__VTI_DATA_ATTR_MAX
+};
+
+enum sixrd_data {
+	SIXRD_DATA_PREFIX,
+	SIXRD_DATA_RELAY_PREFIX,
+	__SIXRD_DATA_ATTR_MAX
+};
+
+enum fmr_data {
+	FMR_DATA_PREFIX6,
+	FMR_DATA_PREFIX4,
+	FMR_DATA_EALEN,
+	FMR_DATA_OFFSET,
+	__FMR_DATA_ATTR_MAX
+};
+
+extern const struct uci_blob_param_list vxlan_data_attr_list;
+extern const struct uci_blob_param_list gre_data_attr_list;
+extern const struct uci_blob_param_list vti_data_attr_list;
+extern const struct uci_blob_param_list sixrd_data_attr_list;
+extern const struct uci_blob_param_list fmr_data_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;
@@ -58,6 +111,7 @@ struct bridge_config {
 	int ageing_time;
 	int hello_time;
 	int max_age;
+	int hash_max;
 };
 
 enum macvlan_opt {
@@ -71,6 +125,20 @@ struct macvlan_config {
 	unsigned char macaddr[6];
 };
 
+enum veth_opt {
+	VETH_OPT_MACADDR = (1 << 0),
+	VETH_OPT_PEER_NAME = (1 << 1),
+	VETH_OPT_PEER_MACADDR = (1 << 2),
+};
+
+struct veth_config {
+	enum veth_opt flags;
+
+	unsigned char macaddr[6];
+	char peer_name[IFNAMSIZ];
+	unsigned char peer_macaddr[6];
+};
+
 enum vlan_proto {
 	VLAN_PROTO_8021Q = 0x8100,
 	VLAN_PROTO_8021AD = 0x88A8
@@ -107,12 +175,16 @@ 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_veth_add(struct device *veth, struct veth_config *cfg);
+int system_veth_del(struct device *veth);
+
 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);
@@ -134,6 +206,7 @@ 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);
@@ -151,6 +224,6 @@ time_t system_get_rtime(void);
 
 void system_fd_set_cloexec(int fd);
 
-int system_update_ipv6_mtu(struct device *device, int mtu);
+int system_update_ipv6_mtu(struct device *dev, int mtu);
 
 #endif