IPv6: fix device_prefix vlist_key to not include prefix class

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

diff --git a/interface-ip.h b/interface-ip.h
index 9b4f0a1..5cc5665 100644 (file)
--- a/interface-ip.h
+++ b/interface-ip.h
@@ -36,6 +36,12 @@ 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),
 };
 
 union if_addr {
@@ -43,26 +49,29 @@ union if_addr {
        struct in6_addr in6;
 };
 
+struct device_prefix_assignment {
+       struct list_head head;
+       int32_t assigned;
+       uint8_t length;
+       bool enabled;
+       char name[];
+};
+
 struct device_prefix {
        struct vlist_node node;
        struct list_head head;
-       struct vlist_tree *assignments;
+       struct list_head assignments;
        struct interface *iface;
-       uint64_t avail;
        time_t valid_until;
        time_t preferred_until;
 
-       struct in6_addr addr;
-       uint8_t length;
-};
+       struct in6_addr excl_addr;
+       uint8_t excl_length;
 
-struct device_prefix_assignment {
-       struct vlist_node node;
-       struct device_prefix *prefix;
        struct in6_addr addr;
-       bool enabled;
        uint8_t length;
-       char *name;
+
+       char pclass[];
 };
 
 struct device_addr {
@@ -97,6 +106,7 @@ struct device_route {
        /* 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;
 };
@@ -129,12 +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);
 
-void interface_ip_set_prefix_assignment(struct device_prefix *prefix,
-               struct interface *iface, uint8_t length);
 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 *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);
 
 #endif