X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-ip.h;h=bbef62ceb305f5f82ba8c1ffa2591ba39a92b3bb;hp=2559bccc4adc1b946a2acce77555dd04a72b744c;hb=7f6be657e2dabc185417520de4d0d0de2580c27d;hpb=5e43781680f9f55e0ae7c1b681465d64882e3b8c

diff --git a/interface-ip.h b/interface-ip.h
index 2559bcc..bbef62c 100644
--- a/interface-ip.h
+++ b/interface-ip.h
@@ -42,6 +42,12 @@ enum device_addr_flags {
 
 	/* route resides in default source-route table */
 	DEVROUTE_SRCTABLE	= (1 << 8),
+
+	/* route is on-link */
+	DEVROUTE_ONLINK		= (1 << 9),
+
+	/* route overrides the default route type */
+	DEVROUTE_TYPE		= (1 << 10),
 };
 
 union if_addr {
@@ -53,6 +59,7 @@ struct device_prefix_assignment {
 	struct list_head head;
 	int32_t assigned;
 	uint8_t length;
+	struct in6_addr addr;
 	bool enabled;
 	char name[];
 };
@@ -74,44 +81,50 @@ struct device_prefix {
 	char pclass[];
 };
 
-struct device_addr {
+struct device_route {
 	struct vlist_node node;
-	bool enabled;
+	struct interface *iface;
 
-	/* ipv4 only */
-	uint32_t broadcast;
-	uint32_t point_to_point;
+	bool enabled;
+	bool keep;
+	bool failed;
 
-	/* ipv6 only */
+	union if_addr nexthop;
+	int mtu;
+	unsigned int type;
 	time_t valid_until;
-	time_t preferred_until;
-	char *pclass;
 
 	/* must be last */
 	enum device_addr_flags flags;
+	int metric; // there can be multiple routes to the same target
+	unsigned int table;
 	unsigned int mask;
+	unsigned int sourcemask;
 	union if_addr addr;
+	union if_addr source;
 };
 
-struct device_route {
+struct device_addr {
 	struct vlist_node node;
-	struct interface *iface;
-
 	bool enabled;
-	bool keep;
+	bool failed;
+	unsigned int policy_table;
 
-	union if_addr nexthop;
-	int mtu;
+	struct device_route subnet;
+
+	/* ipv4 only */
+	uint32_t broadcast;
+	uint32_t point_to_point;
+
+	/* ipv6 only */
 	time_t valid_until;
+	time_t preferred_until;
+	char *pclass;
 
 	/* must be last */
 	enum device_addr_flags flags;
-	int metric; // there can be multiple routes to the same target
-	unsigned int table;
 	unsigned int mask;
-	unsigned int sourcemask;
 	union if_addr addr;
-	union if_addr source;
 };
 
 struct device_source_table {