odhcpd: fix compilation with GCC10

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

diff --git a/src/odhcpd.h b/src/odhcpd.h
index 97d2113571326b06c287d49ee6dee38843ad39bf..09013c4b094b76f1555f6bbe7e951c746821329c 100644 (file)
--- a/src/odhcpd.h
+++ b/src/odhcpd.h
@@ -44,6 +44,7 @@
 struct interface;
 struct nl_sock;
 extern struct vlist_tree leases;
+extern struct config config;
 
 struct odhcpd_event {
        struct uloop_fd uloop;
@@ -129,7 +130,8 @@ enum odhcpd_assignment_flags {
        OAF_STATIC              = (1 << 2),
        OAF_BROKEN_HOSTNAME     = (1 << 3),
        OAF_DHCPV4              = (1 << 4),
-       OAF_DHCPV6              = (1 << 5),
+       OAF_DHCPV6_NA           = (1 << 5),
+       OAF_DHCPV6_PD           = (1 << 6),
 };
 
 struct config {
@@ -138,7 +140,7 @@ struct config {
        char *dhcp_cb;
        char *dhcp_statefile;
        int log_level;
-} config;
+};
 
 
 struct lease {
@@ -189,6 +191,7 @@ struct dhcp_assignment {
        unsigned int flags;
        uint32_t leasetime;
        char *hostname;
+       char *reqopts;
 #define hwaddr         mac
        uint8_t mac[6];
 
@@ -211,6 +214,7 @@ struct interface {
        // RA runtime data
        struct odhcpd_event router_event;
        struct uloop_timeout timer_rs;
+       uint32_t ra_sent;
 
        // DHCPv6 runtime data
        struct odhcpd_event dhcpv6_event;
@@ -245,6 +249,13 @@ struct interface {
        bool master;
        bool ignore;
        bool always_rewrite_dns;
+
+       // NDP
+       int learn_routes;
+
+       // RA
+       uint8_t ra_flags;
+       bool ra_slaac;
        bool ra_not_onlink;
        bool ra_advrouter;
        bool ra_useleasetime;
@@ -252,11 +263,7 @@ struct interface {
        bool no_dynamic_dhcp;
        uint8_t pio_filter_length;
        struct in6_addr pio_filter_addr;
-
-       // RA
-       int learn_routes;
        int default_router;
-       int ra_managed;
        int route_preference;
        int ra_maxinterval;
        int ra_mininterval;
@@ -266,6 +273,9 @@ struct interface {
        uint32_t ra_hoplimit;
        int ra_mtu;
 
+       // DHCP
+       uint32_t dhcp_leasetime;
+
        // DHCPv4
        struct in_addr dhcpv4_start;
        struct in_addr dhcpv4_end;
@@ -278,7 +288,6 @@ struct interface {
        size_t dhcpv4_router_cnt;
        struct in_addr *dhcpv4_dns;
        size_t dhcpv4_dns_cnt;
-       uint32_t dhcpv4_leasetime;
        bool dhcpv4_forcereconf;
 
        // DNS
@@ -302,25 +311,32 @@ struct interface {
 
 extern struct avl_tree interfaces;
 
-#define RA_MANAGED_NO_MFLAG    0
-#define RA_MANAGED_MFLAG       1
-#define RA_MANAGED_NO_AFLAG    2
-
 inline static void free_assignment(struct dhcp_assignment *a)
 {
-       if (a->head.next)
-               list_del(&a->head);
-
-       if (a->lease_list.next)
-               list_del(&a->lease_list);
+       list_del(&a->head);
+       list_del(&a->lease_list);
 
        if (a->dhcp_free_cb)
                a->dhcp_free_cb(a);
 
        free(a->hostname);
+       free(a->reqopts);
        free(a);
 }
 
+inline static struct dhcp_assignment *alloc_assignment(size_t extra_len)
+{
+       struct dhcp_assignment *a = calloc(1, sizeof(*a) + extra_len);
+
+       if (!a)
+               return NULL;
+
+       INIT_LIST_HEAD(&a->head);
+       INIT_LIST_HEAD(&a->lease_list);
+
+       return a;
+}
+
 // Exported main functions
 int odhcpd_register(struct odhcpd_event *event);
 int odhcpd_deregister(struct odhcpd_event *event);
@@ -375,6 +391,7 @@ void dhcpv6_ia_write_statefile(void);
 int netlink_add_netevent_handler(struct netevent_handler *hdlr);
 ssize_t netlink_get_interface_addrs(const int ifindex, bool v6,
                struct odhcpd_ipaddr **addrs);
+int netlink_get_interface_proxy_neigh(int ifindex, const struct in6_addr *addr);
 int netlink_setup_route(const struct in6_addr *addr, const int prefixlen,
                const int ifindex, const struct in6_addr *gw,
                const uint32_t metric, const bool add);