router: allow RA prefix lifetime being set to leasetime value (FS#397)

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

diff --git a/src/odhcpd.h b/src/odhcpd.h
index a2ef9f7..538a7e5 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 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;
 
 struct interface;
 struct nl_sock;


@@ -66,7 +67,8 @@ 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);
+       void (*handle_error)(struct odhcpd_event *e, int error);
+       void (*recv_msgs)(struct odhcpd_event *e);

 };
 
 
 };
 
 


@@ -95,6 +97,7 @@ struct config {
        bool legacy;
        char *dhcp_cb;
        char *dhcp_statefile;
        bool legacy;
        char *dhcp_cb;
        char *dhcp_statefile;

+       int log_level;

 } config;
 
 
 } config;
 
 


@@ -147,13 +150,17 @@ struct interface {
        bool always_rewrite_dns;
        bool ra_not_onlink;
        bool ra_advrouter;
        bool always_rewrite_dns;
        bool ra_not_onlink;
        bool ra_advrouter;

+       bool ra_useleasetime;

        bool no_dynamic_dhcp;
 
        bool no_dynamic_dhcp;
 

+       // RA

        int learn_routes;
        int default_router;
        int managed;
        int route_preference;
        int ra_maxinterval;
        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;
 
        // DHCPv4
        struct in_addr dhcpv4_start;


@@ -186,11 +193,11 @@ extern struct list_head interfaces;
 
 
 // Exported main functions
 
 
 // Exported main functions

-struct nl_sock *odhcpd_open_rtnl(int protocol, int groups);

 int odhcpd_register(struct odhcpd_event *event);
 int odhcpd_register(struct odhcpd_event *event);

+int odhcpd_deregister(struct odhcpd_event *event);

 void odhcpd_process(struct odhcpd_event *event);
 
 void odhcpd_process(struct odhcpd_event *event);
 

-struct nl_sock *odhcpd_create_nl_socket(int protocol, int groups);
+struct nl_sock *odhcpd_create_nl_socket(int protocol);

 ssize_t odhcpd_send(int socket, struct sockaddr_in6 *dest,
                struct iovec *iov, size_t iov_len,
                const struct interface *iface);
 ssize_t odhcpd_send(int socket, struct sockaddr_in6 *dest,
                struct iovec *iov, size_t iov_len,
                const struct interface *iface);


@@ -203,9 +210,11 @@ 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);
 struct interface* odhcpd_get_interface_by_index(int ifindex);
 struct interface* odhcpd_get_master_interface(void);
 int odhcpd_urandom(void *data, size_t len);

-int odhcpd_setup_route(const struct in6_addr *addr, int prefixlen,
+int odhcpd_setup_route(const struct in6_addr *addr, const int prefixlen,

                const struct interface *iface, const struct in6_addr *gw,
                const struct interface *iface, const struct in6_addr *gw,

-               uint32_t metric, bool add);
+               const uint32_t metric, const bool add);
+int odhcpd_setup_proxy_neigh(const struct in6_addr *addr,
+               const struct interface *iface, const bool add);

 
 void odhcpd_run(void);
 time_t odhcpd_time(void);
 
 void odhcpd_run(void);
 time_t odhcpd_time(void);