Don't print non bound assignments in the state file

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

diff --git a/src/dhcpv6.h b/src/dhcpv6.h
index 936a350f89b10c2c7265e3a97b6cea05966677c3..c0775f190c90559f61ffbbe65f68f7a2eb140356 100644 (file)
--- a/src/dhcpv6.h
+++ b/src/dhcpv6.h
@@ -14,6 +14,7 @@
 #pragma once
 
 #include <libubox/ustream.h>
+#include "odhcpd.h"
 
 #define ALL_DHCPV6_RELAYS {{{0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\
                0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02}}}
@@ -57,11 +58,7 @@
 #define DHCPV6_OPT_INFO_REFRESH 32
 #define DHCPV6_OPT_FQDN 39
 #define DHCPV6_OPT_SOL_MAX_RT 82
-
-#ifdef EXT_PREFIX_CLASS
-/* draft-bhandari-dhc-class-based-prefix, not yet standardized */
-#define DHCPV6_OPT_PREFIX_CLASS EXT_PREFIX_CLASS
-#endif
+#define DHCPV6_OPT_INF_MAX_RT 83
 
 #define DHCPV6_DUID_VENDOR 2
 
@@ -69,6 +66,7 @@
 #define DHCPV6_STATUS_NOADDRSAVAIL 2
 #define DHCPV6_STATUS_NOBINDING 3
 #define DHCPV6_STATUS_NOTONLINK 4
+#define DHCPV6_STATUS_USEMULTICAST 5
 #define DHCPV6_STATUS_NOPREFIXAVAIL 6
 
 // I just remembered I have an old one lying around...
@@ -144,9 +142,6 @@ struct dhcpv6_assignment {
        struct sockaddr_in6 peer;
        time_t valid_until;
        time_t reconf_sent;
-       bool all_class;
-       uint8_t classes_cnt;
-       uint16_t *classes;
        int reconf_cnt;
        char *hostname;
        uint8_t key[16];
@@ -160,10 +155,22 @@ struct dhcpv6_assignment {
        ssize_t managed_size;
        struct ustream_fd managed_sock;
 
+       uint32_t leasetime;
+       unsigned int flags;
+
        uint8_t clid_len;
        uint8_t clid_data[];
 };
 
+struct dhcpv6_cer_id {
+       uint16_t type;
+       uint16_t len;
+       uint16_t reserved;
+       uint16_t auth_type;
+       uint8_t auth[16];
+       struct in6_addr addr;
+};
+
 
 
 #define dhcpv6_for_each_option(start, end, otype, olen, odata)\
@@ -173,8 +180,10 @@ struct dhcpv6_assignment {
                _o += 4 + (_o[2] << 8 | _o[3]))
 
 int dhcpv6_init_ia(struct interface *iface, int socket);
-size_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
+ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
                const struct sockaddr_in6 *addr, const void *data, const uint8_t *end);
 int dhcpv6_ia_init(void);
 int setup_dhcpv6_ia_interface(struct interface *iface, bool enable);
 void dhcpv6_write_statefile(void);
+void dhcpv6_ia_preupdate(struct interface *iface);
+void dhcpv6_ia_postupdate(struct interface *iface, time_t now);