treewide: rework logic to retrieve IPv6 interface addresses

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

diff --git a/src/odhcpd.h b/src/odhcpd.h
index 334276e..28eb88e 100644 (file)
--- a/src/odhcpd.h
+++ b/src/odhcpd.h
@@ -16,11 +16,10 @@
 #include <netinet/in.h>
 #include <netinet/icmp6.h>
 #include <netinet/ether.h>
-#include <net/if.h>
 #include <stdbool.h>
 #include <syslog.h>
 
-#include "libubox/blobmsg.h"
+#include <libubox/blobmsg.h>
 
 #ifndef typeof
 #define typeof __typeof
@@ -31,8 +30,8 @@
     (type *)( (char *)ptr - offsetof(type,member) ))
 #endif
 
-#include "libubox/list.h"
-#include "libubox/uloop.h"
+#include <libubox/list.h>
+#include <libubox/uloop.h>
 
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
 
@@ -42,8 +41,6 @@
 #define ND_OPT_DNS_SEARCH 31
 
 #define RELAYD_BUFFER_SIZE 8192
-#define RELAYD_MAX_PREFIXES 8
-#define RELAYD_MAX_ADDRS 8
 
 #define INFINITE_VALID(x) ((x) == 0)
 
@@ -71,10 +68,16 @@ struct odhcpd_event {
        void (*recv_msgs)(struct odhcpd_event *e);
 };
 
+union if_addr {
+       struct in_addr in;
+       struct in6_addr in6;
+};
 
 struct odhcpd_ipaddr {
-       struct in6_addr addr;
+       union if_addr addr;
        uint8_t prefix;
+
+       /* ipv6 only */
        uint8_t dprefix;
        uint32_t preferred;
        uint32_t valid;
@@ -118,13 +121,13 @@ struct interface {
        struct list_head head;
 
        int ifindex;
-       char ifname[IF_NAMESIZE];
-       char name[IF_NAMESIZE];
+       char *ifname;
+       const char *name;
 
        // Runtime data
        struct uloop_timeout timer_rs;
        struct list_head ia_assignments;
-       struct odhcpd_ipaddr ia_addr[RELAYD_MAX_ADDRS];
+       struct odhcpd_ipaddr *ia_addr;
        size_t ia_addr_len;
 
        // DHCPv4
@@ -162,6 +165,10 @@ struct interface {
        int ra_maxinterval;
        int ra_mininterval;
        int ra_lifetime;
+       uint32_t ra_reachabletime;
+       uint32_t ra_retranstime;
+       uint32_t ra_hoplimit;
+       int ra_mtu;
 
        // DHCPv4
        struct in_addr dhcpv4_start;
@@ -202,8 +209,8 @@ 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_get_interface_addresses(int ifindex,
-               struct odhcpd_ipaddr *addrs, size_t cnt);
+ssize_t odhcpd_get_interface_addresses(int ifindex, bool v6,
+               struct odhcpd_ipaddr **addrs);
 int odhcpd_get_interface_dns_addr(const struct interface *iface,
                struct in6_addr *addr);
 struct interface* odhcpd_get_interface_by_name(const char *name);
@@ -228,9 +235,6 @@ 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);
 
-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);