X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=interface-ip.h;h=cc7efbdb84804f744f2b75d47631bff8982ef079;hb=33ec3daaaa52cea628df91eb0eb1701e16172c1e;hp=c78a076293cd0dcffdcd60330f3238c8bbfd00ac;hpb=d095bf24cf7879150d008c23998676bfedebbde6;p=project%2Fnetifd.git

diff --git a/interface-ip.h b/interface-ip.h
index c78a076..cc7efbd 100644
--- a/interface-ip.h
+++ b/interface-ip.h
@@ -31,8 +31,8 @@ enum device_addr_flags {
 	/* route overrides the default interface mtu */
 	DEVROUTE_MTU		= (1 << 4),
 
-	/* route automatically added by kernel */
-	DEVADDR_KERNEL		= (1 << 5),
+	/* route overrides the default proto type */
+	DEVROUTE_PROTO		= (1 << 5),
 
 	/* address is off-link (no subnet-route) */
 	DEVADDR_OFFLINK		= (1 << 6),
@@ -42,6 +42,18 @@ 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),
+
+	/* neighbor mac address */
+	DEVNEIGH_MAC		= (1 << 11),
+
+	/* route specifies no device */
+	DEVROUTE_NODEV		= (1 << 12),
 };
 
 union if_addr {
@@ -53,6 +65,8 @@ struct device_prefix_assignment {
 	struct list_head head;
 	int32_t assigned;
 	uint8_t length;
+	int weight;
+	struct in6_addr addr;
 	bool enabled;
 	char name[];
 };
@@ -74,43 +88,77 @@ 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;
+	unsigned int proto;
 	time_t valid_until;
-	time_t preferred_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_route {
+struct device_neighbor {
 	struct vlist_node node;
-	struct interface *iface;
 
-	bool enabled;
+	bool failed;
+	bool proxy;
 	bool keep;
+	bool enabled;
+	bool router;
 
-	union if_addr nexthop;
-	int mtu;
+	uint8_t macaddr[6];
+	enum device_addr_flags flags;
+	union if_addr addr;
+};
+
+struct device_addr {
+	struct vlist_node node;
+	bool enabled;
+	bool failed;
+	int index;
+	unsigned int policy_table;
+
+	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;
 	union if_addr addr;
 };
 
+struct device_source_table {
+	struct list_head head;
+	uint32_t table;
+	uint16_t refcount;
+	uint8_t v6;
+	uint8_t mask;
+	union if_addr addr;
+};
+
 struct dns_server {
 	struct vlist_simple_node node;
 	int af;
@@ -123,28 +171,30 @@ struct dns_search_domain {
 };
 
 extern const struct uci_blob_param_list route_attr_list;
+extern const struct uci_blob_param_list neighbor_attr_list;
 extern struct list_head prefixes;
 
 void interface_ip_init(struct interface *iface);
-void interface_add_dns_server(struct interface_ip_settings *ip, const char *str);
 void interface_add_dns_server_list(struct interface_ip_settings *ip, struct blob_attr *list);
 void interface_add_dns_search_list(struct interface_ip_settings *ip, struct blob_attr *list);
-void interface_write_resolv_conf(void);
+void interface_write_resolv_conf(const char *jail);
 
 void interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6);
-
+void interface_ip_add_neighbor(struct interface *iface, struct blob_attr *attr, bool v6);
 void interface_ip_update_start(struct interface_ip_settings *ip);
 void interface_ip_update_complete(struct interface_ip_settings *ip);
 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 *iface);
+struct interface *interface_ip_add_target_route(union if_addr *addr, bool v6, struct interface *iface,
+						bool exclude);
 
 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, const char *pclass);
 void interface_ip_set_ula_prefix(const char *prefix);
 void interface_refresh_assignments(bool hint);
+void interface_update_prefix_delegation(struct interface_ip_settings *ip);
 
 #endif