dhcpv6-ia: fix dereference after freeing assignment

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

diff --git a/src/odhcpd.h b/src/odhcpd.h
index 6b90831..0e5868c 100644 (file)
--- a/src/odhcpd.h
+++ b/src/odhcpd.h
@@ -44,6 +44,8 @@
 #define RELAYD_BUFFER_SIZE 8192
 #define RELAYD_MAX_PREFIXES 8
 
+#define INFINITE_VALID(x) ((x) == 0)
+
 #define _unused __attribute__((unused))
 #define _packed __attribute__((packed))
 
@@ -61,7 +63,8 @@ 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);
+       void (*handle_error)(int error);
 };
 
 
@@ -69,8 +72,6 @@ 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;
 };
@@ -83,6 +84,11 @@ enum odhcpd_mode {
 };
 
 
+enum odhcpd_assignment_flags {
+       OAF_BOUND       = (1 << 0),
+       OAF_STATIC      = (1 << 1),
+};
+
 struct config {
        bool legacy;
        char *dhcp_cb;
@@ -97,6 +103,7 @@ struct lease {
        struct ether_addr mac;
        uint16_t duid_len;
        uint8_t *duid;
+       uint32_t dhcpv4_leasetime;
        char hostname[];
 };
 
@@ -118,13 +125,12 @@ 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;
-       void *dhcpv6_raw;
-       size_t dhcpv6_raw_len;
 
        // Services
        enum odhcpd_mode ra;
@@ -139,16 +145,20 @@ struct interface {
        bool ignore;
        bool always_rewrite_dns;
        bool ra_not_onlink;
+       bool ra_advrouter;
        bool no_dynamic_dhcp;
 
        int learn_routes;
        int default_router;
        int managed;
        int route_preference;
+       int ra_maxinterval;
 
        // 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;
@@ -159,11 +169,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;
@@ -175,20 +187,23 @@ 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,
                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);
 struct interface* odhcpd_get_interface_by_name(const char *name);
-int odhcpd_get_interface_mtu(const char *ifname);
+int odhcpd_get_interface_config(const char *ifname, const char *what);
 int odhcpd_get_mac(const struct interface *iface, uint8_t mac[6]);
 struct interface* odhcpd_get_interface_by_index(int ifindex);
 struct interface* odhcpd_get_master_interface(void);
-void odhcpd_urandom(void *data, size_t len);
+int odhcpd_urandom(void *data, size_t len);
 void odhcpd_setup_route(const struct in6_addr *addr, int prefixlen,
-               const struct interface *iface, const struct in6_addr *gw, bool add);
+               const struct interface *iface, const struct in6_addr *gw,
+               int metric, bool add);
 
 void odhcpd_run(void);
 time_t odhcpd_time(void);
@@ -205,7 +220,6 @@ 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