X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=system.h;h=52161a8f573d6e254f80cc032d9deebca2e2a160;hb=88c6003e2b4fdc0c990045ff140bf19b37ba745a;hp=3bf6f9782799de60f790b6a507a86503ad71749e;hpb=fe08cfd2bfb389f7c174e2dd1561ba4a381db213;p=project%2Fnetifd.git

diff --git a/system.h b/system.h
index 3bf6f97..52161a8 100644
--- a/system.h
+++ b/system.h
@@ -14,12 +14,14 @@
 #ifndef __NETIFD_SYSTEM_H
 #define __NETIFD_SYSTEM_H
 
+#include <net/if.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include "device.h"
 #include "interface-ip.h"
 #include "iprule.h"
+#include "utils.h"
 
 enum tunnel_param {
 	TUNNEL_ATTR_TYPE,
@@ -29,27 +31,104 @@ 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_SRCPORTMIN,
+	VXLAN_DATA_ATTR_SRCPORTMAX,
+	VXLAN_DATA_ATTR_LEARNING,
+	VXLAN_DATA_ATTR_RSC,
+	VXLAN_DATA_ATTR_PROXY,
+	VXLAN_DATA_ATTR_L2MISS,
+	VXLAN_DATA_ATTR_L3MISS,
+	VXLAN_DATA_ATTR_GBP,
+	VXLAN_DATA_ATTR_AGEING,
+	VXLAN_DATA_ATTR_LIMIT,
+	__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_ENCAPLIMIT,
+	__GRE_DATA_ATTR_MAX
+};
+
+enum vti_data {
+	VTI_DATA_IKEY,
+	VTI_DATA_OKEY,
+	__VTI_DATA_ATTR_MAX
+};
+
+enum xfrm_data {
+	XFRM_DATA_IF_ID,
+	__XFRM_DATA_ATTR_MAX
+};
+
+enum sixrd_data {
+	SIXRD_DATA_PREFIX,
+	SIXRD_DATA_RELAY_PREFIX,
+	__SIXRD_DATA_ATTR_MAX
+};
+
+enum ipip6_data {
+	IPIP6_DATA_ENCAPLIMIT,
+	IPIP6_DATA_FMRS,
+	__IPIP6_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 xfrm_data_attr_list;
+extern const struct uci_blob_param_list sixrd_data_attr_list;
+extern const struct uci_blob_param_list ipip6_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;
@@ -57,6 +136,9 @@ struct bridge_config {
 	int ageing_time;
 	int hello_time;
 	int max_age;
+	int hash_max;
+
+	bool vlan_filtering;
 };
 
 enum macvlan_opt {
@@ -70,14 +152,36 @@ 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
 };
 
+struct vlan_qos_mapping {
+	struct vlist_simple_node node; /* entry in vlandev_config->{e,in}gress_qos_mapping_list */
+	uint32_t from;
+	uint32_t to;
+};
+
 struct vlandev_config {
 	enum vlan_proto proto;
 	uint16_t vid;
+	struct vlist_simple_tree ingress_qos_mapping_list; /* list of struct vlan_qos_mapping */
+	struct vlist_simple_tree egress_qos_mapping_list;  /* list of struct vlan_qos_mapping */
 };
 
 static inline int system_get_addr_family(unsigned int flags)
@@ -90,7 +194,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);
@@ -102,16 +206,21 @@ int system_bridge_addbr(struct device *bridge, struct bridge_config *cfg);
 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_bridge_vlan(const char *iface, uint16_t vid, bool add, unsigned int vflags);
 
 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);
@@ -132,9 +241,14 @@ 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_add_neighbor(struct device *dev, struct device_neighbor * neighbor);
+int system_del_neighbor(struct device *dev, struct device_neighbor * neighbor);
+
 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);
@@ -149,6 +263,10 @@ 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);
+
+int system_link_netns_move(struct device *dev, const pid_t target_ns, const char *target_ifname);
+int system_netns_open(const pid_t target_ns);
+int system_netns_set(int netns_fd);
 
 #endif