IPv6: fix prefix assignment with continuous hints

[project/netifd.git] / interface-ip.h

diff --git a/interface-ip.h b/interface-ip.h
index cd6ec84..c78a076 100644 (file)
--- a/interface-ip.h
+++ b/interface-ip.h
@@ -65,11 +65,13 @@ 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 {
@@ -120,7 +122,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);
@@ -137,13 +139,12 @@ 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);
-int interface_ip_resolve_v6_rtable(int ifindex);
 
 #endif