X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=system.h;h=6077b95140647fef67c11da6b1379b5f976f7273;hp=8c9e99475946f337bed70f96e85aa53eeed7258a;hb=6397f5edb977b5963aa8eec1deaa709355bbbc7d;hpb=7c5d82806c11886bcc08821584fe51790a593feb

diff --git a/system.h b/system.h
index 8c9e994..6077b95 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>
@@ -37,19 +38,30 @@ enum tunnel_param {
 	__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 */
-	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 +69,7 @@ struct bridge_config {
 	int ageing_time;
 	int hello_time;
 	int max_age;
+	int hash_max;
 };
 
 enum macvlan_opt {
@@ -70,6 +83,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
@@ -90,7 +117,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);
@@ -106,12 +133,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);
@@ -133,10 +164,10 @@ 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);
-bool system_resolve_igmpversion(const unsigned int version, 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);