config: fix dhcpv4 server being started

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

diff --git a/src/odhcpd.h b/src/odhcpd.h
index 393194c..334276e 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;


@@ -94,8 +95,10 @@ enum odhcpd_assignment_flags {
 
 struct config {
        bool legacy;
 
 struct config {
        bool legacy;

+       bool main_dhcpv4;

        char *dhcp_cb;
        char *dhcp_statefile;
        char *dhcp_cb;
        char *dhcp_statefile;

+       int log_level;

 } config;
 
 
 } config;
 
 


@@ -148,13 +151,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;


@@ -188,6 +195,7 @@ extern struct list_head interfaces;
 
 // Exported main functions
 int odhcpd_register(struct odhcpd_event *event);
 
 // Exported main functions
 int odhcpd_register(struct odhcpd_event *event);

+int odhcpd_deregister(struct odhcpd_event *event);

 void odhcpd_process(struct odhcpd_event *event);
 
 struct nl_sock *odhcpd_create_nl_socket(int protocol);
 void odhcpd_process(struct odhcpd_event *event);
 
 struct nl_sock *odhcpd_create_nl_socket(int protocol);


@@ -196,7 +204,8 @@ 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_linklocal_interface_address(int ifindex, struct in6_addr *lladdr);
+int odhcpd_get_interface_dns_addr(const struct interface *iface,
+               struct in6_addr *addr);

 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]);


@@ -219,6 +228,9 @@ 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);
 
 
 int config_parse_interface(void *data, size_t len, const char *iname, bool overwrite);
 

+void ndp_handle_addr6_dump(void);
+void ndp_rqs_addr6_dump(void);
+

 #ifdef WITH_UBUS
 int init_ubus(void);
 const char* ubus_get_ifname(const char *name);
 #ifdef WITH_UBUS
 int init_ubus(void);
 const char* ubus_get_ifname(const char *name);