ubus: don't redeclare variable c

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

diff --git a/src/odhcpd.h b/src/odhcpd.h
index 9949253..2b7829e 100644 (file)
--- a/src/odhcpd.h
+++ b/src/odhcpd.h
@@ -68,6 +68,9 @@ struct odhcpd_event {
 struct odhcpd_ipaddr {
        struct in6_addr addr;
        uint8_t prefix;
+       uint8_t dprefix;
+       bool has_class;
+       uint16_t class;
        uint32_t preferred;
        uint32_t valid;
 };
@@ -113,6 +116,7 @@ struct interface {
        bool ia_reconf;
 
        // DHCPv4
+       struct odhcpd_event dhcpv6_event;
        struct odhcpd_event dhcpv4_event;
        struct list_head dhcpv4_assignments;
 
@@ -128,7 +132,6 @@ struct interface {
        bool master;
        bool ignore;
        bool always_rewrite_dns;
-       bool deprecate_ula_if_public_avail;
        bool ra_not_onlink;
        bool no_dynamic_dhcp;
 
@@ -186,6 +189,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
@@ -193,6 +199,7 @@ int init_ubus(void);
 const char* ubus_get_ifname(const char *name);
 void ubus_apply_network(void);
 bool ubus_has_prefix(const char *name, const char *ifname);
+bool ubus_get_class(const char *ifname, const struct in6_addr *addr, uint16_t *pclass);
 #endif