dhcpv6-ia: don't always send reconf accept option (FS#1377)

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

diff --git a/src/odhcpd.h b/src/odhcpd.h
index fb78ec0..258d3b6 100644 (file)
--- a/src/odhcpd.h
+++ b/src/odhcpd.h
@@ -57,6 +57,7 @@
 #define ALL_IPV6_ROUTERS {{{0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\
                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02}}}
 
+#define IN6_IS_ADDR_ULA(a) (((a)->s6_addr32[0] & htonl(0xfe000000)) == htonl(0xfc000000))
 
 struct interface;
 struct nl_sock;
@@ -94,8 +95,10 @@ enum odhcpd_assignment_flags {
 
 struct config {
        bool legacy;
+       bool main_dhcpv4;
        char *dhcp_cb;
        char *dhcp_statefile;
+       int log_level;
 } config;
 
 
@@ -148,13 +151,17 @@ struct interface {
        bool always_rewrite_dns;
        bool ra_not_onlink;
        bool ra_advrouter;
+       bool ra_useleasetime;
        bool no_dynamic_dhcp;
 
+       // RA
        int learn_routes;
        int default_router;
        int managed;
        int route_preference;
        int ra_maxinterval;
+       int ra_mininterval;
+       int ra_lifetime;
 
        // DHCPv4
        struct in_addr dhcpv4_start;
@@ -171,8 +178,10 @@ struct interface {
        uint8_t *search;
        size_t search_len;
 
+       // DHCPV6
        void *dhcpv6_raw;
        size_t dhcpv6_raw_len;
+       bool dhcpv6_assignall;
 
        char *upstream;
        size_t upstream_len;
@@ -197,7 +206,8 @@ ssize_t odhcpd_send(int socket, struct sockaddr_in6 *dest,
                const struct interface *iface);
 ssize_t odhcpd_get_interface_addresses(int ifindex,
                struct odhcpd_ipaddr *addrs, size_t cnt);
-int odhcpd_get_linklocal_interface_address(int ifindex, struct in6_addr *lladdr);
+int odhcpd_get_interface_dns_addr(const struct interface *iface,
+               struct in6_addr *addr);
 struct interface* odhcpd_get_interface_by_name(const char *name);
 int odhcpd_get_interface_config(const char *ifname, const char *what);
 int odhcpd_get_mac(const struct interface *iface, uint8_t mac[6]);
@@ -220,6 +230,9 @@ 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);
 
+void ndp_handle_addr6_dump(void);
+void ndp_rqs_addr6_dump(void);
+
 #ifdef WITH_UBUS
 int init_ubus(void);
 const char* ubus_get_ifname(const char *name);
@@ -231,12 +244,16 @@ bool ubus_has_prefix(const char *name, const char *ifname);
 // Exported module initializers
 int init_router(void);
 int init_dhcpv6(void);
+#ifdef DHCPV4_SUPPORT
 int init_dhcpv4(void);
+#endif
 int init_ndp(void);
 
 int setup_router_interface(struct interface *iface, bool enable);
 int setup_dhcpv6_interface(struct interface *iface, bool enable);
 int setup_ndp_interface(struct interface *iface, bool enable);
+#ifdef DHCPV4_SUPPORT
 int setup_dhcpv4_interface(struct interface *iface, bool enable);
+#endif
 
 void odhcpd_reload(void);