router: advertise removed addresses as invalid in 3 consecutive RAs

[project/odhcpd.git] / src / odhcpd.h

diff --git a/src/odhcpd.h b/src/odhcpd.h
index 45b6784ce0986acd5167d49d10ee58122c77cd22..88c8c792fe6e00d506140ab38c65ffe222ab1f2b 100644 (file)
--- a/src/odhcpd.h
+++ b/src/odhcpd.h
@@ -26,6 +26,9 @@
 #include <libubox/ustream.h>
 #include <libubox/vlist.h>
 
+#define min(a, b) (((a) < (b)) ? (a) : (b))
+#define max(a, b) (((a) > (b)) ? (a) : (b))
+
 // RFC 6106 defines this router advertisement option
 #define ND_OPT_ROUTE_INFO 24
 #define ND_OPT_RECURSIVE_DNS 25
@@ -41,6 +44,11 @@
 
 #define IN6_IS_ADDR_ULA(a) (((a)->s6_addr32[0] & htonl(0xfe000000)) == htonl(0xfc000000))
 
+#define ADDR_MATCH_PIO_FILTER(_addr, iface) (odhcpd_bmemcmp(&(_addr)->addr, \
+                                                           &(iface)->pio_filter_addr, \
+                                                           (iface)->pio_filter_length) != 0 || \
+                                            (_addr)->prefix < (iface)->pio_filter_length)
+
 struct interface;
 struct nl_sock;
 extern struct vlist_tree leases;
@@ -113,11 +121,16 @@ struct odhcpd_ipaddr {
        uint32_t preferred;
        uint32_t valid;
 
-       /* ipv6 only */
-       uint8_t dprefix;
+       union {
+               /* ipv6 only */
+               struct {
+                       uint8_t dprefix;
+                       uint8_t invalid_advertisements;
+               };
 
-       /* ipv4 only */
-       struct in_addr broadcast;
+               /* ipv4 only */
+               struct in_addr broadcast;
+       };
 };
 
 enum odhcpd_mode {
@@ -151,7 +164,7 @@ struct lease {
        struct vlist_node node;
        struct list_head assignments;
        uint32_t ipaddr;
-       uint32_t hostid;
+       uint64_t hostid;
        struct ether_addr mac;
        uint16_t duid_len;
        uint8_t *duid;
@@ -194,7 +207,10 @@ struct dhcp_assignment {
        struct odhcpd_ref_ip *fr_ip;
 
        uint32_t addr;
-       uint32_t assigned;
+       union {
+               uint64_t assigned_host_id;
+               uint32_t assigned_subnet_id;
+       };
        uint32_t iaid;
        uint8_t length; // length == 128 -> IA_NA, length <= 64 -> IA_PD
 
@@ -224,6 +240,8 @@ struct interface {
        // IPv6 runtime data
        struct odhcpd_ipaddr *addr6;
        size_t addr6_len;
+       struct odhcpd_ipaddr *invalid_addr6;
+       size_t invalid_addr6_len;
 
        // RA runtime data
        struct odhcpd_event router_event;
@@ -318,6 +336,7 @@ struct interface {
        bool dhcpv6_assignall;
        bool dhcpv6_pd;
        bool dhcpv6_na;
+       uint32_t dhcpv6_hostid_len;
 
        char *upstream;
        size_t upstream_len;
@@ -385,7 +404,7 @@ bool odhcpd_valid_hostname(const char *name);
 int config_parse_interface(void *data, size_t len, const char *iname, bool overwrite);
 struct lease *config_find_lease_by_duid(const uint8_t *duid, const uint16_t len);
 struct lease *config_find_lease_by_mac(const uint8_t *mac);
-struct lease *config_find_lease_by_hostid(const uint32_t hostid);
+struct lease *config_find_lease_by_hostid(const uint64_t hostid);
 struct lease *config_find_lease_by_ipaddr(const uint32_t ipaddr);
 int set_lease_from_blobmsg(struct blob_attr *ba);