X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fodhcpd.h;h=0ae36c3e65e92b592da02edf06de54c425c4a18d;hp=8db3e7d2c7eee3c4dd32964a71222a58593a9748;hb=24cdc1b59f00a065dd1cf0a04145ca6aaf6f23f1;hpb=4dc7edb23f1d587f9e09ad84ee200a9edf351d00 diff --git a/src/odhcpd.h b/src/odhcpd.h index 8db3e7d..0ae36c3 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])) @@ -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 }; @@ -95,6 +99,7 @@ enum odhcpd_assignment_flags { struct config { bool legacy; + bool main_dhcpv4; char *dhcp_cb; char *dhcp_statefile; int log_level; @@ -117,20 +122,31 @@ 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]; + // IPv6 runtime data + struct odhcpd_ipaddr *ia_addr; size_t ia_addr_len; - // DHCPv4 + // RA runtime data + struct uloop_timeout timer_rs; + + // DHCPv6 runtime data struct odhcpd_event dhcpv6_event; - struct odhcpd_event dhcpv4_event; + struct list_head ia_assignments; + + // NDP runtime data struct odhcpd_event ndp_event; + + // IPv4 runtime data + struct odhcpd_ipaddr *addr4; + size_t addr4_len; + + // DHCPv4 runtime data + struct odhcpd_event dhcpv4_event; struct list_head dhcpv4_assignments; + struct list_head dhcpv4_fr_ips; // Managed PD char dhcpv6_pd_manager[128]; @@ -150,22 +166,36 @@ 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; struct in_addr dhcpv4_end; + struct in_addr dhcpv4_start_ip; + struct in_addr dhcpv4_end_ip; + struct in_addr dhcpv4_local; + struct in_addr dhcpv4_bcast; + struct in_addr dhcpv4_mask; struct in_addr *dhcpv4_router; size_t dhcpv4_router_cnt; struct in_addr *dhcpv4_dns; size_t dhcpv4_dns_cnt; uint32_t dhcpv4_leasetime; + bool dhcpv4_forcereconf; // DNS struct in6_addr *dns; @@ -173,8 +203,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; @@ -184,8 +216,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 @@ -193,24 +226,17 @@ 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_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_index(int ifindex); struct interface* odhcpd_get_master_interface(void); 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); @@ -220,25 +246,43 @@ void odhcpd_hexlify(char *dst, const uint8_t *src, size_t len); int odhcpd_bmemcmp(const void *av, const void *bv, size_t bits); void odhcpd_bmemcpy(void *av, const void *bv, size_t bits); +int odhcpd_netmask2bitlen(bool v6, void *mask); +bool odhcpd_bitlen2netmask(bool v6, unsigned int bits, void *mask); + int config_parse_interface(void *data, size_t len, const char *iname, bool overwrite); +void dhcpv4_addr_update(struct interface *iface); + #ifdef WITH_UBUS -int init_ubus(void); +int ubus_init(void); const char* ubus_get_ifname(const char *name); void ubus_apply_network(void); bool ubus_has_prefix(const char *name, const char *ifname); #endif +struct nl_sock *netlink_create_socket(int protocol); +ssize_t netlink_get_interface_addrs(int ifindex, bool v6, + struct odhcpd_ipaddr **addrs); +int netlink_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 netlink_setup_proxy_neigh(const struct in6_addr *addr, + const struct interface *iface, const bool add); +int netlink_setup_addr(struct odhcpd_ipaddr *addr, + const struct interface *iface, const bool v6, + const bool add); + // Exported module initializers -int init_router(void); -int init_dhcpv6(void); -int init_dhcpv4(void); -int init_ndp(void); - -int setup_router_interface(struct interface *iface, bool enable); -int setup_dhcpv6_interface(struct interface *iface, bool enable); -int setup_ndp_interface(struct interface *iface, bool enable); -int setup_dhcpv4_interface(struct interface *iface, bool enable); +int netlink_init(void); +int router_init(void); +int dhcpv6_init(void); +int dhcpv4_init(void); +int ndp_init(void); + +int router_setup_interface(struct interface *iface, bool enable); +int dhcpv6_setup_interface(struct interface *iface, bool enable); +int ndp_setup_interface(struct interface *iface, bool enable); +int dhcpv4_setup_interface(struct interface *iface, bool enable); void odhcpd_reload(void);