X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fodhcpd.h;h=10f0edbe80bae725f98dced345f411097910bc9a;hp=bc837d584087e88bfb7a27c30b4900ad136944d8;hb=f4d38e0a853e933a4da54fde8ec2711b5dc5b741;hpb=549a4a7d93a828d7d2b9354bc1b1957de4333e65;ds=sidebyside diff --git a/src/odhcpd.h b/src/odhcpd.h index bc837d5..10f0edb 100644 --- a/src/odhcpd.h +++ b/src/odhcpd.h @@ -16,11 +16,10 @@ #include #include #include -#include #include #include -#include "libubox/blobmsg.h" +#include #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 +#include #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) @@ -42,7 +41,8 @@ #define ND_OPT_DNS_SEARCH 31 #define RELAYD_BUFFER_SIZE 8192 -#define RELAYD_MAX_PREFIXES 8 + +#define INFINITE_VALID(x) ((x) == 0) #define _unused __attribute__((unused)) #define _packed __attribute__((packed)) @@ -54,23 +54,31 @@ #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; 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, void *dest_addr); + void (*handle_error)(struct odhcpd_event *e, int error); + 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; - bool has_class; - uint16_t class; uint32_t preferred; uint32_t valid; }; @@ -83,10 +91,17 @@ enum odhcpd_mode { }; +enum odhcpd_assignment_flags { + OAF_BOUND = (1 << 0), + OAF_STATIC = (1 << 1), +}; + struct config { bool legacy; + bool main_dhcpv4; char *dhcp_cb; char *dhcp_statefile; + int log_level; } config; @@ -97,6 +112,7 @@ struct lease { struct ether_addr mac; uint16_t duid_len; uint8_t *duid; + uint32_t dhcpv4_leasetime; char hostname[]; }; @@ -105,15 +121,14 @@ 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[8]; + struct odhcpd_ipaddr *ia_addr; size_t ia_addr_len; - bool ia_reconf; // DHCPv4 struct odhcpd_event dhcpv6_event; @@ -139,12 +154,21 @@ struct interface { bool always_rewrite_dns; bool ra_not_onlink; bool ra_advrouter; + bool ra_useleasetime; bool no_dynamic_dhcp; + // 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_reachabletime; + uint32_t ra_retranstime; + uint32_t ra_hoplimit; + int ra_mtu; // DHCPv4 struct in_addr dhcpv4_start; @@ -172,29 +196,35 @@ 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 -int odhcpd_open_rtnl(void); 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); 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); +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); -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); -void odhcpd_setup_route(const struct in6_addr *addr, int prefixlen, - const struct interface *iface, const struct in6_addr *gw, bool add); +int odhcpd_urandom(void *data, size_t len); +int odhcpd_setup_route(const struct in6_addr *addr, const int prefixlen, + const struct interface *iface, const struct in6_addr *gw, + 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); @@ -211,7 +241,6 @@ 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); #endif