X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=system.h;h=890966b26e3b14654bfcdef0ff8c9e37e03a76d5;hb=HEAD;hp=e810ed9e94bab307cceeeb40f93d1a495838b344;hpb=650758b16e5185505a3fbc1307949340af70b611;p=project%2Fnetifd.git

diff --git a/system.h b/system.h
index e810ed9..890966b 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,30 +31,96 @@ 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
 };
 
 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_ROBUSTNESS              = (1 << 3),
-	BRIDGE_OPT_QUERY_INTERVAL          = (1 << 4),
-	BRIDGE_OPT_QUERY_RESPONSE_INTERVAL = (1 << 5),
-	BRIDGE_OPT_LAST_MEMBER_INTERVAL    = (1 << 6),
+	/* stp, forward delay, max age and hello time are always set */
+	BRIDGE_OPT_AGEING_TIME		    = (1 << 0),
+	BRIDGE_OPT_ROBUSTNESS		    = (1 << 1),
+	BRIDGE_OPT_QUERY_INTERVAL	    = (1 << 2),
+	BRIDGE_OPT_QUERY_RESPONSE_INTERVAL  = (1 << 3),
+	BRIDGE_OPT_LAST_MEMBER_INTERVAL	    = (1 << 4),
 };
 
 struct bridge_config {
 	enum bridge_opt flags;
 	bool stp;
+	bool stp_kernel;
+	const char *stp_proto;
 
 	bool igmp_snoop;
 	bool multicast_querier;
@@ -69,6 +137,8 @@ struct bridge_config {
 	int hello_time;
 	int max_age;
 	int hash_max;
+
+	bool vlan_filtering;
 };
 
 enum macvlan_opt {
@@ -82,14 +152,74 @@ 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 */
+};
+
+enum bonding_mode {
+	BONDING_MODE_BALANCE_RR,
+	BONDING_MODE_ACTIVE_BACKUP,
+	BONDING_MODE_BALANCE_XOR,
+	BONDING_MODE_BROADCAST,
+	BONDING_MODE_8023AD,
+	BONDING_MODE_BALANCE_TLB,
+	BONDING_MODE_BALANCE_ALB,
+	__BONDING_MODE_MAX,
+};
+
+struct bonding_config {
+	enum bonding_mode policy;
+	const char *xmit_hash_policy;
+	bool all_ports_active;
+	int min_links;
+	const char *ad_actor_system;
+	int ad_actor_sys_prio;
+	const char *ad_select;
+	const char *lacp_rate;
+	int packets_per_port;
+	int lp_interval;
+	bool dynamic_lb;
+	int resend_igmp;
+	int num_peer_notif;
+	const char *primary;
+	const char *primary_reselect;
+	const char *failover_mac;
+	bool monitor_arp;
+	int monitor_interval;
+	struct blob_attr *arp_target;
+	bool arp_all_targets;
+	const char *arp_validate;
+	bool use_carrier;
+	int updelay;
+	int downdelay;
 };
 
 static inline int system_get_addr_family(unsigned int flags)
@@ -108,16 +238,27 @@ static inline int system_get_addr_len(unsigned int flags)
 		return sizeof(struct in6_addr);
 }
 
+extern const char * const bonding_policy_str[__BONDING_MODE_MAX];
+
 int system_init(void);
 
 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, int16_t vid_end, bool add, unsigned int vflags);
+int system_bridge_vlan_check(struct device *dev, char *ifname);
+void system_bridge_set_stp_state(struct device *dev, bool val);
+
+int system_bonding_set_device(struct device *dev, struct bonding_config *cfg);
+int system_bonding_set_port(struct device *dev, struct device *port, bool add, bool primary);
 
 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);
 
@@ -136,7 +277,8 @@ 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,
-			      unsigned int apply_mask);
+			      uint64_t apply_mask);
+void system_if_apply_settings_after_up(struct device *dev, struct device_settings *s);
 
 int system_add_address(struct device *dev, struct device_addr *addr);
 int system_del_address(struct device *dev, struct device_addr *addr);
@@ -145,14 +287,17 @@ 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);
+int system_del_ip_tunnel(const struct device *dev);
+int system_add_ip_tunnel(const struct device *dev, struct blob_attr *attr);
 
 int system_add_iprule(struct iprule *rule);
 int system_del_iprule(struct iprule *rule);
@@ -164,6 +309,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