X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-ip.h;h=7c4a8aeacf3b506f66e2570237bf72fb2ce8777d;hp=91358b84944bb1311cd06a9d15893e1717316711;hb=3eea8576d48d9b20cc1c6b46f54c7345a39d13aa;hpb=48ffedb4a2b6701eec99e32e91b8a66a0a4be950

diff --git a/interface-ip.h b/interface-ip.h
index 91358b8..7c4a8ae 100644
--- a/interface-ip.h
+++ b/interface-ip.h
@@ -36,6 +36,18 @@ enum device_addr_flags {
 
 	/* address is off-link (no subnet-route) */
 	DEVADDR_OFFLINK		= (1 << 6),
+
+	/* route resides in different table */
+	DEVROUTE_TABLE		= (1 << 7),
+
+	/* 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 {
@@ -47,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[];
 };
@@ -59,16 +72,19 @@ struct device_prefix {
 	time_t valid_until;
 	time_t preferred_until;
 
-	struct in6_addr addr;
 	struct in6_addr excl_addr;
+	uint8_t excl_length;
 
+	struct in6_addr addr;
 	uint8_t length;
-	uint8_t excl_length;
+
+	char pclass[];
 };
 
 struct device_addr {
 	struct vlist_node node;
 	bool enabled;
+	bool failed;
 
 	/* ipv4 only */
 	uint32_t broadcast;
@@ -77,6 +93,7 @@ struct device_addr {
 	/* ipv6 only */
 	time_t valid_until;
 	time_t preferred_until;
+	char *pclass;
 
 	/* must be last */
 	enum device_addr_flags flags;
@@ -90,15 +107,29 @@ struct device_route {
 
 	bool enabled;
 	bool keep;
+	bool failed;
 
 	union if_addr nexthop;
 	int mtu;
+	unsigned int type;
 	time_t valid_until;
 
 	/* 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 {
+	struct list_head head;
+	uint32_t table;
+	uint16_t refcount;
+	uint8_t v6;
+	uint8_t mask;
 	union if_addr addr;
 };
 
@@ -113,7 +144,7 @@ struct dns_search_domain {
 	char name[];
 };
 
-extern const struct config_param_list route_attr_list;
+extern const struct uci_blob_param_list route_attr_list;
 extern struct list_head prefixes;
 
 void interface_ip_init(struct interface *iface);
@@ -130,11 +161,11 @@ void interface_ip_flush(struct interface_ip_settings *ip);
 void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled);
 void interface_ip_update_metric(struct interface_ip_settings *ip, int metric);
 
-struct interface *interface_ip_add_target_route(union if_addr *addr, bool v6);
+struct interface *interface_ip_add_target_route(union if_addr *addr, bool v6, struct interface *iface);
 
 struct device_prefix* interface_ip_add_device_prefix(struct interface *iface,
 		struct in6_addr *addr, uint8_t length, time_t valid_until, time_t preferred_until,
-		struct in6_addr *excl_addr, uint8_t excl_length);
+		struct in6_addr *excl_addr, uint8_t excl_length, const char *pclass);
 void interface_ip_set_ula_prefix(const char *prefix);
 void interface_refresh_assignments(bool hint);