dhcpv4: remove unused addr_attrs struct

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

diff --git a/src/odhcpd.h b/src/odhcpd.h
index 2b7829e..d3a5ad6 100644 (file)
--- a/src/odhcpd.h
+++ b/src/odhcpd.h
@@ -61,7 +61,7 @@ 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);
 };
 
 
@@ -69,8 +69,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;
 };
@@ -118,8 +116,13 @@ 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;
+
        // Services
        enum odhcpd_mode ra;
        enum odhcpd_mode dhcpv6;
@@ -133,6 +136,7 @@ struct interface {
        bool ignore;
        bool always_rewrite_dns;
        bool ra_not_onlink;
+       bool ra_advrouter;
        bool no_dynamic_dhcp;
 
        int learn_routes;
@@ -141,8 +145,12 @@ struct interface {
        int route_preference;
 
        // DHCPv4
+       struct in_addr dhcpv4_addr;
+       struct in_addr dhcpv4_mask;
        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;
@@ -153,11 +161,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;
@@ -169,18 +179,20 @@ 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_preferred_interface_address(int ifindex, struct in6_addr *addr);
 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);
 
@@ -199,7 +211,8 @@ 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);
+const char* ubus_get_address4(const char *name);
+int ubus_get_mask4(const char *name);
 #endif