dhcpv6-ia: fix dereference after freeing assignment

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

diff --git a/src/odhcpd.h b/src/odhcpd.h
index 729b629..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 RELAYD_BUFFER_SIZE 8192
 #define RELAYD_MAX_PREFIXES 8
 

+#define INFINITE_VALID(x) ((x) == 0)
+

 #define _unused __attribute__((unused))
 #define _packed __attribute__((packed))
 
 #define _unused __attribute__((unused))
 #define _packed __attribute__((packed))
 


@@ -62,6 +64,7 @@ struct odhcpd_event {
        struct uloop_fd uloop;
        void (*handle_dgram)(void *addr, void *data, size_t len,
                        struct interface *iface, void *dest_addr);
        struct uloop_fd uloop;
        void (*handle_dgram)(void *addr, void *data, size_t len,
                        struct interface *iface, void *dest_addr);

+       void (*handle_error)(int error);

 };
 
 
 };
 
 


@@ -81,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;
 struct config {
        bool legacy;
        char *dhcp_cb;


@@ -95,6 +103,7 @@ struct lease {
        struct ether_addr mac;
        uint16_t duid_len;
        uint8_t *duid;
        struct ether_addr mac;
        uint16_t duid_len;
        uint8_t *duid;

+       uint32_t dhcpv4_leasetime;

        char hostname[];
 };
 
        char hostname[];
 };
 


@@ -143,6 +152,7 @@ struct interface {
        int default_router;
        int managed;
        int route_preference;
        int default_router;
        int managed;
        int route_preference;

+       int ra_maxinterval;

 
        // DHCPv4
        struct in_addr dhcpv4_start;
 
        // DHCPv4
        struct in_addr dhcpv4_start;


@@ -184,7 +194,7 @@ 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);
                const struct interface *iface);
 ssize_t odhcpd_get_interface_addresses(int ifindex,
                struct odhcpd_ipaddr *addrs, size_t cnt);

-int odhcpd_get_preferred_interface_address(int ifindex, struct in6_addr *addr);
+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_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_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]);


@@ -203,10 +213,6 @@ 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 odhcpd_bmemcmp(const void *av, const void *bv, size_t bits);
 void odhcpd_bmemcpy(void *av, const void *bv, size_t bits);
 

-int odhcpd_iterate_interface_neighbors(const struct interface *iface,
-               void(*cb_neigh)(const struct in6_addr *addr,
-                               const struct interface *iface, void *data), void *data);
-

 int config_parse_interface(void *data, size_t len, const char *iname, bool overwrite);
 
 #ifdef WITH_UBUS
 int config_parse_interface(void *data, size_t len, const char *iname, bool overwrite);
 
 #ifdef WITH_UBUS