dhcpv6: fix calculation of T1 and T2

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

diff --git a/src/odhcpd.h b/src/odhcpd.h
index 789f696..c0e509d 100644 (file)
--- a/src/odhcpd.h
+++ b/src/odhcpd.h
@@ -61,13 +61,14 @@ extern struct list_head leases;
 struct odhcpd_event {
        struct uloop_fd uloop;
        void (*handle_dgram)(void *addr, void *data, size_t len,
-                       struct interface *iface);
+                       struct interface *iface, void *dest_addr);
 };
 
 
 struct odhcpd_ipaddr {
        struct in6_addr addr;
        uint8_t prefix;
+       uint8_t dprefix;
        bool has_class;
        uint16_t class;
        uint32_t preferred;
@@ -117,8 +118,13 @@ struct interface {
        // DHCPv4
        struct odhcpd_event dhcpv6_event;
        struct odhcpd_event dhcpv4_event;
+       struct odhcpd_event ndp_event;
        struct list_head dhcpv4_assignments;
 
+       // Managed PD
+       char dhcpv6_pd_manager[128];
+       struct in6_addr dhcpv6_pd_cer;
+
        // Services
        enum odhcpd_mode ra;
        enum odhcpd_mode dhcpv6;
@@ -132,6 +138,7 @@ struct interface {
        bool ignore;
        bool always_rewrite_dns;
        bool ra_not_onlink;
+       bool ra_advrouter;
        bool no_dynamic_dhcp;
 
        int learn_routes;
@@ -142,6 +149,8 @@ struct interface {
        // DHCPv4
        struct in_addr dhcpv4_start;
        struct in_addr dhcpv4_end;
+       struct in_addr *dhcpv4_router;
+       size_t dhcpv4_router_cnt;
        struct in_addr *dhcpv4_dns;
        size_t dhcpv4_dns_cnt;
        uint32_t dhcpv4_leasetime;
@@ -152,11 +161,13 @@ struct interface {
        uint8_t *search;
        size_t search_len;
 
-       char* static_ndp;
-       size_t static_ndp_len;
+       void *dhcpv6_raw;
+       size_t dhcpv6_raw_len;
 
        char *upstream;
        size_t upstream_len;
+
+       char *filter_class;
 };
 
 extern struct list_head interfaces;
@@ -168,6 +179,7 @@ extern struct list_head interfaces;
 // Exported main functions
 int odhcpd_open_rtnl(void);
 int odhcpd_register(struct odhcpd_event *event);
+void odhcpd_process(struct odhcpd_event *event);
 
 ssize_t odhcpd_send(int socket, struct sockaddr_in6 *dest,
                struct iovec *iov, size_t iov_len,
@@ -188,6 +200,9 @@ time_t odhcpd_time(void);
 ssize_t odhcpd_unhexlify(uint8_t *dst, size_t len, const char *src);
 void odhcpd_hexlify(char *dst, const uint8_t *src, size_t len);
 
+int odhcpd_bmemcmp(const void *av, const void *bv, size_t bits);
+void odhcpd_bmemcpy(void *av, const void *bv, size_t bits);
+
 int config_parse_interface(void *data, size_t len, const char *iname, bool overwrite);
 
 #ifdef WITH_UBUS