ubus: display accept reconf status for DHCPv6 assignments

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

diff --git a/src/odhcpd.h b/src/odhcpd.h
index 50827a4..a240aa1 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]))
 
@@ -41,10 +40,6 @@
 #define ND_OPT_RECURSIVE_DNS 25
 #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)
 
 #define _unused __attribute__((unused))
@@ -71,20 +66,29 @@ 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;
-       uint8_t dprefix;
        uint32_t preferred;
        uint32_t valid;
+
+       /* ipv6 only */
+       uint8_t dprefix;
+
+       /* ipv4 only */
+       struct in_addr broadcast;
 };
 
 enum odhcpd_mode {
-       RELAYD_DISABLED,
-       RELAYD_SERVER,
-       RELAYD_RELAY,
-       RELAYD_HYBRID
+       MODE_DISABLED,
+       MODE_SERVER,
+       MODE_RELAY,
+       MODE_HYBRID
 };
 
 
@@ -118,13 +122,15 @@ 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 *addr4;
+       size_t addr4_len;
+       struct odhcpd_ipaddr *ia_addr;
        size_t ia_addr_len;
 
        // DHCPv4
@@ -157,12 +163,15 @@ struct interface {
        // RA
        int learn_routes;
        int default_router;
-       int managed;
+       int ra_managed;
        int route_preference;
        int ra_maxinterval;
        int ra_mininterval;
        int ra_lifetime;
-       uint32_t ra_mtu;
+       uint32_t ra_reachabletime;
+       uint32_t ra_retranstime;
+       uint32_t ra_hoplimit;
+       int ra_mtu;
 
        // DHCPv4
        struct in_addr dhcpv4_start;
@@ -179,8 +188,10 @@ struct interface {
        uint8_t *search;
        size_t search_len;
 
+       // DHCPV6
        void *dhcpv6_raw;
        size_t dhcpv6_raw_len;
+       bool dhcpv6_assignall;
 
        char *upstream;
        size_t upstream_len;
@@ -190,8 +201,9 @@ struct interface {
 
 extern struct list_head interfaces;
 
-#define RELAYD_MANAGED_MFLAG   1
-#define RELAYD_MANAGED_NO_AFLAG        2
+#define RA_MANAGED_NO_MFLAG    0
+#define RA_MANAGED_MFLAG       1
+#define RA_MANAGED_NO_AFLAG    2
 
 
 // Exported main functions
@@ -203,8 +215,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);
@@ -229,9 +241,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);