X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=src%2Fodhcpd.h;h=a49ab57986b31b8a632b50c9a1b4b46385afb9e8;hb=cf29925b29a4e4e38ab88573f12ec075eacb3d22;hp=b0801a44b27285a7a48e6f9c8017b10d1d4ac458;hpb=95d0fb6c25944985b9717a51cebaa7ea8dc7222d;p=project%2Fodhcpd.git diff --git a/src/odhcpd.h b/src/odhcpd.h index b0801a4..a49ab57 100644 --- a/src/odhcpd.h +++ b/src/odhcpd.h @@ -40,8 +40,6 @@ #define ND_OPT_RECURSIVE_DNS 25 #define ND_OPT_DNS_SEARCH 31 -#define RELAYD_BUFFER_SIZE 8192 - #define INFINITE_VALID(x) ((x) == 0) #define _unused __attribute__((unused)) @@ -73,6 +71,46 @@ union if_addr { struct in6_addr in6; }; +struct netevent_handler_info { + struct interface *iface; + union { + struct { + union if_addr dst; + uint8_t dst_len; + union if_addr gateway; + } rt; + struct { + union if_addr dst; + uint16_t state; + uint8_t flags; + } neigh; + struct { + struct odhcpd_ipaddr *addrs; + size_t len; + } addrs_old; + union if_addr addr; + }; +}; + +enum netevents { + NETEV_IFINDEX_CHANGE, + NETEV_ADDR_ADD, + NETEV_ADDR_DEL, + NETEV_ADDRLIST_CHANGE, + NETEV_ADDR6_ADD, + NETEV_ADDR6_DEL, + NETEV_ADDR6LIST_CHANGE, + NETEV_ROUTE6_ADD, + NETEV_ROUTE6_DEL, + NETEV_NEIGH6_ADD, + NETEV_NEIGH6_DEL, +}; + +struct netevent_handler { + struct list_head head; + void (*cb) (unsigned long event, struct netevent_handler_info *info); +}; + struct odhcpd_ipaddr { union if_addr addr; uint8_t prefix; @@ -87,10 +125,10 @@ struct odhcpd_ipaddr { }; enum odhcpd_mode { - RELAYD_DISABLED, - RELAYD_SERVER, - RELAYD_RELAY, - RELAYD_HYBRID + MODE_DISABLED, + MODE_SERVER, + MODE_RELAY, + MODE_HYBRID }; @@ -127,19 +165,28 @@ struct interface { char *ifname; const char *name; - // Runtime data + // IPv6 runtime data + struct odhcpd_ipaddr *addr6; + size_t addr6_len; + + // RA runtime data struct uloop_timeout timer_rs; + + // DHCPv6 runtime data + struct odhcpd_event dhcpv6_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; - struct odhcpd_ipaddr *ia_addr; - size_t ia_addr_len; - // DHCPv4 - struct odhcpd_event dhcpv6_event; + // DHCPv4 runtime data struct odhcpd_event dhcpv4_event; - struct odhcpd_event ndp_event; struct list_head dhcpv4_assignments; + struct list_head dhcpv4_fr_ips; // Managed PD char dhcpv6_pd_manager[128]; @@ -178,11 +225,17 @@ struct interface { // 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; @@ -213,12 +266,9 @@ 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, 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); @@ -227,11 +277,6 @@ 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); @@ -241,25 +286,41 @@ 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); #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 +int netlink_add_netevent_handler(struct netevent_handler *hdlr); +ssize_t netlink_get_interface_addrs(const int ifindex, bool v6, + struct odhcpd_ipaddr **addrs); +int netlink_setup_route(const struct in6_addr *addr, const int prefixlen, + const int ifindex, const struct in6_addr *gw, + const uint32_t metric, const bool add); +int netlink_setup_proxy_neigh(const struct in6_addr *addr, + const int ifindex, const bool add); +int netlink_setup_addr(struct odhcpd_ipaddr *addr, + const int ifindex, const bool v6, const bool add); +void netlink_dump_neigh_table(const bool proxy); +void netlink_dump_addr_table(const bool v6); // 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);