router: speed up initial router advertisements

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

diff --git a/src/odhcpd.h b/src/odhcpd.h
index e7fcd8210db4d954452a3d987edb25688e764181..4a07252322d40d228bb0d1851e7560089e34a227 100644 (file)
--- a/src/odhcpd.h
+++ b/src/odhcpd.h
@@ -24,6 +24,7 @@
 #include <libubox/uloop.h>
 #include <libubox/avl.h>
 #include <libubox/ustream.h>
+#include <libubox/vlist.h>
 
 // RFC 6106 defines this router advertisement option
 #define ND_OPT_ROUTE_INFO 24
@@ -42,7 +43,7 @@
 
 struct interface;
 struct nl_sock;
-extern struct list_head leases;
+extern struct vlist_tree leases;
 
 struct odhcpd_event {
        struct uloop_fd uloop;
@@ -52,6 +53,10 @@ struct odhcpd_event {
        void (*recv_msgs)(struct odhcpd_event *e);
 };
 
+typedef void (*dhcpv6_binding_cb_handler_t)(struct in6_addr *addr, int prefix,
+                                           uint32_t pref, uint32_t valid,
+                                           void *arg);
+
 union if_addr {
        struct in_addr in;
        struct in6_addr in6;
@@ -123,6 +128,8 @@ enum odhcpd_assignment_flags {
        OAF_BOUND               = (1 << 1),
        OAF_STATIC              = (1 << 2),
        OAF_BROKEN_HOSTNAME     = (1 << 3),
+       OAF_DHCPV4              = (1 << 4),
+       OAF_DHCPV6              = (1 << 5),
 };
 
 struct config {
@@ -135,14 +142,15 @@ struct config {
 
 
 struct lease {
-       struct list_head head;
-       struct in_addr ipaddr;
+       struct vlist_node node;
+       struct list_head assignments;
+       uint32_t ipaddr;
        uint32_t hostid;
        struct ether_addr mac;
        uint16_t duid_len;
        uint8_t *duid;
-       uint32_t dhcpv4_leasetime;
-       char hostname[];
+       uint32_t leasetime;
+       char *hostname;
 };
 
 
@@ -150,7 +158,12 @@ struct odhcpd_ref_ip;
 
 struct dhcp_assignment {
        struct list_head head;
+       struct list_head lease_list;
+
+       void (*dhcp_free_cb)(struct dhcp_assignment *a);
+
        struct interface *iface;
+       struct lease *lease;
 
        struct sockaddr_in6 peer;
        time_t valid_until;
@@ -176,10 +189,11 @@ struct dhcp_assignment {
        unsigned int flags;
        uint32_t leasetime;
        char *hostname;
+       char *reqopts;
 #define hwaddr         mac
        uint8_t mac[6];
 
-       uint8_t clid_len;
+       uint16_t clid_len;
        uint8_t clid_data[];
 };
 
@@ -196,7 +210,9 @@ struct interface {
        size_t addr6_len;
 
        // 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;
@@ -204,6 +220,7 @@ struct interface {
 
        // NDP runtime data
        struct odhcpd_event ndp_event;
+       int ndp_ping_fd;
 
        // IPv4 runtime data
        struct odhcpd_ipaddr *addr4;
@@ -230,6 +247,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;
@@ -237,11 +261,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;
@@ -287,10 +307,31 @@ 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)
+{
+       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);
@@ -305,7 +346,6 @@ int odhcpd_get_interface_dns_addr(const struct interface *iface,
 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);
 int odhcpd_urandom(void *data, size_t len);
 
 void odhcpd_run(void);
@@ -322,6 +362,10 @@ bool odhcpd_bitlen2netmask(bool v6, unsigned int bits, void *mask);
 bool odhcpd_valid_hostname(const char *name);
 
 int config_parse_interface(void *data, size_t len, const char *iname, bool overwrite);
+struct lease *config_find_lease_by_duid(const uint8_t *duid, const uint16_t len);
+struct lease *config_find_lease_by_mac(const uint8_t *mac);
+struct lease *config_find_lease_by_hostid(const uint32_t hostid);
+struct lease *config_find_lease_by_ipaddr(const uint32_t ipaddr);
 
 #ifdef WITH_UBUS
 int ubus_init(void);
@@ -332,6 +376,14 @@ void ubus_bcast_dhcp_event(const char *type, const uint8_t *mac, const size_t ma
                const struct in_addr *addr, const char *name, const char *interface);
 #endif
 
+ssize_t dhcpv6_ia_handle_IAs(uint8_t *buf, size_t buflen, struct interface *iface,
+               const struct sockaddr_in6 *addr, const void *data, const uint8_t *end);
+int dhcpv6_ia_init(void);
+int dhcpv6_ia_setup_interface(struct interface *iface, bool enable);
+void dhcpv6_ia_enum_addrs(struct interface *iface, struct dhcp_assignment *c, time_t now,
+                               dhcpv6_binding_cb_handler_t func, void *arg);
+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);